diff --git a/templates/skin/developer/comments/comment_tree.tpl b/templates/skin/developer/comments/comment_tree.tpl index 1d5c9097..880fadcf 100644 --- a/templates/skin/developer/comments/comment_tree.tpl +++ b/templates/skin/developer/comments/comment_tree.tpl @@ -5,7 +5,7 @@ *} {* Добавляем в тулбар кнопку обновления комментариев *} -{add_block group='toolbar' name='toolbar_comment.tpl' +{add_block group='toolbar' name='toolbar/toolbar_comment.tpl' aPagingCmt=$aPagingCmt iTargetId=$iTargetId sTargetType=$sTargetType diff --git a/templates/skin/developer/footer.tpl b/templates/skin/developer/footer.tpl index deb97e7b..1b3bee53 100644 --- a/templates/skin/developer/footer.tpl +++ b/templates/skin/developer/footer.tpl @@ -16,7 +16,7 @@ -{include file='toolbar.tpl'} +{include file='toolbar/toolbar.tpl'} {hook run='body_end'} diff --git a/templates/skin/developer/header.tpl b/templates/skin/developer/header.tpl index e4d2969c..e12e5997 100644 --- a/templates/skin/developer/header.tpl +++ b/templates/skin/developer/header.tpl @@ -112,8 +112,8 @@ {** * Добавление кнопок в тулбар *} -{add_block group='toolbar' name='toolbar_admin.tpl' priority=100} -{add_block group='toolbar' name='toolbar_scrollup.tpl' priority=-100} +{add_block group='toolbar' name='toolbar/toolbar_admin.tpl' priority=100} +{add_block group='toolbar' name='toolbar/toolbar_scrollup.tpl' priority=-100} diff --git a/templates/skin/developer/toolbar.tpl b/templates/skin/developer/toolbar/toolbar.tpl similarity index 100% rename from templates/skin/developer/toolbar.tpl rename to templates/skin/developer/toolbar/toolbar.tpl diff --git a/templates/skin/developer/toolbar_admin.tpl b/templates/skin/developer/toolbar/toolbar_admin.tpl similarity index 100% rename from templates/skin/developer/toolbar_admin.tpl rename to templates/skin/developer/toolbar/toolbar_admin.tpl diff --git a/templates/skin/developer/toolbar_comment.tpl b/templates/skin/developer/toolbar/toolbar_comment.tpl similarity index 100% rename from templates/skin/developer/toolbar_comment.tpl rename to templates/skin/developer/toolbar/toolbar_comment.tpl diff --git a/templates/skin/developer/toolbar_scrollup.tpl b/templates/skin/developer/toolbar/toolbar_scrollup.tpl similarity index 100% rename from templates/skin/developer/toolbar_scrollup.tpl rename to templates/skin/developer/toolbar/toolbar_scrollup.tpl diff --git a/templates/skin/developer/toolbar_topic.tpl b/templates/skin/developer/toolbar/toolbar_topic.tpl similarity index 100% rename from templates/skin/developer/toolbar_topic.tpl rename to templates/skin/developer/toolbar/toolbar_topic.tpl diff --git a/templates/skin/developer/topics/topic_list.tpl b/templates/skin/developer/topics/topic_list.tpl index c4bc3c09..c4d71dda 100644 --- a/templates/skin/developer/topics/topic_list.tpl +++ b/templates/skin/developer/topics/topic_list.tpl @@ -3,7 +3,7 @@ *} {if count($aTopics) > 0} - {add_block group='toolbar' name='toolbar_topic.tpl' iCountTopic=count($aTopics)} + {add_block group='toolbar' name='toolbar/toolbar_topic.tpl' iCountTopic=count($aTopics)} {foreach from=$aTopics item=oTopic} {if $LS->Topic_IsAllowTopicType($oTopic->getType())} diff --git a/templates/skin/synio/comments/comment_tree.tpl b/templates/skin/synio/comments/comment_tree.tpl index 1d5c9097..880fadcf 100644 --- a/templates/skin/synio/comments/comment_tree.tpl +++ b/templates/skin/synio/comments/comment_tree.tpl @@ -5,7 +5,7 @@ *} {* Добавляем в тулбар кнопку обновления комментариев *} -{add_block group='toolbar' name='toolbar_comment.tpl' +{add_block group='toolbar' name='toolbar/toolbar_comment.tpl' aPagingCmt=$aPagingCmt iTargetId=$iTargetId sTargetType=$sTargetType diff --git a/templates/skin/synio/footer.tpl b/templates/skin/synio/footer.tpl index 69f0a852..15ba473a 100644 --- a/templates/skin/synio/footer.tpl +++ b/templates/skin/synio/footer.tpl @@ -66,7 +66,7 @@ -{include file='toolbar.tpl'} +{include file='toolbar/toolbar.tpl'} {hook run='body_end'} diff --git a/templates/skin/synio/header.tpl b/templates/skin/synio/header.tpl index ffe2f49d..8b880f98 100644 --- a/templates/skin/synio/header.tpl +++ b/templates/skin/synio/header.tpl @@ -112,8 +112,8 @@ {** * Добавление кнопок в тулбар *} -{add_block group='toolbar' name='toolbar_admin.tpl' priority=100} -{add_block group='toolbar' name='toolbar_scrollup.tpl' priority=-100} +{add_block group='toolbar' name='toolbar/toolbar_admin.tpl' priority=100} +{add_block group='toolbar' name='toolbar/toolbar_scrollup.tpl' priority=-100} diff --git a/templates/skin/synio/toolbar.tpl b/templates/skin/synio/toolbar/toolbar.tpl similarity index 100% rename from templates/skin/synio/toolbar.tpl rename to templates/skin/synio/toolbar/toolbar.tpl diff --git a/templates/skin/synio/toolbar_admin.tpl b/templates/skin/synio/toolbar/toolbar_admin.tpl similarity index 100% rename from templates/skin/synio/toolbar_admin.tpl rename to templates/skin/synio/toolbar/toolbar_admin.tpl diff --git a/templates/skin/synio/toolbar_comment.tpl b/templates/skin/synio/toolbar/toolbar_comment.tpl similarity index 100% rename from templates/skin/synio/toolbar_comment.tpl rename to templates/skin/synio/toolbar/toolbar_comment.tpl diff --git a/templates/skin/synio/toolbar_scrollup.tpl b/templates/skin/synio/toolbar/toolbar_scrollup.tpl similarity index 100% rename from templates/skin/synio/toolbar_scrollup.tpl rename to templates/skin/synio/toolbar/toolbar_scrollup.tpl diff --git a/templates/skin/synio/toolbar_topic.tpl b/templates/skin/synio/toolbar/toolbar_topic.tpl similarity index 100% rename from templates/skin/synio/toolbar_topic.tpl rename to templates/skin/synio/toolbar/toolbar_topic.tpl diff --git a/templates/skin/synio/topics/topic_list.tpl b/templates/skin/synio/topics/topic_list.tpl index c4bc3c09..c4d71dda 100644 --- a/templates/skin/synio/topics/topic_list.tpl +++ b/templates/skin/synio/topics/topic_list.tpl @@ -3,7 +3,7 @@ *} {if count($aTopics) > 0} - {add_block group='toolbar' name='toolbar_topic.tpl' iCountTopic=count($aTopics)} + {add_block group='toolbar' name='toolbar/toolbar_topic.tpl' iCountTopic=count($aTopics)} {foreach from=$aTopics item=oTopic} {if $LS->Topic_IsAllowTopicType($oTopic->getType())}