mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-07-02 22:45:02 +03:00
Merge branch 'master' of https://github.com/livestreet/livestreet
This commit is contained in:
commit
e1839a704f
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
{block 'layout_options' append}
|
{block 'layout_options' append}
|
||||||
{$layoutNav = [[
|
{$layoutNav = [[
|
||||||
hook => 'profile_created',
|
hook => 'profile_favourite',
|
||||||
hookParams => [ 'oUserProfile' => $oUserProfile ],
|
hookParams => [ 'oUserProfile' => $oUserProfile ],
|
||||||
activeItem => $sMenuSubItemSelect,
|
activeItem => $sMenuSubItemSelect,
|
||||||
items => [
|
items => [
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
*}
|
*}
|
||||||
|
|
||||||
{$component = 'user-info-group'}
|
{$component = 'user-info-group'}
|
||||||
{component_define_params params=[ 'url', 'count', 'html', 'items', 'name', 'title', 'mods', 'classes', 'attributes' ]}
|
{component_define_params params=[ 'url', 'hookParams','count', 'html', 'items', 'name', 'title', 'mods', 'classes', 'attributes' ]}
|
||||||
|
|
||||||
{hook run="{$component}-{$name}-before"}
|
{hook run="{$component}-{$name}-before"}
|
||||||
|
|
||||||
{* Получаем пункты установленные плагинами *}
|
{* Получаем пункты установленные плагинами *}
|
||||||
{hook run="{$component}-{$name}-items" assign='itemsHook' items=$items array=true}
|
{hook run="{$component}-{$name}-items" assign='itemsHook' items=$items array=true params=$hookParams}
|
||||||
{$items = ($itemsHook) ? $itemsHook : $items}
|
{$items = ($itemsHook) ? $itemsHook : $items}
|
||||||
|
|
||||||
{if $html || $items}
|
{if $html || $items}
|
||||||
|
|
|
@ -83,7 +83,7 @@
|
||||||
]}
|
]}
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{component 'user.info-group' title={lang name='user.profile.personal.title'} items=$items}
|
{component 'user.info-group' title={lang name='user.profile.personal.title'} items=$items hookParams = [ 'user' => $user ]}
|
||||||
|
|
||||||
{**
|
{**
|
||||||
* Активность
|
* Активность
|
||||||
|
@ -185,7 +185,7 @@
|
||||||
]}
|
]}
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{component 'user.info-group' name='activity' title={lang name='user.profile.activity.title'} items=$items}
|
{component 'user.info-group' name='activity' title={lang name='user.profile.activity.title'} items=$items hookParams = [ 'user' => $user ]}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="user-info-group-col">
|
<div class="user-info-group-col">
|
||||||
|
@ -218,7 +218,7 @@
|
||||||
]}
|
]}
|
||||||
{/foreach}
|
{/foreach}
|
||||||
|
|
||||||
{component 'user.info-group' name='social-networks' title={lang name='user.profile.social_networks'} items=$items}
|
{component 'user.info-group' name='social-networks' title={lang name='user.profile.social_networks'} items=$items hookParams = [ 'user' => $user ]}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -250,4 +250,4 @@
|
||||||
]}
|
]}
|
||||||
{/capture}
|
{/capture}
|
||||||
|
|
||||||
{component 'user.info-group' name='wall' title={lang name='wall.title'} html=$smarty.capture.user_info_wall}
|
{component 'user.info-group' name='wall' title={lang name='wall.title'} html=$smarty.capture.user_info_wall hookParams = [ 'user' => $user ]}
|
|
@ -7,7 +7,7 @@
|
||||||
{block 'layout_options' append}
|
{block 'layout_options' append}
|
||||||
{if $sEvent != 'add'}
|
{if $sEvent != 'add'}
|
||||||
{$layoutNav = [[
|
{$layoutNav = [[
|
||||||
name => 'blog_edit',
|
hook => 'blog_edit',
|
||||||
activeItem => $sMenuItemSelect,
|
activeItem => $sMenuItemSelect,
|
||||||
items => [
|
items => [
|
||||||
[ 'name' => 'profile', 'url' => "{router page='blog'}edit/{$blogEdit->getId()}/", 'text' => $aLang.blog.admin.nav.profile ],
|
[ 'name' => 'profile', 'url' => "{router page='blog'}edit/{$blogEdit->getId()}/", 'text' => $aLang.blog.admin.nav.profile ],
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
]}
|
]}
|
||||||
|
|
||||||
{$layoutNav = [[
|
{$layoutNav = [[
|
||||||
name => 'content_form',
|
hook => 'content_form',
|
||||||
activeItem => $sMenuSubItemSelect,
|
activeItem => $sMenuSubItemSelect,
|
||||||
items => $_items
|
items => $_items
|
||||||
]]}
|
]]}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
{block 'layout_options' prepend}
|
{block 'layout_options' prepend}
|
||||||
{* Все / Лента *}
|
{* Все / Лента *}
|
||||||
{$layoutNav = [[
|
{$layoutNav = [[
|
||||||
name => 'topics',
|
hook => 'topics',
|
||||||
activeItem => $sMenuItemSelect,
|
activeItem => $sMenuItemSelect,
|
||||||
showSingle => true,
|
showSingle => true,
|
||||||
items => [
|
items => [
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{$layoutNav[] = [
|
{$layoutNav[] = [
|
||||||
name => 'topics_sub',
|
hook => 'topics_sub',
|
||||||
activeItem => $sMenuSubItemSelect,
|
activeItem => $sMenuSubItemSelect,
|
||||||
items => [
|
items => [
|
||||||
[ 'name' => 'good', 'url' => $sNavTopicsSubUrl, 'text' => {lang name='blog.menu.all_good'} ],
|
[ 'name' => 'good', 'url' => $sNavTopicsSubUrl, 'text' => {lang name='blog.menu.all_good'} ],
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
{block 'layout_options' append}
|
{block 'layout_options' append}
|
||||||
{$layoutNav = [[
|
{$layoutNav = [[
|
||||||
name => 'profile_created',
|
hook => 'profile_created',
|
||||||
hookParams => [ 'oUserProfile' => $oUserProfile ],
|
hookParams => [ 'oUserProfile' => $oUserProfile ],
|
||||||
activeItem => $sMenuSubItemSelect,
|
activeItem => $sMenuSubItemSelect,
|
||||||
items => [
|
items => [
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
{block 'layout_options' append}
|
{block 'layout_options' append}
|
||||||
{$layoutNav = [[
|
{$layoutNav = [[
|
||||||
name => 'profile_created',
|
hook => 'profile_favourite',
|
||||||
hookParams => [ 'oUserProfile' => $oUserProfile ],
|
hookParams => [ 'oUserProfile' => $oUserProfile ],
|
||||||
activeItem => $sMenuSubItemSelect,
|
activeItem => $sMenuSubItemSelect,
|
||||||
items => [
|
items => [
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
{block 'layout_options' append}
|
{block 'layout_options' append}
|
||||||
{$layoutNav = [[
|
{$layoutNav = [[
|
||||||
name => 'talk',
|
hook => 'talk',
|
||||||
activeItem => $sMenuSubItemSelect,
|
activeItem => $sMenuSubItemSelect,
|
||||||
items => [
|
items => [
|
||||||
[ 'name' => 'inbox', 'url' => "{router page='talk'}", 'text' => $aLang.talk.nav.inbox ],
|
[ 'name' => 'inbox', 'url' => "{router page='talk'}", 'text' => $aLang.talk.nav.inbox ],
|
||||||
|
|
Loading…
Reference in a new issue