ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-26 03:30:48 +03:00
Code Issues Releases Wiki Activity

Мспользование getDisplayName в шаблонах вместо getLogin() Issue #292 #353

Browse source
This commit is contained in:
Mzhelskiy Maxim 2013-10-23 14:02:40 +07:00
parent 2473c7b27d
commit df228b184b
101 changed files with 136 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
application/classes/modules/user/entity/User.entity.class.php
View file

@ -454,6 +454,15 @@ class ModuleUser_EntityUser extends Entity {
}
return $this->_getDataOne('user_note');
}
/**
* Возвращает имя пользователя для отображения на сайте
* В дефолте логин пользователя
*
* @return null|string
*/
public function getDisplayName() {
return $this->getLogin();
}
/**

2
application/frontend/skin/developer/actions/ActionBlog/admin.tpl
View file

@ -35,7 +35,7 @@
<tr>
<td class="cell-name">
<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</td>
{if $oUser->getId()==$oUserCurrent->getId()}

8
application/frontend/skin/developer/actions/ActionBlog/blog.tpl
View file

@ -112,14 +112,14 @@
<strong>{$aLang.blog_user_administrators} ({$iCountBlogAdministrators}):</strong>
{* Создатель блога *}
<a href="{$oUserOwner->getUserWebPath()}" class="user"><i class="icon-user"></i>{$oUserOwner->getLogin()}</a>
<a href="{$oUserOwner->getUserWebPath()}" class="user"><i class="icon-user"></i>{$oUserOwner->getDisplayName()}</a>
{* Список администраторов блога *}
{if $aBlogAdministrators}
{foreach $aBlogAdministrators as $oBlogUser}
{$oUser = $oBlogUser->getUser()}
<a href="{$oUser->getUserWebPath()}" class="user"><i class="icon-user"></i>{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}" class="user"><i class="icon-user"></i>{$oUser->getDisplayName()}</a>
{/foreach}
{/if}
<br />
@ -132,7 +132,7 @@
{foreach $aBlogModerators as $oBlogUser}
{$oUser = $oBlogUser->getUser()}
<a href="{$oUser->getUserWebPath()}" class="user"><i class="icon-user"></i>{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}" class="user"><i class="icon-user"></i>{$oUser->getDisplayName()}</a>
{/foreach}
{else}
{$aLang.blog_user_moderators_empty}
@ -147,7 +147,7 @@
{foreach $aBlogUsers as $oBlogUser}
{$oUser = $oBlogUser->getUser()}
<a href="{$oUser->getUserWebPath()}" class="user"><i class="icon-user"></i>{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}" class="user"><i class="icon-user"></i>{$oUser->getDisplayName()}</a>
{/foreach}
{* Если пользователей слишком много, то показываем ссылку на страницу со всеми пользователями *}

2
application/frontend/skin/developer/actions/ActionProfile/created.notes.tpl
View file

@ -13,7 +13,7 @@
<table class="table table-profile-notes" cellspacing="0">
{foreach $aNotes as $oNote}
<tr>
<td class="cell-username"><a href="{$oNote->getTargetUser()->getUserWebPath()}">{$oNote->getTargetUser()->getLogin()}</a></td>
<td class="cell-username"><a href="{$oNote->getTargetUser()->getUserWebPath()}">{$oNote->getTargetUser()->getDisplayName()}</a></td>
<td class="cell-note">{$oNote->getText()}</td>
<td class="cell-date">{date_format date=$oNote->getDateAdd() format="j F Y"}</td>
</tr>

4
application/frontend/skin/developer/actions/ActionProfile/info.tpl
View file

@ -132,7 +132,7 @@
<tr>
<td class="cell-label">{$aLang.profile_invite_from}:</td>
<td>
<a href="{$oUserInviteFrom->getUserWebPath()}">{$oUserInviteFrom->getLogin()}</a>&nbsp;
<a href="{$oUserInviteFrom->getUserWebPath()}">{$oUserInviteFrom->getDisplayName()}</a>&nbsp;
</td>
</tr>
{/if}
@ -143,7 +143,7 @@
<td class="cell-label">{$aLang.profile_invite_to}:</td>
<td>
{foreach $aUsersInvite as $oUserInvite}
<a href="{$oUserInvite->getUserWebPath()}">{$oUserInvite->getLogin()}</a>&nbsp;
<a href="{$oUserInvite->getUserWebPath()}">{$oUserInvite->getDisplayName()}</a>&nbsp;
{/foreach}
</td>
</tr>

2
application/frontend/skin/developer/actions/ActionProfile/wall.comments.tpl
View file

@ -9,7 +9,7 @@
<a href="{$oReplyUser->getUserWebPath()}"><img src="{$oReplyUser->getProfileAvatarPath(48)}" alt="avatar" class="comment-avatar" /></a>
<ul class="comment-info">
<li class="comment-author"><a href="{$oReplyUser->getUserWebPath()}">{$oReplyUser->getLogin()}</a></li>
<li class="comment-author"><a href="{$oReplyUser->getUserWebPath()}">{$oReplyUser->getDisplayName()}</a></li>
<li class="comment-date">
<time datetime="{date_format date=$oReplyWall->getDateAdd() format='c'}">
{date_format date=$oReplyWall->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}

2
application/frontend/skin/developer/actions/ActionProfile/wall.posts.tpl
View file

@ -13,7 +13,7 @@
</a>
<ul class="comment-info">
<li class="comment-author"><a href="{$oWallUser->getUserWebPath()}">{$oWallUser->getLogin()}</a></li>
<li class="comment-author"><a href="{$oWallUser->getUserWebPath()}">{$oWallUser->getDisplayName()}</a></li>
<li class="comment-date">
<time datetime="{date_format date=$oWall->getDateAdd() format='c'}">
{date_format date=$oWall->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}

10
application/frontend/skin/developer/actions/ActionStream/events.tpl
View file

@ -26,7 +26,7 @@
<li class="activity-event activity-event-type-{$oStreamEvent->getEventType()}">
{* Аватар *}
<a href="{$oUser->getUserWebPath()}">
<img src="{$oUser->getProfileAvatarPath(48)}" alt="{$oUser->getLogin()}" class="activity-event-avatar" />
<img src="{$oUser->getProfileAvatarPath(48)}" alt="{$oUser->getDisplayName()}" class="activity-event-avatar" />
</a>
{* Дата *}
@ -37,7 +37,7 @@
</time>
{* Логин *}
<a href="{$oUser->getUserWebPath()}"><strong>{$oUser->getLogin()}</strong></a>
<a href="{$oUser->getUserWebPath()}"><strong>{$oUser->getDisplayName()}</strong></a>
{*
* Текст события
@ -117,7 +117,7 @@
{$aLang.stream_list_event_vote_user_female}
{/if}
<a href="{$oTarget->getUserWebPath()}">{$oTarget->getLogin()}</a>
<a href="{$oTarget->getUserWebPath()}">{$oTarget->getDisplayName()}</a>
{elseif $oStreamEvent->getEventType() == 'join_blog'}
{* Вступили в блог *}
@ -137,7 +137,7 @@
{$aLang.stream_list_event_add_friend_female}
{/if}
<a href="{$oTarget->getUserWebPath()}">{$oTarget->getLogin()}</a>
<a href="{$oTarget->getUserWebPath()}">{$oTarget->getDisplayName()}</a>
{elseif $oStreamEvent->getEventType() == 'add_wall'}
{* Написали на стене *}
@ -147,7 +147,7 @@
{$aLang.stream_list_event_add_wall_female}
{/if}
<a href="{$oTarget->getUrlWall()}">{$oTarget->getWallUser()->getLogin()}</a>
<a href="{$oTarget->getUrlWall()}">{$oTarget->getWallUser()->getDisplayName()}</a>
{$sTextEvent = $oTarget->getText()}

2
application/frontend/skin/developer/actions/ActionTalk/add.tpl
View file

@ -17,7 +17,7 @@
{foreach $aUsersFriend as $oFriend}
<li>
<input id="talk_friend_{$oFriend->getId()}" type="checkbox" name="friend[{$oFriend->getId()}]" class="input-checkbox" />
<label for="talk_friend_{$oFriend->getId()}" id="talk_friend_{$oFriend->getId()}_label">{$oFriend->getLogin()}</label>
<label for="talk_friend_{$oFriend->getId()}" id="talk_friend_{$oFriend->getId()}_label">{$oFriend->getDisplayName()}</label>
</li>
{/foreach}
</ul>

2
application/frontend/skin/developer/actions/ActionTalk/blacklist.tpl
View file

@ -14,7 +14,7 @@
{if $aUsersBlacklist}
<ul class="list" id="black_list">
{foreach $aUsersBlacklist as $oUser}
<li id="blacklist_item_{$oUser->getId()}_area"><a href="{$oUser->getUserWebPath()}" class="user">{$oUser->getLogin()}</a> - <a href="#" id="blacklist_item_{$oUser->getId()}" class="delete">{$aLang.blog_delete}</a></li>
<li id="blacklist_item_{$oUser->getId()}_area"><a href="{$oUser->getUserWebPath()}" class="user">{$oUser->getDisplayName()}</a> - <a href="#" id="blacklist_item_{$oUser->getId()}" class="delete">{$aLang.blog_delete}</a></li>
{/foreach}
</ul>
{/if}

6
application/frontend/skin/developer/actions/ActionTalk/message.tpl
View file

@ -14,7 +14,7 @@
<div class="topic-info">
<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(48)}" width="32px" alt="avatar" class="avatar" /></a>
<p class="author-wrapper"><a href="{$oUser->getUserWebPath()}" class="author">{$oUser->getLogin()}</a>
<p class="author-wrapper"><a href="{$oUser->getUserWebPath()}" class="author">{$oUser->getDisplayName()}</a>
<time datetime="{date_format date=$oTalk->getDate() format='c'}" pubdate>
{date_format date=$oTalk->getDate() format="j F Y, H:i"}
</time>
@ -28,7 +28,7 @@
{if $oUser->getId() != $oUserRecipient->getId()}
<a class="user {if $oTalkUser->getUserActive() != $TALK_USER_ACTIVE}inactive{/if}"
href="{$oUserRecipient->getUserWebPath()}"
{if $oTalkUser->getUserActive() != $TALK_USER_ACTIVE}title="{$aLang.talk_speaker_not_found}"{/if}>{$oUserRecipient->getLogin()}</a>{if ! $oTalkUser@last}, {/if}
{if $oTalkUser->getUserActive() != $TALK_USER_ACTIVE}title="{$aLang.talk_speaker_not_found}"{/if}>{$oUserRecipient->getDisplayName()}</a>{if ! $oTalkUser@last}, {/if}
{/if}
{/foreach}
@ -63,7 +63,7 @@
{if $oTalkUser->getUserActive()!=$TALK_USER_DELETE_BY_AUTHOR}
<li id="speaker_item_{$oTalkUser->getUserId()}_area">
<a class="user {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}inactive{/if}" href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a class="user {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}inactive{/if}" href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
{if $oTalkUser->getUserActive()==$TALK_USER_ACTIVE}- <a href="#" id="speaker_item_{$oTalkUser->getUserId()}" class="delete">{$aLang.blog_delete}</a>{/if}
</li>
{/if}

2
application/frontend/skin/developer/actions/ActionTalk/message_list.tpl
View file

@ -42,7 +42,7 @@
{foreach $aTalkUserOther as $oTalkUser}
{$oUser = $oTalkUser->getUser()}
{if ! $oTalkUser@first}, {/if}<a href="{$oUser->getUserWebPath()}" class="user {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}inactive{/if}" {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}title="{$aLang.talk_speaker_not_found}"{/if}>{$oUser->getLogin()}</a>
{if ! $oTalkUser@first}, {/if}<a href="{$oUser->getUserWebPath()}" class="user {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}inactive{/if}" {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}title="{$aLang.talk_speaker_not_found}"{/if}>{$oUser->getDisplayName()}</a>
{/foreach}
{/strip}
</td>

2
application/frontend/skin/developer/blocks/block.activityFriends.tpl
View file

@ -23,7 +23,7 @@
type="checkbox"
{if isset($aStreamSubscribedUsers.$iUserId)}checked{/if}
data-user-id="{$iUserId}" />
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</li>
{/foreach}
</ul>

2
application/frontend/skin/developer/blocks/block.activityUsers.tpl
View file

@ -30,7 +30,7 @@
<input type="checkbox"
checked
data-user-id="{$iUserId}" />
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</li>
{/if}
{/foreach}

2
application/frontend/skin/developer/blocks/block.blogInvite.tpl
View file

@ -28,7 +28,7 @@
{$oUser = $oBlogUser->getUser()}
<li id="blog-invite-remove-item-{$oBlogEdit->getId()}-{$oUser->getId()}">
<a href="{$oUser->getUserWebPath()}" class="user">{$oUser->getLogin()}</a> -
<a href="{$oUser->getUserWebPath()}" class="user">{$oUser->getDisplayName()}</a> -
<a href="#" onclick="return ls.blog.repeatInvite({$oUser->getId()}, {$oBlogEdit->getId()});">{$aLang.blog_user_invite_readd}</a>
<a href="#" onclick="return ls.blog.removeInvite({$oUser->getId()}, {$oBlogEdit->getId()});">{$aLang.blog_user_invite_remove}</a>
</li>

2
application/frontend/skin/developer/blocks/block.stream_comment.tpl
View file

@ -15,7 +15,7 @@
<li class="js-title-comment" title="{$oComment->getText()|strip_tags|trim|truncate:100:'...'|escape:'html'}">
<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
<a href="{$oUser->getUserWebPath()}" class="author">{$oUser->getLogin()}</a> &rarr;
<a href="{$oUser->getUserWebPath()}" class="author">{$oUser->getDisplayName()}</a> &rarr;
<a href="{$oBlog->getUrlFull()}" class="blog-name">{$oBlog->getTitle()|escape:'html'}</a> &rarr;
<a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}">{$oTopic->getTitle()|escape:'html'}</a>

2
application/frontend/skin/developer/blocks/block.stream_topic.tpl
View file

@ -14,7 +14,7 @@
<li class="js-title-topic" title="{$oTopic->getText()|strip_tags|trim|truncate:150:'...'|escape:'html'}">
<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
<a href="{$oUser->getUserWebPath()}" class="author">{$oUser->getLogin()}</a> &rarr;
<a href="{$oUser->getUserWebPath()}" class="author">{$oUser->getDisplayName()}</a> &rarr;
<a href="{$oBlog->getUrlFull()}" class="blog-name">{$oBlog->getTitle()|escape:'html'}</a> &rarr;
<a href="{$oTopic->getUrl()}">{$oTopic->getTitle()|escape:'html'}</a>

2
application/frontend/skin/developer/blocks/block.userPhoto.tpl
View file

@ -14,7 +14,7 @@
<div class="profile-photo-wrapper">
<div class="status {if $oUserProfile->isOnline()}status-online{else}status-offline{/if}">{if $oUserProfile->isOnline()}{$aLang.user_status_online}{else}{$aLang.user_status_offline}{/if}</div>
<a href="{$oUserProfile->getUserWebPath()}">
<img src="{$oUserProfile->getProfileFotoPath()}" alt="{$oUserProfile->getLogin()} photo" class="profile-photo js-ajax-image-upload-image" />
<img src="{$oUserProfile->getProfileFotoPath()}" alt="{$oUserProfile->getDisplayName()} photo" class="profile-photo js-ajax-image-upload-image" />
</a>
</div>

2
application/frontend/skin/developer/blocks/block.userfeedFriends.tpl
View file

@ -23,7 +23,7 @@
type="checkbox"
data-user-id="{$iUserId}"
{if isset($aUserfeedSubscribedUsers.$iUserId)} checked{/if} />
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</li>
{/foreach}
</ul>

2
application/frontend/skin/developer/blocks/block.userfeedUsers.tpl
View file

@ -32,7 +32,7 @@
type="checkbox"
checked
data-user-id="{$iUserId}" />
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</li>
{/if}
{/foreach}

4
application/frontend/skin/developer/comments/comment.tpl
View file

@ -49,14 +49,14 @@
{* Аватар пользователя *}
<a href="{$oUser->getUserWebPath()}">
<img src="{$oUser->getProfileAvatarPath(48)}" alt="{$oUser->getLogin()}" class="comment-avatar" />
<img src="{$oUser->getProfileAvatarPath(48)}" alt="{$oUser->getDisplayName()}" class="comment-avatar" />
</a>
{* Информация *}
<ul class="comment-info">
{* Автор комментария *}
<li class="comment-username {if $iAuthorId == $oUser->getId()}comment-username-author{/if}" title="{if $sAuthorNotice}{$sAuthorNotice}{/if}">
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</li>
{* Дата *}

2
application/frontend/skin/developer/emails/en/notify.blog_invite_new.tpl
View file

@ -1,4 +1,4 @@
The user «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a>»</b> invites you to join the blog <a href="{$oBlog->getUrlFull()}">"{$oBlog->getTitle()|escape:'html'}"</a>.
The user «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a>»</b> invites you to join the blog <a href="{$oBlog->getUrlFull()}">"{$oBlog->getTitle()|escape:'html'}"</a>.
<br /><br />
<a href='{$sPath}'>Have a look at the invitation</a> (Don't forget to register before!)
<br />

2
application/frontend/skin/developer/emails/en/notify.comment_new.tpl
View file

@ -1,4 +1,4 @@
The user <a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getLogin()}</a> left a new comment to topic <b>«{$oTopic->getTitle()|escape:'html'}»</b>, you can read it by clicking on <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}">this link</a><br>
The user <a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getDisplayName()}</a> left a new comment to topic <b>«{$oTopic->getTitle()|escape:'html'}»</b>, you can read it by clicking on <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}">this link</a><br>
{if $oConfig->GetValue('sys.mail.include_comment')}
Message: <i>{$oComment->getText()}</i>
{/if}

2
application/frontend/skin/developer/emails/en/notify.comment_reply.tpl
View file

@ -1,4 +1,4 @@
The user <a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getLogin()}</a> replied your comment in the topic <b>«{$oTopic->getTitle()|escape:'html'}»</b>, you can read it by clicking on <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}">this link</a><br>
The user <a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getDisplayName()}</a> replied your comment in the topic <b>«{$oTopic->getTitle()|escape:'html'}»</b>, you can read it by clicking on <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}">this link</a><br>
{if $oConfig->GetValue('sys.mail.include_comment')}
Message: <i>{$oComment->getText()}</i>
{/if}

2
application/frontend/skin/developer/emails/en/notify.invite.tpl
View file

@ -1,4 +1,4 @@
The user <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a> invited you to register on the site <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a><br>
The user <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a> invited you to register on the site <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a><br>
The invitation code: <b>{$oInvite->getCode()}</b><br>
To register you need to enter the invitation code on <a href="{router page='login'}"> the main page</a>
<br><br>

2
application/frontend/skin/developer/emails/en/notify.talk_comment_new.tpl
View file

@ -1,4 +1,4 @@
The user <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a> left a new comment to the letter <b>«{$oTalk->getTitle()|escape:'html'}»</b>, you can read it by clicking on <a href="{router page='talk'}read/{$oTalk->getId()}/#comment{$oTalkComment->getId()}">this link</a><br>
The user <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a> left a new comment to the letter <b>«{$oTalk->getTitle()|escape:'html'}»</b>, you can read it by clicking on <a href="{router page='talk'}read/{$oTalk->getId()}/#comment{$oTalkComment->getId()}">this link</a><br>
{if $oConfig->GetValue('sys.mail.include_talk')}
Message: <i>{$oTalkComment->getText()}</i> <br>
{/if}

2
application/frontend/skin/developer/emails/en/notify.talk_new.tpl
View file

@ -1,4 +1,4 @@
You have a new incoming letter from the user <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a>, you can read and answer it by clicking on <a href="{router page='talk'}read/{$oTalk->getId()}/"> this link</a><br>
You have a new incoming letter from the user <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a>, you can read and answer it by clicking on <a href="{router page='talk'}read/{$oTalk->getId()}/"> this link</a><br>
Letter topic: <b>{$oTalk->getTitle()|escape:'html'}</b><br>
{if $oConfig->GetValue('sys.mail.include_talk')}
Message: <i>{$oTalk->getText()}</i> <br>

2
application/frontend/skin/developer/emails/en/notify.topic_new.tpl
View file

@ -1,4 +1,4 @@
The user <a href="{$oUserTopic->getUserWebPath()}">{$oUserTopic->getLogin()}</a> posted a new topic - <a href="{$oTopic->getUrl()}">{$oTopic->getTitle()|escape:'html'}</a><br> in a blog <b>«{$oBlog->getTitle()|escape:'html'}»</b>
The user <a href="{$oUserTopic->getUserWebPath()}">{$oUserTopic->getDisplayName()}</a> posted a new topic - <a href="{$oTopic->getUrl()}">{$oTopic->getTitle()|escape:'html'}</a><br> in a blog <b>«{$oBlog->getTitle()|escape:'html'}»</b>
<br><br>
Best regards, site administration <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>

2
application/frontend/skin/developer/emails/en/notify.user_changemail_from.tpl
View file

@ -1,4 +1,4 @@
You have sent a request to change user email <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> on site <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.<br/>
You have sent a request to change user email <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> on site <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.<br/>
Old email: <b>{$oChangemail->getMailFrom()}</b><br/>
New email: <b>{$oChangemail->getMailTo()}</b><br/>

2
application/frontend/skin/developer/emails/en/notify.user_changemail_to.tpl
View file

@ -1,4 +1,4 @@
You have sent a request to change user email <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> on site <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.<br/>
You have sent a request to change user email <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> on site <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.<br/>
Old email: <b>{$oChangemail->getMailFrom()}</b><br/>
New email: <b>{$oChangemail->getMailTo()}</b><br/>

2
application/frontend/skin/developer/emails/en/notify.user_friend_new.tpl
View file

@ -1,4 +1,4 @@
The user «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a>»</b> wants to add you to Friends.
The user «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a>»</b> wants to add you to Friends.
<br /><br />
<i>{$sText}</i>
<a href='{$sPath}'>See application</a> (Dont forget to register before!)

2
application/frontend/skin/developer/emails/en/notify.wall.new.tpl
View file

@ -1,4 +1,4 @@
The user <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> post on <a href="{$oUserWall->getUserWebPath()}wall/">your wall</a><br/>
The user <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> post on <a href="{$oUserWall->getUserWebPath()}wall/">your wall</a><br/>
Post: <i>{$oWall->getText()}</i>

2
application/frontend/skin/developer/emails/en/notify.wall.reply.tpl
View file

@ -1,4 +1,4 @@
The user <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> replied your post on <a href="{$oUserWall->getUserWebPath()}wall/">wall</a><br/>
The user <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> replied your post on <a href="{$oUserWall->getUserWebPath()}wall/">wall</a><br/>
Your post: <i>{$oWallParent->getText()}</i><br/><br/>
Reply post: <i>{$oWall->getText()}</i>

2
application/frontend/skin/developer/emails/ru/email.blog_invite_new.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a>» приглашает вас вступить в блог <a href="{$oBlog->getUrlFull()}">"{$oBlog->getTitle()|escape:'html'}"</a>.
Пользователь «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a>» приглашает вас вступить в блог <a href="{$oBlog->getUrlFull()}">"{$oBlog->getTitle()|escape:'html'}"</a>.
<br>
<br>
<a href='{$sPath}'>Посмотреть приглашение</a> (Не забудьте предварительно авторизоваться!)

2
application/frontend/skin/developer/emails/ru/email.comment_new.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getLogin()}</a> оставил новый комментарий к топику <b>«{$oTopic->getTitle()|escape:'html'}»</b>, прочитать его можно перейдя по <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}">этой ссылке</a><br>
Пользователь <a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getDisplayName()}</a> оставил новый комментарий к топику <b>«{$oTopic->getTitle()|escape:'html'}»</b>, прочитать его можно перейдя по <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}">этой ссылке</a><br>
{if $oConfig->GetValue('sys.mail.include_comment')}
Текст сообщения: <i>{$oComment->getText()}</i>

2
application/frontend/skin/developer/emails/ru/email.comment_reply.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getLogin()}</a> ответил на ваш комментарий в топике <b>«{$oTopic->getTitle()|escape:'html'}»</b>, прочитать его можно перейдя по <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}">этой ссылке</a>
Пользователь <a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getDisplayName()}</a> ответил на ваш комментарий в топике <b>«{$oTopic->getTitle()|escape:'html'}»</b>, прочитать его можно перейдя по <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}">этой ссылке</a>
<br>
{if $oConfig->GetValue('sys.mail.include_comment')}

2
application/frontend/skin/developer/emails/ru/email.invite.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a> пригласил вас зарегистрироваться на сайте <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>
Пользователь <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a> пригласил вас зарегистрироваться на сайте <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>
<br>
<br>
Код приглашения: <b>{$oInvite->getCode()}</b>

2
application/frontend/skin/developer/emails/ru/email.talk_comment_new.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a> оставил новый комментарий к письму <b>«{$oTalk->getTitle()|escape:'html'}»</b>, прочитать его можно перейдя по <a href="{router page='talk'}read/{$oTalk->getId()}/#comment{$oTalkComment->getId()}">этой ссылке</a>
Пользователь <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a> оставил новый комментарий к письму <b>«{$oTalk->getTitle()|escape:'html'}»</b>, прочитать его можно перейдя по <a href="{router page='talk'}read/{$oTalk->getId()}/#comment{$oTalkComment->getId()}">этой ссылке</a>
<br>
<br>

2
application/frontend/skin/developer/emails/ru/email.talk_new.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Вам пришло новое письмо от пользователя <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a>, прочитать и ответить на него можно перейдя по <a href="{router page='talk'}read/{$oTalk->getId()}/">этой ссылке</a>
Вам пришло новое письмо от пользователя <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a>, прочитать и ответить на него можно перейдя по <a href="{router page='talk'}read/{$oTalk->getId()}/">этой ссылке</a>
<br>
<br>
Тема письма: <b>{$oTalk->getTitle()|escape:'html'}</b>

2
application/frontend/skin/developer/emails/ru/email.topic_new.tpl
View file

@ -1,5 +1,5 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUserTopic->getUserWebPath()}">{$oUserTopic->getLogin()}</a> опубликовал в блоге <b>«{$oBlog->getTitle()|escape:'html'}»</b> новый топик &mdash; <a href="{$oTopic->getUrl()}">{$oTopic->getTitle()|escape:'html'}</a>
Пользователь <a href="{$oUserTopic->getUserWebPath()}">{$oUserTopic->getDisplayName()}</a> опубликовал в блоге <b>«{$oBlog->getTitle()|escape:'html'}»</b> новый топик &mdash; <a href="{$oTopic->getUrl()}">{$oTopic->getTitle()|escape:'html'}</a>
{/block}

2
application/frontend/skin/developer/emails/ru/email.user_changemail_from.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Вами отправлен запрос на смену e-mail адреса пользователя <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> на сайте <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.
Вами отправлен запрос на смену e-mail адреса пользователя <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> на сайте <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.
<br>
<br>
Старый e-mail: <b>{$oChangemail->getMailFrom()}</b><br>

2
application/frontend/skin/developer/emails/ru/email.user_changemail_to.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Вами отправлен запрос на смену e-mail адреса пользователя <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> на сайте <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.
Вами отправлен запрос на смену e-mail адреса пользователя <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> на сайте <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.
<br>
<br>
Старый e-mail: <b>{$oChangemail->getMailFrom()}</b><br>

2
application/frontend/skin/developer/emails/ru/email.user_friend_new.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a>» хочет добавить вас в друзья.
Пользователь «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a>» хочет добавить вас в друзья.
<br>
<br>
<i>{$sText}</i>

2
application/frontend/skin/developer/emails/ru/email.wall.new.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> оставил сообщение на <a href="{$oUserWall->getUserWebPath()}wall/">вашей стене</a>
Пользователь <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> оставил сообщение на <a href="{$oUserWall->getUserWebPath()}wall/">вашей стене</a>
<br>
<br>
Текст сообщения:

2
application/frontend/skin/developer/emails/ru/email.wall.reply.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> ответил на ваше сообщение на <a href="{$oUserWall->getUserWebPath()}wall/">стене</a>
Пользователь <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> ответил на ваше сообщение на <a href="{$oUserWall->getUserWebPath()}wall/">стене</a>
<br>
<br>
<b>Ваше сообщение:</b><br>

4
application/frontend/skin/developer/layouts/layout.base.tpl
View file

@ -148,8 +148,8 @@
{if $oUserCurrent}
<li class="nav-userbar-username">
<a href="{$oUserCurrent->getUserWebPath()}" class="dropdown-toggle js-dropdown-default" data-dropdown-target="js-dropdown-usermenu">
<img src="{$oUserCurrent->getProfileAvatarPath(24)}" alt="{$oUserCurrent->getLogin()}" class="avatar" />
{$oUserCurrent->getLogin()}
<img src="{$oUserCurrent->getProfileAvatarPath(24)}" alt="{$oUserCurrent->getDisplayName()}" class="avatar" />
{$oUserCurrent->getDisplayName()}
</a>
</li>
<li><a href="{router page='topic'}add/" data-modal-target="modal-write">{$aLang.block_create}</a></li>

2
application/frontend/skin/developer/layouts/layout.user.tpl
View file

@ -40,7 +40,7 @@
<div class="vote-count count js-vote-rating" title="{$aLang.user_vote_count}: {$oUserProfile->getCountVote()}">{if $oUserProfile->getRating() > 0}+{/if}{$oUserProfile->getRating()}</div>
</div>
<h2 class="page-header user-login word-wrap {if !$oUserProfile->getProfileName()}no-user-name{/if}" itemprop="nickname">{$oUserProfile->getLogin()}</h2>
<h2 class="page-header user-login word-wrap {if !$oUserProfile->getProfileName()}no-user-name{/if}" itemprop="nickname">{$oUserProfile->getDisplayName()}</h2>
{if $oUserProfile->getProfileName()}
<p class="user-name" itemprop="name">{$oUserProfile->getProfileName()|escape:'html'}</p>

2
application/frontend/skin/developer/topics/topic_base.tpl
View file

@ -159,7 +159,7 @@
</li>
{* Автор топика *}
<li class="topic-info-author"><a rel="author" href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a></li>
<li class="topic-info-author"><a rel="author" href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a></li>
{if ! $bTopicList}
{* Избранное *}

2
application/frontend/skin/developer/topics/topic_preview_topic.tpl
View file

@ -42,7 +42,7 @@
</ul>
<ul class="topic-info">
<li class="topic-info-author"><a rel="author" href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a></li>
<li class="topic-info-author"><a rel="author" href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a></li>
{hook run='topic_preview_show_info' topic=$oTopic}
</ul>

2
application/frontend/skin/developer/user_list.tpl
View file

@ -31,7 +31,7 @@
<tr>
<td class="cell-name">
<a href="{$oUserList->getUserWebPath()}"><img src="{$oUserList->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<p class="username word-wrap"><a href="{$oUserList->getUserWebPath()}">{$oUserList->getLogin()}</a>
<p class="username word-wrap"><a href="{$oUserList->getUserWebPath()}">{$oUserList->getDisplayName()}</a>
{if $oUserNote}
<i class="icon-comment js-tooltip" title="{$oUserNote->getText()|escape:'html'}"></i>
{/if}

2
application/frontend/skin/developer/user_list_avatar.tpl
View file

@ -9,7 +9,7 @@
<li>
<a href="{$oUserList->getUserWebPath()}"><img src="{$oUserList->getProfileAvatarPath(64)}" alt="avatar" class="avatar" /></a>
<a href="{$oUserList->getUserWebPath()}">{$oUserList->getLogin()}</a>
<a href="{$oUserList->getUserWebPath()}">{$oUserList->getDisplayName()}</a>
</li>
{/foreach}
</ul>

2
application/frontend/skin/synio/actions/ActionBlog/admin.tpl
View file

@ -31,7 +31,7 @@
<tr>
<td class="cell-name">
<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</td>
{if $oUser->getId()==$oUserCurrent->getId()}

8
application/frontend/skin/synio/actions/ActionBlog/blog.tpl
View file

@ -133,7 +133,7 @@
{* Создатель блога *}
<span class="user-avatar">
<a href="{$oUserOwner->getUserWebPath()}"><img src="{$oUserOwner->getProfileAvatarPath(24)}" alt="avatar" /></a>
<a href="{$oUserOwner->getUserWebPath()}">{$oUserOwner->getLogin()}</a>
<a href="{$oUserOwner->getUserWebPath()}">{$oUserOwner->getDisplayName()}</a>
</span>
{* Список администраторов блога *}
@ -143,7 +143,7 @@
<span class="user-avatar">
<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" /></a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</span>
{/foreach}
{/if}<br /><br />
@ -158,7 +158,7 @@
<span class="user-avatar">
<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" /></a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</span>
{/foreach}
{else}
@ -191,7 +191,7 @@
{$aLang.blogs_owner} —
<span class="user-avatar">
<a href="{$oUserOwner->getUserWebPath()}"><img src="{$oUserOwner->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a href="{$oUserOwner->getUserWebPath()}">{$oUserOwner->getLogin()}</a>
<a href="{$oUserOwner->getUserWebPath()}">{$oUserOwner->getDisplayName()}</a>
</span>
</div>
</footer>

2
application/frontend/skin/synio/actions/ActionBlogs/blog_list.tpl
View file

@ -64,7 +64,7 @@
<span class="user-avatar">
<a href="{$oUserOwner->getUserWebPath()}"><img src="{$oUserOwner->getProfileAvatarPath(24)}" alt="avatar" /></a>
<a href="{$oUserOwner->getUserWebPath()}">{$oUserOwner->getLogin()}</a>
<a href="{$oUserOwner->getUserWebPath()}">{$oUserOwner->getDisplayName()}</a>
</span>
</td>

2
application/frontend/skin/synio/actions/ActionProfile/created.notes.tpl
View file

@ -11,7 +11,7 @@
<table class="table table-profile-notes" cellspacing="0">
{foreach $aNotes as $oNote}
<tr>
<td class="cell-username"><a href="{$oNote->getTargetUser()->getUserWebPath()}">{$oNote->getTargetUser()->getLogin()}</a></td>
<td class="cell-username"><a href="{$oNote->getTargetUser()->getUserWebPath()}">{$oNote->getTargetUser()->getDisplayName()}</a></td>
<td class="cell-note">{$oNote->getText()}</td>
<td class="cell-date">{date_format date=$oNote->getDateAdd() format="j F Y"}</td>
</tr>

4
application/frontend/skin/synio/actions/ActionProfile/info.tpl
View file

@ -109,7 +109,7 @@
<li class="dotted-list-item">
<span class="dotted-list-item-label">{$aLang.profile_invite_from}</span>
<strong class="dotted-list-item-value">
<a href="{$oUserInviteFrom->getUserWebPath()}">{$oUserInviteFrom->getLogin()}</a>&nbsp;
<a href="{$oUserInviteFrom->getUserWebPath()}">{$oUserInviteFrom->getDisplayName()}</a>&nbsp;
</strong>
</li>
{/if}
@ -120,7 +120,7 @@
<span class="dotted-list-item-label">{$aLang.profile_invite_to}</span>
<strong class="dotted-list-item-value">
{foreach $aUsersInvite as $oUserInvite}
<a href="{$oUserInvite->getUserWebPath()}">{$oUserInvite->getLogin()}</a>&nbsp;
<a href="{$oUserInvite->getUserWebPath()}">{$oUserInvite->getDisplayName()}</a>&nbsp;
{/foreach}
</strong>
</li>

2
application/frontend/skin/synio/actions/ActionProfile/wall.comments.tpl
View file

@ -10,7 +10,7 @@
<img src="{$oReplyUser->getProfileAvatarPath(48)}" alt="avatar" class="avatar" />
</a>
<a href="{$oReplyUser->getUserWebPath()}" class="author">{$oReplyUser->getLogin()}</a> ·
<a href="{$oReplyUser->getUserWebPath()}" class="author">{$oReplyUser->getDisplayName()}</a> ·
<span class="comment-content text">{$oReplyWall->getText()}</span>
<ul class="actions">

2
application/frontend/skin/synio/actions/ActionProfile/wall.posts.tpl
View file

@ -11,7 +11,7 @@
<a href="{$oWallUser->getUserWebPath()}"><img src="{$oWallUser->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
<p class="info">
<a href="{$oWallUser->getUserWebPath()}">{$oWallUser->getLogin()}</a> ·
<a href="{$oWallUser->getUserWebPath()}">{$oWallUser->getDisplayName()}</a> ·
<time class="date" datetime="{date_format date=$oWall->getDateAdd() format='c'}">{date_format date=$oWall->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}</time>
</p>

10
application/frontend/skin/synio/actions/ActionStream/events.tpl
View file

@ -26,12 +26,12 @@
<li class="activity-event activity-event-type-{$oStreamEvent->getEventType()}">
{* Аватар *}
<a href="{$oUser->getUserWebPath()}">
<img src="{$oUser->getProfileAvatarPath(48)}" alt="{$oUser->getLogin()}" class="activity-event-avatar" />
<img src="{$oUser->getProfileAvatarPath(48)}" alt="{$oUser->getDisplayName()}" class="activity-event-avatar" />
</a>
<p class="activity-event-info">
{* Логин *}
<a href="{$oUser->getUserWebPath()}"><strong>{$oUser->getLogin()}</strong></a> ·
<a href="{$oUser->getUserWebPath()}"><strong>{$oUser->getDisplayName()}</strong></a> ·
{* Дата *}
<time datetime="{date_format date=$oStreamEvent->getDateAdded() format='c'}"
@ -125,7 +125,7 @@
<span class="user-avatar user-avatar-n">
<a href="{$oTarget->getUserWebPath()}"><img src="{$oTarget->getProfileAvatarPath(24)}" alt="avatar" /></a>
<a href="{$oTarget->getUserWebPath()}">{$oTarget->getLogin()}</a>
<a href="{$oTarget->getUserWebPath()}">{$oTarget->getDisplayName()}</a>
</span>
{elseif $oStreamEvent->getEventType() == 'join_blog'}
{* Вступили в блог *}
@ -148,7 +148,7 @@
<span class="user-avatar user-avatar-n">
<a href="{$oTarget->getUserWebPath()}"><img src="{$oTarget->getProfileAvatarPath(24)}" alt="avatar" /></a>
<a href="{$oTarget->getUserWebPath()}">{$oTarget->getLogin()}</a>
<a href="{$oTarget->getUserWebPath()}">{$oTarget->getDisplayName()}</a>
</span>
{elseif $oStreamEvent->getEventType() == 'add_wall'}
{* Написали на стене *}
@ -161,7 +161,7 @@
<span class="user-avatar user-avatar-n">
<a href="{$oTarget->getWallUser()->getUserWebPath()}"><img src="{$oTarget->getWallUser()->getProfileAvatarPath(24)}" alt="avatar" /></a>
<a href="{$oTarget->getUrlWall()}">{$oTarget->getWallUser()->getLogin()}</a>
<a href="{$oTarget->getUrlWall()}">{$oTarget->getWallUser()->getDisplayName()}</a>
</span>
{$sTextEvent = $oTarget->getText()}

2
application/frontend/skin/synio/actions/ActionTalk/add.tpl
View file

@ -20,7 +20,7 @@
{foreach $aUsersFriend as $oFriend}
<li>
<input id="talk_friend_{$oFriend->getId()}" type="checkbox" name="friend[{$oFriend->getId()}]" class="input-checkbox" />
<label for="talk_friend_{$oFriend->getId()}" id="talk_friend_{$oFriend->getId()}_label">{$oFriend->getLogin()}</label>
<label for="talk_friend_{$oFriend->getId()}" id="talk_friend_{$oFriend->getId()}_label">{$oFriend->getDisplayName()}</label>
</li>
{/foreach}
</ul>

2
application/frontend/skin/synio/actions/ActionTalk/blacklist.tpl
View file

@ -18,7 +18,7 @@
{if $aUsersBlacklist}
<ul class="list" id="black_list">
{foreach $aUsersBlacklist as $oUser}
<li id="blacklist_item_{$oUser->getId()}_area"><a href="{$oUser->getUserWebPath()}" class="user">{$oUser->getLogin()}</a> - <a href="#" id="blacklist_item_{$oUser->getId()}" class="delete">{$aLang.blog_delete}</a></li>
<li id="blacklist_item_{$oUser->getId()}_area"><a href="{$oUser->getUserWebPath()}" class="user">{$oUser->getDisplayName()}</a> - <a href="#" id="blacklist_item_{$oUser->getId()}" class="delete">{$aLang.blog_delete}</a></li>
{/foreach}
</ul>
{/if}

6
application/frontend/skin/synio/actions/ActionTalk/message.tpl
View file

@ -30,7 +30,7 @@
<a class="username {if $oTalkUser->getUserActive() != $TALK_USER_ACTIVE}inactive{/if}"
href="{$oUserRecipient->getUserWebPath()}"
{if $oTalkUser->getUserActive() != $TALK_USER_ACTIVE}title="{$aLang.talk_speaker_not_found}"{/if}>{$oUserRecipient->getLogin()}</a>{if ! $oTalkUser@last}, {/if}
{if $oTalkUser->getUserActive() != $TALK_USER_ACTIVE}title="{$aLang.talk_speaker_not_found}"{/if}>{$oUserRecipient->getDisplayName()}</a>{if ! $oTalkUser@last}, {/if}
{/foreach}
{if $oTalk->getUserId()==$oUserCurrent->getId() or $oUserCurrent->isAdministrator()}
@ -54,7 +54,7 @@
{if $oTalkUser->getUserActive()!=$TALK_USER_DELETE_BY_AUTHOR}
<li id="speaker_item_{$oTalkUser->getUserId()}_area">
<a class="user {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}inactive{/if}" href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a class="user {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}inactive{/if}" href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
{if $oTalkUser->getUserActive()==$TALK_USER_ACTIVE}- <a href="#" id="speaker_item_{$oTalkUser->getUserId()}" class="delete">{$aLang.blog_delete}</a>{/if}
</li>
{/if}
@ -72,7 +72,7 @@
<ul class="topic-info">
<li class="topic-info-author">
<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a rel="author" href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a rel="author" href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</li>
<li class="topic-info-date">
<time datetime="{date_format date=$oTalk->getDate() format='c'}" pubdate title="{date_format date=$oTalk->getDate() format='j F Y, H:i'}">

2
application/frontend/skin/synio/actions/ActionTalk/message_list.tpl
View file

@ -36,7 +36,7 @@
{foreach $aTalkUserOther as $oTalkUser}
{$oUser = $oTalkUser->getUser()}
{if ! $oTalkUser@first}, {/if}<a href="{$oUser->getUserWebPath()}" class="username {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}inactive{/if}" {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}title="{$aLang.talk_speaker_not_found}"{/if}>{$oUser->getLogin()}</a>
{if ! $oTalkUser@first}, {/if}<a href="{$oUser->getUserWebPath()}" class="username {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}inactive{/if}" {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}title="{$aLang.talk_speaker_not_found}"{/if}>{$oUser->getDisplayName()}</a>
{/foreach}
{/strip}
</td>

4
application/frontend/skin/synio/blocks/block.activityFriends.tpl
View file

@ -23,8 +23,8 @@
type="checkbox"
{if isset($aStreamSubscribedUsers.$iUserId)}checked{/if}
data-user-id="{$iUserId}" />
<a href="{$oUser->getUserWebPath()}" title="{$oUser->getLogin()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}" title="{$oUser->getDisplayName()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</li>
{/foreach}
</ul>

4
application/frontend/skin/synio/blocks/block.activityUsers.tpl
View file

@ -31,8 +31,8 @@
type="checkbox"
checked
data-user-id="{$iUserId}" />
<a href="{$oUser->getUserWebPath()}" title="{$oUser->getLogin()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}" title="{$oUser->getDisplayName()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</li>
{/if}
{/foreach}

2
application/frontend/skin/synio/blocks/block.blogInvite.tpl
View file

@ -27,7 +27,7 @@
<li id="blog-invite-remove-item-{$oBlogEdit->getId()}-{$oUser->getId()}">
<span class="user-avatar user-avatar-n">
<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" /></a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</span> -
<a href="#" onclick="return ls.blog.repeatInvite({$oUser->getId()}, {$oBlogEdit->getId()});">{$aLang.blog_user_invite_readd}</a>
<a href="#" onclick="return ls.blog.removeInvite({$oUser->getId()}, {$oBlogEdit->getId()});">{$aLang.blog_user_invite_remove}</a>

2
application/frontend/skin/synio/blocks/block.stream_comment.tpl
View file

@ -14,7 +14,7 @@
<li class="js-title-comment" title="{$oComment->getText()|strip_tags|trim|truncate:100:'...'|escape:'html'}">
<p>
<a href="{$oUser->getUserWebPath()}" class="author">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}" class="author">{$oUser->getDisplayName()}</a>
<time datetime="{date_format date=$oComment->getDate() format='c'}" title="{date_format date=$oComment->getDate() format="j F Y, H:i"}">
{date_format date=$oComment->getDate() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
</time>

2
application/frontend/skin/synio/blocks/block.stream_topic.tpl
View file

@ -13,7 +13,7 @@
<li class="js-title-topic" title="{$oTopic->getText()|strip_tags|trim|truncate:150:'...'|escape:'html'}">
<p>
<a href="{$oUser->getUserWebPath()}" class="author">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}" class="author">{$oUser->getDisplayName()}</a>
<time datetime="{date_format date=$oTopic->getDateAdd() format='c'}" title="{date_format date=$oTopic->getDateAdd() format="j F Y, H:i"}">
{date_format date=$oTopic->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
</time>

4
application/frontend/skin/synio/blocks/block.userfeedFriends.tpl
View file

@ -22,8 +22,8 @@
type="checkbox"
data-user-id="{$iUserId}"
{if isset($aUserfeedSubscribedUsers.$iUserId)} checked{/if} />
<a href="{$oUser->getUserWebPath()}" title="{$oUser->getLogin()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}" title="{$oUser->getDisplayName()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</li>
{/foreach}
</ul>

4
application/frontend/skin/synio/blocks/block.userfeedUsers.tpl
View file

@ -32,8 +32,8 @@
type="checkbox"
checked
data-user-id="{$iUserId}" />
<a href="{$oUser->getUserWebPath()}" title="{$oUser->getLogin()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}" title="{$oUser->getDisplayName()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</li>
{/if}
{/foreach}

2
application/frontend/skin/synio/comments/comment.tpl
View file

@ -46,7 +46,7 @@
<ul class="comment-info">
{* Автор комментария *}
<li class="comment-author {if $iAuthorId == $oUser->getId()}comment-topic-author{/if}" title="{if $iAuthorId == $oUser->getId() and $sAuthorNotice}{$sAuthorNotice}{/if}">
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</li>
{* Дата *}

2
application/frontend/skin/synio/emails/en/notify.blog_invite_new.tpl
View file

@ -1,4 +1,4 @@
<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a> invites you to join the blog <a href="{$oBlog->getUrlFull()}">"{$oBlog->getTitle()|escape:'html'}"</a>.
<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a> invites you to join the blog <a href="{$oBlog->getUrlFull()}">"{$oBlog->getTitle()|escape:'html'}"</a>.
<br /><br />
<a href='{$sPath}'>Have a look at the invitation</a>
<br><br>

2
application/frontend/skin/synio/emails/en/notify.comment_new.tpl
View file

@ -1,4 +1,4 @@
<a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getLogin()}</a> has left a new comment on the topic <b>«{$oTopic->getTitle()|escape:'html'}»</b>.
<a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getDisplayName()}</a> has left a new comment on the topic <b>«{$oTopic->getTitle()|escape:'html'}»</b>.
<br><br>
{if $oConfig->GetValue('sys.mail.include_comment')}
Their comment reads as follows: <i>{$oComment->getText()}</i>

2
application/frontend/skin/synio/emails/en/notify.comment_reply.tpl
View file

@ -1,4 +1,4 @@
<a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getLogin()}</a> has replied to your comment on the topic <b>«{$oTopic->getTitle()|escape:'html'}»</b>.
<a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getDisplayName()}</a> has replied to your comment on the topic <b>«{$oTopic->getTitle()|escape:'html'}»</b>.
<br /><br />
{if $oConfig->GetValue('sys.mail.include_comment')}
Their reply reads as follows: <i>{$oComment->getText()}</i>

2
application/frontend/skin/synio/emails/en/notify.invite.tpl
View file

@ -1,4 +1,4 @@
<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a> has invited you to register at <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a><br>
<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a> has invited you to register at <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a><br>
Your invitation code: <b>{$oInvite->getCode()}</b><br>
To register, you need to enter the invitation code into the corresponding field on <a href="{router page='login'}"> the main page</a>. Please note, the invitation code is to be entered just once. After you have registered, use your login and password to access the website.
<br><br>

2
application/frontend/skin/synio/emails/en/notify.talk_comment_new.tpl
View file

@ -1,4 +1,4 @@
<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a> has left a new comment to the message<b>«{$oTalk->getTitle()|escape:'html'}»</b>.<br><br>
<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a> has left a new comment to the message<b>«{$oTalk->getTitle()|escape:'html'}»</b>.<br><br>
{if $oConfig->GetValue('sys.mail.include_talk')}
Their comment reads as follows: <i>{$oTalkComment->getText()}</i> <br>
{/if}

2
application/frontend/skin/synio/emails/en/notify.talk_new.tpl
View file

@ -1,4 +1,4 @@
You have a new incoming message from <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a>. You can read and answer it by clicking on <a href="{router page='talk'}read/{$oTalk->getId()}/"> this link</a><br>
You have a new incoming message from <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a>. You can read and answer it by clicking on <a href="{router page='talk'}read/{$oTalk->getId()}/"> this link</a><br>
Letter topic: <b>{$oTalk->getTitle()|escape:'html'}</b><br>
{if $oConfig->GetValue('sys.mail.include_talk')}
Message: <i>{$oTalk->getText()}</i> <br>

2
application/frontend/skin/synio/emails/en/notify.topic_new.tpl
View file

@ -1,4 +1,4 @@
The user <a href="{$oUserTopic->getUserWebPath()}">{$oUserTopic->getLogin()}</a> has posted a new topic - <a href="{$oTopic->getUrl()}">{$oTopic->getTitle()|escape:'html'}</a><br> in the blog <b>«{$oBlog->getTitle()|escape:'html'}»</b>
The user <a href="{$oUserTopic->getUserWebPath()}">{$oUserTopic->getDisplayName()}</a> has posted a new topic - <a href="{$oTopic->getUrl()}">{$oTopic->getTitle()|escape:'html'}</a><br> in the blog <b>«{$oBlog->getTitle()|escape:'html'}»</b>
<br><br>
Best regards,

2
application/frontend/skin/synio/emails/en/notify.user_changemail_from.tpl
View file

@ -1,4 +1,4 @@
You have sent a request to change user email <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> at <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.<br/><br/>
You have sent a request to change user email <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> at <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.<br/><br/>
Old email: <b>{$oChangemail->getMailFrom()}</b><br/>
New email: <b>{$oChangemail->getMailTo()}</b><br/>

2
application/frontend/skin/synio/emails/en/notify.user_changemail_to.tpl
View file

@ -1,4 +1,4 @@
You have sent a request to change user email <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> at <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.<br/>
You have sent a request to change user email <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> at <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.<br/>
Old email: <b>{$oChangemail->getMailFrom()}</b><br/>
New email: <b>{$oChangemail->getMailTo()}</b><br/>

2
application/frontend/skin/synio/emails/en/notify.user_friend_new.tpl
View file

@ -1,4 +1,4 @@
The user «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a>»</b> wants to add you to Friends.
The user «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a>»</b> wants to add you to Friends.
<br /><br />
<i>{$sText}</i>
<a href='{$sPath}'>Reply to the friend request</a>

2
application/frontend/skin/synio/emails/en/notify.wall.new.tpl
View file

@ -1,4 +1,4 @@
The user <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> has posted on <a href="{$oUserWall->getUserWebPath()}wall/">your wall</a><br/>
The user <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> has posted on <a href="{$oUserWall->getUserWebPath()}wall/">your wall</a><br/>
Their post reads as follows: <i>{$oWall->getText()}</i>

2
application/frontend/skin/synio/emails/en/notify.wall.reply.tpl
View file

@ -1,4 +1,4 @@
The user <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> has replied to your post on <a href="{$oUserWall->getUserWebPath()}wall/"> the wall</a><br/>
The user <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> has replied to your post on <a href="{$oUserWall->getUserWebPath()}wall/"> the wall</a><br/>
Your post was: <i>{$oWallParent->getText()}</i><br/><br/>
Their reply reads as follows: <i>{$oWall->getText()}</i>

2
application/frontend/skin/synio/emails/ru/email.blog_invite_new.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a>» приглашает вас вступить в блог <a href="{$oBlog->getUrlFull()}">"{$oBlog->getTitle()|escape:'html'}"</a>.
Пользователь «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a>» приглашает вас вступить в блог <a href="{$oBlog->getUrlFull()}">"{$oBlog->getTitle()|escape:'html'}"</a>.
<br>
<br>
<a href='{$sPath}'>Посмотреть приглашение</a> (Не забудьте предварительно авторизоваться!)

2
application/frontend/skin/synio/emails/ru/email.comment_new.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getLogin()}</a> оставил новый комментарий к топику <b>«{$oTopic->getTitle()|escape:'html'}»</b>, прочитать его можно перейдя по <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}">этой ссылке</a><br>
Пользователь <a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getDisplayName()}</a> оставил новый комментарий к топику <b>«{$oTopic->getTitle()|escape:'html'}»</b>, прочитать его можно перейдя по <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}">этой ссылке</a><br>
{if $oConfig->GetValue('sys.mail.include_comment')}
Текст сообщения: <i>{$oComment->getText()}</i>

2
application/frontend/skin/synio/emails/ru/email.comment_reply.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getLogin()}</a> ответил на ваш комментарий в топике <b>«{$oTopic->getTitle()|escape:'html'}»</b>, прочитать его можно перейдя по <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}">этой ссылке</a>
Пользователь <a href="{$oUserComment->getUserWebPath()}">{$oUserComment->getDisplayName()}</a> ответил на ваш комментарий в топике <b>«{$oTopic->getTitle()|escape:'html'}»</b>, прочитать его можно перейдя по <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}">этой ссылке</a>
<br>
{if $oConfig->GetValue('sys.mail.include_comment')}

2
application/frontend/skin/synio/emails/ru/email.invite.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a> пригласил вас зарегистрироваться на сайте <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>
Пользователь <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a> пригласил вас зарегистрироваться на сайте <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>
<br>
<br>
Код приглашения: <b>{$oInvite->getCode()}</b>

2
application/frontend/skin/synio/emails/ru/email.talk_comment_new.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a> оставил новый комментарий к письму <b>«{$oTalk->getTitle()|escape:'html'}»</b>, прочитать его можно перейдя по <a href="{router page='talk'}read/{$oTalk->getId()}/#comment{$oTalkComment->getId()}">этой ссылке</a>
Пользователь <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a> оставил новый комментарий к письму <b>«{$oTalk->getTitle()|escape:'html'}»</b>, прочитать его можно перейдя по <a href="{router page='talk'}read/{$oTalk->getId()}/#comment{$oTalkComment->getId()}">этой ссылке</a>
<br>
<br>

2
application/frontend/skin/synio/emails/ru/email.talk_new.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Вам пришло новое письмо от пользователя <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a>, прочитать и ответить на него можно перейдя по <a href="{router page='talk'}read/{$oTalk->getId()}/">этой ссылке</a>
Вам пришло новое письмо от пользователя <a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a>, прочитать и ответить на него можно перейдя по <a href="{router page='talk'}read/{$oTalk->getId()}/">этой ссылке</a>
<br>
<br>
Тема письма: <b>{$oTalk->getTitle()|escape:'html'}</b>

2
application/frontend/skin/synio/emails/ru/email.topic_new.tpl
View file

@ -1,5 +1,5 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUserTopic->getUserWebPath()}">{$oUserTopic->getLogin()}</a> опубликовал в блоге <b>«{$oBlog->getTitle()|escape:'html'}»</b> новый топик &mdash; <a href="{$oTopic->getUrl()}">{$oTopic->getTitle()|escape:'html'}</a>
Пользователь <a href="{$oUserTopic->getUserWebPath()}">{$oUserTopic->getDisplayName()}</a> опубликовал в блоге <b>«{$oBlog->getTitle()|escape:'html'}»</b> новый топик &mdash; <a href="{$oTopic->getUrl()}">{$oTopic->getTitle()|escape:'html'}</a>
{/block}

2
application/frontend/skin/synio/emails/ru/email.user_changemail_from.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Вами отправлен запрос на смену e-mail адреса пользователя <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> на сайте <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.
Вами отправлен запрос на смену e-mail адреса пользователя <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> на сайте <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.
<br>
<br>
Старый e-mail: <b>{$oChangemail->getMailFrom()}</b><br>

2
application/frontend/skin/synio/emails/ru/email.user_changemail_to.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Вами отправлен запрос на смену e-mail адреса пользователя <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> на сайте <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.
Вами отправлен запрос на смену e-mail адреса пользователя <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> на сайте <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>.
<br>
<br>
Старый e-mail: <b>{$oChangemail->getMailFrom()}</b><br>

2
application/frontend/skin/synio/emails/ru/email.user_friend_new.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getLogin()}</a>» хочет добавить вас в друзья.
Пользователь «<a href="{$oUserFrom->getUserWebPath()}">{$oUserFrom->getDisplayName()}</a>» хочет добавить вас в друзья.
<br>
<br>
<i>{$sText}</i>

2
application/frontend/skin/synio/emails/ru/email.wall.new.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> оставил сообщение на <a href="{$oUserWall->getUserWebPath()}wall/">вашей стене</a>
Пользователь <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> оставил сообщение на <a href="{$oUserWall->getUserWebPath()}wall/">вашей стене</a>
<br>
<br>
Текст сообщения:

2
application/frontend/skin/synio/emails/ru/email.wall.reply.tpl
View file

@ -1,7 +1,7 @@
{extends file='emails/email.base.tpl'}
{block name='content'}
Пользователь <a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a> ответил на ваше сообщение на <a href="{$oUserWall->getUserWebPath()}wall/">стене</a>
Пользователь <a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a> ответил на ваше сообщение на <a href="{$oUserWall->getUserWebPath()}wall/">стене</a>
<br>
<br>
<b>Ваше сообщение:</b><br>

4
application/frontend/skin/synio/layouts/layout.base.tpl
View file

@ -175,7 +175,7 @@
{if $oUserCurrent}
<div class="dropdown-user" id="user-menu">
<a href="{$oUserCurrent->getUserWebPath()}"><img src="{$oUserCurrent->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
<a href="{$oUserCurrent->getUserWebPath()}" class="username">{$oUserCurrent->getLogin()}</a>
<a href="{$oUserCurrent->getUserWebPath()}" class="username">{$oUserCurrent->getDisplayName()}</a>
<div class="dropdown-user-shadow"></div>
<div class="dropdown-user-trigger js-dropdown-usermenu" data-type="dropdown-toggle" data-option-target="dropdown-user-menu"><i></i></div>
@ -305,7 +305,7 @@
<footer id="footer">
{if $oUserCurrent}
<ul class="footer-list">
<li class="footer-list-header word-wrap">{$oUserCurrent->getLogin()}</li>
<li class="footer-list-header word-wrap">{$oUserCurrent->getDisplayName()}</li>
<li><a href="{$oUserCurrent->getUserWebPath()}">{$aLang.footer_menu_user_profile}</a></li>
<li><a href="{router page='settings'}profile/">{$aLang.user_settings}</a></li>
<li><a href="{router page='topic'}add/" class="js-write-window-show">{$aLang.block_create}</a></li>

2
application/frontend/skin/synio/layouts/layout.user.tpl
View file

@ -60,7 +60,7 @@
</a>
{/if}
<h2 class="page-header user-login word-wrap {if !$oUserProfile->getProfileName()}no-user-name{/if}" itemprop="nickname">{$oUserProfile->getLogin()}</h2>
<h2 class="page-header user-login word-wrap {if !$oUserProfile->getProfileName()}no-user-name{/if}" itemprop="nickname">{$oUserProfile->getDisplayName()}</h2>
{if $oUserProfile->getProfileName()}
<p class="user-name" itemprop="name">{$oUserProfile->getProfileName()|escape:'html'}</p>

2
application/frontend/skin/synio/topics/topic_base.tpl
View file

@ -116,7 +116,7 @@
{* Автор топика *}
<li class="topic-info-author">
<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a rel="author" href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a rel="author" href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</li>
{* Дата публикации *}

2
application/frontend/skin/synio/topics/topic_preview_topic.tpl
View file

@ -46,7 +46,7 @@
<ul class="topic-info">
<li class="topic-info-author">
<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
<a rel="author" href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
<a rel="author" href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
</li>
{hook run='topic_preview_show_info' topic=$oTopic}

2
application/frontend/skin/synio/user_list.tpl
View file

@ -42,7 +42,7 @@
<td class="cell-name">
<a href="{$oUserList->getUserWebPath()}"><img src="{$oUserList->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
<div class="name {if !$oUserList->getProfileName()}no-realname{/if}">
<p class="username word-wrap"><a href="{$oUserList->getUserWebPath()}">{$oUserList->getLogin()}</a></p>
<p class="username word-wrap"><a href="{$oUserList->getUserWebPath()}">{$oUserList->getDisplayName()}</a></p>
{if $oUserList->getProfileName()}<p class="realname">{$oUserList->getProfileName()}</p>{/if}
</div>
</td>

Some files were not shown because too many files have changed in this diff Show more