Lanmikeman/openvk
Lanmikeman/openvk
1
1
Fork 0
mirror of https://github.com/openvk/openvk synced 2024-11-11 01:19:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
KosFurler 2022-01-25 22:26:24 +03:00
commit 43ebb2c8ad
6 changed files with 51 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Web/Presenters/AboutPresenter.php
View file

@ -63,7 +63,7 @@ final class AboutPresenter extends OpenVKPresenter
$this->template->usersStats = (new Users)->getStatistics(); $this->template->usersStats = (new Users)->getStatistics();
$this->template->clubsCount = (new Clubs)->getCount(); $this->template->clubsCount = (new Clubs)->getCount();
$this->template->postsCount = (new Posts)->getCount(); $this->template->postsCount = (new Posts)->getCount();
$this->template->popularClubs = (new Clubs)->getPopularClubs(); $this->template->popularClubs = iterator_to_array((new Clubs)->getPopularClubs());
$this->template->admins = iterator_to_array((new Users)->getInstanceAdmins()); $this->template->admins = iterator_to_array((new Users)->getInstanceAdmins());
} }

1
Web/Presenters/GroupPresenter.php
View file

@ -207,6 +207,7 @@ final class GroupPresenter extends OpenVKPresenter
$club->setShortcode(empty($this->postParam("shortcode")) ? NULL : $this->postParam("shortcode")); $club->setShortcode(empty($this->postParam("shortcode")) ? NULL : $this->postParam("shortcode"));
$club->setWall(empty($this->postParam("wall")) ? 0 : 1); $club->setWall(empty($this->postParam("wall")) ? 0 : 1);
$club->setAdministrators_List_Display(empty($this->postParam("administrators_list_display")) ? 0 : $this->postParam("administrators_list_display")); $club->setAdministrators_List_Display(empty($this->postParam("administrators_list_display")) ? 0 : $this->postParam("administrators_list_display"));
$club->setEveryone_Can_Create_Topics(empty($this->postParam("everyone_can_create_topics")) ? 0 : 1);
$club->setDisplay_Topics_Above_Wall(empty($this->postParam("display_topics_above_wall")) ? 0 : 1); $club->setDisplay_Topics_Above_Wall(empty($this->postParam("display_topics_above_wall")) ? 0 : 1);
$club->setHide_From_Global_Feed(empty($this->postParam("hide_from_global_feed")) ? 0 : 1); $club->setHide_From_Global_Feed(empty($this->postParam("hide_from_global_feed")) ? 0 : 1);

2
Web/Presenters/templates/@listView.xml
View file

@ -11,7 +11,7 @@
{if sizeof($data) > 0} {if sizeof($data) > 0}
<div class="content" n:foreach="$data as $dat"> <div class="content" n:foreach="$data as $dat">
<table cellspacing="0" cellpadding="0"> <table>
<tbody> <tbody>
<tr> <tr>
<td valign="top"> <td valign="top">

20
Web/Presenters/templates/About/AboutInstance.xml
View file

@ -42,15 +42,17 @@
</tbody> </tbody>
</table> </table>
<h4>{_most_popular_groups}</h4> {if sizeof($popularClubs) !== 0}
<ol> <h4>{_most_popular_groups}</h4>
<li n:foreach="$popularClubs as $entry" style="margin-top: 5px;"> <ol>
<a href="{$entry->club->getURL()}">{$entry->club->getName()}</a> <li n:foreach="$popularClubs as $entry" style="margin-top: 5px;">
<div> <a href="{$entry->club->getURL()}">{$entry->club->getName()}</a>
{tr("participants", $entry->subscriptions)} <div>
</div> {tr("participants", $entry->subscriptions)}
</li> </div>
</ol> </li>
</ol>
{/if}
<h4>{_rules}</h4> <h4>{_rules}</h4>
<div style="margin-top: 16px;"> <div style="margin-top: 16px;">

14
Web/Presenters/templates/Photos/AlbumList.xml
View file

@ -28,9 +28,9 @@
{var cover = $x->getCoverPhoto()} {var cover = $x->getCoverPhoto()}
{var preview = is_null($cover) ? "/assets/packages/static/openvk/img/camera_200.png" : $cover->getURL()} {var preview = is_null($cover) ? "/assets/packages/static/openvk/img/camera_200.png" : $cover->getURL()}
<a href="/album{$x->getPrettyId()}"> <a href="/album{$x->getPrettyId()}">
<img src="{$preview}" alt="{$x->getName()}" style="height: 130px;width: 170px;object-fit: cover;margin-right: 15px;" /> <img src="{$preview}" alt="{$x->getName()}" style="height: 130px; width: 170px; object-fit: cover" />
</a> </a>
{/block} {/block}
{block name} {block name}
@ -38,8 +38,8 @@
{/block} {/block}
{block description} {block description}
<span>{$x->getDescription() ?? $x->getName()}</span><br/> <span>{$x->getDescription() ?? $x->getName()}</span><br />
<span style="color: grey;">{$x->getPhotosCount()} фотографий</span><br/> <span style="color: grey;">{$x->getPhotosCount()} фотографий</span><br />
<span style="color: grey;">Обновлен {$x->getEditTime() ?? $x->getCreationTime()}</span> <span style="color: grey;">Обновлен {$x->getEditTime() ?? $x->getCreationTime()}</span><br />
<span style="color: grey;">Создан {$x->getCreationTime()}</span><br/> <span style="color: grey;">Создан {$x->getCreationTime()}</span><br />
{/block} {/block}

60
Web/static/css/style.css
View file

@ -794,9 +794,9 @@ table.User {
} }
.tabs { .tabs {
border-bottom: 1px solid #707070; border-bottom: 1px solid #707070;
margin-right: -12px; margin-right: -12px;
margin-left: -12px; margin-left: -12px;
} }
#activetabs { #activetabs {
@ -1581,10 +1581,10 @@ body.scrolled .toTop:hover {
} }
.postFeedWrapper { .postFeedWrapper {
padding: 4px 8px; padding: 4px 8px;
background-color: rgb(240, 240, 240); background-color: rgb(240, 240, 240);
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
} }
.user-alert { .user-alert {
@ -1787,38 +1787,38 @@ body.scrolled .toTop:hover {
} }
.summaryBar { .summaryBar {
border-bottom: 1px solid #DAE2E8; border-bottom: 1px solid #DAE2E8;
clear: both; clear: both;
padding: 11px 10px; padding: 11px 10px;
color: black; color: black;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
margin-left: -12px; margin-left: -12px;
margin-right: -12px; margin-right: -12px;
} }
.summaryBar .summary { .summaryBar .summary {
color: #45688E; color: #45688E;
font-weight: bold; font-weight: bold;
padding-top: 3px; padding-top: 3px;
padding-bottom: 4px; padding-bottom: 4px;
display: inline-block; display: inline-block;
} }
.note_header { .note_header {
background: #f7f7f7; background: #f7f7f7;
border-bottom: solid 1px #DAE1E8; border-bottom: solid 1px #DAE1E8;
border-top: solid 1px #45688E; border-top: solid 1px #45688E;
padding: 4px 6px 5px 6px; padding: 4px 6px 5px 6px;
} }
.note_header .note_title { .note_header .note_title {
color: #45688E; color: #45688E;
font-size: 13px; font-size: 13px;
font-weight: bold; font-weight: bold;
line-height: 15px; line-height: 15px;
margin: 0; margin: 0;
padding: 0 0 1px 0; padding: 0 0 1px 0;
} }
.note_footer { .note_footer {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;