diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php index e3e1ac38..bff4de2f 100644 --- a/Web/Presenters/UserPresenter.php +++ b/Web/Presenters/UserPresenter.php @@ -156,7 +156,7 @@ final class UserPresenter extends OpenVKPresenter } } elseif($_GET['act'] === "contacts") { $user->setEmail_Contact(empty($this->postParam("email_contact")) ? NULL : $this->postParam("email_contact")); - $user->setTelegram(empty($this->postParam("telegram")) ? NULL : $this->postParam("telegram")); + $user->setTelegram(empty($this->postParam("telegram")) ? NULL : ltrim($this->postParam("telegram"), "@")); $user->setCity(empty($this->postParam("city")) ? NULL : $this->postParam("city")); $user->setAddress(empty($this->postParam("address")) ? NULL : $this->postParam("address")); diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml index a2154f45..2687c42b 100644 --- a/Web/Presenters/templates/User/View.xml +++ b/Web/Presenters/templates/User/View.xml @@ -354,49 +354,50 @@
{$alert}
-
-

{$user->getFullName()}

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

{$user->getFullName()}

+ {if !is_null($user->getStatus())} +
{$user->getStatus()}
+ {elseif isset($thisUser) && $user->getId() == $thisUser->getId()} +
+ [ {_"change_status"} ] +
{/if} -
-
{_"gender"}: {$user->isFemale() ? tr("female") : tr("male")}
{_"relationship"}:{var $marialStatus = $user->getMaritalStatus()}{_"relationship_$marialStatus"}
{_"registration_date"}: {$user->getRegistrationTime()}
{_"hometown"}:{$user->getHometown()}
{_"politViews"}:{var $pviews = $user->getPoliticalViews()}{_"politViews_$pviews"}
{_"birth_date"}:{date('d F Y',$user->getBirthday())}, - {date('m d') >= date('m d', $user->getBirthday()) ? date('Y') - date('Y', $user->getBirthday()) : - (date('m d') < date('m d', $user->getBirthday()) ? date('Y') - date('Y', $user->getBirthday()) - 1)} {_"years"}
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + {if $user->getBirthday() > 0} + + + + + {/if} + +
{_"gender"}: {$user->isFemale() ? tr("female") : tr("male")}
{_"relationship"}:{var $marialStatus = $user->getMaritalStatus()}{_"relationship_$marialStatus"}
{_"registration_date"}: {$user->getRegistrationTime()}
{_"hometown"}:{$user->getHometown()}
{_"politViews"}:{var $pviews = $user->getPoliticalViews()}{_"politViews_$pviews"}
{_"birth_date"}:{date('d F Y',$user->getBirthday())}, + {date('m d') >= date('m d', $user->getBirthday()) ? date('Y') - date('Y', $user->getBirthday()) : + (date('m d') < date('m d', $user->getBirthday()) ? date('Y') - date('Y', $user->getBirthday()) - 1)} {_"years"}
diff --git a/Web/static/css/style.css b/Web/static/css/style.css index 4355bcd5..3f9cfa1c 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -364,7 +364,6 @@ input[class=button] { } input[type=checkbox], input[type=radio] { - background-image: url("data:image/gif;base64,R0lGODlhDwA4AKIHANrh6P///8DK1a22wF+DpbfAy9/l6v///yH5BAEAAAcALAAAAAAPADgAAAOzKLrMJyHKGcWjOFiY5+7eBVbi+I1aCZ6m2rGrm21NrTx2LWMEwYE93yho+PF6gmKHyCJIiEVRMABNcQzBnsFAumK13K5kS9iGjNuwBPbC5RyDuHw+PwwA+LweP7Dv/wB9d4B6goSFfod8iYqGioGMh46NkYSTkpWAgnSccXadnJl/PYOHQaWAQQWoe6qrhK6MBHmujkEArpCDBVkEBQWLu7w9v3mTv77AxpG/ysusmp+gdQkAOw=="); background-color: transparent; -webkit-appearance: none; -moz-appearance: none; @@ -377,6 +376,14 @@ input[type=checkbox], input[type=radio] { margin: 4px 3px 3px 3px; } +input[type=checkbox] { + background-image: url("data:image/gif;base64,R0lGODlhDwA4AKIHANrh6P///8DK1a22wF+DpbfAy9/l6v///yH5BAEAAAcALAAAAAAPADgAAAOzKLrMJyHKGcWjOFiY5+7eBVbi+I1aCZ6m2rGrm21NrTx2LWMEwYE93yho+PF6gmKHyCJIiEVRMABNcQzBnsFAumK13K5kS9iGjNuwBPbC5RyDuHw+PwwA+LweP7Dv/wB9d4B6goSFfod8iYqGioGMh46NkYSTkpWAgnSccXadnJl/PYOHQaWAQQWoe6qrhK6MBHmujkEArpCDBVkEBQWLu7w9v3mTv77AxpG/ysusmp+gdQkAOw=="); +} + +input[type=radio] { + background-image: url("../img/radio.png"); +} + input[type=checkbox]:hover, input[type=radio]:hover { background-position: 0 -28px; } diff --git a/Web/static/img/radio.png b/Web/static/img/radio.png new file mode 100644 index 00000000..6472e0ac Binary files /dev/null and b/Web/static/img/radio.png differ diff --git a/locales/kk.strings b/locales/kk.strings index d2f0e921..8228a4cb 100644 --- a/locales/kk.strings +++ b/locales/kk.strings @@ -390,10 +390,10 @@ "notifications_like" = "$1 сіздің $4 жазған $2жазбаңызды$3 ұнатады"; "notifications_repost" = "$1 сіздің $4 жазған $2жазбаңызбен$3 бөлісті"; "notifications_comment_under" = "$1 $2 астына пікір жазды"; -"notifications_under_note" = "сіздің $3жолжазбаңызбен$4"; -"notifications_under_photo" = "сіздің $3фотоңызбен$4"; -"notifications_under_post" = "сіздің $5 жазған $3жазбаңызбен$4"; -"notifications_under_video" = "сіздің $3видеожазбаңызмен$4"; +"notifications_under_note" = "сіздің $3жолжазбаңызға$4"; +"notifications_under_photo" = "сіздің $3фотоңызға$4"; +"notifications_under_post" = "сіздің $5 жазған $3жазбаңызға$4"; +"notifications_under_video" = "сіздің $3видеожазбаңызға$4"; "notifications_post" = "$1 сіздің қабырғаңызға $2жазба$3 қойды: $4"; "notifications_appoint" = "$1 сізді қоғамның менеджері етіп тағайындады $2"; @@ -442,6 +442,11 @@ "gifts_zero" = "Нөл сыйлық"; "gifts_one" = "Бір сыйлық"; "gifts_other" = "$1 сыйлық"; +"gifts_left" = "Қалған сыйлық саны: $1"; +"gifts_left_zero" = "Нөл сыйлық қалды; +"gifts_left_one" = "Бір сыйлық қалды"; +"gifts_left_other" = "$1 сыйлық қалды"; +"gifts_left_other" = "$1 сыйлық"; "send_gift" = "Сыйлық жіберу"; diff --git a/locales/pl.strings b/locales/pl.strings index 1be669b0..06515c84 100644 --- a/locales/pl.strings +++ b/locales/pl.strings @@ -78,6 +78,7 @@ "email" = "E-mail"; "phone" = "Telefon"; "telegram" = "Telegram"; +"personal_website" = "Witryna osobista"; "city" = "Miasto"; "address" = "Adres"; @@ -187,13 +188,31 @@ "group_type_open" = "To otwarta grupa. Każdy może do niej dołączyć."; "group_type_closed" = "To grupa zamknięta. Aby dołączyć, musisz złożyć wniosek."; "creator" = "Twórca"; +"administrators" = "Administrator"; +"add_to_left_menu" = "Dodaj do lewego menu"; +"remove_from_left_menu" = "Usuń z lewego menu"; +"all_followers" = "Wszyscy subskrybenci"; +"only_administrators" = "Tylko administratorzy"; +"website" = "Witryna"; +"managed" = "Kierowany"; + +"administrators_one" = "$1 administrator"; +"administrators_few" = "$1 adminów"; +"administrators_other" = "$1 adminów"; "role" = "Rola"; "administrator" = "Administrator"; "promote_to_admin" = "Awans do admina"; "devote" = "Zdegradować"; +"set_comment" = "Edytuj Komentarz"; +"hidden_yes" = "Ukryty: Tak"; +"hidden_no" = "Ukryty: Nie"; "group_allow_post_for_everyone" = "Zezwalaj na publikowanie wpisów wszystkim"; "statistics" = "Statystyk"; +"group_administrators_list" = "Lista adminów"; +"group_display_only_creator" = "Wyświetl tylko twórcę grupy"; +"group_display_all_administrators" = "Wyświetl wszystkich administratorów"; +"group_dont_display_administrators_list" = "Nic nie wyświetla"; "participants_zero" = "Brak uczestnika"; "participants_one" = "Jeden uczestnik"; @@ -487,6 +506,11 @@ "gifts_few" = "$1 prezenty"; "gifts_many" = "$1 prezentów"; "gifts_other" = "$1 prezentów"; +"gifts_left" = "Prezentów zostało: $1"; +"gifts_left_one" = "Jeden prezent został"; +"gifts_left_few" = "$1 pozostały prezenty"; +"gifts_left_many" = "$1 pozostało prezentów"; +"gifts_left_other" = "$1 pozostało prezentów"; "send_gift" = "Wyślij prezent"; @@ -539,6 +563,7 @@ /* Admin actions */ "login_as" = "Zaloguj się jako $1"; +"manage_user_action" = "Zarządzanie użytkownikiem"; "ban_user_action" = "Zbanuj użytkownika"; "warn_user_action" = "Ostrzec użytkownika";