Fixup "Groups: Update groups layout (#444)"

This commit is contained in:
Maxim Leshchenko 2022-02-01 18:58:39 +02:00
parent 16df715068
commit b7654c8d16
No known key found for this signature in database
GPG key ID: BB9C44A8733FBEEE
4 changed files with 16 additions and 15 deletions

View file

@ -2,7 +2,7 @@
{block wrap} {block wrap}
<div class="page_wrap"> <div class="page_wrap">
<div n:ifset="tabs" class="tabs"> <div n:ifset="tabs" n:ifcontent class="tabs">
{include tabs} {include tabs}
</div> </div>
@ -24,8 +24,8 @@
</a> </a>
</td> </td>
<td valign="top" style="width: 100%"> <td valign="top" style="width: 100%">
{ifset infotable} {ifset infoTable}
{include infotable, x => $dat} {include infoTable, x => $dat}
{else} {else}
<a href="{include link, x => $dat}"> <a href="{include link, x => $dat}">
<b> <b>

View file

@ -23,8 +23,8 @@
{_groups} {_groups}
</a> </a>
</div> </div>
<div n:attr='id => ($admin ? false : "activetabs")' class="tab"> <div n:attr='id => (!$admin ? false : "activetabs")' class="tab">
<a n:attr='id => ($admin ? false : "act_tab_a")' href="/groups{$user->getId()}?act=managed"> <a n:attr='id => (!$admin ? false : "act_tab_a")' href="/groups{$user->getId()}?act=managed">
{_managed} {_managed}
</a> </a>
</div> </div>
@ -32,7 +32,7 @@
{/block} {/block}
{block size} {block size}
<div style="padding-bottom: 0px;border-bottom: 0;" class="summaryBar"> <div n:if="!is_null($thisUser) && $user->getId() === $thisUser->getId()" style="padding-bottom: 0px; border-bottom: 0;" class="summaryBar">
<div class="summary"> <div class="summary">
{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} {if !is_null($thisUser) && $user->getId() === $thisUser->getId()}
{tr("groups_list", $thisUser->getClubCount())} {tr("groups_list", $thisUser->getClubCount())}
@ -51,15 +51,15 @@
<img src="{$x->getAvatarUrl()}" width="75" alt="Фотография группы" /> <img src="{$x->getAvatarUrl()}" width="75" alt="Фотография группы" />
{/block} {/block}
{block infotable} {block infoTable}
<table id="basicInfo" class="ugc-table group_info" cellspacing="0" cellpadding="0" border="0"> <table id="basicInfo" class="ugc-table group_info" cellspacing="0" cellpadding="0" border="0">
<tbody> <tbody>
<tr> <tr>
<td class="label"><span class="nobold">Название: </span></td> <td class="label"><span class="nobold">{_name}: </span></td>
<td class="data"><a href="{$x->getURL()}">{$x->getName()}</a></td> <td class="data"><a href="{$x->getURL()}">{$x->getName()}</a></td>
</tr> </tr>
<tr> <tr>
<td class="label"><span class="nobold">Размер:</span></td> <td class="label"><span class="nobold">{_size}:</span></td>
<td class="data"><a href="/club{$x->getId()}/followers">{tr("participants", $x->getFollowersCount())}</a></td> <td class="data"><a href="/club{$x->getId()}/followers">{tr("participants", $x->getFollowersCount())}</a></td>
</tr> </tr>
</tbody> </tbody>
@ -73,11 +73,11 @@
{block actions} {block actions}
{var clubPinned = $thisUser->isClubPinned($x)} {var clubPinned = $thisUser->isClubPinned($x)}
{if $x->canBeModifiedBy($thisUser ?? NULL) && ($clubPinned || $thisUser->getPinnedClubCount() <= 10)} {if $x->canBeModifiedBy($thisUser ?? NULL) && ($clubPinned || $thisUser->getPinnedClubCount() <= 10)}
<a style="border-bottom: none; width: 140px;" class="profile_link" href="{$x->getURL()}"> <a style="width: 140px;" class="profile_link" href="{$x->getURL()}">
{_check_community} {_check_community}
</a> </a>
<a style="border-bottom: none; width: 140px;" class="profile_link" href="/groups_pin?club={$x->getId()}&hash={rawurlencode($csrfToken)}" data-group-name="{$x->getName()}" data-group-url="{$x->getUrl()}"> <a style="width: 140px;" class="profile_link" href="/groups_pin?club={$x->getId()}&hash={rawurlencode($csrfToken)}" id="_pinGroup" data-group-name="{$x->getName()}" data-group-url="{$x->getUrl()}">
{if $clubPinned} {if $clubPinned}
{_remove_from_left_menu} {_remove_from_left_menu}
{else} {else}
@ -89,16 +89,15 @@
<input type="hidden" name="act" value="rem" /> <input type="hidden" name="act" value="rem" />
<input type="hidden" name="id" value="{$x->getId()}" /> <input type="hidden" name="id" value="{$x->getId()}" />
<input type="hidden" name="hash" value="{$csrfToken}" /> <input type="hidden" name="hash" value="{$csrfToken}" />
<input style="text-transform: lowercase; border-bottom: none; width: 140px;" type="submit" id="profile_link" value="{_leave_community}" /> <input style="width: 140px; text-transform: lowercase;" type="submit" id="profile_link" value="{_leave_community}" />
</form> </form>
{/if} {/if}
{/block} {/block}
{block bottom} {block bottom}
{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} {if !is_null($thisUser) && $user->getId() === $thisUser->getId()}
<div class="groups_options"> <div class="groups_options">
<div id="gp_container" style="width: 200px;margin-right: 40px;"> <div id="gp_container" style="width: 200px; margin-right: 40px;">
<h4>{_open_new_group}</h4> <h4>{_open_new_group}</h4>
<span>{_open_group_desc}</span> <span>{_open_group_desc}</span>
<form action="/groups_create"> <form action="/groups_create">
@ -110,7 +109,7 @@
<span>{_search_group_desc}</span> <span>{_search_group_desc}</span>
<form action="/search"> <form action="/search">
<input name="type" type="hidden" value="groups"> <input name="type" type="hidden" value="groups">
<input name="query" class="header_search_input" value="" style="background: none;width: 155px;padding-left: 3px;"> <input name="query" class="header_search_input" value="" style="background: none; width: 155px; padding-left: 3px;">
<button class="button">{_search_by_groups}</button> <button class="button">{_search_by_groups}</button>
</form> </form>
</div> </div>

View file

@ -241,6 +241,7 @@
"only_administrators" = "Only administrators"; "only_administrators" = "Only administrators";
"website" = "Website"; "website" = "Website";
"managed" = "Managed"; "managed" = "Managed";
"size" = "Size";
"administrators_one" = "$1 administrator"; "administrators_one" = "$1 administrator";
"administrators_other" = "$1 administrators"; "administrators_other" = "$1 administrators";

View file

@ -250,6 +250,7 @@
"only_administrators" = "Только администраторы"; "only_administrators" = "Только администраторы";
"website" = "Сайт"; "website" = "Сайт";
"managed" = "Управляемые"; "managed" = "Управляемые";
"size" = "Размер";
"administrators_one" = "$1 администратор"; "administrators_one" = "$1 администратор";
"administrators_few" = "$1 администратора"; "administrators_few" = "$1 администратора";