From bceeed7b805e3d74eae0897a2697cd96ac7f66e6 Mon Sep 17 00:00:00 2001
From: Denis Shakhov <denis.shakhov@gmail.com>
Date: Tue, 25 Nov 2014 15:12:44 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B8=D0=BF=20=D0=B0=D1=82=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B1=D1=83=D1=82=D0=BE=D0=B2=20=D1=83=20=D0=BA=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20=D0=BD=D0=B0=20=D0=BC=D0=B0?=
 =?UTF-8?q?=D1=81=D1=81=D0=B8=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skin/developer/components/accordion/accordion.tpl     | 2 +-
 .../skin/developer/components/actionbar/actionbar.tpl     | 2 +-
 .../skin/developer/components/activity/activity.tpl       | 2 +-
 .../skin/developer/components/activity/event-list.tpl     | 2 +-
 .../skin/developer/components/activity/settings.tpl       | 2 +-
 .../frontend/skin/developer/components/admin/plugins.tpl  | 2 +-
 .../frontend/skin/developer/components/alert/alert.tpl    | 2 +-
 .../skin/developer/components/article/article.tpl         | 2 +-
 .../frontend/skin/developer/components/block/block.tpl    | 2 +-
 .../components/blog/blocks/block.blogs-search.tpl         | 2 +-
 .../frontend/skin/developer/components/blog/blog.tpl      | 2 +-
 .../frontend/skin/developer/components/blog/join.tpl      | 2 +-
 .../frontend/skin/developer/components/button/button.tpl  | 6 ++----
 .../skin/developer/components/comment/comment-form.tpl    | 2 +-
 .../skin/developer/components/comment/comment.tpl         | 2 +-
 .../skin/developer/components/comment/comments.tpl        | 2 +-
 .../skin/developer/components/comment/toolbar.comment.tpl | 2 +-
 .../skin/developer/components/dropdown/dropdown.menu.tpl  | 2 +-
 .../skin/developer/components/dropdown/dropdown.tpl       | 2 +-
 .../frontend/skin/developer/components/editor/editor.tpl  | 2 +-
 .../skin/developer/components/favourite/favourite.tpl     | 2 +-
 .../frontend/skin/developer/components/feed/blogs.tpl     | 2 +-
 .../frontend/skin/developer/components/feed/feed.tpl      | 2 +-
 .../frontend/skin/developer/components/field/field.tpl    | 4 ++--
 .../skin/developer/components/field/field.upload-area.tpl | 4 ++--
 .../skin/developer/components/info-list/info-list.tpl     | 2 +-
 .../frontend/skin/developer/components/item/item.tpl      | 2 +-
 .../skin/developer/components/media/panes/pane.insert.tpl | 2 +-
 .../media/uploader/uploader-block.insert.image.tpl        | 2 +-
 .../components/media/uploader/uploader-block.photoset.tpl | 2 +-
 .../skin/developer/components/media/uploader/uploader.tpl | 6 +++++-
 .../frontend/skin/developer/components/more/more.tpl      | 2 +-
 .../frontend/skin/developer/components/nav/nav.tpl        | 2 +-
 .../frontend/skin/developer/components/note/note.tpl      | 2 +-
 .../skin/developer/components/page-header/page-header.tpl | 2 +-
 .../skin/developer/components/pagination/pagination.tpl   | 2 +-
 .../frontend/skin/developer/components/photo/photo.tpl    | 2 +-
 .../frontend/skin/developer/components/poll/poll.form.tpl | 4 ++--
 .../skin/developer/components/poll/poll.result.tpl        | 6 +++++-
 .../skin/developer/components/search-form/search-form.tpl | 2 +-
 .../frontend/skin/developer/components/talk/add.tpl       | 8 ++++----
 .../components/toolbar-scrollup/toolbar.scrollup.tpl      | 2 +-
 .../skin/developer/components/toolbar/toolbar.item.tpl    | 4 ++--
 .../skin/developer/components/toolbar/toolbar.tpl         | 4 ++--
 .../components/uploader/uploader-block.info-group.tpl     | 2 +-
 .../skin/developer/components/uploader/uploader.tpl       | 2 +-
 .../developer/components/user-list-add/user-list-add.tpl  | 2 +-
 .../components/user/blocks/block.users-search.tpl         | 6 +++---
 .../skin/developer/components/user/friend-item.tpl        | 2 +-
 .../frontend/skin/developer/components/user/header.tpl    | 2 +-
 .../skin/developer/components/user/info-group.tpl         | 2 +-
 .../developer/components/user/modals/modal.user-list.tpl  | 2 +-
 .../frontend/skin/developer/components/user/user-item.tpl | 2 +-
 .../developer/components/user/user-list-small-item.tpl    | 2 +-
 .../frontend/skin/developer/components/vote/vote.tpl      | 2 +-
 .../frontend/skin/developer/components/wall/wall.tpl      | 4 ++--
 56 files changed, 76 insertions(+), 70 deletions(-)

diff --git a/application/frontend/skin/developer/components/accordion/accordion.tpl b/application/frontend/skin/developer/components/accordion/accordion.tpl
index 5b06779e..e200d19e 100644
--- a/application/frontend/skin/developer/components/accordion/accordion.tpl
+++ b/application/frontend/skin/developer/components/accordion/accordion.tpl
@@ -9,7 +9,7 @@
 
 {$component = 'accordion'}
 
-<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {$smarty.local.attributes}>
+<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {cattr list=$smarty.local.attributes}>
     {foreach $smarty.local.items as $item}
         <h3>{$item[ 'title' ]}</h3>
         <div>{$item[ 'content' ]}</div>
diff --git a/application/frontend/skin/developer/components/actionbar/actionbar.tpl b/application/frontend/skin/developer/components/actionbar/actionbar.tpl
index 11a3f293..342ea9da 100644
--- a/application/frontend/skin/developer/components/actionbar/actionbar.tpl
+++ b/application/frontend/skin/developer/components/actionbar/actionbar.tpl
@@ -10,7 +10,7 @@
 {$component = 'actionbar'}
 
 {if $smarty.local.items}
-    <ul class="{$component} clearfix {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {$smarty.local.attributes}>
+    <ul class="{$component} clearfix {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {cattr list=$smarty.local.attributes}>
         {foreach $smarty.local.items as $item}
             {if $item[ 'html' ]}
                 {$item[ 'html' ]}
diff --git a/application/frontend/skin/developer/components/activity/activity.tpl b/application/frontend/skin/developer/components/activity/activity.tpl
index 6339fc12..0687772b 100644
--- a/application/frontend/skin/developer/components/activity/activity.tpl
+++ b/application/frontend/skin/developer/components/activity/activity.tpl
@@ -14,7 +14,7 @@
 
 {$events = $smarty.local.events}
 
-<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {$smarty.local.attributes}>
+<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {cattr list=$smarty.local.attributes}>
     {if $events}
         {* Список *}
         <ul class="activity-event-list js-activity-event-list">
diff --git a/application/frontend/skin/developer/components/activity/event-list.tpl b/application/frontend/skin/developer/components/activity/event-list.tpl
index 369fabe0..94702c9e 100644
--- a/application/frontend/skin/developer/components/activity/event-list.tpl
+++ b/application/frontend/skin/developer/components/activity/event-list.tpl
@@ -18,7 +18,7 @@
 
 		<li class="activity-date">
 			{if $dateNow == $dateLast}
-				{$aLang.today}
+				{$aLang.date.today}
 			{else}
 				{date_format date=$event->getDateAdded() format="j F Y"}
 			{/if}
diff --git a/application/frontend/skin/developer/components/activity/settings.tpl b/application/frontend/skin/developer/components/activity/settings.tpl
index 65ff8e76..9f34bada 100644
--- a/application/frontend/skin/developer/components/activity/settings.tpl
+++ b/application/frontend/skin/developer/components/activity/settings.tpl
@@ -16,7 +16,7 @@
                 {if ! (Config::Get('module.stream.disable_vote_events') && substr($type, 0, 4) == 'vote')}
                     {include 'components/field/field.checkbox.tpl'
                         inputClasses    = 'js-activity-settings-type-checkbox'
-                        inputAttributes = "data-type=\"{$type}\""
+                        inputAttributes = [ 'data-type' => $type ]
                         checked         = in_array( $type, $smarty.local.typesActive )
                         label           = $aLang.activity.settings.options[ $type ]}
                 {/if}
diff --git a/application/frontend/skin/developer/components/admin/plugins.tpl b/application/frontend/skin/developer/components/admin/plugins.tpl
index e3178fa9..a7cd53c5 100644
--- a/application/frontend/skin/developer/components/admin/plugins.tpl
+++ b/application/frontend/skin/developer/components/admin/plugins.tpl
@@ -59,7 +59,7 @@
                         <li>
                             {include 'components/button/button.tpl'
                                 url  = "{router page='admin'}plugins/?plugin={$plugin.code}&action=remove&security_ls_key={$LIVESTREET_SECURITY_KEY}"
-                                attributes = "onclick=\"return confirm('{lang 'common.remove_confirm'}');\""
+                                attributes = [ 'onclick' => "return confirm('{lang 'common.remove_confirm'}');" ]
                                 text = {lang 'admin.plugins.plugin.remove'}}
                         </li>
                     </ul>
diff --git a/application/frontend/skin/developer/components/alert/alert.tpl b/application/frontend/skin/developer/components/alert/alert.tpl
index a41cce85..88ba02db 100644
--- a/application/frontend/skin/developer/components/alert/alert.tpl
+++ b/application/frontend/skin/developer/components/alert/alert.tpl
@@ -24,7 +24,7 @@
 {* Уведомление *}
 <div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes} js-alert"
     {if ! $visible}hidden{/if}
-    {$smarty.local.attributes}
+    {cattr list=$smarty.local.attributes}
     role="alert">
 
     {* Заголовок *}
diff --git a/application/frontend/skin/developer/components/article/article.tpl b/application/frontend/skin/developer/components/article/article.tpl
index df07a554..b7635406 100644
--- a/application/frontend/skin/developer/components/article/article.tpl
+++ b/application/frontend/skin/developer/components/article/article.tpl
@@ -27,7 +27,7 @@
 {/block}
 
 {block 'article'}
-	<article class="{$component} {mod name=$component mods=$mods} {$classes}" {$smarty.local.attributes}>
+	<article class="{$component} {mod name=$component mods=$mods} {$classes}" {cattr list=$smarty.local.attributes}>
 		{**
 		 * Хидер
 		 *}
diff --git a/application/frontend/skin/developer/components/block/block.tpl b/application/frontend/skin/developer/components/block/block.tpl
index 4b59fbb6..c4eaee82 100644
--- a/application/frontend/skin/developer/components/block/block.tpl
+++ b/application/frontend/skin/developer/components/block/block.tpl
@@ -14,7 +14,7 @@
 {if $show}
 	{block 'block_before'}{/block}
 
-	<div class="{$component} {mod name=$component mods=$mods} {$classes}" {$attributes}>
+	<div class="{$component} {mod name=$component mods=$mods} {$classes}" {cattr list=$attributes}>
 		{* Шапка *}
 		{block 'block_title' hide}
 			<header class="{$component}-header">
diff --git a/application/frontend/skin/developer/components/blog/blocks/block.blogs-search.tpl b/application/frontend/skin/developer/components/blog/blocks/block.blogs-search.tpl
index 50a5ae25..56afba2a 100644
--- a/application/frontend/skin/developer/components/blog/blocks/block.blogs-search.tpl
+++ b/application/frontend/skin/developer/components/blog/blocks/block.blogs-search.tpl
@@ -38,7 +38,7 @@
         {include 'components/nav/nav.tpl'
             name       = 'blogs_categories'
             classes    = 'actionbar-item-link'
-            attributes = 'id="js-search-ajax-blog-category"'
+            attributes = [ 'id' => 'js-search-ajax-blog-category' ]
             activeItem = 'all'
             mods       = 'stacked pills'
             items      = $items}
diff --git a/application/frontend/skin/developer/components/blog/blog.tpl b/application/frontend/skin/developer/components/blog/blog.tpl
index 3009006f..3ee5b9ae 100644
--- a/application/frontend/skin/developer/components/blog/blog.tpl
+++ b/application/frontend/skin/developer/components/blog/blog.tpl
@@ -26,7 +26,7 @@
 
 
 {* Блог *}
-<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" data-id="{$blog->getId()}" {$smarty.local.attributes}>
+<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" data-id="{$blog->getId()}" {cattr list=$smarty.local.attributes}>
     <header class="{$component}-header">
         {* Заголовок *}
         <h2 class="page-header blog-title">
diff --git a/application/frontend/skin/developer/components/blog/join.tpl b/application/frontend/skin/developer/components/blog/join.tpl
index 35cd11e1..53f01faf 100644
--- a/application/frontend/skin/developer/components/blog/join.tpl
+++ b/application/frontend/skin/developer/components/blog/join.tpl
@@ -6,7 +6,7 @@
 
 {if $oUserCurrent && $oUserCurrent->getId() != $blog->getOwnerId() && $blog->getType() == 'open'}
     {include 'components/button/button.tpl'
-        attributes = "data-blog-id=\"{$blog->getId()}\""
+        attributes = [ 'data-blog-id' => $blog->getId() ]
         classes    = 'js-blog-join'
         text       = ($blog->getUserIsJoin()) ? $aLang.blog.join.leave : $aLang.blog.join.join
         mods       = ($blog->getUserIsJoin()) ? false : 'primary'}
diff --git a/application/frontend/skin/developer/components/button/button.tpl b/application/frontend/skin/developer/components/button/button.tpl
index ce519283..ddcc4e3f 100644
--- a/application/frontend/skin/developer/components/button/button.tpl
+++ b/application/frontend/skin/developer/components/button/button.tpl
@@ -11,9 +11,7 @@
  * @param icon       string  (null)     Класс иконки
  * @param classes    string  (null)     Дополнительные классы (указываются через пробел)
  * @param mods       string  (null)     Список классов-модификаторов (указываются через пробел)
- * @param attributes string  (null)     Атрибуты (указываются через пробел)
- *
- * @styles <framework>/css/button.css
+ * @param attributes array   (null)     Атрибуты
  *}
 
 {* Название компонента *}
@@ -32,7 +30,7 @@
         {if $smarty.local.id}id="{$smarty.local.id}"{/if}
         {if $smarty.local.name}name="{$smarty.local.name}"{/if}
         class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}"
-        {$smarty.local.attributes}>
+        {cattr list=$smarty.local.attributes}>
     {* Иконка *}
     {if $smarty.local.icon}
         <i class="{$smarty.local.icon}"></i>
diff --git a/application/frontend/skin/developer/components/comment/comment-form.tpl b/application/frontend/skin/developer/components/comment/comment-form.tpl
index 7895e1d0..676b3f94 100644
--- a/application/frontend/skin/developer/components/comment/comment-form.tpl
+++ b/application/frontend/skin/developer/components/comment/comment-form.tpl
@@ -24,7 +24,7 @@
       enctype          = "multipart/form-data"
       data-target-id   = "{$targetId}"
       data-target-type = "{$targetType}"
-      {$smarty.local.attributes}>
+      {cattr list=$smarty.local.attributes}>
 
     {block 'comment-form'}
         {hook run='comment-form-begin'}
diff --git a/application/frontend/skin/developer/components/comment/comment.tpl b/application/frontend/skin/developer/components/comment/comment.tpl
index a9668601..bc5673ef 100644
--- a/application/frontend/skin/developer/components/comment/comment.tpl
+++ b/application/frontend/skin/developer/components/comment/comment.tpl
@@ -67,7 +67,7 @@
 <section class   = "{$component} {mod name=$component mods=$mods} {$smarty.local.classes} open js-{$component}"
          id      = "comment{$commentId}"
          data-id = "{$commentId}"
-         {foreach $smarty.local.attributes as $attr}{$attr@key}="{$attr@value}" {/foreach}>
+         {cattr list=$smarty.local.attributes}>
 
     {* Показываем удаленные комментарии только администраторам *}
     {if ! $isDeleted || ( $oUserCurrent && $oUserCurrent->isAdministrator() )}
diff --git a/application/frontend/skin/developer/components/comment/comments.tpl b/application/frontend/skin/developer/components/comment/comments.tpl
index 821a6361..7959812e 100644
--- a/application/frontend/skin/developer/components/comment/comments.tpl
+++ b/application/frontend/skin/developer/components/comment/comments.tpl
@@ -47,7 +47,7 @@
     data-target-type="{$targetType}"
     data-target-id="{$targetId}"
     data-comment-last-id="{$smarty.local.lastCommentId}"
-    {foreach $smarty.local.attributes as $attr}{$attr@key}="{$attr@value}" {/foreach}>
+    {cattr list=$smarty.local.attributes}>
     {**
      * Заголовок
      *}
diff --git a/application/frontend/skin/developer/components/comment/toolbar.comment.tpl b/application/frontend/skin/developer/components/comment/toolbar.comment.tpl
index f78646f9..4553757d 100644
--- a/application/frontend/skin/developer/components/comment/toolbar.comment.tpl
+++ b/application/frontend/skin/developer/components/comment/toolbar.comment.tpl
@@ -12,7 +12,7 @@
 	{$_mods = 'comments'}
 	{$_bShow = !! $oUserCurrent}
 	{$_classes = 'js-toolbar-comments'}
-	{$_attributes = 'data-target=".js-comment"'}
+	{$_attributes = [ 'data-target' => '.js-comment' ]}
 {/block}
 
 {block 'toolbar_item'}
diff --git a/application/frontend/skin/developer/components/dropdown/dropdown.menu.tpl b/application/frontend/skin/developer/components/dropdown/dropdown.menu.tpl
index fee706de..e63dbbbe 100644
--- a/application/frontend/skin/developer/components/dropdown/dropdown.menu.tpl
+++ b/application/frontend/skin/developer/components/dropdown/dropdown.menu.tpl
@@ -14,5 +14,5 @@
 	activeItem = $smarty.local.activeItem
 	mods       = 'stacked dropdown'
 	classes    = "dropdown-menu {$smarty.local.classes}"
-	attributes = "{$smarty.local.attributes} id=\"{$smarty.local.id}\""
+	attributes = array_merge( $smarty.local.attributes|default:[], [ 'id' => $smarty.local.id ] )
 	items      = $smarty.local.items}
\ No newline at end of file
diff --git a/application/frontend/skin/developer/components/dropdown/dropdown.tpl b/application/frontend/skin/developer/components/dropdown/dropdown.tpl
index ff756cee..09240561 100644
--- a/application/frontend/skin/developer/components/dropdown/dropdown.tpl
+++ b/application/frontend/skin/developer/components/dropdown/dropdown.tpl
@@ -16,7 +16,7 @@
 {include 'components/button/button.tpl'
     type       = 'button'
     classes    = "{$component}-toggle {$smarty.local.classes}"
-    attributes = "data-{$component}-target=\"{$uid}\" {$smarty.local.attributes}"
+    attributes = array_merge( $smarty.local.attributes|default:[], [ 'data-dropdown-target' => $uid ] )
     text       = $smarty.local.text}
 
 {* Меню *}
diff --git a/application/frontend/skin/developer/components/editor/editor.tpl b/application/frontend/skin/developer/components/editor/editor.tpl
index 4c6ca951..18ac2747 100644
--- a/application/frontend/skin/developer/components/editor/editor.tpl
+++ b/application/frontend/skin/developer/components/editor/editor.tpl
@@ -31,7 +31,7 @@
 		entityField     = $smarty.local.entityField
 		entity          = $smarty.local.entity
 		inputClasses    = "{$smarty.local.classes} {$smarty.local.inputClasses}"
-		inputAttributes = "{$smarty.local.attributes} data-editor-type=\"{$type}\" data-editor-set=\"{$set}\" data-editor-media=\"{$_mediaUid}\""
+		inputAttributes = array_merge( $smarty.local.attributes|default:[], [ 'data-editor-type' => $type, 'data-editor-set' => $set, 'data-editor-media' => $_mediaUid ] )
 		note            = $smarty.local.note
 		rows            = $smarty.local.rows|default:10}
 {/function}
diff --git a/application/frontend/skin/developer/components/favourite/favourite.tpl b/application/frontend/skin/developer/components/favourite/favourite.tpl
index 0fe55293..c6d4217a 100644
--- a/application/frontend/skin/developer/components/favourite/favourite.tpl
+++ b/application/frontend/skin/developer/components/favourite/favourite.tpl
@@ -36,7 +36,7 @@
 <div class="{$component} {mod name=$component mods=$mods} {if $isActive}active{/if} {$smarty.local.classes}"
 	 data-param-i-target-id="{$target->getId()}"
 	 title="{$aLang.$component[ ($isActive) ? 'remove' : 'add' ]}"
-	 {$smarty.local.attributes}>
+	 {cattr list=$smarty.local.attributes}>
 
 	{* Кнопка добавления/удаления из избранного *}
 	<div class="icon-heart {$component}-toggle js-{$component}-toggle"></div>
diff --git a/application/frontend/skin/developer/components/feed/blogs.tpl b/application/frontend/skin/developer/components/feed/blogs.tpl
index 6858a0be..f2824ee9 100644
--- a/application/frontend/skin/developer/components/feed/blogs.tpl
+++ b/application/frontend/skin/developer/components/feed/blogs.tpl
@@ -18,7 +18,7 @@
                 {foreach $smarty.local.blogsJoined as $blog}
                     {include 'components/field/field.checkbox.tpl'
                         inputClasses    = 'js-feed-blogs-subscribe'
-                        inputAttributes = "data-id=\"{$blog->getId()}\""
+                        inputAttributes = [ 'data-id' => $blog->getId() ]
                         checked         = isset($blogsSubscribed[ $blog->getId() ])
                         label           = "<a href=\"{$blog->getUrlFull()}\">{$blog->getTitle()|escape}</a>"}
                 {/foreach}
diff --git a/application/frontend/skin/developer/components/feed/feed.tpl b/application/frontend/skin/developer/components/feed/feed.tpl
index 89d1db14..d4b5b6ce 100644
--- a/application/frontend/skin/developer/components/feed/feed.tpl
+++ b/application/frontend/skin/developer/components/feed/feed.tpl
@@ -9,7 +9,7 @@
 
 {$topics = $smarty.local.topics}
 
-<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {$smarty.local.attributes}>
+<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {cattr list=$smarty.local.attributes}>
     {if $topics}
         {* Список *}
         <ul class="{$component}-topic-list js-{$component}-topic-list">
diff --git a/application/frontend/skin/developer/components/field/field.tpl b/application/frontend/skin/developer/components/field/field.tpl
index d9fec58a..c27c09d0 100644
--- a/application/frontend/skin/developer/components/field/field.tpl
+++ b/application/frontend/skin/developer/components/field/field.tpl
@@ -59,12 +59,12 @@
 
 		data-{$rule@key}="{$rule@value}"
 	{/foreach}
-	{$_inputAttributes}
+	{cattr list=$_inputAttributes}
 {/function}
 
 
 {block 'field'}
-	<div class="{$component} {mod name=$component mods=$_mods} clearfix {$smarty.local.classes} {block 'field_classes'}{/block}" {$smarty.local.attributes}>
+	<div class="{$component} {mod name=$component mods=$_mods} clearfix {$smarty.local.classes} {block 'field_classes'}{/block}" {cattr list=$smarty.local.attributes}>
 		{* Лэйбл *}
 		{if $label}
 			<label for="{$_uid}" class="{$component}-label">{$label}</label>
diff --git a/application/frontend/skin/developer/components/field/field.upload-area.tpl b/application/frontend/skin/developer/components/field/field.upload-area.tpl
index 14774b96..8b271354 100644
--- a/application/frontend/skin/developer/components/field/field.upload-area.tpl
+++ b/application/frontend/skin/developer/components/field/field.upload-area.tpl
@@ -4,7 +4,7 @@
 
 {$component = 'field-upload-area'}
 
-<label class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {$smarty.local.attributes}>
+<label class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {cattr list=$smarty.local.attributes}>
 	<span>{$smarty.local.label|default:{lang name='field.upload_area.label'}}</span>
-	<input type="file" name="{$smarty.local.inputName|default:'file'}" class="{$smarty.local.inputClasses}" {$smarty.local.inputAttributes} {$smarty.local.isMultiple|default:'multiple'}>
+	<input type="file" name="{$smarty.local.inputName|default:'file'}" class="{$smarty.local.inputClasses}" {cattr list=$smarty.local.inputAttributes} {$smarty.local.isMultiple|default:'multiple'}>
 </label>
\ No newline at end of file
diff --git a/application/frontend/skin/developer/components/info-list/info-list.tpl b/application/frontend/skin/developer/components/info-list/info-list.tpl
index dc7cc632..0039fbf8 100644
--- a/application/frontend/skin/developer/components/info-list/info-list.tpl
+++ b/application/frontend/skin/developer/components/info-list/info-list.tpl
@@ -8,7 +8,7 @@
 {$component = 'info-list'}
 
 {if $list}
-	<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {$smarty.local.attributes}>
+	<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {cattr list=$smarty.local.attributes}>
 		{* Заголовок *}
 		{if $smarty.local.title}
 			<h2 class="{$component}-title">{$smarty.local.title}</h2>
diff --git a/application/frontend/skin/developer/components/item/item.tpl b/application/frontend/skin/developer/components/item/item.tpl
index 481b9d2c..b2d6389b 100644
--- a/application/frontend/skin/developer/components/item/item.tpl
+++ b/application/frontend/skin/developer/components/item/item.tpl
@@ -13,7 +13,7 @@
     {$title = $smarty.local.title}
 {/block}
 
-<li class="{$component} {$smarty.local.classes} {mod name=$component mods=$smarty.local.mods}" {$smarty.local.attributes}>
+<li class="{$component} {$smarty.local.classes} {mod name=$component mods=$smarty.local.mods}" {cattr list=$smarty.local.attributes}>
     <a href="{$image[ 'url' ]}">
         <img src="{$image[ 'path' ]}" alt="{$image[ 'alt' ]}" title="{$image[ 'title' ]}" class="{$component}-image {$image[ 'classes' ]}">
     </a>
diff --git a/application/frontend/skin/developer/components/media/panes/pane.insert.tpl b/application/frontend/skin/developer/components/media/panes/pane.insert.tpl
index 9377b194..81ad9337 100644
--- a/application/frontend/skin/developer/components/media/panes/pane.insert.tpl
+++ b/application/frontend/skin/developer/components/media/panes/pane.insert.tpl
@@ -6,7 +6,7 @@
 
 {block 'media_pane_content'}
 	{include './../uploader/uploader.tpl'
-		attributes   = 'id="media-uploader"'
+		attributes   = [ 'id' => 'media-uploader' ]
 		classes      = 'js-media-uploader'
 		targetParams = $aTargetParams
 		targetType   = $sMediaTargetType
diff --git a/application/frontend/skin/developer/components/media/uploader/uploader-block.insert.image.tpl b/application/frontend/skin/developer/components/media/uploader/uploader-block.insert.image.tpl
index 58499a16..fd076ce4 100644
--- a/application/frontend/skin/developer/components/media/uploader/uploader-block.insert.image.tpl
+++ b/application/frontend/skin/developer/components/media/uploader/uploader-block.insert.image.tpl
@@ -6,7 +6,7 @@
 
 {block 'block_options' append}
 	{$classes = "{$classes} js-media-info-block"}
-	{$attributes = "{$attributes} data-type=\"insert\" data-filetype=\"1\""}
+	{$attributes = array_merge( $attributes|default:[], [ 'data-type' => 'insert', 'data-type' => '1' ] )}
 {/block}
 
 {block 'block_title'}
diff --git a/application/frontend/skin/developer/components/media/uploader/uploader-block.photoset.tpl b/application/frontend/skin/developer/components/media/uploader/uploader-block.photoset.tpl
index 7fa7ddc9..00d2b90d 100644
--- a/application/frontend/skin/developer/components/media/uploader/uploader-block.photoset.tpl
+++ b/application/frontend/skin/developer/components/media/uploader/uploader-block.photoset.tpl
@@ -6,7 +6,7 @@
 
 {block 'block_options' append}
 	{$classes = "{$classes} js-media-info-block"}
-	{$attributes = "{$attributes} data-type=\"photoset\""}
+	{$attributes = array_merge( $attributes|default:[], [ 'data-type' => 'photoset' ] )}
 {/block}
 
 {block 'block_title'}
diff --git a/application/frontend/skin/developer/components/media/uploader/uploader.tpl b/application/frontend/skin/developer/components/media/uploader/uploader.tpl
index 5e23f00d..d3403d6e 100644
--- a/application/frontend/skin/developer/components/media/uploader/uploader.tpl
+++ b/application/frontend/skin/developer/components/media/uploader/uploader.tpl
@@ -1,7 +1,11 @@
 {extends 'components/uploader/uploader.tpl'}
 
 {block 'uploader_options' append}
-	{$attributes = "{$attributes} data-param-target_type={json var=$smarty.local.targetType} data-param-target_id={json var=$smarty.local.targetId} data-param-target_tmp={json var=$smarty.local.targetTmp}"}
+    {$attributes = array_merge( $attributes|default:[], [
+        'data-param-target_type' => {json var=$smarty.local.targetType},
+        'data-param-target_id'   => {json var=$smarty.local.targetId},
+        'data-param-target_tmp'  => {json var=$smarty.local.targetTmp}
+    ])}
 {/block}
 
 {block 'uploader_aside' append}
diff --git a/application/frontend/skin/developer/components/more/more.tpl b/application/frontend/skin/developer/components/more/more.tpl
index 256be70d..fdb11d05 100644
--- a/application/frontend/skin/developer/components/more/more.tpl
+++ b/application/frontend/skin/developer/components/more/more.tpl
@@ -13,7 +13,7 @@
 <div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}"
      data-more-append="{$smarty.local.append|default:true}"
      {if $smarty.local.target}data-more-target="{$smarty.local.target}"{/if}
-     {foreach $smarty.local.attributes as $attr}{$attr@key}="{$attr@value}" {/foreach}>
+     {cattr list=$smarty.local.attributes}>
 
     {* Текст *}
     {$smarty.local.text|default:{lang 'more.text'}}
diff --git a/application/frontend/skin/developer/components/nav/nav.tpl b/application/frontend/skin/developer/components/nav/nav.tpl
index e5709a26..9d309629 100644
--- a/application/frontend/skin/developer/components/nav/nav.tpl
+++ b/application/frontend/skin/developer/components/nav/nav.tpl
@@ -33,7 +33,7 @@
 
 {* Отображем меню только если есть активные пункты *}
 {if count( $items ) - $disabledItemsCounter}
-    <ul class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {$smarty.local.attributes}>
+    <ul class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {cattr list=$smarty.local.attributes}>
         {foreach $items as $item}
             {$isEnabled = $item[ 'is_enabled' ]}
             {$isDropdown = isset( $item[ 'menu' ] )}
diff --git a/application/frontend/skin/developer/components/note/note.tpl b/application/frontend/skin/developer/components/note/note.tpl
index 89d5c4c8..d9e108e9 100644
--- a/application/frontend/skin/developer/components/note/note.tpl
+++ b/application/frontend/skin/developer/components/note/note.tpl
@@ -13,7 +13,7 @@
 {$note = $smarty.local.note}
 {$isEditable = $smarty.local.isEditable|default:true}
 
-<div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes}" data-param-i-user-id="{$smarty.local.targetId}" {$smarty.local.attributes}>
+<div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes}" data-param-i-user-id="{$smarty.local.targetId}" {cattr list=$smarty.local.attributes}>
 	{* Заметка *}
 	<div class="{$component}-body js-{$component}-body">
 		{* Текст *}
diff --git a/application/frontend/skin/developer/components/page-header/page-header.tpl b/application/frontend/skin/developer/components/page-header/page-header.tpl
index fec3f4c0..fdf8cd05 100644
--- a/application/frontend/skin/developer/components/page-header/page-header.tpl
+++ b/application/frontend/skin/developer/components/page-header/page-header.tpl
@@ -6,6 +6,6 @@
 
 {$component = 'page-header'}
 
-<h2 class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {$smarty.local.attributes}>
+<h2 class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {cattr list=$smarty.local.attributes}>
     {$smarty.local.text}
 </h2>
\ No newline at end of file
diff --git a/application/frontend/skin/developer/components/pagination/pagination.tpl b/application/frontend/skin/developer/components/pagination/pagination.tpl
index 0973863f..add53aa7 100644
--- a/application/frontend/skin/developer/components/pagination/pagination.tpl
+++ b/application/frontend/skin/developer/components/pagination/pagination.tpl
@@ -39,7 +39,7 @@
  * Страницы
  *}
 {if $_paging && $_paging.iCountPage > 1}
-	<nav class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes} js-{$component}" role="navigation" {$smarty.local.attributes}>
+	<nav class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes} js-{$component}" role="navigation" {cattr list=$smarty.local.attributes}>
 		{* Следущая / предыдущая страница *}
 		<ul class="{$component}-list">
 			{* Следущая страница *}
diff --git a/application/frontend/skin/developer/components/photo/photo.tpl b/application/frontend/skin/developer/components/photo/photo.tpl
index cbc72d83..b41fd6d5 100644
--- a/application/frontend/skin/developer/components/photo/photo.tpl
+++ b/application/frontend/skin/developer/components/photo/photo.tpl
@@ -24,7 +24,7 @@
 
 <div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes}"
     data-target-id="{$smarty.local.targetId}"
-    {foreach $smarty.local.attributes as $attr}{$attr@key}="{$attr@value}" {/foreach}>
+    {cattr list=$smarty.local.attributes}>
 
     {* Фото *}
     <a href="{$smarty.local.url}">
diff --git a/application/frontend/skin/developer/components/poll/poll.form.tpl b/application/frontend/skin/developer/components/poll/poll.form.tpl
index fd97260e..e44ff374 100644
--- a/application/frontend/skin/developer/components/poll/poll.form.tpl
+++ b/application/frontend/skin/developer/components/poll/poll.form.tpl
@@ -11,7 +11,7 @@
 			 name  = 'poll[title]'
 			 value = {($oPoll) ? $oPoll->getTitle() : '' }
 			 label = $aLang.poll.answer
-			 inputAttributes="autofocus"}
+			 inputAttributes= [ 'autofocus' => true ]}
 
 
 	{* Кол-во вариантов которые может выбрать пользователь *}
@@ -74,7 +74,7 @@
 				{include 'components/button/button.tpl'
 						 type       = 'button'
 						 text       = $aLang.common.add
-						 attributes = 'title="[Ctrl + Enter]"'
+						 attributes = [ 'title' => '[Ctrl + Enter]' ]
 						 classes    = 'js-poll-form-answer-add'}
 			</footer>
 		{/if}
diff --git a/application/frontend/skin/developer/components/poll/poll.result.tpl b/application/frontend/skin/developer/components/poll/poll.result.tpl
index 83501ff2..7dc1c785 100644
--- a/application/frontend/skin/developer/components/poll/poll.result.tpl
+++ b/application/frontend/skin/developer/components/poll/poll.result.tpl
@@ -37,7 +37,11 @@
 </ul>
 
 {* Кнопка сортировки *}
-{include 'components/button/button.tpl' mods='icon' classes='js-poll-result-sort' icon='icon-align-left' attributes="title=\"{$aLang.poll.result.sort}\""}
+{include 'components/button/button.tpl'
+    mods       = 'icon'
+    classes    = 'js-poll-result-sort'
+    icon       = 'icon-align-left'
+    attributes = [ 'title' => $aLang.poll.result.sort ]}
 
 {* Статистика голосования *}
 <span class="poll-result-total">
diff --git a/application/frontend/skin/developer/components/search-form/search-form.tpl b/application/frontend/skin/developer/components/search-form/search-form.tpl
index 96bcd722..2f2a4a32 100644
--- a/application/frontend/skin/developer/components/search-form/search-form.tpl
+++ b/application/frontend/skin/developer/components/search-form/search-form.tpl
@@ -9,7 +9,7 @@
 {* Название компонента *}
 {$component = 'search-form'}
 
-<form action="{$smarty.local.action}" method="{$smarty.local.method|default:'get'}" class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {$smarty.local.attributes}>
+<form action="{$smarty.local.action}" method="{$smarty.local.method|default:'get'}" class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {cattr list=$smarty.local.attributes}>
 	{block 'search_form'}
 		{include 'components/field/field.text.tpl'
 				placeholder  = ( $smarty.local.placeholder ) ? $smarty.local.placeholder : $aLang.search.search
diff --git a/application/frontend/skin/developer/components/talk/add.tpl b/application/frontend/skin/developer/components/talk/add.tpl
index d0eb1fde..e98aaa4d 100644
--- a/application/frontend/skin/developer/components/talk/add.tpl
+++ b/application/frontend/skin/developer/components/talk/add.tpl
@@ -40,10 +40,10 @@
 	{* Кнопки *}
 	{include 'components/button/button.tpl' name='submit_talk_add' mods='primary' text=$aLang.common.send}
 	{include 'components/button/button.tpl'
-		name       ='submit_preview'
-		type       ='button'
-		text       =$aLang.common.preview_text
-		attributes ='onclick="jQuery(\'#text_preview\').show(); ls.utils.textPreview($(\'#talk_text\'), $(\'#text_preview\'), false); return false;"'}
+		name       = 'submit_preview'
+		type       = 'button'
+		text       = $aLang.common.preview_text
+		attributes = [ 'onclick' => "jQuery(\'#text_preview\').show(); ls.utils.textPreview($(\'#talk_text\'), $(\'#text_preview\'), false); return false;" ]}
 </form>
 
 {hook run='talk_add_end'}
\ No newline at end of file
diff --git a/application/frontend/skin/developer/components/toolbar-scrollup/toolbar.scrollup.tpl b/application/frontend/skin/developer/components/toolbar-scrollup/toolbar.scrollup.tpl
index daec6df3..77b72007 100644
--- a/application/frontend/skin/developer/components/toolbar-scrollup/toolbar.scrollup.tpl
+++ b/application/frontend/skin/developer/components/toolbar-scrollup/toolbar.scrollup.tpl
@@ -11,7 +11,7 @@
 {block 'toolbar_item_options' append}
 	{$_mods = 'scrollup'}
 	{$_classes = 'js-toolbar-scrollup'}
-	{$_attributes = 'id="toolbar_scrollup"'}
+	{$_attributes = [ 'id' => 'toolbar_scrollup' ]}
 {/block}
 
 {block 'toolbar_item'}
diff --git a/application/frontend/skin/developer/components/toolbar/toolbar.item.tpl b/application/frontend/skin/developer/components/toolbar/toolbar.item.tpl
index e75f2b14..2f9e2bbc 100644
--- a/application/frontend/skin/developer/components/toolbar/toolbar.item.tpl
+++ b/application/frontend/skin/developer/components/toolbar/toolbar.item.tpl
@@ -4,12 +4,12 @@
 {block 'toolbar_item_options'}
 	{$_mods = ''}
 	{$_classes = ''}
-	{$_attributes = ''}
+	{$_attributes = []}
 	{$_bShow = true}
 {/block}
 
 {if $_bShow}
-	<section class="{$component} {mod name=$component mods=$_mods} {$_classes}" {$_attributes}>
+	<section class="{$component} {mod name=$component mods=$_mods} {$_classes}" {cattr list=$_attributes}>
 		{block 'toolbar_item'}{/block}
 	</section>
 {/if}
\ No newline at end of file
diff --git a/application/frontend/skin/developer/components/toolbar/toolbar.tpl b/application/frontend/skin/developer/components/toolbar/toolbar.tpl
index db0717d1..6f4d52c4 100644
--- a/application/frontend/skin/developer/components/toolbar/toolbar.tpl
+++ b/application/frontend/skin/developer/components/toolbar/toolbar.tpl
@@ -10,11 +10,11 @@
 {$component = 'toolbar'}
 
 {function toolbar_item_icon}
-	<{if $url}a href="{$url}"{else}div{/if} class="toolbar-item-button {$classes}" {$attributes} {if $title}title="{$title}"{/if}>
+	<{if $url}a href="{$url}"{else}div{/if} class="toolbar-item-button {$classes}" {cattr list=$attributes} {if $title}title="{$title}"{/if}>
 		<i class="{$icon}"></i>
 	</{if $url}a{else}div{/if}>
 {/function}
 
-<aside class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes} js-toolbar" {$smarty.local.attributes}>
+<aside class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes} js-toolbar" {cattr list=$smarty.local.attributes}>
 	{include 'blocks.tpl' group='toolbar'}
 </aside>
\ No newline at end of file
diff --git a/application/frontend/skin/developer/components/uploader/uploader-block.info-group.tpl b/application/frontend/skin/developer/components/uploader/uploader-block.info-group.tpl
index 7495d318..36e76f09 100644
--- a/application/frontend/skin/developer/components/uploader/uploader-block.info-group.tpl
+++ b/application/frontend/skin/developer/components/uploader/uploader-block.info-group.tpl
@@ -28,7 +28,7 @@
 				{include 'components/field/field.text.tpl'
 					name            = $property['name']
 					inputClasses    = "js-{$component_info}-property"
-					inputAttributes = "data-name=\"{$property['name']}\""
+					inputAttributes = [ 'data-name' => $property['name'] ]
 					label           = $property['label']}
 			{/foreach}
 		</div>
diff --git a/application/frontend/skin/developer/components/uploader/uploader.tpl b/application/frontend/skin/developer/components/uploader/uploader.tpl
index 4fced861..5b3a64d7 100644
--- a/application/frontend/skin/developer/components/uploader/uploader.tpl
+++ b/application/frontend/skin/developer/components/uploader/uploader.tpl
@@ -11,7 +11,7 @@
 	{$show = $smarty.local.show|default:true}
 {/block}
 
-<div class="{$component} {mod name=$component mods=$mods} {$classes}" {$attributes}>
+<div class="{$component} {mod name=$component mods=$mods} {$classes}" {cattr list=$attributes}>
 	{* @hook Начало основного блока загрузчика *}
 	{hook run='uploader_begin'}
 
diff --git a/application/frontend/skin/developer/components/user-list-add/user-list-add.tpl b/application/frontend/skin/developer/components/user-list-add/user-list-add.tpl
index b371d507..d6679746 100644
--- a/application/frontend/skin/developer/components/user-list-add/user-list-add.tpl
+++ b/application/frontend/skin/developer/components/user-list-add/user-list-add.tpl
@@ -16,7 +16,7 @@
 
 {* Форма добавления *}
 <div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}"
-     {foreach $smarty.local.attributes as $attr}{$attr@key}="{$attr@value}" {/foreach}>
+     {cattr list=$smarty.local.attributes}>
 
     {* Заголовок *}
     {if $smarty.local.title}
diff --git a/application/frontend/skin/developer/components/user/blocks/block.users-search.tpl b/application/frontend/skin/developer/components/user/blocks/block.users-search.tpl
index 7f1f1337..07aa1450 100644
--- a/application/frontend/skin/developer/components/user/blocks/block.users-search.tpl
+++ b/application/frontend/skin/developer/components/user/blocks/block.users-search.tpl
@@ -26,8 +26,8 @@
     <p class="mb-10">Пол</p>
 
     <div class="field-checkbox-group">
-        {include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-user-sex' inputAttributes='data-search-type="users"' name='sex' value='' checked=true label='Любой'}
-        {include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-user-sex' inputAttributes='data-search-type="users"' name='sex' value='man' label='Мужской'}
-        {include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-user-sex' inputAttributes='data-search-type="users"' name='sex' value='woman' label='Женский'}
+        {include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-user-sex' name='sex' value='' checked=true label='Любой'}
+        {include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-user-sex' name='sex' value='man' label='Мужской'}
+        {include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-user-sex' name='sex' value='woman' label='Женский'}
     </div>
 {/block}
\ No newline at end of file
diff --git a/application/frontend/skin/developer/components/user/friend-item.tpl b/application/frontend/skin/developer/components/user/friend-item.tpl
index 13aa9e06..467f75aa 100644
--- a/application/frontend/skin/developer/components/user/friend-item.tpl
+++ b/application/frontend/skin/developer/components/user/friend-item.tpl
@@ -47,7 +47,7 @@
 {/block}
 
 
-<{$tag} class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes}" {$smarty.local.attributes} data-status="{$status}" data-target="{$userTarget->getId()}">
+<{$tag} class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes}" {cattr list=$smarty.local.attributes} data-status="{$status}" data-target="{$userTarget->getId()}">
 	{block 'user_friend'}
 		{if in_array( $status, [ 'sent', 'rejected' ] )}
 			<span class="{$component}-text js-user-friend-text">{lang name="user.friends.status.{$status}"}</span>
diff --git a/application/frontend/skin/developer/components/user/header.tpl b/application/frontend/skin/developer/components/user/header.tpl
index 7d8af697..71008cd5 100644
--- a/application/frontend/skin/developer/components/user/header.tpl
+++ b/application/frontend/skin/developer/components/user/header.tpl
@@ -11,7 +11,7 @@
 	{$mods = "{$mods} has-name"}
 {/if}
 
-<div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes}" {$smarty.local.attributes}>
+<div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes}" {cattr list=$smarty.local.attributes}>
 	{hook run='profile_top_begin' user=$user}
 
 	{* Пользователь *}
diff --git a/application/frontend/skin/developer/components/user/info-group.tpl b/application/frontend/skin/developer/components/user/info-group.tpl
index f33c6633..102b9b7f 100644
--- a/application/frontend/skin/developer/components/user/info-group.tpl
+++ b/application/frontend/skin/developer/components/user/info-group.tpl
@@ -11,7 +11,7 @@
 {$items = $itemsHook|default:$smarty.local.items}
 
 {if $smarty.local.html || $smarty.local.items}
-	<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {$smarty.local.attributes}>
+	<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {cattr list=$smarty.local.attributes}>
 		<h3 class="user-info-group-title">
 			{$smarty.local.title}
 		</h3>
diff --git a/application/frontend/skin/developer/components/user/modals/modal.user-list.tpl b/application/frontend/skin/developer/components/user/modals/modal.user-list.tpl
index 5d0d2982..315f45cd 100644
--- a/application/frontend/skin/developer/components/user/modals/modal.user-list.tpl
+++ b/application/frontend/skin/developer/components/user/modals/modal.user-list.tpl
@@ -46,6 +46,6 @@
             text       = $aLang.common.add
             mods       = 'primary'
             classes    = 'js-user-list-select-add'
-            attributes = "data-target=\"{$smarty.local.target}\""}
+            attributes = [ 'data-target' => $smarty.local.target ]}
     {/if}
 {/block}
\ No newline at end of file
diff --git a/application/frontend/skin/developer/components/user/user-item.tpl b/application/frontend/skin/developer/components/user/user-item.tpl
index 2cefe128..3a978e64 100644
--- a/application/frontend/skin/developer/components/user/user-item.tpl
+++ b/application/frontend/skin/developer/components/user/user-item.tpl
@@ -14,7 +14,7 @@
 {$user = $smarty.local.user}
 
 <div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}"
-    {foreach $smarty.local.attributes as $attr}{$attr@key}="{$attr@value}" {/foreach}>
+    {cattr list=$smarty.local.attributes}>
 
     <a href="{$user->getUserWebPath()}" class="{$component}-avatar-link">
         <img src="{$user->getProfileAvatarPath( $smarty.local.avatarSize|default:24 )}" alt="{$user->getLogin()}" class="{$component}-avatar" />
diff --git a/application/frontend/skin/developer/components/user/user-list-small-item.tpl b/application/frontend/skin/developer/components/user/user-list-small-item.tpl
index 69000622..1da848dc 100644
--- a/application/frontend/skin/developer/components/user/user-list-small-item.tpl
+++ b/application/frontend/skin/developer/components/user/user-list-small-item.tpl
@@ -20,7 +20,7 @@
     {$userId = $user->getId()}
 {/block}
 
-<li class="{$component} js-user-list-small-item {$classes}" data-user-id="{$userId}" {foreach $attributes as $attr}{$attr@key}="{$attr@value}" {/foreach}>
+<li class="{$component} js-user-list-small-item {$classes}" data-user-id="{$userId}" {cattr list=$attributes}>
     {* Чекбокс *}
     {if $smarty.local.selectable}
         <input type="checkbox" class="js-user-list-small-checkbox" data-user-id="{$userId}" data-user-login="{$user->getLogin()}" />
diff --git a/application/frontend/skin/developer/components/vote/vote.tpl b/application/frontend/skin/developer/components/vote/vote.tpl
index c1a0f401..2512bd6d 100644
--- a/application/frontend/skin/developer/components/vote/vote.tpl
+++ b/application/frontend/skin/developer/components/vote/vote.tpl
@@ -55,7 +55,7 @@
 {/if}
 
 
-<div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes}" data-param-i-target-id="{$target->getId()}" {$smarty.local.attributes}>
+<div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes}" data-param-i-target-id="{$target->getId()}" {cattr list=$smarty.local.attributes}>
 	{* Заголовок *}
 	{if $showLabel}
 		<h4 class="{$component}-heading">{$aLang.$component.rating}</h4>
diff --git a/application/frontend/skin/developer/components/wall/wall.tpl b/application/frontend/skin/developer/components/wall/wall.tpl
index a3c95d4a..ef73565d 100644
--- a/application/frontend/skin/developer/components/wall/wall.tpl
+++ b/application/frontend/skin/developer/components/wall/wall.tpl
@@ -16,7 +16,7 @@
 {$moreCount = $smarty.local.count - $loadedCount}
 
 {* Стена *}
-<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" data-user-id="{$oUserProfile->getId()}" {$smarty.local.attributes}>
+<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" data-user-id="{$oUserProfile->getId()}" {cattr list=$smarty.local.attributes}>
     {* Форма добавления записи *}
     {if $oUserCurrent}
         {include './wall.form.tpl'}
@@ -31,7 +31,7 @@
 
     {* Уведомление о пустом списке *}
     {if $oUserCurrent || ( ! $oUserCurrent && ! $loadedCount )}
-        {include 'components/alert/alert.tpl' text=$aLang.common.empty mods='empty' classes='mt-15 js-wall-alert-empty' attributes='id="wall-empty"' visible=!$loadedCount}
+        {include 'components/alert/alert.tpl' text=$aLang.common.empty mods='empty' classes='mt-15 js-wall-alert-empty' attributes=[ 'id' => 'wall-empty' ] visible=!$loadedCount}
     {/if}
 
     {* Кнопка подгрузки записей *}