diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml index 9b47d992..e6bfaa8a 100644 --- a/Web/Presenters/templates/@listView.xml +++ b/Web/Presenters/templates/@listView.xml @@ -9,58 +9,62 @@ {ifset size} {include size, x => $dat} {/ifset} + + {ifset specpage} + {include specpage, x => $dat} + {else} +
+ {var data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} -
- {var data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} - - {if sizeof($data) > 0} -
- - - - - + + + + +
- - {include preview, x => $dat} - - - {ifset infoTable} - {include infoTable, x => $dat} - {else} + {if sizeof($data) > 0} +
+ + + + - - - -
- - {include name, x => $dat} - + {include preview, x => $dat} -
- {include description, x => $dat} - {/ifset} -
-
- {include "components/paginator.xml", conf => (object) [ - "page" => $page, - "count" => $count, - "amount" => sizeof($data), - "perPage" => $perPage ?? OPENVK_DEFAULT_PER_PAGE, - "atBottom" => true, - ]} - {else} - {ifset customErrorMessage} - {include customErrorMessage} +
+ {ifset infotable} + {include infotable, x => $dat} + {else} + + + {include name, x => $dat} + + +
+ {include description, x => $dat} + {/ifset} +
+
+ {include "components/paginator.xml", conf => (object) [ + "page" => $page, + "count" => $count, + "amount" => sizeof($data), + "perPage" => $perPage ?? OPENVK_DEFAULT_PER_PAGE, + "atBottom" => true, + ]} {else} - {include "components/nothing.xml"} - {/ifset} - {/if} -
+ {ifset customErrorMessage} + {include customErrorMessage} + {else} + {include "components/nothing.xml"} + {/ifset} + {/if} +
+ {/ifset} {ifset bottom} {include bottom} {/ifset} -{/block} +{/block} \ No newline at end of file diff --git a/Web/Presenters/templates/Notes/List.xml b/Web/Presenters/templates/Notes/List.xml index 44d831f5..2fb31c0c 100644 --- a/Web/Presenters/templates/Notes/List.xml +++ b/Web/Presenters/templates/Notes/List.xml @@ -5,12 +5,25 @@ {block title}{_notes}{/block} {block header} - {$owner->getCanonicalName()} - » - {_notes} - -
- {_create_note} + {if isset($thisUser) && $thisUser->getId() == $owner->getId()} + {_my_notes} + {else} + + {$owner->getCanonicalName()} + » + {_notes} + {/if} +{/block} + +{block size} +
+
+ {tr("notes_list", $count)} + +  |  + {_create_note} + +
{/block} @@ -20,18 +33,66 @@ {* BEGIN ELEMENTS DESCRIPTION *} -{block link|strip|stripHtml} - /note{$x->getPrettyId()} -{/block} +{block specpage} +
-{block preview} -
{_note}
-{/block} + {var data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} + {if sizeof($data) > 0} -{block name} - {$x->getName()} -{/block} +
+
+ + + +
+ +
+ + {else} + {if isset($thisUser) && $thisUser->getId() == $owner->getId()} + +

{_welcome}

{_notes_start_screen}
+ + {else} + {ifset customErrorMessage} + {include ../customErrorMessage} + {else} + {include ../components/nothing.xml} + {/ifset} + {/if} + {/if} +
{/block} diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 26c7b7e1..3a92bed8 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -32,7 +32,7 @@ {/block} {block size} -
+
{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} {tr("groups_list", $thisUser->getClubCount())} @@ -72,19 +72,19 @@ {block actions} {var clubPinned = $thisUser->isClubPinned($x)} - {if $x->canBeModifiedBy($thisUser ?? NULL) && ($clubPinned || $thisUser->getPinnedClubCount() <= 10)} - + {if $x->canBeModifiedBy($thisUser ?? NULL)} + {_check_community} - - - {if $clubPinned} - {_remove_from_left_menu} - {else} - {_add_to_left_menu} - {/if} - - + {if ($clubPinned || $thisUser->getPinnedClubCount() <= 10)} + + {if $clubPinned} + {_remove_from_left_menu} + {else} + {_add_to_left_menu} + {/if} + + {/if}
@@ -116,3 +116,26 @@
{/if} {/block} + +{block bottom} + {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} +
+
+

{_open_new_group}

+ {_open_group_desc} + + + +
+
+

{_search_group}

+ {_search_group_desc} +
+ + + +
+
+
+ {/if} +{/block} \ No newline at end of file diff --git a/Web/Presenters/templates/Videos/List.xml b/Web/Presenters/templates/Videos/List.xml index 0f04b482..be9e3cad 100644 --- a/Web/Presenters/templates/Videos/List.xml +++ b/Web/Presenters/templates/Videos/List.xml @@ -8,9 +8,17 @@ {block header} {$user->getCanonicalName()} » {_"videos"} - -
- {_"upload_video"} +{/block} + +{block size} +
+
+ {tr("videos", $count)} + +  |  + {_upload_video} + +
{/block} diff --git a/Web/static/css/style.css b/Web/static/css/style.css index cf40d339..b10bd125 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -1866,6 +1866,17 @@ body.scrolled .toTop:hover { padding-right: 5px; } +table td[width="120"] { + text-align: right; +} + +.profile_thumb { + padding: 0px 10px 0px 0px; + width: 50px; + display: inline-block; + vertical-align: top; +} + .border-block { box-shadow: inset 0px 0 0px 1px #b6bfca, inset 0px 0 0px 10px #d8dfe7; width: 300px; @@ -1874,4 +1885,4 @@ body.scrolled .toTop:hover { .center { margin: 0 auto; -} +} \ No newline at end of file diff --git a/locales/en.strings b/locales/en.strings index 9d0f7ef6..b4a97cd3 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -323,6 +323,7 @@ "notes_zero" = "No notes"; "notes_one" = "$1 note"; "notes_other" = "$1 notes"; +"notes_start_screen" = "With notes, you can share your events with friends and see what's going on with them."; /* Menus */ diff --git a/locales/ru.strings b/locales/ru.strings index c20a5719..ce456b6c 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -332,9 +332,10 @@ "note" = "Заметка"; "name_note" = "Название"; "text_note" = "Содержание"; -"create_note" = "Создать заметку"; +"create_note" = "Добавить запись"; "edit_note" = "Редактировать заметку"; "actions" = "Действия"; +"notes_start_screen" = "С помощью заметок Вы можете делиться событиями из жизни с друзьями, а так же быть в курсе того, что происходит у них."; "edited" = "Отредактировано"; @@ -344,6 +345,12 @@ "notes_many" = "$1 заметок"; "notes_other" = "$1 заметок"; +"notes_list_zero" = "Не найдено ни одной заметки"; +"notes_list_one" = "Найдена одна заметка"; +"notes_list_few" = "Найдено $1 заметки"; +"notes_list_many" = "Найдено $1 заметок"; +"notes_list_other" = "Найдено $1 заметок"; + /* Menus */ "edit_button" = "ред."; @@ -510,7 +517,7 @@ "info_uploaded_by" = "Загрузил"; "info_upload_date" = "Дата загрузки"; -"videos_zero" = "Ни одной видеозаписи"; +"videos_zero" = "Нет видео"; "videos_one" = "Одна видеозапись"; "videos_few" = "$1 видеозаписи"; "videos_many" = "$1 видеозаписей";