From 5bc9f7ff5857d9ff021acb9c6b182a124bbf869c Mon Sep 17 00:00:00 2001 From: Alma Armas Date: Mon, 29 Jun 2020 20:12:57 +0000 Subject: [PATCH] Multiple user profile page layout improvements Co-authored-by: Kos Furler <35310076+kosfurler@users.noreply.github.com> --- Web/Presenters/templates/User/View.xml | 109 +++++++++++++------------ Web/static/img/note.gif | Bin 0 -> 369 bytes 2 files changed, 58 insertions(+), 51 deletions(-) create mode 100644 Web/static/img/note.gif diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml index fa723e49..bc5f99e4 100644 --- a/Web/Presenters/templates/User/View.xml +++ b/Web/Presenters/templates/User/View.xml @@ -250,16 +250,20 @@ {_"all_title"} -
-
-
- -
-
- {$note->getName()}
- {$note->getPreview(35)} -
-
+ +
+
@@ -306,41 +310,44 @@
-

- {$user->getFullName()} - - {if !is_null($user->getStatus())} + +
+
+

{$user->getFullName()}

+ {if !is_null($user->getStatus())}
{$user->getStatus()}
{elseif !is_null($thisUser) && $user->getId() == $thisUser->getId()}
[ {_"change_status"} ]
{/if} -

- + +
+
- - + + - - + + - - + + - - + + - - + +
{_"gender"}: {$user->isFemale() ? tr("female") : tr("male")}{_"gender"}: {$user->isFemale() ? tr("female") : tr("male")}
{_"relationship"}:{var $marialStatus = $user->getMaritalStatus()}{_"relationship_$marialStatus"}{_"relationship"}:{var $marialStatus = $user->getMaritalStatus()}{_"relationship_$marialStatus"}
{_"registration_date"}: {$user->getRegistrationTime()}{_"registration_date"}: {$user->getRegistrationTime()}
{_"hometown"}:{$user->getHometown()}{_"hometown"}:{$user->getHometown()}
{_"politViews"}:{var $pviews = $user->getPoliticalViews()}{_"politViews_$pviews"}{_"politViews"}:{var $pviews = $user->getPoliticalViews()}{_"politViews_$pviews"}
+
@@ -348,11 +355,11 @@
{capture $contactInfo_Tmp} - +
- + - + - - + + - - + +
{_"email"}: {_"email"}: {$user->getContactEmail()} @@ -360,7 +367,7 @@
{_"telegram"}: {_"telegram"}: @{$user->getTelegram()} @@ -369,52 +376,52 @@
{_"city"}:{$user->getCity()}{_"city"}:{$user->getCity()}
{_"address"}:{$user->getPhysicalAddress()}{_"address"}:{$user->getPhysicalAddress()}
{/capture} {capture $uInfo_Tmp} - +
- - + + - - + + - - + + - - + + - - + + - - + + - - + +
{_"interests"}: {$user->getInterests()}{_"interests"}: {$user->getInterests()}
{_"favorite_music"}: {$user->getFavoriteMusic()}{_"favorite_music"}: {$user->getFavoriteMusic()}
{_"favorite_films"}: {$user->getFavoriteFilms()}{_"favorite_films"}: {$user->getFavoriteFilms()}
{_"favorite_shows"}: {$user->getFavoriteShows()}{_"favorite_shows"}: {$user->getFavoriteShows()}
{_"favorite_books"}: {$user->getFavoriteBooks()}{_"favorite_books"}: {$user->getFavoriteBooks()}
{_"favorite_quotes"}: {$user->getFavoriteQuote()}{_"favorite_quotes"}: {$user->getFavoriteQuote()}
О себе: {$user->getDescription()}О себе: {$user->getDescription()}
{/capture} - -
+
+
{if !empty($contactInfo_Tmp)}

{_"contact_information"} {ifset $thisUser}{if $thisUser->getId() == $user->getId()}[ {_"edit"} ]{/if}{/ifset}

{if !empty($contactInfo_Tmp)} @@ -431,7 +438,7 @@
Информация отсутствует.
{/if}
- +

Пользователь предпочёл оставить о себе только воздух тайны.

diff --git a/Web/static/img/note.gif b/Web/static/img/note.gif new file mode 100644 index 0000000000000000000000000000000000000000..1413b8d11eaeb64847bf27d2d960a68e49e9892e GIT binary patch literal 369 zcmZ?wbhEHb6krf!xT?hP|NsBk*tnIeSAYHX?d`jFKYsrF^XJc-w{M@neEIRyr=!P? zUA=ns?AddtPMyAV>C%UfAAkM&)!oxuUQxMZ*|G@}CnY7Pq-SKleEoXrwCS_v%&n=d zZENqCzi{EdfB(LG{o2^noSU0hSX9hFGobjBg^__li9rWs1ISMdY<&(B3p{j$SWhf5 zvYf*(?}A2x(Gv!%?lol>84KDZ8xnogn2nry7#?M8S1e#i^I#NtS7Fm&)Wg8m(AdZz z=q$}3$J5o#BgY`^EYH9>W$IK0d1omGe%^WW_!lxrISVnctXR2{LC9H=fqmnqO$>_8 m3Jl_0yZ3O3GblKVF>nBbj6uv