From 60acf2fd30574c00c32f8699f481a8345c8863f4 Mon Sep 17 00:00:00 2001 From: Gran <4freework@gmail.com> Date: Thu, 21 Sep 2017 18:33:02 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BD=D0=B0?= =?UTF-8?q?=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=85=D1=83=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B8=D0=B7=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Имя хука было такое же как и в layout.user.created.tpl --- .../frontend/skin/synio/layouts/layout.user.favourite.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/frontend/skin/synio/layouts/layout.user.favourite.tpl b/application/frontend/skin/synio/layouts/layout.user.favourite.tpl index e2744487..e5196243 100644 --- a/application/frontend/skin/synio/layouts/layout.user.favourite.tpl +++ b/application/frontend/skin/synio/layouts/layout.user.favourite.tpl @@ -6,7 +6,7 @@ {block 'layout_options' append} {$layoutNav = [[ - name => 'profile_created', + name => 'profile_favourite', hookParams => [ 'oUserProfile' => $oUserProfile ], activeItem => $sMenuSubItemSelect, items => [ @@ -14,4 +14,4 @@ [ 'name' => 'comments', 'text' => {lang name='user.favourites.nav.comments'}, 'url' => "{$oUserProfile->getUserWebPath()}favourites/comments/", 'count' => $iCountCommentFavourite ] ] ]]} -{/block} \ No newline at end of file +{/block} From 8619305f6c67bb6c7b50511276ea823991fdee32 Mon Sep 17 00:00:00 2001 From: Gran <4freework@gmail.com> Date: Thu, 21 Sep 2017 18:35:07 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BD=D0=B0?= =?UTF-8?q?=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=85=D1=83=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B8=D0=B7=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Название было такое же как и у layout.user.created.tpl --- .../frontend/skin/developer/layouts/layout.user.favourite.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/frontend/skin/developer/layouts/layout.user.favourite.tpl b/application/frontend/skin/developer/layouts/layout.user.favourite.tpl index 1668fe56..f3912e74 100644 --- a/application/frontend/skin/developer/layouts/layout.user.favourite.tpl +++ b/application/frontend/skin/developer/layouts/layout.user.favourite.tpl @@ -6,7 +6,7 @@ {block 'layout_options' append} {$layoutNav = [[ - hook => 'profile_created', + hook => 'profile_favourite', hookParams => [ 'oUserProfile' => $oUserProfile ], activeItem => $sMenuSubItemSelect, items => [ @@ -14,4 +14,4 @@ [ 'name' => 'comments', 'text' => {lang name='user.favourites.nav.comments'}, 'url' => "{$oUserProfile->getUserWebPath()}favourites/comments/", 'count' => $iCountCommentFavourite ] ] ]]} -{/block} \ No newline at end of file +{/block} From 46df5f31d9de2bb36ef6058ff68a7c624e40acfc Mon Sep 17 00:00:00 2001 From: Gran <4freework@gmail.com> Date: Fri, 22 Sep 2017 12:03:51 +0300 Subject: [PATCH 3/5] =?UTF-8?q?hookParams=20=D0=B4=D0=BB=D1=8F=20=D0=B8?= =?UTF-8?q?=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BE?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D0=B5=20(=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2?= =?UTF-8?q?=20=D1=85=D1=83=D0=BA=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0?= =?UTF-8?q?=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frontend/skin/synio/components/user/info-group.tpl | 4 ++-- application/frontend/skin/synio/components/user/info.tpl | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/frontend/skin/synio/components/user/info-group.tpl b/application/frontend/skin/synio/components/user/info-group.tpl index eb0a008f..ceb723d5 100644 --- a/application/frontend/skin/synio/components/user/info-group.tpl +++ b/application/frontend/skin/synio/components/user/info-group.tpl @@ -3,12 +3,12 @@ *} {$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}-items" assign='itemsHook' items=$items array=true} +{hook run="{$component}-{$name}-items" assign='itemsHook' items=$items array=true params=$hookParams} {$items = ($itemsHook) ? $itemsHook : $items} {if $html || $items} diff --git a/application/frontend/skin/synio/components/user/info.tpl b/application/frontend/skin/synio/components/user/info.tpl index 5b29205d..17f2be42 100644 --- a/application/frontend/skin/synio/components/user/info.tpl +++ b/application/frontend/skin/synio/components/user/info.tpl @@ -83,7 +83,7 @@ ]} {/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} - {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 ]}
@@ -218,7 +218,7 @@ ]} {/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 ]}
@@ -250,4 +250,4 @@ ]} {/capture} -{component 'user.info-group' name='wall' title={lang name='wall.title'} html=$smarty.capture.user_info_wall} \ No newline at end of file +{component 'user.info-group' name='wall' title={lang name='wall.title'} html=$smarty.capture.user_info_wall hookParams = [ 'user' => $user ]} \ No newline at end of file From 9b5891594967802e3df19b8c9ea83d40f4bd6511 Mon Sep 17 00:00:00 2001 From: Gran <4freework@gmail.com> Date: Fri, 22 Sep 2017 18:26:28 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D0=A5=D1=83=D0=BA=D0=B8=20=D0=BE=D1=81?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BD=D0=BE=D0=B9=20=D0=BD=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=B3=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/frontend/skin/synio/layouts/layout.blog.edit.tpl | 2 +- application/frontend/skin/synio/layouts/layout.content.form.tpl | 2 +- application/frontend/skin/synio/layouts/layout.index.tpl | 2 +- application/frontend/skin/synio/layouts/layout.topics.tpl | 2 +- application/frontend/skin/synio/layouts/layout.user.created.tpl | 2 +- .../frontend/skin/synio/layouts/layout.user.favourite.tpl | 2 +- .../frontend/skin/synio/layouts/layout.user.messages.tpl | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/application/frontend/skin/synio/layouts/layout.blog.edit.tpl b/application/frontend/skin/synio/layouts/layout.blog.edit.tpl index 67f8c788..db81c6af 100644 --- a/application/frontend/skin/synio/layouts/layout.blog.edit.tpl +++ b/application/frontend/skin/synio/layouts/layout.blog.edit.tpl @@ -7,7 +7,7 @@ {block 'layout_options' append} {if $sEvent != 'add'} {$layoutNav = [[ - name => 'blog_edit', + hook => 'blog_edit', activeItem => $sMenuItemSelect, items => [ [ 'name' => 'profile', 'url' => "{router page='blog'}edit/{$blogEdit->getId()}/", 'text' => $aLang.blog.admin.nav.profile ], diff --git a/application/frontend/skin/synio/layouts/layout.content.form.tpl b/application/frontend/skin/synio/layouts/layout.content.form.tpl index e04b3554..887115b6 100644 --- a/application/frontend/skin/synio/layouts/layout.content.form.tpl +++ b/application/frontend/skin/synio/layouts/layout.content.form.tpl @@ -32,7 +32,7 @@ ]} {$layoutNav = [[ - name => 'content_form', + hook => 'content_form', activeItem => $sMenuSubItemSelect, items => $_items ]]} diff --git a/application/frontend/skin/synio/layouts/layout.index.tpl b/application/frontend/skin/synio/layouts/layout.index.tpl index 118c651a..fd65dca8 100644 --- a/application/frontend/skin/synio/layouts/layout.index.tpl +++ b/application/frontend/skin/synio/layouts/layout.index.tpl @@ -7,7 +7,7 @@ {block 'layout_options' prepend} {* Все / Лента *} {$layoutNav = [[ - name => 'topics', + hook => 'topics', activeItem => $sMenuItemSelect, showSingle => true, items => [ diff --git a/application/frontend/skin/synio/layouts/layout.topics.tpl b/application/frontend/skin/synio/layouts/layout.topics.tpl index 0e647483..983b3708 100644 --- a/application/frontend/skin/synio/layouts/layout.topics.tpl +++ b/application/frontend/skin/synio/layouts/layout.topics.tpl @@ -12,7 +12,7 @@ {/if} {$layoutNav[] = [ - name => 'topics_sub', + hook => 'topics_sub', activeItem => $sMenuSubItemSelect, items => [ [ 'name' => 'good', 'url' => $sNavTopicsSubUrl, 'text' => {lang name='blog.menu.all_good'} ], diff --git a/application/frontend/skin/synio/layouts/layout.user.created.tpl b/application/frontend/skin/synio/layouts/layout.user.created.tpl index 5e591f99..c21e0023 100644 --- a/application/frontend/skin/synio/layouts/layout.user.created.tpl +++ b/application/frontend/skin/synio/layouts/layout.user.created.tpl @@ -6,7 +6,7 @@ {block 'layout_options' append} {$layoutNav = [[ - name => 'profile_created', + hook => 'profile_created', hookParams => [ 'oUserProfile' => $oUserProfile ], activeItem => $sMenuSubItemSelect, items => [ diff --git a/application/frontend/skin/synio/layouts/layout.user.favourite.tpl b/application/frontend/skin/synio/layouts/layout.user.favourite.tpl index e2744487..1668fe56 100644 --- a/application/frontend/skin/synio/layouts/layout.user.favourite.tpl +++ b/application/frontend/skin/synio/layouts/layout.user.favourite.tpl @@ -6,7 +6,7 @@ {block 'layout_options' append} {$layoutNav = [[ - name => 'profile_created', + hook => 'profile_created', hookParams => [ 'oUserProfile' => $oUserProfile ], activeItem => $sMenuSubItemSelect, items => [ diff --git a/application/frontend/skin/synio/layouts/layout.user.messages.tpl b/application/frontend/skin/synio/layouts/layout.user.messages.tpl index 5d980384..6c2ac6d7 100644 --- a/application/frontend/skin/synio/layouts/layout.user.messages.tpl +++ b/application/frontend/skin/synio/layouts/layout.user.messages.tpl @@ -6,7 +6,7 @@ {block 'layout_options' append} {$layoutNav = [[ - name => 'talk', + hook => 'talk', activeItem => $sMenuSubItemSelect, items => [ [ 'name' => 'inbox', 'url' => "{router page='talk'}", 'text' => $aLang.talk.nav.inbox ], From ad429e1e8988cf9dc6215dd2521565e268f48ab9 Mon Sep 17 00:00:00 2001 From: Gran <4freework@gmail.com> Date: Fri, 22 Sep 2017 18:33:51 +0300 Subject: [PATCH 5/5] Update layout.user.favourite.tpl --- .../frontend/skin/synio/layouts/layout.user.favourite.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/frontend/skin/synio/layouts/layout.user.favourite.tpl b/application/frontend/skin/synio/layouts/layout.user.favourite.tpl index 1668fe56..f3912e74 100644 --- a/application/frontend/skin/synio/layouts/layout.user.favourite.tpl +++ b/application/frontend/skin/synio/layouts/layout.user.favourite.tpl @@ -6,7 +6,7 @@ {block 'layout_options' append} {$layoutNav = [[ - hook => 'profile_created', + hook => 'profile_favourite', hookParams => [ 'oUserProfile' => $oUserProfile ], activeItem => $sMenuSubItemSelect, items => [ @@ -14,4 +14,4 @@ [ 'name' => 'comments', 'text' => {lang name='user.favourites.nav.comments'}, 'url' => "{$oUserProfile->getUserWebPath()}favourites/comments/", 'count' => $iCountCommentFavourite ] ] ]]} -{/block} \ No newline at end of file +{/block}