ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-07-02 22:45:02 +03:00
Code Issues Releases Wiki Activity

Доработка подсказок #287

Browse source
This commit is contained in:
Denis Shakhov 2013-07-03 12:30:44 +07:00
parent 834a449e7a
commit 048beb8679
12 changed files with 33 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
templates/framework/js/livestreet/favourite.js
View file

@ -49,9 +49,10 @@ ls.favourite = (function ($) {
this.objFavourite.removeClass(this.options.active);
if (result.bState) {
this.objFavourite.addClass(this.options.active);
this.objFavourite.addClass(this.options.active).attr('title', ls.lang.get('talk_favourite_del'));
this.showTags(type,idTarget);
} else {
this.objFavourite.attr('title', ls.lang.get('talk_favourite_add'));
this.hideTags(type,idTarget);
}

5
templates/language/russian.php
View file

@ -823,11 +823,11 @@ return array(
'talk_create_submit' => 'Отправить',
'talk_time_limit' => 'Вам нельзя отправлять инбоксы слишком часто',
'talk_favourite_inbox' => 'Избранные письма',
'talk_favourite_add' => 'добавить в избранное',
'talk_favourite_add' => 'Добавить в избранное',
'talk_favourite_add_ok' => 'Письмо добавлено в избранное',
'talk_favourite_add_no' => 'Этого письма нет в вашем избранном',
'talk_favourite_add_already' => 'Это письмо уже есть в вашем избранном',
'talk_favourite_del' => 'удалить из избранного',
'talk_favourite_del' => 'Удалить из избранного',
'talk_favourite_del_ok' => 'Письмо удалено из избранного',
'talk_favourite_empty' => 'Нет писем в избранном',
'talk_filter_title' => 'Поиск сообщений',
@ -1203,7 +1203,6 @@ return array(
'date_hours_back_less' => 'Менее часа назад',
'today' => 'Сегодня',
'more' => 'еще',
'favourite_add_remove' => 'Добавить / удалить из избранного',
'timezone_list'=> array(
'-12' => '[UTC − 12] Меридиан смены дат (запад)',

5
templates/skin/developer/actions/ActionTalk/message.tpl
View file

@ -84,7 +84,10 @@
<footer class="topic-footer">
<ul class="topic-info">
<li class="topic-info-favourite">
<a href="#" onclick="return ls.favourite.toggle({$oTalk->getId()},this,'talk');" class="favourite {if $oTalk->getIsFavourite()}active{/if}" title="{$aLang.favourite_add_remove}"></a>
<a href="#"
onclick="return ls.favourite.toggle({$oTalk->getId()},this,'talk');"
class="favourite {if $oTalk->getIsFavourite()}active{/if}"
title="{if $oTalk->getIsFavourite()}{$aLang.talk_favourite_del}{else}{$aLang.talk_favourite_add}{/if}"></a>
</li>
<li class="delete">
<a href="{router page='talk'}delete/{$oTalk->getId()}/?security_ls_key={$LIVESTREET_SECURITY_KEY}" onclick="return confirm('{$aLang.talk_inbox_delete_confirm}');" class="delete">{$aLang.delete}</a>

5
templates/skin/developer/actions/ActionTalk/message_list.tpl
View file

@ -24,7 +24,10 @@
<td class="cell-checkbox"><input type="checkbox" name="talk_select[{$oTalk->getId()}]" class="form_talks_checkbox input-checkbox" /></td>
{/if}
<td class="cell-favourite">
<a href="#" onclick="return ls.favourite.toggle({$oTalk->getId()},this,'talk');" class="favourite {if $oTalk->getIsFavourite()}active{/if}" title="{$aLang.favourite_add_remove}"></a>
<a href="#"
onclick="return ls.favourite.toggle({$oTalk->getId()},this,'talk');"
class="favourite {if $oTalk->getIsFavourite()}active{/if}"
title="{if $oTalk->getIsFavourite()}{$aLang.talk_favourite_del}{else}{$aLang.talk_favourite_add}{/if}"></a>
</td>
<td>
{strip}

4
templates/skin/developer/comments/comment.tpl
View file

@ -109,7 +109,9 @@
{* Кнопка добавления в избранное *}
{if $oUserCurrent and ! $bNoCommentFavourites}
<li class="comment-favourite">
<div onclick="return ls.favourite.toggle({$oComment->getId()},this,'comment');" class="favourite {if $oComment->getIsFavourite()}active{/if}" title="{$aLang.favourite_add_remove}"></div>
<div onclick="return ls.favourite.toggle({$oComment->getId()},this,'comment');"
class="favourite {if $oComment->getIsFavourite()}active{/if}"
title="{if $oComment->getIsFavourite()}{$aLang.talk_favourite_del}{else}{$aLang.talk_favourite_add}{/if}"></div>
<span class="favourite-count" id="fav_count_comment_{$oComment->getId()}">{if $oComment->getCountFavourite() > 0}{$oComment->getCountFavourite()}{/if}</span>
</li>
{/if}

2
templates/skin/developer/layouts/layout.base.tpl
View file

@ -65,7 +65,7 @@
<script>
ls.lang.load({json var = $aLangJs});
ls.lang.load({lang_load name="blog"});
ls.lang.load({lang_load name="blog,talk_favourite_add,talk_favourite_del"});
ls.registry.set('comment_max_tree', {json var=$oConfig->Get('module.comment.max_tree')});
ls.registry.set('block_stream_show_tip', {json var=$oConfig->Get('block.stream.show_tip')});

4
templates/skin/developer/topics/topic_base.tpl
View file

@ -151,7 +151,9 @@
<li class="topic-info-author"><a rel="author" href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a></li>
<li class="topic-info-favourite">
<div onclick="return ls.favourite.toggle({$oTopic->getId()},this,'topic');" class="favourite {if $oUserCurrent && $oTopic->getIsFavourite()}active{/if}" title="{$aLang.favourite_add_remove}"></div>
<div onclick="return ls.favourite.toggle({$oTopic->getId()},this,'topic');"
class="favourite {if $oUserCurrent && $oTopic->getIsFavourite()}active{/if}"
title="{if $oTopic->getIsFavourite()}{$aLang.talk_favourite_del}{else}{$aLang.talk_favourite_add}{/if}"></div>
<span class="favourite-count" id="fav_count_topic_{$oTopic->getId()}" {if ! $oTopic->getCountFavourite()}style="display: none"{/if}>{$oTopic->getCountFavourite()}</span>
</li>
<li class="topic-info-share"><a href="#" class="icon-share js-popover-default" title="{$aLang.topic_share}" data-type="popover-toggle" data-option-target="topic_share_{$oTopic->getId()}"></a></li>

4
templates/skin/synio/actions/ActionTalk/message.tpl
View file

@ -80,7 +80,9 @@
</time>
</li>
<li class="topic-info-favourite" onclick="return ls.favourite.toggle({$oTalk->getId()},$('#fav_topic_{$oTalk->getId()}'),'talk');">
<i id="fav_topic_{$oTalk->getId()}" class="favourite {if $oTalk->getIsFavourite()}active{/if}" title="{$aLang.favourite_add_remove}"></i>
<i id="fav_topic_{$oTalk->getId()}"
class="favourite {if $oTalk->getIsFavourite()}active{/if}"
title="{if $oTalk->getIsFavourite()}{$aLang.talk_favourite_del}{else}{$aLang.talk_favourite_add}{/if}"></i>
</li>
<li class="delete">
<a href="{router page='talk'}delete/{$oTalk->getId()}/?security_ls_key={$LIVESTREET_SECURITY_KEY}" onclick="return confirm('{$aLang.talk_inbox_delete_confirm}');" class="delete">{$aLang.delete}</a>

5
templates/skin/synio/actions/ActionTalk/message_list.tpl
View file

@ -41,7 +41,10 @@
{/strip}
</td>
<td class="cell-favourite">
<a href="#" onclick="return ls.favourite.toggle({$oTalk->getId()},this,'talk');" class="favourite {if $oTalk->getIsFavourite()}active{/if}" title="{$aLang.favourite_add_remove}"></a>
<a href="#"
onclick="return ls.favourite.toggle({$oTalk->getId()},this,'talk');"
class="favourite {if $oTalk->getIsFavourite()}active{/if}"
title="{if $oTalk->getIsFavourite()}{$aLang.talk_favourite_del}{else}{$aLang.talk_favourite_add}{/if}"></a>
</td>
<td class="cell-title">
{strip}

4
templates/skin/synio/comments/comment.tpl
View file

@ -59,7 +59,9 @@
{* Кнопка добавления в избранное *}
{if $oUserCurrent and ! $bNoCommentFavourites}
<li class="comment-favourite">
<div onclick="return ls.favourite.toggle({$oComment->getId()},this,'comment');" class="favourite {if $oComment->getIsFavourite()}active{/if}" title="{$aLang.favourite_add_remove}"></div>
<div onclick="return ls.favourite.toggle({$oComment->getId()},this,'comment');"
class="favourite {if $oComment->getIsFavourite()}active{/if}"
title="{if $oComment->getIsFavourite()}{$aLang.talk_favourite_del}{else}{$aLang.talk_favourite_add}{/if}"></div>
<span class="favourite-count" id="fav_count_comment_{$oComment->getId()}" {if $oComment->getCountFavourite() == 0}style="display: none"{/if}>{if $oComment->getCountFavourite() > 0}{$oComment->getCountFavourite()}{/if}</span>
</li>
{/if}

2
templates/skin/synio/layouts/layout.base.tpl
View file

@ -67,7 +67,7 @@
<script>
ls.lang.load({json var = $aLangJs});
ls.lang.load({lang_load name="blog"});
ls.lang.load({lang_load name="blog,talk_favourite_add,talk_favourite_del"});
ls.registry.set('comment_max_tree', {json var=$oConfig->Get('module.comment.max_tree')});
ls.registry.set('block_stream_show_tip', {json var=$oConfig->Get('block.stream.show_tip')});

4
templates/skin/synio/topics/topic_base.tpl
View file

@ -129,7 +129,9 @@
<i class="icon-synio-share-blue" title="{$aLang.topic_share}"></i>
</li>
<li class="topic-info-favourite" onclick="return ls.favourite.toggle({$oTopic->getId()},$('#fav_topic_{$oTopic->getId()}'),'topic');">
<i id="fav_topic_{$oTopic->getId()}" class="favourite {if $oUserCurrent && $oTopic->getIsFavourite()}active{/if}" title="{$aLang.favourite_add_remove}"></i>
<i id="fav_topic_{$oTopic->getId()}"
class="favourite {if $oUserCurrent && $oTopic->getIsFavourite()}active{/if}"
title="{if $oTopic->getIsFavourite()}{$aLang.talk_favourite_del}{else}{$aLang.talk_favourite_add}{/if}"></i>
<span class="favourite-count" id="fav_count_topic_{$oTopic->getId()}" {if ! $oTopic->getCountFavourite()}style="display: none"{/if}>{if $oTopic->getCountFavourite()>0}{$oTopic->getCountFavourite()}{/if}</span>
</li>