1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-07-01 05:55:02 +03:00

Тип атрибутов у компонентов изменен на массив

This commit is contained in:
Denis Shakhov 2014-11-25 15:12:44 +07:00
parent 51496839d2
commit bceeed7b80
56 changed files with 76 additions and 70 deletions

View file

@ -9,7 +9,7 @@
{$component = 'accordion'} {$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} {foreach $smarty.local.items as $item}
<h3>{$item[ 'title' ]}</h3> <h3>{$item[ 'title' ]}</h3>
<div>{$item[ 'content' ]}</div> <div>{$item[ 'content' ]}</div>

View file

@ -10,7 +10,7 @@
{$component = 'actionbar'} {$component = 'actionbar'}
{if $smarty.local.items} {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} {foreach $smarty.local.items as $item}
{if $item[ 'html' ]} {if $item[ 'html' ]}
{$item[ 'html' ]} {$item[ 'html' ]}

View file

@ -14,7 +14,7 @@
{$events = $smarty.local.events} {$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} {if $events}
{* Список *} {* Список *}
<ul class="activity-event-list js-activity-event-list"> <ul class="activity-event-list js-activity-event-list">

View file

@ -18,7 +18,7 @@
<li class="activity-date"> <li class="activity-date">
{if $dateNow == $dateLast} {if $dateNow == $dateLast}
{$aLang.today} {$aLang.date.today}
{else} {else}
{date_format date=$event->getDateAdded() format="j F Y"} {date_format date=$event->getDateAdded() format="j F Y"}
{/if} {/if}

View file

@ -16,7 +16,7 @@
{if ! (Config::Get('module.stream.disable_vote_events') && substr($type, 0, 4) == 'vote')} {if ! (Config::Get('module.stream.disable_vote_events') && substr($type, 0, 4) == 'vote')}
{include 'components/field/field.checkbox.tpl' {include 'components/field/field.checkbox.tpl'
inputClasses = 'js-activity-settings-type-checkbox' inputClasses = 'js-activity-settings-type-checkbox'
inputAttributes = "data-type=\"{$type}\"" inputAttributes = [ 'data-type' => $type ]
checked = in_array( $type, $smarty.local.typesActive ) checked = in_array( $type, $smarty.local.typesActive )
label = $aLang.activity.settings.options[ $type ]} label = $aLang.activity.settings.options[ $type ]}
{/if} {/if}

View file

@ -59,7 +59,7 @@
<li> <li>
{include 'components/button/button.tpl' {include 'components/button/button.tpl'
url = "{router page='admin'}plugins/?plugin={$plugin.code}&action=remove&security_ls_key={$LIVESTREET_SECURITY_KEY}" 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'}} text = {lang 'admin.plugins.plugin.remove'}}
</li> </li>
</ul> </ul>

View file

@ -24,7 +24,7 @@
{* Уведомление *} {* Уведомление *}
<div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes} js-alert" <div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes} js-alert"
{if ! $visible}hidden{/if} {if ! $visible}hidden{/if}
{$smarty.local.attributes} {cattr list=$smarty.local.attributes}
role="alert"> role="alert">
{* Заголовок *} {* Заголовок *}

View file

@ -27,7 +27,7 @@
{/block} {/block}
{block 'article'} {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}>
{** {**
* Хидер * Хидер
*} *}

View file

@ -14,7 +14,7 @@
{if $show} {if $show}
{block 'block_before'}{/block} {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} {block 'block_title' hide}
<header class="{$component}-header"> <header class="{$component}-header">

View file

@ -38,7 +38,7 @@
{include 'components/nav/nav.tpl' {include 'components/nav/nav.tpl'
name = 'blogs_categories' name = 'blogs_categories'
classes = 'actionbar-item-link' classes = 'actionbar-item-link'
attributes = 'id="js-search-ajax-blog-category"' attributes = [ 'id' => 'js-search-ajax-blog-category' ]
activeItem = 'all' activeItem = 'all'
mods = 'stacked pills' mods = 'stacked pills'
items = $items} items = $items}

View file

@ -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"> <header class="{$component}-header">
{* Заголовок *} {* Заголовок *}
<h2 class="page-header blog-title"> <h2 class="page-header blog-title">

View file

@ -6,7 +6,7 @@
{if $oUserCurrent && $oUserCurrent->getId() != $blog->getOwnerId() && $blog->getType() == 'open'} {if $oUserCurrent && $oUserCurrent->getId() != $blog->getOwnerId() && $blog->getType() == 'open'}
{include 'components/button/button.tpl' {include 'components/button/button.tpl'
attributes = "data-blog-id=\"{$blog->getId()}\"" attributes = [ 'data-blog-id' => $blog->getId() ]
classes = 'js-blog-join' classes = 'js-blog-join'
text = ($blog->getUserIsJoin()) ? $aLang.blog.join.leave : $aLang.blog.join.join text = ($blog->getUserIsJoin()) ? $aLang.blog.join.leave : $aLang.blog.join.join
mods = ($blog->getUserIsJoin()) ? false : 'primary'} mods = ($blog->getUserIsJoin()) ? false : 'primary'}

View file

@ -11,9 +11,7 @@
* @param icon string (null) Класс иконки * @param icon string (null) Класс иконки
* @param classes string (null) Дополнительные классы (указываются через пробел) * @param classes string (null) Дополнительные классы (указываются через пробел)
* @param mods string (null) Список классов-модификаторов (указываются через пробел) * @param mods string (null) Список классов-модификаторов (указываются через пробел)
* @param attributes string (null) Атрибуты (указываются через пробел) * @param attributes array (null) Атрибуты
*
* @styles <framework>/css/button.css
*} *}
{* Название компонента *} {* Название компонента *}
@ -32,7 +30,7 @@
{if $smarty.local.id}id="{$smarty.local.id}"{/if} {if $smarty.local.id}id="{$smarty.local.id}"{/if}
{if $smarty.local.name}name="{$smarty.local.name}"{/if} {if $smarty.local.name}name="{$smarty.local.name}"{/if}
class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}"
{$smarty.local.attributes}> {cattr list=$smarty.local.attributes}>
{* Иконка *} {* Иконка *}
{if $smarty.local.icon} {if $smarty.local.icon}
<i class="{$smarty.local.icon}"></i> <i class="{$smarty.local.icon}"></i>

View file

@ -24,7 +24,7 @@
enctype = "multipart/form-data" enctype = "multipart/form-data"
data-target-id = "{$targetId}" data-target-id = "{$targetId}"
data-target-type = "{$targetType}" data-target-type = "{$targetType}"
{$smarty.local.attributes}> {cattr list=$smarty.local.attributes}>
{block 'comment-form'} {block 'comment-form'}
{hook run='comment-form-begin'} {hook run='comment-form-begin'}

View file

@ -67,7 +67,7 @@
<section class = "{$component} {mod name=$component mods=$mods} {$smarty.local.classes} open js-{$component}" <section class = "{$component} {mod name=$component mods=$mods} {$smarty.local.classes} open js-{$component}"
id = "comment{$commentId}" id = "comment{$commentId}"
data-id = "{$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() )} {if ! $isDeleted || ( $oUserCurrent && $oUserCurrent->isAdministrator() )}

View file

@ -47,7 +47,7 @@
data-target-type="{$targetType}" data-target-type="{$targetType}"
data-target-id="{$targetId}" data-target-id="{$targetId}"
data-comment-last-id="{$smarty.local.lastCommentId}" data-comment-last-id="{$smarty.local.lastCommentId}"
{foreach $smarty.local.attributes as $attr}{$attr@key}="{$attr@value}" {/foreach}> {cattr list=$smarty.local.attributes}>
{** {**
* Заголовок * Заголовок
*} *}

View file

@ -12,7 +12,7 @@
{$_mods = 'comments'} {$_mods = 'comments'}
{$_bShow = !! $oUserCurrent} {$_bShow = !! $oUserCurrent}
{$_classes = 'js-toolbar-comments'} {$_classes = 'js-toolbar-comments'}
{$_attributes = 'data-target=".js-comment"'} {$_attributes = [ 'data-target' => '.js-comment' ]}
{/block} {/block}
{block 'toolbar_item'} {block 'toolbar_item'}

View file

@ -14,5 +14,5 @@
activeItem = $smarty.local.activeItem activeItem = $smarty.local.activeItem
mods = 'stacked dropdown' mods = 'stacked dropdown'
classes = "dropdown-menu {$smarty.local.classes}" 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} items = $smarty.local.items}

View file

@ -16,7 +16,7 @@
{include 'components/button/button.tpl' {include 'components/button/button.tpl'
type = 'button' type = 'button'
classes = "{$component}-toggle {$smarty.local.classes}" 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} text = $smarty.local.text}
{* Меню *} {* Меню *}

View file

@ -31,7 +31,7 @@
entityField = $smarty.local.entityField entityField = $smarty.local.entityField
entity = $smarty.local.entity entity = $smarty.local.entity
inputClasses = "{$smarty.local.classes} {$smarty.local.inputClasses}" 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 note = $smarty.local.note
rows = $smarty.local.rows|default:10} rows = $smarty.local.rows|default:10}
{/function} {/function}

View file

@ -36,7 +36,7 @@
<div class="{$component} {mod name=$component mods=$mods} {if $isActive}active{/if} {$smarty.local.classes}" <div class="{$component} {mod name=$component mods=$mods} {if $isActive}active{/if} {$smarty.local.classes}"
data-param-i-target-id="{$target->getId()}" data-param-i-target-id="{$target->getId()}"
title="{$aLang.$component[ ($isActive) ? 'remove' : 'add' ]}" title="{$aLang.$component[ ($isActive) ? 'remove' : 'add' ]}"
{$smarty.local.attributes}> {cattr list=$smarty.local.attributes}>
{* Кнопка добавления/удаления из избранного *} {* Кнопка добавления/удаления из избранного *}
<div class="icon-heart {$component}-toggle js-{$component}-toggle"></div> <div class="icon-heart {$component}-toggle js-{$component}-toggle"></div>

View file

@ -18,7 +18,7 @@
{foreach $smarty.local.blogsJoined as $blog} {foreach $smarty.local.blogsJoined as $blog}
{include 'components/field/field.checkbox.tpl' {include 'components/field/field.checkbox.tpl'
inputClasses = 'js-feed-blogs-subscribe' inputClasses = 'js-feed-blogs-subscribe'
inputAttributes = "data-id=\"{$blog->getId()}\"" inputAttributes = [ 'data-id' => $blog->getId() ]
checked = isset($blogsSubscribed[ $blog->getId() ]) checked = isset($blogsSubscribed[ $blog->getId() ])
label = "<a href=\"{$blog->getUrlFull()}\">{$blog->getTitle()|escape}</a>"} label = "<a href=\"{$blog->getUrlFull()}\">{$blog->getTitle()|escape}</a>"}
{/foreach} {/foreach}

View file

@ -9,7 +9,7 @@
{$topics = $smarty.local.topics} {$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} {if $topics}
{* Список *} {* Список *}
<ul class="{$component}-topic-list js-{$component}-topic-list"> <ul class="{$component}-topic-list js-{$component}-topic-list">

View file

@ -59,12 +59,12 @@
data-{$rule@key}="{$rule@value}" data-{$rule@key}="{$rule@value}"
{/foreach} {/foreach}
{$_inputAttributes} {cattr list=$_inputAttributes}
{/function} {/function}
{block 'field'} {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} {if $label}
<label for="{$_uid}" class="{$component}-label">{$label}</label> <label for="{$_uid}" class="{$component}-label">{$label}</label>

View file

@ -4,7 +4,7 @@
{$component = 'field-upload-area'} {$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> <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> </label>

View file

@ -8,7 +8,7 @@
{$component = 'info-list'} {$component = 'info-list'}
{if $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} {if $smarty.local.title}
<h2 class="{$component}-title">{$smarty.local.title}</h2> <h2 class="{$component}-title">{$smarty.local.title}</h2>

View file

@ -13,7 +13,7 @@
{$title = $smarty.local.title} {$title = $smarty.local.title}
{/block} {/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' ]}"> <a href="{$image[ 'url' ]}">
<img src="{$image[ 'path' ]}" alt="{$image[ 'alt' ]}" title="{$image[ 'title' ]}" class="{$component}-image {$image[ 'classes' ]}"> <img src="{$image[ 'path' ]}" alt="{$image[ 'alt' ]}" title="{$image[ 'title' ]}" class="{$component}-image {$image[ 'classes' ]}">
</a> </a>

View file

@ -6,7 +6,7 @@
{block 'media_pane_content'} {block 'media_pane_content'}
{include './../uploader/uploader.tpl' {include './../uploader/uploader.tpl'
attributes = 'id="media-uploader"' attributes = [ 'id' => 'media-uploader' ]
classes = 'js-media-uploader' classes = 'js-media-uploader'
targetParams = $aTargetParams targetParams = $aTargetParams
targetType = $sMediaTargetType targetType = $sMediaTargetType

View file

@ -6,7 +6,7 @@
{block 'block_options' append} {block 'block_options' append}
{$classes = "{$classes} js-media-info-block"} {$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 'block_title'} {block 'block_title'}

View file

@ -6,7 +6,7 @@
{block 'block_options' append} {block 'block_options' append}
{$classes = "{$classes} js-media-info-block"} {$classes = "{$classes} js-media-info-block"}
{$attributes = "{$attributes} data-type=\"photoset\""} {$attributes = array_merge( $attributes|default:[], [ 'data-type' => 'photoset' ] )}
{/block} {/block}
{block 'block_title'} {block 'block_title'}

View file

@ -1,7 +1,11 @@
{extends 'components/uploader/uploader.tpl'} {extends 'components/uploader/uploader.tpl'}
{block 'uploader_options' append} {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}
{block 'uploader_aside' append} {block 'uploader_aside' append}

View file

@ -13,7 +13,7 @@
<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" <div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}"
data-more-append="{$smarty.local.append|default:true}" data-more-append="{$smarty.local.append|default:true}"
{if $smarty.local.target}data-more-target="{$smarty.local.target}"{/if} {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'}} {$smarty.local.text|default:{lang 'more.text'}}

View file

@ -33,7 +33,7 @@
{* Отображем меню только если есть активные пункты *} {* Отображем меню только если есть активные пункты *}
{if count( $items ) - $disabledItemsCounter} {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} {foreach $items as $item}
{$isEnabled = $item[ 'is_enabled' ]} {$isEnabled = $item[ 'is_enabled' ]}
{$isDropdown = isset( $item[ 'menu' ] )} {$isDropdown = isset( $item[ 'menu' ] )}

View file

@ -13,7 +13,7 @@
{$note = $smarty.local.note} {$note = $smarty.local.note}
{$isEditable = $smarty.local.isEditable|default:true} {$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"> <div class="{$component}-body js-{$component}-body">
{* Текст *} {* Текст *}

View file

@ -6,6 +6,6 @@
{$component = 'page-header'} {$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} {$smarty.local.text}
</h2> </h2>

View file

@ -39,7 +39,7 @@
* Страницы * Страницы
*} *}
{if $_paging && $_paging.iCountPage > 1} {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"> <ul class="{$component}-list">
{* Следущая страница *} {* Следущая страница *}

View file

@ -24,7 +24,7 @@
<div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes}" <div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes}"
data-target-id="{$smarty.local.targetId}" 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}"> <a href="{$smarty.local.url}">

View file

@ -11,7 +11,7 @@
name = 'poll[title]' name = 'poll[title]'
value = {($oPoll) ? $oPoll->getTitle() : '' } value = {($oPoll) ? $oPoll->getTitle() : '' }
label = $aLang.poll.answer label = $aLang.poll.answer
inputAttributes="autofocus"} inputAttributes= [ 'autofocus' => true ]}
{* Кол-во вариантов которые может выбрать пользователь *} {* Кол-во вариантов которые может выбрать пользователь *}
@ -74,7 +74,7 @@
{include 'components/button/button.tpl' {include 'components/button/button.tpl'
type = 'button' type = 'button'
text = $aLang.common.add text = $aLang.common.add
attributes = 'title="[Ctrl + Enter]"' attributes = [ 'title' => '[Ctrl + Enter]' ]
classes = 'js-poll-form-answer-add'} classes = 'js-poll-form-answer-add'}
</footer> </footer>
{/if} {/if}

View file

@ -37,7 +37,11 @@
</ul> </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"> <span class="poll-result-total">

View file

@ -9,7 +9,7 @@
{* Название компонента *} {* Название компонента *}
{$component = 'search-form'} {$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'} {block 'search_form'}
{include 'components/field/field.text.tpl' {include 'components/field/field.text.tpl'
placeholder = ( $smarty.local.placeholder ) ? $smarty.local.placeholder : $aLang.search.search placeholder = ( $smarty.local.placeholder ) ? $smarty.local.placeholder : $aLang.search.search

View file

@ -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_talk_add' mods='primary' text=$aLang.common.send}
{include 'components/button/button.tpl' {include 'components/button/button.tpl'
name ='submit_preview' name = 'submit_preview'
type ='button' type = 'button'
text =$aLang.common.preview_text text = $aLang.common.preview_text
attributes ='onclick="jQuery(\'#text_preview\').show(); ls.utils.textPreview($(\'#talk_text\'), $(\'#text_preview\'), false); return false;"'} attributes = [ 'onclick' => "jQuery(\'#text_preview\').show(); ls.utils.textPreview($(\'#talk_text\'), $(\'#text_preview\'), false); return false;" ]}
</form> </form>
{hook run='talk_add_end'} {hook run='talk_add_end'}

View file

@ -11,7 +11,7 @@
{block 'toolbar_item_options' append} {block 'toolbar_item_options' append}
{$_mods = 'scrollup'} {$_mods = 'scrollup'}
{$_classes = 'js-toolbar-scrollup'} {$_classes = 'js-toolbar-scrollup'}
{$_attributes = 'id="toolbar_scrollup"'} {$_attributes = [ 'id' => 'toolbar_scrollup' ]}
{/block} {/block}
{block 'toolbar_item'} {block 'toolbar_item'}

View file

@ -4,12 +4,12 @@
{block 'toolbar_item_options'} {block 'toolbar_item_options'}
{$_mods = ''} {$_mods = ''}
{$_classes = ''} {$_classes = ''}
{$_attributes = ''} {$_attributes = []}
{$_bShow = true} {$_bShow = true}
{/block} {/block}
{if $_bShow} {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} {block 'toolbar_item'}{/block}
</section> </section>
{/if} {/if}

View file

@ -10,11 +10,11 @@
{$component = 'toolbar'} {$component = 'toolbar'}
{function toolbar_item_icon} {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> <i class="{$icon}"></i>
</{if $url}a{else}div{/if}> </{if $url}a{else}div{/if}>
{/function} {/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'} {include 'blocks.tpl' group='toolbar'}
</aside> </aside>

View file

@ -28,7 +28,7 @@
{include 'components/field/field.text.tpl' {include 'components/field/field.text.tpl'
name = $property['name'] name = $property['name']
inputClasses = "js-{$component_info}-property" inputClasses = "js-{$component_info}-property"
inputAttributes = "data-name=\"{$property['name']}\"" inputAttributes = [ 'data-name' => $property['name'] ]
label = $property['label']} label = $property['label']}
{/foreach} {/foreach}
</div> </div>

View file

@ -11,7 +11,7 @@
{$show = $smarty.local.show|default:true} {$show = $smarty.local.show|default:true}
{/block} {/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 Начало основного блока загрузчика *}
{hook run='uploader_begin'} {hook run='uploader_begin'}

View file

@ -16,7 +16,7 @@
{* Форма добавления *} {* Форма добавления *}
<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" <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} {if $smarty.local.title}

View file

@ -26,8 +26,8 @@
<p class="mb-10">Пол</p> <p class="mb-10">Пол</p>
<div class="field-checkbox-group"> <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' 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' 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='woman' label='Женский'}
</div> </div>
{/block} {/block}

View file

@ -47,7 +47,7 @@
{/block} {/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'} {block 'user_friend'}
{if in_array( $status, [ 'sent', 'rejected' ] )} {if in_array( $status, [ 'sent', 'rejected' ] )}
<span class="{$component}-text js-user-friend-text">{lang name="user.friends.status.{$status}"}</span> <span class="{$component}-text js-user-friend-text">{lang name="user.friends.status.{$status}"}</span>

View file

@ -11,7 +11,7 @@
{$mods = "{$mods} has-name"} {$mods = "{$mods} has-name"}
{/if} {/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} {hook run='profile_top_begin' user=$user}
{* Пользователь *} {* Пользователь *}

View file

@ -11,7 +11,7 @@
{$items = $itemsHook|default:$smarty.local.items} {$items = $itemsHook|default:$smarty.local.items}
{if $smarty.local.html || $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"> <h3 class="user-info-group-title">
{$smarty.local.title} {$smarty.local.title}
</h3> </h3>

View file

@ -46,6 +46,6 @@
text = $aLang.common.add text = $aLang.common.add
mods = 'primary' mods = 'primary'
classes = 'js-user-list-select-add' classes = 'js-user-list-select-add'
attributes = "data-target=\"{$smarty.local.target}\""} attributes = [ 'data-target' => $smarty.local.target ]}
{/if} {/if}
{/block} {/block}

View file

@ -14,7 +14,7 @@
{$user = $smarty.local.user} {$user = $smarty.local.user}
<div class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" <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"> <a href="{$user->getUserWebPath()}" class="{$component}-avatar-link">
<img src="{$user->getProfileAvatarPath( $smarty.local.avatarSize|default:24 )}" alt="{$user->getLogin()}" class="{$component}-avatar" /> <img src="{$user->getProfileAvatarPath( $smarty.local.avatarSize|default:24 )}" alt="{$user->getLogin()}" class="{$component}-avatar" />

View file

@ -20,7 +20,7 @@
{$userId = $user->getId()} {$userId = $user->getId()}
{/block} {/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} {if $smarty.local.selectable}
<input type="checkbox" class="js-user-list-small-checkbox" data-user-id="{$userId}" data-user-login="{$user->getLogin()}" /> <input type="checkbox" class="js-user-list-small-checkbox" data-user-id="{$userId}" data-user-login="{$user->getLogin()}" />

View file

@ -55,7 +55,7 @@
{/if} {/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} {if $showLabel}
<h4 class="{$component}-heading">{$aLang.$component.rating}</h4> <h4 class="{$component}-heading">{$aLang.$component.rating}</h4>

View file

@ -16,7 +16,7 @@
{$moreCount = $smarty.local.count - $loadedCount} {$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} {if $oUserCurrent}
{include './wall.form.tpl'} {include './wall.form.tpl'}
@ -31,7 +31,7 @@
{* Уведомление о пустом списке *} {* Уведомление о пустом списке *}
{if $oUserCurrent || ( ! $oUserCurrent && ! $loadedCount )} {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} {/if}
{* Кнопка подгрузки записей *} {* Кнопка подгрузки записей *}