mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-07-04 23:44:25 +03:00
Фикс дат, учитывание пола пользователя в активности
This commit is contained in:
parent
ecf291c1b2
commit
f043c41946
|
@ -890,6 +890,7 @@ return array(
|
|||
'stream_no_events' => 'Stream is empty',
|
||||
'stream_error_subscribe_to_yourself' => 'You can not sign up for yourself',
|
||||
'stream_list_user' => 'User',
|
||||
|
||||
'stream_list_event_add_wall' => 'added a post on wall',
|
||||
'stream_list_event_add_topic' => 'added a new topic',
|
||||
'stream_list_event_add_blog' => 'added a new blog',
|
||||
|
@ -900,6 +901,18 @@ return array(
|
|||
'stream_list_event_vote_comment' => 'voted comment',
|
||||
'stream_list_event_join_blog' => 'join to blog',
|
||||
'stream_list_event_add_friend' => 'add to friends',
|
||||
|
||||
'stream_list_event_add_wall_female' => 'added a post on wall',
|
||||
'stream_list_event_add_topic_female' => 'added a new topic',
|
||||
'stream_list_event_add_blog_female' => 'added a new blog',
|
||||
'stream_list_event_add_comment_female' => 'commented on the topic',
|
||||
'stream_list_event_vote_topic_female' => 'voted topic',
|
||||
'stream_list_event_vote_blog_female' => 'voted blog',
|
||||
'stream_list_event_vote_user_female' => 'voted user',
|
||||
'stream_list_event_vote_comment_female' => 'voted comment',
|
||||
'stream_list_event_join_blog_female' => 'join to blog',
|
||||
'stream_list_event_add_friend_female' => 'add to friends',
|
||||
|
||||
'stream_menu' => 'Stream',
|
||||
'stream_menu_all' => 'All',
|
||||
'stream_menu_user' => 'I watch',
|
||||
|
|
|
@ -902,6 +902,18 @@ return array(
|
|||
'stream_list_event_vote_comment' => 'оценил комментарий к топику',
|
||||
'stream_list_event_join_blog' => 'вступил в блог',
|
||||
'stream_list_event_add_friend' => 'добавил в друзья пользователя',
|
||||
|
||||
'stream_list_event_add_wall_female' => 'добавила запись на стену',
|
||||
'stream_list_event_add_topic_female' => 'добавила новый топик',
|
||||
'stream_list_event_add_blog_female' => 'добавила новый блог',
|
||||
'stream_list_event_add_comment_female' => 'прокомментировала топик',
|
||||
'stream_list_event_vote_topic_female' => 'оценила топик',
|
||||
'stream_list_event_vote_blog_female' => 'оценила блог',
|
||||
'stream_list_event_vote_user_female' => 'оценила пользователя',
|
||||
'stream_list_event_vote_comment_female' => 'оценила комментарий к топику',
|
||||
'stream_list_event_join_blog_female' => 'вступила в блог',
|
||||
'stream_list_event_add_friend_female' => 'добавила в друзья пользователя',
|
||||
|
||||
'stream_menu' => 'Активность',
|
||||
'stream_menu_all' => 'Вся',
|
||||
'stream_menu_user' => 'Я слежу',
|
||||
|
|
|
@ -15,41 +15,48 @@
|
|||
{/if}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
{assign var=oUser value=$oStreamEvent->getUser()}
|
||||
|
||||
<li class="stream-item stream-item-type-{$oStreamEvent->getEventType()}">
|
||||
<a href="{$oStreamEvent->getUser()->getUserWebPath()}"><img src="{$oStreamEvent->getUser()->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
|
||||
<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
|
||||
<span class="date" title="{date_format date=$oStreamEvent->getDateAdded()}">{date_format date=$oStreamEvent->getDateAdded() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}</span>
|
||||
|
||||
<a href="{$oStreamEvent->getUser()->getUserWebPath()}"><strong>{$oStreamEvent->getUser()->getLogin()}</strong></a>
|
||||
<a href="{$oUser->getUserWebPath()}"><strong>{$oUser->getLogin()}</strong></a>
|
||||
|
||||
{if $oStreamEvent->getEventType() == 'add_topic'}
|
||||
{$aLang.stream_list_event_add_topic} <a href="{$oTarget->getUrl()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_add_topic} {else} {$aLang.stream_list_event_add_topic_female} {/if}
|
||||
<a href="{$oTarget->getUrl()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'add_comment'}
|
||||
{$aLang.stream_list_event_add_comment} <a href="{$oTarget->getTarget()->getUrl()}#comment{$oTarget->getId()}">{$oTarget->getTarget()->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_add_comment} {else} {$aLang.stream_list_event_add_comment_female} {/if}
|
||||
<a href="{$oTarget->getTarget()->getUrl()}#comment{$oTarget->getId()}">{$oTarget->getTarget()->getTitle()|escape:'html'}</a>
|
||||
{assign var=sTextEvent value=$oTarget->getText()|strip_tags|truncate:200}
|
||||
{if trim($sTextEvent)}
|
||||
<div class="stream-comment-preview">{$sTextEvent}</div>
|
||||
{/if}
|
||||
{elseif $oStreamEvent->getEventType() == 'add_blog'}
|
||||
{$aLang.stream_list_event_add_blog} <a href="{$oTarget->getUrlFull()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_add_blog} {else} {$aLang.stream_list_event_add_blog_female} {/if}
|
||||
<a href="{$oTarget->getUrlFull()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'vote_blog'}
|
||||
{$aLang.stream_list_event_vote_blog} <a href="{$oTarget->getUrlFull()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_vote_blog} {else} {$aLang.stream_list_event_vote_blog_female} {/if}
|
||||
<a href="{$oTarget->getUrlFull()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'vote_topic'}
|
||||
{$aLang.stream_list_event_vote_topic} <a href="{$oTarget->getUrl()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_vote_topic} {else} {$aLang.stream_list_event_vote_topic_female} {/if}
|
||||
<a href="{$oTarget->getUrl()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'vote_comment'}
|
||||
{$aLang.stream_list_event_vote_comment} <a href="{$oTarget->getTarget()->getUrl()}#comment{$oTarget->getId()}">{$oTarget->getTarget()->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_vote_comment} {else} {$aLang.stream_list_event_vote_comment_female} {/if}
|
||||
<a href="{$oTarget->getTarget()->getUrl()}#comment{$oTarget->getId()}">{$oTarget->getTarget()->getTitle()|escape:'html'}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'vote_user'}
|
||||
{$aLang.stream_list_event_vote_user} <a href="{$oTarget->getUserWebPath()}">{$oTarget->getLogin()}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_vote_user} {else} {$aLang.stream_list_event_vote_user_female} {/if}
|
||||
<a href="{$oTarget->getUserWebPath()}">{$oTarget->getLogin()}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'join_blog'}
|
||||
{$aLang.stream_list_event_join_blog} <a href="{$oTarget->getUrlFull()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_join_blog} {else} {$aLang.stream_list_event_join_blog_female} {/if}
|
||||
<a href="{$oTarget->getUrlFull()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'add_friend'}
|
||||
{$aLang.stream_list_event_add_friend} <a href="{$oTarget->getUserWebPath()}">{$oTarget->getLogin()}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_add_friend} {else} {$aLang.stream_list_event_add_friend_female} {/if}
|
||||
<a href="{$oTarget->getUserWebPath()}">{$oTarget->getLogin()}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'add_wall'}
|
||||
{$aLang.stream_list_event_add_wall} <a href="{$oTarget->getUrlWall()}">{$oTarget->getWallUser()->getLogin()}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_add_wall} {else} {$aLang.stream_list_event_add_wall_female} {/if}
|
||||
<a href="{$oTarget->getUrlWall()}">{$oTarget->getWallUser()->getLogin()}</a>
|
||||
{assign var=sTextEvent value=$oTarget->getText()|strip_tags|truncate:200}
|
||||
{if trim($sTextEvent)}
|
||||
<div class="stream-comment-preview">{$sTextEvent}</div>
|
||||
|
|
|
@ -14,45 +14,54 @@
|
|||
</li>
|
||||
{/if}
|
||||
|
||||
<li class="stream-item stream-item-type-{$oStreamEvent->getEventType()}">
|
||||
<a href="{$oStreamEvent->getUser()->getUserWebPath()}"><img src="{$oStreamEvent->getUser()->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
|
||||
{assign var=oUser value=$oStreamEvent->getUser()}
|
||||
|
||||
<p class="info"><a href="{$oStreamEvent->getUser()->getUserWebPath()}"><strong>{$oStreamEvent->getUser()->getLogin()}</strong></a> ·
|
||||
<li class="stream-item stream-item-type-{$oStreamEvent->getEventType()}">
|
||||
<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
|
||||
|
||||
<p class="info"><a href="{$oUser->getUserWebPath()}"><strong>{$oUser->getLogin()}</strong></a> ·
|
||||
<span class="date" title="{date_format date=$oStreamEvent->getDateAdded()}">{date_format date=$oStreamEvent->getDateAdded() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}</span></p>
|
||||
|
||||
|
||||
{if $oStreamEvent->getEventType() == 'add_topic'}
|
||||
{$aLang.stream_list_event_add_topic} <a href="{$oTarget->getUrl()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_add_topic} {else} {$aLang.stream_list_event_add_topic_female} {/if}
|
||||
<a href="{$oTarget->getUrl()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'add_comment'}
|
||||
{$aLang.stream_list_event_add_comment} <a href="{$oTarget->getTarget()->getUrl()}#comment{$oTarget->getId()}">{$oTarget->getTarget()->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_add_comment} {else} {$aLang.stream_list_event_add_comment_female} {/if}
|
||||
<a href="{$oTarget->getTarget()->getUrl()}#comment{$oTarget->getId()}">{$oTarget->getTarget()->getTitle()|escape:'html'}</a>
|
||||
{assign var=sTextEvent value=$oTarget->getText()|strip_tags|truncate:200}
|
||||
{if trim($sTextEvent)}
|
||||
<div class="stream-comment-preview">{$sTextEvent}</div>
|
||||
{/if}
|
||||
{elseif $oStreamEvent->getEventType() == 'add_blog'}
|
||||
{$aLang.stream_list_event_add_blog} <a href="{$oTarget->getUrlFull()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_add_blog} {else} {$aLang.stream_list_event_add_blog_female} {/if}
|
||||
<a href="{$oTarget->getUrlFull()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'vote_blog'}
|
||||
{$aLang.stream_list_event_vote_blog} <a href="{$oTarget->getUrlFull()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_vote_blog} {else} {$aLang.stream_list_event_vote_blog_female} {/if}
|
||||
<a href="{$oTarget->getUrlFull()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'vote_topic'}
|
||||
{$aLang.stream_list_event_vote_topic} <a href="{$oTarget->getUrl()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_vote_topic} {else} {$aLang.stream_list_event_vote_topic_female} {/if}
|
||||
<a href="{$oTarget->getUrl()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'vote_comment'}
|
||||
{$aLang.stream_list_event_vote_comment} <a href="{$oTarget->getTarget()->getUrl()}#comment{$oTarget->getId()}">{$oTarget->getTarget()->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_vote_comment} {else} {$aLang.stream_list_event_vote_comment_female} {/if}
|
||||
<a href="{$oTarget->getTarget()->getUrl()}#comment{$oTarget->getId()}">{$oTarget->getTarget()->getTitle()|escape:'html'}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'vote_user'}
|
||||
{$aLang.stream_list_event_vote_user}
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_vote_user} {else} {$aLang.stream_list_event_vote_user_female} {/if}
|
||||
<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>
|
||||
</span>
|
||||
{elseif $oStreamEvent->getEventType() == 'join_blog'}
|
||||
{$aLang.stream_list_event_join_blog} <a href="{$oTarget->getUrlFull()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_join_blog} {else} {$aLang.stream_list_event_join_blog_female} {/if}
|
||||
<a href="{$oTarget->getUrlFull()}">{$oTarget->getTitle()|escape:'html'}</a>
|
||||
{elseif $oStreamEvent->getEventType() == 'add_friend'}
|
||||
{$aLang.stream_list_event_add_friend}
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_add_friend} {else} {$aLang.stream_list_event_add_friend_female} {/if}
|
||||
<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>
|
||||
</span>
|
||||
{elseif $oStreamEvent->getEventType() == 'add_wall'}
|
||||
{$aLang.stream_list_event_add_wall}
|
||||
{if $oUser->getProfileSex() != 'woman'} {$aLang.stream_list_event_add_wall} {else} {$aLang.stream_list_event_add_wall_female} {/if}
|
||||
<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>
|
||||
|
|
|
@ -7,7 +7,9 @@
|
|||
<li class="js-title-comment" title="{$oComment->getText()|strip_tags|trim|truncate:100:'...'}">
|
||||
<p>
|
||||
<a href="{$oUser->getUserWebPath()}" class="author">{$oUser->getLogin()}</a>
|
||||
<time datetime="{date_format date=$oComment->getDate() format='c'}">{date_format date=$oComment->getDate() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}</time>
|
||||
<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>
|
||||
</p>
|
||||
<a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}{$oTopic->getUrl()}#comment{/if}{$oComment->getId()}" class="stream-topic">{$oTopic->getTitle()|escape:'html'}</a>
|
||||
<span class="block-item-comments"><i class="icon-synio-comments-small"></i>{$oTopic->getCountComment()}</span>
|
||||
|
|
|
@ -6,7 +6,9 @@
|
|||
<li class="js-title-comment" title="{$oTopic->getText()|strip_tags|trim|truncate:150:'...'}">
|
||||
<p>
|
||||
<a href="{$oUser->getUserWebPath()}" class="author">{$oUser->getLogin()}</a>
|
||||
<time datetime="{date_format date=$oTopic->getDateAdd() format='c'}">{date_format date=$oTopic->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}</time>
|
||||
<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>
|
||||
</p>
|
||||
<a href="{$oBlog->getUrlFull()}" class="stream-blog">{$oBlog->getTitle()|escape:'html'}</a> →
|
||||
<a href="{$oTopic->getUrl()}" class="stream-topic">{$oTopic->getTitle()|escape:'html'}</a>
|
||||
|
|
|
@ -33,7 +33,9 @@
|
|||
<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
|
||||
</li>
|
||||
<li class="comment-date">
|
||||
<time datetime="{date_format date=$oComment->getDate() format='c'}">{date_format date=$oComment->getDate() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}</time>
|
||||
<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>
|
||||
</li>
|
||||
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
</li>
|
||||
<li class="topic-info-date">
|
||||
<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() 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>
|
||||
</li>
|
||||
<li class="topic-info-share" data-topic-id="{$oTopic->getId()}" onclick="jQuery('#topic_share_{$oTopic->getId()}').slideToggle(); return false;"><i class="icon-synio-share-blue" title="{$aLang.topic_share}"></i></li>
|
||||
|
|
Loading…
Reference in a new issue