From cae867499cb3a025df0f43eb190203c3e6b95315 Mon Sep 17 00:00:00 2001 From: Denis Shakhov Date: Mon, 3 Jun 2013 00:02:54 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D1=84=D0=BE=D1=80=D0=BC=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B8=D1=81=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../developer/actions/ActionBlogs/index.tpl | 7 ++- .../developer/actions/ActionPeople/index.tpl | 12 +---- .../developer/actions/ActionSearch/index.tpl | 12 +---- .../actions/ActionSearch/results.tpl | 13 +---- .../developer/actions/ActionTag/index.tpl | 7 +-- .../developer/blocks/block.activityUsers.tpl | 7 ++- .../skin/developer/blocks/block.tags.tpl | 4 +- .../developer/blocks/block.userfeedUsers.tpl | 7 ++- templates/skin/developer/css/blocks.css | 1 + templates/skin/developer/css/common.css | 18 ------- templates/skin/developer/css/forms.css | 19 ++++++- templates/skin/developer/css/navs.css | 2 +- templates/skin/developer/form.search.base.tpl | 54 +++++++++++++++++++ .../skin/developer/form.search.blogs.tpl | 23 ++++++++ templates/skin/developer/form.search.main.tpl | 16 ++++++ templates/skin/developer/form.search.tags.tpl | 17 ++++++ .../skin/developer/form.search.users.tpl | 35 ++++++++++++ templates/skin/developer/header_top.tpl | 6 +-- .../skin/synio/actions/ActionBlogs/index.tpl | 7 +-- .../skin/synio/actions/ActionPeople/index.tpl | 15 +----- .../skin/synio/actions/ActionSearch/index.tpl | 12 +---- .../synio/actions/ActionSearch/results.tpl | 12 +---- .../skin/synio/actions/ActionTag/index.tpl | 7 +-- .../skin/synio/blocks/block.activityUsers.tpl | 8 +-- templates/skin/synio/blocks/block.tags.tpl | 7 +-- .../skin/synio/blocks/block.userfeedUsers.tpl | 8 +-- templates/skin/synio/css/base.css | 5 +- templates/skin/synio/css/blocks.css | 1 + templates/skin/synio/css/common.css | 31 ----------- templates/skin/synio/css/forms.css | 38 ++++++++++++- templates/skin/synio/css/grid.css | 4 +- templates/skin/synio/form.search.base.tpl | 54 +++++++++++++++++++ templates/skin/synio/form.search.blogs.tpl | 23 ++++++++ templates/skin/synio/form.search.main.tpl | 16 ++++++ templates/skin/synio/form.search.tags.tpl | 17 ++++++ templates/skin/synio/form.search.users.tpl | 35 ++++++++++++ templates/skin/synio/js/init.js | 4 +- templates/skin/synio/navs/nav.tpl | 13 +++-- 38 files changed, 403 insertions(+), 174 deletions(-) create mode 100644 templates/skin/developer/form.search.base.tpl create mode 100644 templates/skin/developer/form.search.blogs.tpl create mode 100644 templates/skin/developer/form.search.main.tpl create mode 100644 templates/skin/developer/form.search.tags.tpl create mode 100644 templates/skin/developer/form.search.users.tpl create mode 100644 templates/skin/synio/form.search.base.tpl create mode 100644 templates/skin/synio/form.search.blogs.tpl create mode 100644 templates/skin/synio/form.search.main.tpl create mode 100644 templates/skin/synio/form.search.tags.tpl create mode 100644 templates/skin/synio/form.search.users.tpl diff --git a/templates/skin/developer/actions/ActionBlogs/index.tpl b/templates/skin/developer/actions/ActionBlogs/index.tpl index 4b795931..5ae18d2a 100644 --- a/templates/skin/developer/actions/ActionBlogs/index.tpl +++ b/templates/skin/developer/actions/ActionBlogs/index.tpl @@ -2,16 +2,15 @@ - +{include file='form.search.blogs.tpl'}
- {if !$sBlogsRootPage} + {if ! $sBlogsRootPage} {router page='blogs' assign=sBlogsRootPage} {/if} + {include file='blog_list.tpl' bBlogsUseOrder=true sBlogsRootPage=$sBlogsRootPage} {include file='paging.tpl' aPaging=$aPaging}
diff --git a/templates/skin/developer/actions/ActionPeople/index.tpl b/templates/skin/developer/actions/ActionPeople/index.tpl index 69d83cf1..2f10acdc 100644 --- a/templates/skin/developer/actions/ActionPeople/index.tpl +++ b/templates/skin/developer/actions/ActionPeople/index.tpl @@ -1,15 +1,5 @@ {include file='header.tpl' nav='people'} - - - - +{include file='form.search.users.tpl'} diff --git a/templates/skin/developer/actions/ActionSearch/index.tpl b/templates/skin/developer/actions/ActionSearch/index.tpl index 971d669a..2333b799 100644 --- a/templates/skin/developer/actions/ActionSearch/index.tpl +++ b/templates/skin/developer/actions/ActionSearch/index.tpl @@ -2,15 +2,5 @@ -{hook run='search_begin'} - - - -{hook run='search_end'} - +{include file='form.search.main.tpl'} {include file='footer.tpl'} \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionSearch/results.tpl b/templates/skin/developer/actions/ActionSearch/results.tpl index d3a01312..78178876 100644 --- a/templates/skin/developer/actions/ActionSearch/results.tpl +++ b/templates/skin/developer/actions/ActionSearch/results.tpl @@ -1,17 +1,9 @@ {include file='header.tpl'} - - - - +{include file='form.search.main.tpl'} {if $bIsResults} - {if $aReq.sType == 'topics'} {include file='topics/topic_list.tpl'} {elseif $aReq.sType == 'comments'} @@ -44,5 +36,4 @@ {/if} - {include file='footer.tpl'} \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionTag/index.tpl b/templates/skin/developer/actions/ActionTag/index.tpl index 0e65da1e..aeb400a6 100644 --- a/templates/skin/developer/actions/ActionTag/index.tpl +++ b/templates/skin/developer/actions/ActionTag/index.tpl @@ -1,10 +1,7 @@ {include file='header.tpl'} + -
- -
- - +{include file='form.search.tags.tpl'} {include file='topics/topic_list.tpl'} {include file='footer.tpl'} \ No newline at end of file diff --git a/templates/skin/developer/blocks/block.activityUsers.tpl b/templates/skin/developer/blocks/block.activityUsers.tpl index 902f7433..235d1cb9 100644 --- a/templates/skin/developer/blocks/block.activityUsers.tpl +++ b/templates/skin/developer/blocks/block.activityUsers.tpl @@ -13,7 +13,12 @@ {if $oUserCurrent} {$aLang.stream_settings_note_follow_user} -

+
+ +
{if $aStreamSubscribedUsers}