mirror of
https://github.com/openvk/openvk
synced 2024-09-21 08:36:17 +03:00
Global: Some fixes
I corrected the layout and tabulation a bit and put the QA Team back in the OpenVK version description.
This commit is contained in:
Ilya Prokopenko
parent
70dd7e3773
commit
3b1d85d64f
3 changed files with 193 additions and 219 deletions
|
|
@ -1,21 +1,23 @@
|
|||
{var instance_name = OPENVK_ROOT_CONF['openvk']['appearance']['name']}
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Произошёл троллинг... | OpenVK</title>
|
||||
<title>An error occurred - {$instance_name}</title>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, user-scalable=no" />
|
||||
<style>
|
||||
@keyframes gradient {
|
||||
0% {
|
||||
background-position:0% 50%
|
||||
background-position: 0% 50%;
|
||||
}
|
||||
|
||||
50% {
|
||||
background-position:100% 50%
|
||||
background-position: 100% 50%;
|
||||
}
|
||||
|
||||
100% {
|
||||
background-position:0% 50%
|
||||
background-position: 0% 50%;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{var instance_name = OPENVK_ROOT_CONF['openvk']['appearance']['name']}
|
||||
|
||||
<!DOCTYPE html n:if="!isset($parentModule) || substr($parentModule, 0, 21) === 'libchandler:absolute.'">
|
||||
<html n:if="!isset($parentModule) || substr($parentModule, 0, 21) === 'libchandler:absolute.'">
|
||||
<head>
|
||||
<title>
|
||||
|
|
@ -9,6 +10,7 @@
|
|||
<link rel="shortcut icon" href="/assets/packages/static/openvk/img/icon.ico" />
|
||||
<meta name="application-name" content="{$instance_name}" />
|
||||
<meta n:ifset="$csrfToken" name="csrf" value="{$csrfToken}" />
|
||||
|
||||
<script src="/language/{php echo getLanguage()}.js" crossorigin="anonymous"></script>
|
||||
{script "js/node_modules/jquery/dist/jquery.min.js"}
|
||||
{script "js/node_modules/umbrellajs/umbrella.min.js"}
|
||||
|
|
@ -25,12 +27,14 @@
|
|||
{css "css/style.css"}
|
||||
{css "css/dialog.css"}
|
||||
{css "css/notifications.css"}
|
||||
|
||||
{if $isXmas}
|
||||
{css "css/xmas.css"}
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
<link rel="stylesheet" href="/themepack/{$theme->getId()}/{$theme->getVersion()}/stylesheet/styles.css" />
|
||||
|
||||
{if $isXmas}
|
||||
<link rel="stylesheet" href="/themepack/{$theme->getId()}/{$theme->getVersion()}/resource/xmas.css" />
|
||||
{/if}
|
||||
|
|
@ -38,6 +42,7 @@
|
|||
{css "css/style.css"}
|
||||
{css "css/dialog.css"}
|
||||
{css "css/notifications.css"}
|
||||
|
||||
{if $isXmas}
|
||||
{css "css/xmas.css"}
|
||||
{/if}
|
||||
|
|
@ -46,11 +51,11 @@
|
|||
{if $thisUser->getStyleAvatar() == 1}
|
||||
{css "css/avatar.1.css"}
|
||||
{/if}
|
||||
|
||||
{if $thisUser->getStyleAvatar() == 2}
|
||||
{css "css/avatar.2.css"}
|
||||
{/if}
|
||||
|
||||
|
||||
{if $thisUser->hasMicroblogEnabled() == 1}
|
||||
{css "css/microblog.css"}
|
||||
{/if}
|
||||
|
|
@ -65,7 +70,9 @@
|
|||
{/if}
|
||||
{/ifset}
|
||||
|
||||
{ifset headIncludes}{include headIncludes}{/ifset}
|
||||
{ifset headIncludes}
|
||||
{include headIncludes}
|
||||
{/ifset}
|
||||
</head>
|
||||
<body>
|
||||
<div id="sudo-banner" n:if="isset($thisUser) && $userTainted">
|
||||
|
|
@ -77,8 +84,10 @@
|
|||
</div>
|
||||
|
||||
<div n:if="OPENVK_ROOT_CONF['openvk']['preferences']['bellsAndWhistles']['testLabel']" id="test-label">FOR TESTING PURPOSES ONLY</div>
|
||||
|
||||
<div class="notifications_global_wrap"></div>
|
||||
<div class="dimmer"></div>
|
||||
|
||||
<div class="toTop">
|
||||
⬆ Вверх
|
||||
</div>
|
||||
|
|
@ -90,44 +99,37 @@
|
|||
<div n:if="isset($thisUser) ? !$thisUser->isBanned() : true" class="header_navigation">
|
||||
{ifset $thisUser}
|
||||
<div class="link">
|
||||
<a href="/">{_"header_home"}</a>
|
||||
<a href="/">{_header_home}</a>
|
||||
</div>
|
||||
<div class="link">
|
||||
<a href="/search?type=groups">{_"header_groups"}</a>
|
||||
<a href="/search?type=groups">{_header_groups}</a>
|
||||
</div>
|
||||
<div class="link">
|
||||
<a href="/search">{_"header_search"}</a>
|
||||
<a href="/search">{_header_search}</a>
|
||||
</div>
|
||||
<div class="link">
|
||||
<a href="/invite">
|
||||
{_"header_invite"}
|
||||
</a>
|
||||
<a href="/invite">{_header_invite}</a>
|
||||
</div>
|
||||
<div class="link">
|
||||
<a href="/support">
|
||||
{_"header_help"}
|
||||
<b n:if="$ticketAnsweredCount > 0">({$ticketAnsweredCount})</b>
|
||||
</a>
|
||||
<a href="/support">{_header_help} <b n:if="$ticketAnsweredCount > 0">({$ticketAnsweredCount})</b></a>
|
||||
</div>
|
||||
<div class="link">
|
||||
<a href="/logout?hash={urlencode($csrfToken)}">{_"header_log_out"}</a>
|
||||
<a href="/logout?hash={urlencode($csrfToken)}">{_header_log_out}</a>
|
||||
</div>
|
||||
<div class="link">
|
||||
<form action="/search" method="get">
|
||||
<input type="search" name="query" placeholder="{_"header_search"}" style="height: 20px;background: url('/assets/packages/static/openvk/img/search_icon.png') no-repeat 3px 4px; background-color: #fff; padding-left: 18px;width: 120px;" />
|
||||
<input type="search" name="query" placeholder="{_header_search}" style="height: 20px;background: url('/assets/packages/static/openvk/img/search_icon.png') no-repeat 3px 4px; background-color: #fff; padding-left: 18px;width: 120px;" />
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
||||
{else}
|
||||
<div class="link">
|
||||
<a href="/login">{_"header_login"}</a>
|
||||
<a href="/login">{_header_login}</a>
|
||||
</div>
|
||||
<div n:if="OPENVK_ROOT_CONF['openvk']['preferences']['registration']['enable']" class="link">
|
||||
<a href="/reg">{_"header_registration"}</a>
|
||||
<a href="/reg">{_header_registration}</a>
|
||||
</div>
|
||||
<div class="link">
|
||||
<a href="/support">{_"header_help"}</a>
|
||||
<a href="/support">{_header_help}</a>
|
||||
</div>
|
||||
{/ifset}
|
||||
</div>
|
||||
|
|
@ -137,87 +139,67 @@
|
|||
<div class="navigation">
|
||||
{ifset $thisUser}
|
||||
{if !$thisUser->isBanned()}
|
||||
<a href="/edit" class="link edit-button">{_"edit_button"}</a>
|
||||
<a href="{$thisUser->getURL()}" class="link">{_"my_page"}</a>
|
||||
<a href="/friends{$thisUser->getId()}" class="link">{_"my_friends"}
|
||||
{if $thisUser->getFollowersCount() > 0}
|
||||
<object type="internal/link">
|
||||
<a href="/edit" class="link edit-button">{_edit_button}</a>
|
||||
<a href="{$thisUser->getURL()}" class="link">{_my_page}</a>
|
||||
<a href="/friends{$thisUser->getId()}" class="link">{_my_friends}
|
||||
<object type="internal/link" n:if="$thisUser->getFollowersCount() > 0">
|
||||
<a href="/friends{$thisUser->getId()}?act=incoming">
|
||||
(<b>{$thisUser->getFollowersCount()}</b>)
|
||||
</a>
|
||||
</object>
|
||||
{/if}</a>
|
||||
<a n:if="$thisUser->getLeftMenuItemStatus('photos')" href="/albums{$thisUser->getId()}" class="link">{_"my_photos"}</a>
|
||||
<a n:if="$thisUser->getLeftMenuItemStatus('videos')" href="/videos{$thisUser->getId()}" class="link">{_"my_videos"}</a>
|
||||
<a n:if="$thisUser->getLeftMenuItemStatus('messages')" href="/im" class="link">{_"my_messages"}
|
||||
{if $thisUser->getUnreadMessagesCount() > 0}
|
||||
<object type="internal/link">
|
||||
</a>
|
||||
<a n:if="$thisUser->getLeftMenuItemStatus('photos')" href="/albums{$thisUser->getId()}" class="link">{_my_photos}</a>
|
||||
<a n:if="$thisUser->getLeftMenuItemStatus('videos')" href="/videos{$thisUser->getId()}" class="link">{_my_videos}</a>
|
||||
<a n:if="$thisUser->getLeftMenuItemStatus('messages')" href="/im" class="link">{_my_messages}
|
||||
<object type="internal/link" n:if="$thisUser->getUnreadMessagesCount() > 0">
|
||||
(<b>{$thisUser->getUnreadMessagesCount()}</b>)
|
||||
</object>
|
||||
|
||||
{/if}
|
||||
</a>
|
||||
<a n:if="$thisUser->getLeftMenuItemStatus('notes')" href="/notes{$thisUser->getId()}" class="link">{_"my_notes"}</a>
|
||||
<a n:if="$thisUser->getLeftMenuItemStatus('groups')" href="/groups{$thisUser->getId()}" class="link">{_"my_groups"}</a>
|
||||
<a n:if="$thisUser->getLeftMenuItemStatus('news')" href="/feed" class="link">{_"my_feed"}</a>
|
||||
<a n:if="$thisUser->getLeftMenuItemStatus('notes')" href="/notes{$thisUser->getId()}" class="link">{_my_notes}</a>
|
||||
<a n:if="$thisUser->getLeftMenuItemStatus('groups')" href="/groups{$thisUser->getId()}" class="link">{_my_groups}</a>
|
||||
<a n:if="$thisUser->getLeftMenuItemStatus('news')" href="/feed" class="link">{_my_feed}</a>
|
||||
<a href="/notifications" class="link">{_my_feedback}
|
||||
{if $thisUser->getNotificationsCount() > 0}
|
||||
(<b>{$thisUser->getNotificationsCount()}</b>)
|
||||
{/if}
|
||||
</a>
|
||||
<a href="/settings" class="link">{_"my_settings"}</a>
|
||||
<a href="/settings" class="link">{_my_settings}</a>
|
||||
|
||||
{var canAccessAdminPanel = $thisUser->getChandlerUser()->can("access")->model("admin")->whichBelongsTo(NULL)}
|
||||
{var canAccessHelpdesk = $thisUser->getChandlerUser()->can("write")->model('openvk\Web\Models\Entities\TicketReply')->whichBelongsTo(0)}
|
||||
{var menuLinksAvaiable = sizeof(OPENVK_ROOT_CONF['openvk']['preferences']['menu']['links']) > 0 && $thisUser->getLeftMenuItemStatus('links')}
|
||||
<div n:if="$canAccessAdminPanel || $canAccessHelpdesk || $menuLinksAvaiable" class="menu_divider"></div>
|
||||
{if $canAccessAdminPanel}
|
||||
<a href="/admin" class="link">Админ-панель</a>
|
||||
{/if}
|
||||
{if $canAccessHelpdesk}
|
||||
<a href="/support/tickets" class="link">Helpdesk
|
||||
<a href="/admin" class="link" n:if="$canAccessAdminPanel">Админ-панель</a>
|
||||
<a href="/support/tickets" class="link" n:if="$canAccessHelpdesk">Helpdesk
|
||||
{if $helpdeskTicketNotAnsweredCount > 0}
|
||||
(<b>{$helpdeskTicketNotAnsweredCount}</b>)
|
||||
{/if}
|
||||
</a>
|
||||
{/if}
|
||||
<a
|
||||
n:if="$thisUser->getLeftMenuItemStatus('links')"
|
||||
n:foreach="OPENVK_ROOT_CONF['openvk']['preferences']['menu']['links'] as $menuItem"
|
||||
href="{$menuItem['url']}"
|
||||
target="_blank"
|
||||
class="link">{strpos($menuItem["name"], "@") === 0 ? tr(substr($menuItem["name"], 1)) : $menuItem["name"]}</a>
|
||||
|
||||
<a n:if="$thisUser->getLeftMenuItemStatus('links')" n:foreach="OPENVK_ROOT_CONF['openvk']['preferences']['menu']['links'] as $menuItem" href="{$menuItem['url']}" target="_blank" class="link">{strpos($menuItem["name"], "@") === 0 ? tr(substr($menuItem["name"], 1)) : $menuItem["name"]}</a>
|
||||
|
||||
<div id="_groupListPinnedGroups">
|
||||
<div n:if="$thisUser->getPinnedClubCount() > 0" class="menu_divider"></div>
|
||||
<a
|
||||
n:foreach="$thisUser->getPinnedClubs() as $club"
|
||||
href="{$club->getURL()}"
|
||||
class="link group_link">{$club->getName()}</a>
|
||||
|
||||
<a n:foreach="$thisUser->getPinnedClubs() as $club" href="{$club->getURL()}" class="link group_link">{$club->getName()}</a>
|
||||
</div>
|
||||
<a
|
||||
n:if="OPENVK_ROOT_CONF['openvk']['preferences']['adPoster']['enable'] && $thisUser->getLeftMenuItemStatus('poster')"
|
||||
href="{php echo OPENVK_ROOT_CONF['openvk']['preferences']['adPoster']['link']}" >
|
||||
<img
|
||||
src="{php echo OPENVK_ROOT_CONF['openvk']['preferences']['adPoster']['src']}"
|
||||
alt="{php echo OPENVK_ROOT_CONF['openvk']['preferences']['adPoster']['caption']}"
|
||||
class="psa-poster"
|
||||
style="max-width: 100%; margin-top: 50px;" />
|
||||
<a n:if="OPENVK_ROOT_CONF['openvk']['preferences']['adPoster']['enable'] && $thisUser->getLeftMenuItemStatus('poster')" href="{php echo OPENVK_ROOT_CONF['openvk']['preferences']['adPoster']['link']}" >
|
||||
<img src="{php echo OPENVK_ROOT_CONF['openvk']['preferences']['adPoster']['src']}" alt="{php echo OPENVK_ROOT_CONF['openvk']['preferences']['adPoster']['caption']}" class="psa-poster" style="max-width: 100%; margin-top: 50px;" />
|
||||
</a>
|
||||
{else}
|
||||
<a href="/support" class="link">{_"menu_support"}</a>
|
||||
<a href="/logout?hash={urlencode($csrfToken)}" class="link">{_"menu_logout"}</a>
|
||||
<a href="/support" class="link">{_menu_support}</a>
|
||||
<a href="/logout?hash={urlencode($csrfToken)}" class="link">{_menu_logout}</a>
|
||||
{/if}
|
||||
{else}
|
||||
<form id="fastLogin" action="/login" method="POST" enctype="multipart/form-data">
|
||||
<label for="login"><span>{_"email"}:</span></label>
|
||||
<label for="login"><span>{_email}:</span></label>
|
||||
<input id="login" type="text" name="login" required />
|
||||
<label for="password"><span>{_"password"}:</span></label>
|
||||
<label for="password"><span>{_password}:</span></label>
|
||||
<input id="password" type="password" name="password" required />
|
||||
<input type="hidden" name="jReturnTo" value="{$_SERVER['REQUEST_URI']}" />
|
||||
<input type="hidden" name="hash" value="{$csrfToken}" />
|
||||
<input type="submit" value="{_'log_in'}" class="button" style="display: inline-block;" />
|
||||
<input type="submit" value="{_log_in}" class="button" style="display: inline-block;" />
|
||||
<a n:if="OPENVK_ROOT_CONF['openvk']['preferences']['registration']['enable']" href="/reg" class="button" style="display: inline-block;">{_registration}</a><br><br>
|
||||
<a href="/restore">{_"forgot_password"}</a>
|
||||
<a href="/restore">{_forgot_password}</a>
|
||||
</form>
|
||||
{/ifset}
|
||||
</div>
|
||||
|
|
@ -233,12 +215,10 @@
|
|||
</div>
|
||||
|
||||
{ifset wrap}
|
||||
{ifset $flashMessage}
|
||||
<div class="msg msg_{$flashMessage->type}">
|
||||
<div class="msg msg_{$flashMessage->type}" n:ifset="$flashMessage">
|
||||
<b>{$flashMessage->title}</b><br/>
|
||||
{$flashMessage->msg|noescape}
|
||||
</div>
|
||||
{/ifset}
|
||||
|
||||
{include wrap}
|
||||
{else}
|
||||
|
|
@ -246,12 +226,10 @@
|
|||
<div class="wrap1">
|
||||
<div id="auth" class="page-wrap">
|
||||
<div class="page_content">
|
||||
{ifset $flashMessage}
|
||||
<div class="msg msg_{$flashMessage->type}">
|
||||
<div class="msg msg_{$flashMessage->type}" n:ifset="$flashMessage">
|
||||
<b>{$flashMessage->title}</b><br/>
|
||||
{$flashMessage->msg|noescape}
|
||||
</div>
|
||||
{/ifset}
|
||||
|
||||
{include content}
|
||||
</div>
|
||||
|
|
@ -259,7 +237,6 @@
|
|||
</div>
|
||||
</div>
|
||||
{/ifset}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -300,9 +277,7 @@
|
|||
</script>
|
||||
{/if}
|
||||
|
||||
<script n:if="OPENVK_ROOT_CONF['openvk']['telemetry']['plausible']['enable']"
|
||||
async defer data-domain="{php echo OPENVK_ROOT_CONF['openvk']['telemetry']['plausible']['domain']}"
|
||||
src="{php echo OPENVK_ROOT_CONF['openvk']['telemetry']['plausible']['server']}js/plausible.js"></script>
|
||||
<script n:if="OPENVK_ROOT_CONF['openvk']['telemetry']['plausible']['enable']" async defer data-domain="{php echo OPENVK_ROOT_CONF['openvk']['telemetry']['plausible']['domain']}" src="{php echo OPENVK_ROOT_CONF['openvk']['telemetry']['plausible']['server']}js/plausible.js"></script>
|
||||
|
||||
{ifset bodyScripts}
|
||||
{include bodyScripts}
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@
|
|||
text-align: center !important;
|
||||
}
|
||||
|
||||
td,
|
||||
th {
|
||||
td, th {
|
||||
border: 1px solid #666;
|
||||
vertical-align: baseline;
|
||||
padding: 4px 5px;
|
||||
|
|
@ -62,7 +61,7 @@
|
|||
.h {
|
||||
background-color: #13599f;
|
||||
font-weight: bold;
|
||||
color: #fff
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.v {
|
||||
|
|
@ -133,7 +132,7 @@
|
|||
<tr class="v">
|
||||
<td>
|
||||
This program makes use of the Chandler open-source web application server:<br/>
|
||||
libchandler {=CHANDLER_VER} by rem-pai
|
||||
libchandler {=CHANDLER_VER} by Celestora
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
@ -362,7 +361,7 @@
|
|||
Default OpenVK look and feel.
|
||||
</td>
|
||||
<td class="v">
|
||||
Vladimir Barinov, Konstantin Kichulkin and Daniil Myslivets
|
||||
Vladimir Barinov, Konstantin Kichulkin and Daniel Myslivets
|
||||
</td>
|
||||
</tr>
|
||||
<tr n:foreach="$themes as $theme">
|
||||
|
|
@ -396,8 +395,8 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td class="e">
|
||||
Vladimir Barinov (veselcraft), Alexandra Katunina (rem-pai), Konstantin Kichulkin (kosfurler),
|
||||
Nikita Volkov (sup_ban), Daniel Myslivets (myslivets), Alexander Kotov (l-lacker),
|
||||
Vladimir Barinov (veselcraft), Celestora, Konstantin Kichulkin (kosfurler),
|
||||
Nikita Volkov (sup_ban), Daniel Myslivets, Alexander Kotov (l-lacker),
|
||||
Alexey Assemblerov (BiosNod), Ilya Prokopenko (dsrev) and Maxim Leshchenko (maksales / maksalees)
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -459,7 +458,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td class="e">Initial hosting</td>
|
||||
<td class="v">Ilya Prokopenko (dsrev) and Alexandra Katunina (rem-pai)</td>
|
||||
<td class="v">Ilya Prokopenko (dsrev) and Celestora</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="e">Initial bug-tracker hosting</td>
|
||||
|
|
@ -467,22 +466,18 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td class="e">Images</td>
|
||||
<td class="v">Vladimir Barinov (veselcraft), Konstantin Kichulkin (kosfurler) and Daniil Myslivets (myslivets)</td>
|
||||
<td class="v">Vladimir Barinov (veselcraft), Konstantin Kichulkin (kosfurler) and Daniel Myslivets</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="e">Illustrations</td>
|
||||
<td class="v">Ash Defenders</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="e">Soundtrack</td>
|
||||
<td class="v">Ash Defenders</td>
|
||||
<td class="v">Ash Defenders, Polina Katunina (RousPhaul)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="e">Best barmaid</td>
|
||||
<td class="v">Jill</td>
|
||||
<td class="v">Jill</td> {* I can agree ~~ dsrev *}
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="e">Helpdesk implementation</td>
|
||||
<td class="e">Initial Helpdesk implementation</td>
|
||||
<td class="v">Nikita Volkov (sup_ban)</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
@ -495,8 +490,10 @@
|
|||
</tr>
|
||||
<tr class="e">
|
||||
<td>
|
||||
Vladimir Lapskiy (0x7d5), Alexander Minkin (WerySkok), Polina Katunina (RousPhaul),
|
||||
Egor Shevchenko, Dmitriy Daemon and Ilya Prokopenko (dsrev).
|
||||
kovaltim, Vladimir Lapskiy (0x7d5), Alexander Minkin (WerySkok), Polina Katunina (RousPhaul), veth,
|
||||
Egor Shevchenko, Vadim Korovin (yuni), Ash Defenders,
|
||||
Pavel Silaev, Dmitriy Daemon, Ilya Prokopenko (dsrev),
|
||||
cmed404 and unknown tester, who disappeared shortly after trying to upload post with cat.
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
|
|||
Loading…
Reference in a new issue