Доработка компонентов

application/classes/actions/ActionAjax.class.php

@@ -1700,7 +1700,7 @@ class ActionAjax extends Action
             $aBlogs = $aResult['collection'];
             $oViewer = $this->Viewer_GetLocalViewer();
             $oViewer->Assign('aBlogs', $aBlogs);
-            $sTextResult = $oViewer->Fetch("blocks/block.blogs_top.tpl");
+            $sTextResult = $oViewer->Fetch("components/blog/blocks/blogs-top.tpl");
             $this->Viewer_AssignAjax('sText', $sTextResult);
         } else {
             $this->Message_AddErrorSingle($this->Lang_Get('system_error'), $this->Lang_Get('error'));
@@ -1728,7 +1728,7 @@ class ActionAjax extends Action
         if ($aBlogs = $this->Blog_GetBlogsRatingSelf($this->oUserCurrent->getId(), Config::Get('block.blogs.row'))) {
             $oViewer = $this->Viewer_GetLocalViewer();
             $oViewer->Assign('aBlogs', $aBlogs);
-            $sTextResult = $oViewer->Fetch("blocks/block.blogs_top.tpl");
+            $sTextResult = $oViewer->Fetch("components/blog/blocks/blogs-top.tpl");
             $this->Viewer_AssignAjax('sText', $sTextResult);
         } else {
             $this->Message_AddErrorSingle($this->Lang_Get('block_blogs_self_error'), $this->Lang_Get('attention'));
@@ -1756,7 +1756,7 @@ class ActionAjax extends Action
         if ($aBlogs = $this->Blog_GetBlogsRatingJoin($this->oUserCurrent->getId(), Config::Get('block.blogs.row'))) {
             $oViewer = $this->Viewer_GetLocalViewer();
             $oViewer->Assign('aBlogs', $aBlogs);
-            $sTextResult = $oViewer->Fetch("blocks/block.blogs_top.tpl");
+            $sTextResult = $oViewer->Fetch("components/blog/blocks/blogs-top.tpl");
             $this->Viewer_AssignAjax('sText', $sTextResult);
         } else {
             $this->Message_AddErrorSingle($this->Lang_Get('block_blogs_join_error'), $this->Lang_Get('attention'));

application/classes/blocks/BlockBlogNav.class.php

@@ -37,5 +37,6 @@ class BlockBlogNav extends Block
         }
         $aCategories = $this->Blog_GetCategoriesTree();
         $this->Viewer_Assign("aNavigatorBlogCategories", $aCategories);
+        $this->SetTemplate('components/blog/blocks/block.blog-nav.tpl');
     }
 }

application/classes/blocks/BlockBlogs.class.php

@@ -42,8 +42,10 @@ class BlockBlogs extends Block
             /**
              * Формируем результат в виде шаблона и возвращаем
              */
-            $sTextResult = $oViewer->Fetch("blocks/block.blogs_top.tpl");
+            $sTextResult = $oViewer->Fetch("components/blog/blocks/blogs-top.tpl");
             $this->Viewer_Assign('sBlogsTop', $sTextResult);
         }
+
+        $this->SetTemplate('components/blog/blocks/block.blogs.tpl');
     }
 }

application/classes/blocks/BlockBlogsSearch.class.php

@@ -39,5 +39,6 @@ class BlockBlogsSearch extends Block
         $aBlogsAll = $this->Blog_GetBlogsByFilter(array('exclude_type' => 'personal'), array(), 1, 1, array());
         $this->Viewer_Assign("aBlogCategories", $aCategories);
         $this->Viewer_Assign("iCountBlogsAll", $aBlogsAll['count']);
+        $this->SetTemplate('components/blog/blocks/block.blogs-search.tpl');
     }
 }

application/classes/blocks/BlockCategoryUpdate.class.php

@@ -66,5 +66,7 @@ class BlockCategoryUpdate extends Block
                 break;
             }
         }
+
+        $this->SetTemplate('components/field/field.category.tpl');
     }
 }

application/classes/blocks/BlockTopicsTags.class.php

@@ -25,7 +25,7 @@
  * @package application.blocks
  * @since 1.0
  */
-class BlockTags extends Block
+class BlockTopicsTags extends Block
 {
     /**
      * Запуск обработки
@@ -44,7 +44,7 @@ class BlockTags extends Block
             /**
              * Устанавливаем шаблон вывода
              */
-            $this->Viewer_Assign("aTags", $aTags);
+            $this->Viewer_Assign("tags", $aTags, true);
         }
         /**
          * Теги пользователя
@@ -60,8 +60,10 @@ class BlockTags extends Block
                 /**
                  * Устанавливаем шаблон вывода
                  */
-                $this->Viewer_Assign("aTagsUser", $aTags);
+                $this->Viewer_Assign("tagsUser", $aTags, true);
             }
         }
+
+        $this->SetTemplate('components/topic/blocks/block.topics-tags.tpl');
     }
 }

application/classes/blocks/BlockUserfeedBlogs.class.php

@@ -59,5 +59,7 @@ class BlockUserfeedBlogs extends Block
             $this->Viewer_Assign('blogsSubscribed', $aUserSubscribes['blogs']);
             $this->Viewer_Assign('blogsJoined', $aBlogs);
         }
+
+        $this->SetTemplate('components/userfeed/blocks/block.userfeed-blogs.tpl');
     }
 }

application/classes/blocks/BlockUserfeedUsers.class.php

@@ -42,5 +42,7 @@ class BlockUserfeedUsers extends Block
             $aResult = $this->Userfeed_getUserSubscribes($oUserCurrent->getId());
             $this->Viewer_Assign('users', $aResult['users']);
         }
+
+        $this->SetTemplate('components/userfeed/blocks/block.userfeed-users.tpl');
     }
 }

application/classes/blocks/BlockUsersCities.class.php

@@ -25,7 +25,7 @@
  * @package application.blocks
  * @since 1.0
  */
-class BlockTagsCity extends Block
+class BlockUsersCities extends Block
 {
     /**
      * Запуск обработки
@@ -43,6 +43,7 @@ class BlockTagsCity extends Block
         /**
          * Выводим в шаблон
          */
-        $this->Viewer_Assign("aCityList", $aCities);
+        $this->Viewer_Assign("cities", $aCities, true);
+        $this->SetTemplate('components/user/blocks/block.users-cities.tpl');
     }
 }

application/classes/blocks/BlockUsersCountries.class.php

@@ -25,7 +25,7 @@
  * @package application.blocks
  * @since 1.0
  */
-class BlockTagsCountry extends Block
+class BlockUsersCountries extends Block
 {
     /**
      * Запуск обработки
@@ -43,6 +43,7 @@ class BlockTagsCountry extends Block
         /**
          * Выводим в шаблон
          */
-        $this->Viewer_Assign("aCountryList", $aCountries);
+        $this->Viewer_Assign("countries", $aCountries, true);
+        $this->SetTemplate('components/user/blocks/block.users-countries.tpl');
     }
 }

application/config/config.php

@@ -397,7 +397,7 @@ $config['block']['rule_index_blog'] = array(
     'blocks' => array(
         'right' => array(
             'activityRecent' => array('priority' => 100),
-            'tags'   => array('priority' => 50),
+            'topicsTags'   => array('priority' => 50),
             'blogs'  => array('params' => array(), 'priority' => 1)
         )
     ),
@@ -411,7 +411,7 @@ $config['block']['rule_topic_type'] = array(
     'action' => array(
         'content' => array('add', 'edit'),
     ),
-    'blocks' => array('right' => array('blocks/block.blogInfo.tpl', 'blocks/block.blogInfoNote.tpl')),
+    'blocks' => array('right' => array('components/blog/blocks/block.blog-info.tpl', 'components/blog/blocks/block.blog-info-note.tpl')),
 );
 $config['block']['rule_personal_blog'] = array(
     'action' => array('personal_blog'),
@@ -425,7 +425,7 @@ $config['block']['rule_blogs'] = array(
     'action' => array('blogs'),
     'blocks' => array(
         'right' => array(
-            'blocks/block.blogAdd.tpl' => array('priority' => 100),
+            'components/blog/blocks/block.blog-add.tpl' => array('priority' => 100),
             'blogsSearch'              => array('priority' => 50)
         )
     ),
@@ -452,7 +452,7 @@ $config['block']['rule_blog_info'] = array(
         'blog' => array('{topic}')
     ),
     'blocks' => array(
-        'right' => array('blocks/block.blog.tpl' => array('priority' => 300))
+        'right' => array('components/blog/blocks/block.blog.tpl' => array('priority' => 300))
     ),
     'clear'  => false,
 );
@@ -460,10 +460,10 @@ $config['block']['rule_users'] = array(
     'action' => array('people'),
     'blocks' => array(
         'right' => array(
-            'blocks/block.usersStatistics.tpl',
-            'blocks/block.usersSearch.tpl',
-            'tagsCountry',
-            'tagsCity',
+            'components/user/blocks/block.users-statistics.tpl',
+            'components/user/blocks/block.users-search.tpl',
+            'usersCountries',
+            'usersCities',
         )
     )
 );
@@ -471,10 +471,10 @@ $config['block']['rule_profile'] = array(
     'action' => array('profile', 'talk', 'settings'),
     'blocks' => array(
         'right' => array(
-            'blocks/block.userPhoto.tpl'   => array('priority' => 100),
-            'blocks/block.userActions.tpl' => array('priority' => 50),
-            'blocks/block.userNote.tpl'    => array('priority' => 25),
-            'blocks/block.userNav.tpl'     => array('priority' => 1),
+            'components/user/blocks/block.user-photo.tpl'   => array('priority' => 100),
+            'components/user/blocks/block.user-actions.tpl' => array('priority' => 50),
+            'components/user/blocks/block.user-note.tpl'    => array('priority' => 25),
+            'components/user/blocks/block.user-nav.tpl'     => array('priority' => 1),
         )
     )
 );
@@ -482,9 +482,9 @@ $config['block']['rule_blog'] = array(
     'action' => array('blog' => array('{blog}')),
     'blocks' => array(
         'right' => array(
-            'blocks/block.blogActions.tpl' => array('priority' => 300),
-            'blocks/block.blogUsers.tpl'   => array('priority' => 300),
-            'blocks/block.blogAdmins.tpl'  => array('priority' => 300)
+            'components/blog/blocks/block.blog-actions.tpl' => array('priority' => 300),
+            'components/blog/blocks/block.blog-users.tpl'   => array('priority' => 300),
+            'components/blog/blocks/block.blog-admins.tpl'  => array('priority' => 300)
         )
     ),
     'clear'  => true
@@ -578,12 +578,12 @@ $config['head']['default']['js'] = array(
     "___path.skin.web___/components/media/js/media.js",
     "___path.skin.web___/components/tags-favourite/js/tags-favourite.js",
     "___path.skin.web___/components/block/js/block.js",
+    "___path.skin.web___/components/search-ajax/js/search-ajax.js",
     "___path.skin.web___/components/actionbar/js/actionbar-item-select.js",
     "___path.skin.web___/components/toolbar-scrollup/js/toolbar.scrollup.js",
     "___path.skin.web___/components/toolbar-scrollnav/js/toolbar.scrollnav.js",
     "___path.application.web___/frontend/common/js/subscribe.js",
     "___path.application.web___/frontend/common/js/content.js",
-    "___path.application.web___/frontend/common/js/search.js",
     "___path.application.web___/frontend/common/js/init.js",
     "//yandex.st/share/share.js" => array('merge' => false),
 );
@@ -630,6 +630,7 @@ $config['head']['default']['css'] = array(
     "___path.skin.web___/components/topic/css/topic.css",
     "___path.skin.web___/components/wall/css/wall.css",
     "___path.skin.web___/components/blog/css/blog.css",
+    "___path.skin.web___/components/blog/css/blog-blocks.css",
     "___path.skin.web___/components/poll/css/poll.css",
     "___path.skin.web___/components/more/css/more.css",
     "___path.skin.web___/components/sort/css/sort.css",
@@ -645,11 +646,13 @@ $config['head']['default']['css'] = array(
     "___path.skin.web___/components/activity/css/block.activity-recent.css",
     "___path.skin.web___/components/block/css/block.css",
     "___path.skin.web___/components/item/css/item.css",
+    "___path.skin.web___/components/tags/css/tags-blocks.css",
     "___path.skin.web___/components/tags/css/tags.css",
     "___path.skin.web___/components/user/css/user.css",
     "___path.skin.web___/components/user/css/user-item.css",
     "___path.skin.web___/components/user/css/user-list-small.css",
     "___path.skin.web___/components/user/css/user-list-avatar.css",
+    "___path.skin.web___/components/user/css/user-blocks.css",
     "___path.skin.web___/components/user-list-add/css/user-list-add.css",
     "___path.skin.web___/components/talk/css/talk.css",
     "___path.skin.web___/components/userbar/css/userbar.css",

application/frontend/skin/developer/assets/css/blocks.css

@@ -1,99 +0,0 @@
-/**
- * Блоки
- *
- * @template blocks/*.tpl
- * @scripts <frontend>/common/js/blocks.js
- *
- * @license   GNU General Public License, version 2
- * @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
- * @author    Denis Shakhov <denis.shakhov@gmail.com>
- */
-
-
-/**
- * Список категорий блогов
- *
- * @modifier blog-categories
- * @template blocks/block.blogCategories.tpl
- */
-.block--blog-categories .block-header .blog-categories-admin { position: absolute; top: 13px; right: 13px; }
-
-
-/**
- * Блок с кнопкой "Создать блог"
- *
- * @modifier blog-add
- * @template blocks/block.blogAdd.tpl
- */
-.block.block--blog-add .block-content { padding: 30px; text-align: center; }
-.block.block--blog-add p { margin-bottom: 25px; }
-
-
-/**
- * Навигация по блогам
- *
- * @modifier blog-navigation
- * @template blocks/block.blogNav.tpl
- */
-.block--blog-navigation p { margin-bottom: 15px; }
-.block--blog-navigation .blog-navigator-categories option:first-child { color: #aaa; }
-
-
-/**
- * Информация о блоге
- *
- * @modifier blog-actions
- * @template blocks/block.blogActions.tpl
- */
-.block--blog-actions .block-content { padding: 0; }
-.block--blog-actions .avatar        { max-width: 100%; vertical-align: top; }
-.block--blog-actions .block-footer  { text-align: center; }
-
-
-/**
- * Фото пользователя
- *
- * @modifier user
- * @template blocks/block.userPhoto.tpl
- */
-.block--user-photo .block-content         { padding: 0; }
-.block--user-photo .profile-photo-wrapper { position: relative; min-width: 100%; min-height: 50px; display: inline-block; }
-.block--user-photo .profile-photo         { vertical-align: top; min-width: 100%; }
-
-.block--user-photo .status                { position: absolute; top: 20px; left: 0; padding: 12px 15px; font: 300 16px/1em 'Open Sans'; }
-.block--user-photo .status.status-online  { background: #b7bc1c; background: rgba(183, 188, 28, .8); color: #fff; }
-.block--user-photo .status.status-offline { background: #333; background: rgba(0, 0, 0, .6); color: #fff; }
-
-.block--user-photo .upload-photo          { padding: 7px 10px 10px; background: #f7f7f7; }
-
-
-/**
- * Навигация по профилю пользователя
- *
- * @modifier user-nav
- * @template blocks/block.userNav.tpl
- */
-.block--user-nav { padding: 0; background: none; }
-
-
-/**
- * Теги
- *
- * @modifier tags
- */
-.block--tags .tab-pane { padding: 20px; }
-
-
-/**
- * Блок управления на странице пользователя
- *
- * @modifier user-actions
- * @template blocks/block.userActions.tpl
- */
-.block--user-actions                  { border: none; }
-.block--user-actions .block-content   { padding: 0; }
-.block--user-actions ul li            { margin-bottom: 0; }
-.block--user-actions ul li span,
-.block--user-actions ul li a          { display: block; padding: 10px 15px; }
-.block--user-actions ul li a:hover    { background: #fafafa; }
-.block--user-actions ul li a.followed { color: #f00; }

application/frontend/skin/developer/blocks/block.tagsCity.tpl

@@ -1,22 +0,0 @@
-{**
- * Список городов в которых проживают пользователи
- *
- * @styles css/blocks.css
- *}
-
-{extends 'components/block/block.tpl'}
-
-{block 'block_title'}
-	{lang 'user.blocks.cities.title'}
-{/block}
-
-{block 'block_options' append}
-	{$mods = "{$mods} tags-city"}
-{/block}
-
-{block 'block_content'}
-	{include 'components/tags/tag_cloud.tpl'
-			 aTags     = $aCityList
-			 sTagsUrl  = '{router page=\'people\'}city/{$oTag->getId()}/'
-			 sTagsText = '{$oTag->getName()|escape}'}
-{/block}

application/frontend/skin/developer/blocks/block.tagsCountry.tpl

@@ -1,22 +0,0 @@
-{**
- * Список стран в которых проживают пользователи
- *
- * @styles css/blocks.css
- *}
-
-{extends 'components/block/block.tpl'}
-
-{block 'block_title'}
-	{lang 'user.blocks.countries.title'}
-{/block}
-
-{block 'block_options' append}
-	{$mods = "{$mods} tags-country"}
-{/block}
-
-{block 'block_content'}
-	{include 'components/tags/tag_cloud.tpl'
-			 aTags     = $aCountryList
-			 sTagsUrl  = '{router page=\'people\'}country/{$oTag->getId()}/'
-			 sTagsText = '{$oTag->getName()|escape}'}
-{/block}

application/frontend/skin/developer/components/activity/blocks/recent-comments.tpl

@@ -4,7 +4,7 @@
  *}
 
 <div class="block-content">
-	<ul class="item-list">
+	<ul class="block-item-list">
 		{foreach $smarty.local.comments as $comment}
 			{$user = $comment->getUser()}
 			{$topic = $comment->getTarget()}

application/frontend/skin/developer/components/activity/blocks/recent-topics.tpl

@@ -1,29 +1,27 @@
 {**
  * Прямой эфир
  * Последние топики
- *
- * @styles css/blocks.css
  *}
 
 <div class="block-content">
-	<ul class="item-list">
-		{foreach $smarty.local.topics as $oTopic}
-			{$oUser = $oTopic->getUser()}
-			{$oBlog = $oTopic->getBlog()}
+	<ul class="block-item-list">
+		{foreach $smarty.local.topics as $topic}
+			{$user = $topic->getUser()}
+			{$blog = $topic->getBlog()}
 
-			<li class="js-title-topic" title="{$oTopic->getText()|strip_tags|trim|truncate:150:'...'|escape}">
-				<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
+			<li class="js-title-topic" title="{$topic->getText()|strip_tags|trim|truncate:150:'...'|escape}">
+				<a href="{$user->getUserWebPath()}"><img src="{$user->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
 
-				<a href="{$oUser->getUserWebPath()}" class="author">{$oUser->getDisplayName()}</a> &rarr;
-				<a href="{$oBlog->getUrlFull()}" class="blog-name">{$oBlog->getTitle()|escape}</a> &rarr;
-				<a href="{$oTopic->getUrl()}">{$oTopic->getTitle()|escape}</a>
+				<a href="{$user->getUserWebPath()}" class="author">{$user->getDisplayName()}</a> &rarr;
+				<a href="{$blog->getUrlFull()}" class="blog-name">{$blog->getTitle()|escape}</a> &rarr;
+				<a href="{$topic->getUrl()}">{$topic->getTitle()|escape}</a>
 
 				<p>
-					<time datetime="{date_format date=$oTopic->getDate() format='c'}">
-						{date_format date=$oTopic->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
+					<time datetime="{date_format date=$topic->getDate() format='c'}">
+						{date_format date=$topic->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
 					</time> |
 
-					{lang name='comments.comments_declension' count=$oTopic->getCountComment() plural=true}
+					{lang name='comments.comments_declension' count=$topic->getCountComment() plural=true}
 				</p>
 			</li>
 		{/foreach}

application/frontend/skin/developer/components/activity/css/block.activity-recent.css

@@ -8,10 +8,10 @@
  * TODO: Component item
  */
 
-.item-list li               { min-height: 51px; padding: 17px 15px 20px 80px; border-top: 1px solid #eee; position: relative; zoom: 1; background: #fff; }
-.item-list li:first-child   { border: none; }
-.item-list li p             { padding-top: 2px; font-size: 11px; }
-.item-list li a             { text-decoration: none; }
-.item-list li .avatar       { position: absolute; top: 20px; left: 20px; margin-right: 10px; }
-.item-list li .author       { font-weight: bold; color: #333; }
-.item-list li .blog-name    { font-weight: bold; }
+.block-item-list li               { min-height: 51px; padding: 17px 15px 20px 80px; border-top: 1px solid #eee; position: relative; zoom: 1; background: #fff; }
+.block-item-list li:first-child   { border: none; }
+.block-item-list li p             { padding-top: 2px; font-size: 11px; }
+.block-item-list li a             { text-decoration: none; }
+.block-item-list li .avatar       { position: absolute; top: 20px; left: 20px; margin-right: 10px; }
+.block-item-list li .author       { font-weight: bold; color: #333; }
+.block-item-list li .blog-name    { font-weight: bold; }

application/frontend/skin/developer/components/blog/add.tpl

@@ -24,10 +24,8 @@
 
 	{* Категория блога *}
 	{if Config::Get('module.blog.category_allow') and ($oUserCurrent->isAdministrator() or ! Config::Get('module.blog.category_only_admin'))}
-
 		{* Подключаем блок для управления категориями *}
-		{insert name="block" block="categoryUpdate" params=[ 'target' => $oBlogEdit, 'entity' => 'ModuleBlog_EntityBlog' ]}
-
+		{insert name='block' block='categoryUpdate' params=[ 'target' => $oBlogEdit, 'entity' => 'ModuleBlog_EntityBlog' ]}
 	{/if}
 
 

application/frontend/skin/developer/components/blog/blocks/block.blog-actions.tpl

@@ -1,7 +1,5 @@
 {**
- * Список пользователей блога
- *
- * @styles css/blocks.css
+ * 
  *}
 
 {extends 'components/block/block.tpl'}

application/frontend/skin/developer/components/blog/blocks/blogs-top.tpl

@@ -2,10 +2,10 @@
  * Блок со списоком блогов
  * Список блогов
  *
- * @styles css/blocks.css
+ * TODO: Component item
  *}
 
-<ul class="item-list">
+<ul class="block-item-list">
 	{foreach $aBlogs as $oBlog}
 		<li>
 			<a href="{$oBlog->getUrlFull()}">

application/frontend/skin/developer/components/blog/css/blog-blocks.css

@@ -0,0 +1,29 @@
+/**
+ * Блок с кнопкой "Создать блог"
+ *
+ * @modifier blog-add
+ * @template blocks/block.blogAdd.tpl
+ */
+.block.block--blog-add .block-content { padding: 30px; text-align: center; }
+.block.block--blog-add p { margin-bottom: 25px; }
+
+
+/**
+ * Навигация по блогам
+ *
+ * @modifier blog-navigation
+ * @template blocks/block.blogNav.tpl
+ */
+.block--blog-navigation p { margin-bottom: 15px; }
+.block--blog-navigation .blog-navigator-categories option:first-child { color: #aaa; }
+
+
+/**
+ * Информация о блоге
+ *
+ * @modifier blog-actions
+ * @template blocks/block.blogActions.tpl
+ */
+.block--blog-actions .block-content { padding: 0; }
+.block--blog-actions .avatar        { max-width: 100%; vertical-align: top; }
+.block--blog-actions .block-footer  { text-align: center; }

application/frontend/skin/developer/components/tags-favourite/tags-cloud.tpl

@@ -5,11 +5,11 @@
  * @styles css/common.css
  *}
 
-{include 'components/tags/tag_cloud.tpl'
-    aTags       = $aFavouriteTopicUserTags
-    sTagsUrl    = '{$oFavouriteUser->getUserWebPath()}favourites/topics/tag/{$oTag->getText()|escape:\'url\'}/'
-    sTagsActive = $sFavouriteTag
-    assign      = tags}
+{include 'components/tags/tag-cloud.tpl'
+	tags   = $aFavouriteTopicUserTags
+	url    = '{$oFavouriteUser->getUserWebPath()}favourites/topics/tag/{$oTag->getText()|escape:\'url\'}/'
+	active = $sFavouriteTag
+	assign = tags}
 
 {include 'components/accordion/accordion.tpl' classes='js-tags-favourite-accordion' items=[[
     'title' => "{lang 'favourite_tags.title'} {if $sFavouriteTag}({$sFavouriteTag}){/if}",

application/frontend/skin/developer/components/tags/blocks/block.tags.tpl

@@ -0,0 +1,19 @@
+{**
+ * Теги
+ *
+ * @styles css/blocks.css
+ *}
+
+{extends 'components/block/block.tpl'}
+
+{block 'block_title'}
+	{lang 'tags.block_tags.title'}
+{/block}
+
+{block 'block_options' append}
+	{$mods = "{$mods} tags nopadding"}
+{/block}
+
+{block 'block_content'}
+	{include 'components/tags/tag-cloud.tpl' tags=$smarty.local.tags url=$smarty.local.url}
+{/block}

application/frontend/skin/developer/components/tags/css/tags-blocks.css

@@ -0,0 +1,9 @@
+/**
+ * Теги
+ *
+ * @modifier tags
+ */
+
+.block--tags .tab-pane {
+	padding: 20px;
+}

application/frontend/skin/developer/components/tags/tag-cloud.tpl

@@ -0,0 +1,28 @@
+{**
+ * Облако тегов
+ *
+ * @param array  $tags   Массив с тегами
+ * @param string $url    Код для получения ссылки тега
+ * @param string $text   Код для получения названия тега
+ * @param string $active Текст активного тега
+ *
+ * @styles css/common.css
+ *}
+
+{if $smarty.local.tags}
+	<ul class="tag-cloud word-wrap">
+		{foreach $smarty.local.tags as $tag}
+			<li class="tag-cloud-item {if $tag->getText() && $smarty.local.active == $tag->getText()}active{/if}">
+				<a class="tag-size-{$tag->getSize()}" href="{eval var=$smarty.local.url}" title="{$tag->getCount()}">
+					{if $smarty.local.text}
+						{eval var=$smarty.local.text}
+					{else}
+						{$tag->getText()|escape}
+					{/if}
+				</a>
+			</li>
+		{/foreach}
+	</ul>
+{else}
+	{include 'components/alert/alert.tpl' text=$aLang.common.empty mods='empty'}
+{/if}

application/frontend/skin/developer/components/tags/tag_cloud.tpl

@@ -1,28 +0,0 @@
-{**
- * Облако тегов
- *
- * @param array  $aTags       Массив с тегами
- * @param string $sTagsUrl    Код для получения ссылки тега
- * @param string $sTagsText   Код для получения названия тега
- * @param string $sTagsActive Текст активного тега
- *
- * @styles css/common.css
- *}
-
-{if $aTags}
-	<ul class="tag-cloud word-wrap">
-		{foreach $aTags as $oTag}
-			<li class="tag-cloud-item {if $oTag->getText() && $sTagsActive == $oTag->getText()}active{/if}">
-				<a class="tag-size-{$oTag->getSize()}" href="{eval var=$sTagsUrl}" title="{$oTag->getCount()}">
-					{if $sTagsText}
-						{eval var=$sTagsText}
-					{else}
-						{$oTag->getText()|escape}
-					{/if}
-				</a>
-			</li>
-		{/foreach}
-	</ul>
-{else}
-	{include 'components/alert/alert.tpl' text=$aLang.block_tags_empty mods='empty'}
-{/if}

application/frontend/skin/developer/components/topic/blocks/block.topics-tags.tpl

@@ -4,20 +4,19 @@
  * @styles css/blocks.css
  *}
 
-{extends 'components/block/block.tpl'}
+{extends 'components/tags/blocks/block.tags.tpl'}
 
 {block 'block_title'}
 	{lang 'tags.block_tags.title'}
 {/block}
 
 {block 'block_options' append}
-	{$mods = "{$mods} tags nopadding"}
 	{$classes = "{$classes} js-block-default"}
 {/block}
 
 {block 'block_content'}
-	{include 'components/tags/tag_cloud.tpl' aTags=$aTags sTagsUrl='{router page=\'tag\'}{$oTag->getText()|escape:\'url\'}/' assign=tags_block_all}
-	{include 'components/tags/tag_cloud.tpl' aTags=$aTagsUser sTagsUrl='{router page=\'tag\'}{$oTag->getText()|escape:\'url\'}/' assign=tags_block_favourite}
+	{include 'components/tags/tag-cloud.tpl' tags=$smarty.local.tags     url='{router page=\'tag\'}{$tag->getText()|escape:\'url\'}/' assign=tags_block_all}
+	{include 'components/tags/tag-cloud.tpl' tags=$smarty.local.tagsUser url='{router page=\'tag\'}{$tag->getText()|escape:\'url\'}/' assign=tags_block_favourite}
 
 	{include 'components/tabs/tabs.tpl' classes='js-tabs-block' tabs=[
         [ 'text' => {lang 'tags.block_tags.nav.all'},       'content' => $tags_block_all ],

application/frontend/skin/developer/components/user/blocks/block.users-cities.tpl

@@ -0,0 +1,18 @@
+{**
+ * Список городов в которых проживают пользователи
+ *
+ * @styles css/blocks.css
+ *}
+
+{extends 'components/block/block.tpl'}
+
+{block 'block_title'}
+    {lang 'user.blocks.cities.title'}
+{/block}
+
+{block 'block_content'}
+    {include 'components/tags/tag-cloud.tpl'
+        tags = $smarty.local.cities
+        url  = '{router page=\'people\'}city/{$tag->getId()}/'
+        text = '{$tag->getName()|escape}'}
+{/block}

application/frontend/skin/developer/components/user/blocks/block.users-countries.tpl

@@ -0,0 +1,18 @@
+{**
+ * Список стран в которых проживают пользователи
+ *
+ * @styles css/blocks.css
+ *}
+
+{extends 'components/block/block.tpl'}
+
+{block 'block_title'}
+    {lang 'user.blocks.countries.title'}
+{/block}
+
+{block 'block_content'}
+    {include 'components/tags/tag-cloud.tpl'
+        tags = $smarty.local.countries
+        url  = '{router page=\'people\'}country/{$tag->getId()}/'
+        text = '{$tag->getName()|escape}'}
+{/block}

application/frontend/skin/developer/components/user/css/user-blocks.css

@@ -0,0 +1,37 @@
+/**
+ * Фото пользователя
+ *
+ * @modifier user
+ * @template blocks/block.userPhoto.tpl
+ */
+.block--user-photo .block-content         { padding: 0; }
+.block--user-photo .profile-photo-wrapper { position: relative; min-width: 100%; min-height: 50px; display: inline-block; }
+.block--user-photo .profile-photo         { vertical-align: top; min-width: 100%; }
+
+.block--user-photo .status                { position: absolute; top: 20px; left: 0; padding: 12px 15px; font: 300 16px/1em 'Open Sans'; }
+.block--user-photo .status.status-online  { background: #b7bc1c; background: rgba(183, 188, 28, .8); color: #fff; }
+.block--user-photo .status.status-offline { background: #333; background: rgba(0, 0, 0, .6); color: #fff; }
+
+.block--user-photo .upload-photo          { padding: 7px 10px 10px; background: #f7f7f7; }
+
+/**
+ * Блок управления на странице пользователя
+ *
+ * @modifier user-actions
+ * @template blocks/block.userActions.tpl
+ */
+.block--user-actions                  { border: none; }
+.block--user-actions .block-content   { padding: 0; }
+.block--user-actions ul li            { margin-bottom: 0; }
+.block--user-actions ul li span,
+.block--user-actions ul li a          { display: block; padding: 10px 15px; }
+.block--user-actions ul li a:hover    { background: #fafafa; }
+.block--user-actions ul li a.followed { color: #f00; }
+
+/**
+ * Навигация по профилю пользователя
+ *
+ * @modifier user-nav
+ * @template blocks/block.userNav.tpl
+ */
+.block--user-nav { padding: 0; background: none; }

application/frontend/skin/developer/settings/config/config.php

@@ -26,7 +26,6 @@ $config['head']['default']['js'] = array_merge(Config::Get('head.default.js'), a
 $config['head']['default']['css'] = array_merge(Config::Get('head.default.css'), array(
 	"___path.skin.assets.web___/css/base.css",
 	"___path.skin.assets.web___/css/layout.css",
-	"___path.skin.assets.web___/css/blocks.css",
 	"___path.skin.assets.web___/css/print.css"
 ));