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

Доработка тегов #725

Browse source
This commit is contained in:
Denis Shakhov 2015-11-09 21:37:00 +07:00
parent c8f7262605
commit c95241c565
5 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
application/frontend/components/tags-personal/tags-cloud.tpl
View file

@ -2,20 +2,12 @@
* Избранные теги пользователя
*
* @param array $tags
* @param object $user
* @param object $activeTag
*}
{$user = $smarty.local.user}
{$activeTag = $smarty.local.activeTag}
{component 'tags' template='cloud'
tags = $smarty.local.tags
url = '{$user->getUserWebPath()}favourites/topics/tag/{$tag->getText()|escape:\'url\'}/'
active = $activeTag
assign = tags}
{component 'details'
classes = 'js-tags-favourite-cloud'
title = "{lang 'tags_personal.title'} {if $activeTag}({$activeTag}){/if}"
content = $tags}
content = {component 'tags' template='cloud' tags=$smarty.local.tags active=$activeTag}}

4
application/frontend/components/tags-personal/tags.tpl
View file

@ -15,8 +15,8 @@
{if $oUserCurrent}
{foreach $smarty.local.tagsPersonal as $tag}
{component 'tags' template='item'
text=$tag
url="{$oUserCurrent->getUserWebPath()}favourites/topics/tag/{$tag|escape:'url'}/"
text=$tag->getText()
url=$tag->getUrl()
classes="js-tags-personal-tag"
mods="personal"}
{/foreach}

4
application/frontend/components/topic/blocks/block.topics-tags.tpl
View file

@ -10,11 +10,11 @@
'tabs' => [
[
'text' => {lang 'tags.block_tags.nav.all'},
'content' => {component 'tags' template='cloud' tags=$smarty.local.tags url='{router page=\'tag\'}{$tag->getText()|escape:\'url\'}/'}
'content' => {component 'tags' template='cloud' tags=$smarty.local.tags}
],
[
'text' => {lang 'tags.block_tags.nav.favourite'},
'content' => {component 'tags' template='cloud' tags=$smarty.local.tagsUser url='{router page=\'tag\'}{$tag->getText()|escape:\'url\'}/'},
'content' => {component 'tags' template='cloud' tags=$smarty.local.tagsUser},
'is_enabled' => !! $oUserCurrent
]
]

8
application/frontend/components/topic/topic.tpl
View file

@ -140,13 +140,13 @@
{$favourite = $topic->getFavourite()}
{if ! $isPreview}
{component 'tags-personal'
{*component 'tags-personal'
classes = 'js-tags-favourite'
tags = $topic->getTagsArray()
tagsPersonal = ( $favourite ) ? $favourite->getTagsArray() : []
tags = $topic->getTags()
tagsPersonal = ( $favourite ) ? $favourite->getTags() : []
isEditable = ! $favourite
targetType = 'topic'
targetId = $topic->getId()}
targetId = $topic->getId()*}
{/if}
{/if}

2
framework

@ -1 +1 @@
Subproject commit 6e84853becbd465cfbb2e9bc721ad808206eaff7
Subproject commit 12c4e60c3940153c36fa4379045f6af5ff1bbe52