Merge branch 'master' of github.com:openvk/openvk

This commit is contained in:
veselcraft 2022-01-22 15:55:09 +03:00
commit 2e0f51eb80
No known key found for this signature in database
GPG key ID: AED66BC1AC628A4E
5 changed files with 12 additions and 7 deletions

View file

@ -222,7 +222,6 @@ final class SupportPresenter extends OpenVKPresenter
$content = implode($lines); $content = implode($lines);
$parser = new Parsedown(); $parser = new Parsedown();
$parser->setSafeMode(true);
$this->template->heading = $heading; $this->template->heading = $heading;
$this->template->content = $parser->text($content); $this->template->content = $parser->text($content);
} }

View file

@ -6,7 +6,7 @@
{var css = file_get_contents(OPENVK_ROOT . "/Web/static/js/node_modules/@atlassian/aui/dist/aui/aui-prototyping.css")} {var css = file_get_contents(OPENVK_ROOT . "/Web/static/js/node_modules/@atlassian/aui/dist/aui/aui-prototyping.css")}
{str_replace("fonts/", "/assets/packages/static/openvk/js/node_modules/@atlassian/aui/dist/aui/fonts/", $css)|noescape} {str_replace("fonts/", "/assets/packages/static/openvk/js/node_modules/@atlassian/aui/dist/aui/fonts/", $css)|noescape}
</style> </style>
<title>{include title}</title> <title>{include title} - Админ-панель {=OPENVK_ROOT_CONF['openvk']['appearance']['name']}</title>
</head> </head>
<body> <body>
<div id="page"> <div id="page">
@ -16,7 +16,7 @@
<div class="aui-header-primary"> <div class="aui-header-primary">
<h1 id="logo" class="aui-header-logo aui-header-logo-textonly"> <h1 id="logo" class="aui-header-logo aui-header-logo-textonly">
<a href="/admin"> <a href="/admin">
<span class="aui-header-logo-device">OVK</span> <span class="aui-header-logo-device">{=OPENVK_ROOT_CONF['openvk']['appearance']['name']}</span>
</a> </a>
</h1> </h1>
</div> </div>
@ -163,9 +163,7 @@
</div> </div>
<footer id="footer" role="contentinfo"> <footer id="footer" role="contentinfo">
<section class="footer-body"> <section class="footer-body">
<div id="footer-logo"> OpenVK <a href="/about:openvk">{php echo OPENVK_VERSION}</a> | PHP: {phpversion()} | DB: {\Chandler\Database\DatabaseConnection::i()->getConnection()->getPdo()->getAttribute(\PDO::ATTR_SERVER_VERSION)}
OpenVK
</div>
</section> </section>
</footer> </footer>
</div> </div>

View file

@ -129,7 +129,8 @@
{/foreach} {/foreach}
<div n:ifset="$thisUser" id="commentTextArea{$commentTextAreaId}" n:attr="style => ($commentsCount == 0 ? 'display: none;')" class="commentsTextFieldWrap"> <div n:ifset="$thisUser" id="commentTextArea{$commentTextAreaId}" n:attr="style => ($commentsCount == 0 ? 'display: none;')" class="commentsTextFieldWrap">
{var commentsURL = "/al_comments/create/posts/" . $post->getId()} {var commentsURL = "/al_comments/create/posts/" . $post->getId()}
{include "../textArea.xml", route => $commentsURL, postOpts => false, graffiti => (bool) ovkGetQuirk("comments.allow-graffiti"), post => $post} {var club = is_null($club) ? ($post->getTargetWall() < 0 ? (new openvk\Web\Models\Repositories\Clubs)->get(abs($post->getTargetWall())) : NULL) : $club}
{include "../textArea.xml", route => $commentsURL, postOpts => false, graffiti => (bool) ovkGetQuirk("comments.allow-graffiti"), post => $post, club => $club}
</div> </div>
</div> </div>
{/if} {/if}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View file

@ -15,6 +15,13 @@ body {
background-position-x: 1px; background-position-x: 1px;
} }
.home_button_custom {
background: url("/themepack/openvk_modern/0.0.1.0/resource/5.png") no-repeat;
background-position-y: 0px;
background-position-x: 1px;
text-shadow: none;
}
.header_navigation .link { .header_navigation .link {
background: unset; background: unset;
} }