diff --git a/application/config/config.php b/application/config/config.php index faedd131..9adc24a5 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -536,7 +536,7 @@ $config['components'] = array( // Базовые компоненты 'css-reset', 'css-helpers', 'typography', 'forms', 'grid', 'ls-vendor', 'ls-core', 'ls-component', 'lightbox', 'slider', 'details', 'alert', 'dropdown', 'button', 'block', 'nav', 'tooltip', 'tabs', 'modal', 'table', 'text', 'uploader', 'email', 'field', 'pagination', 'editor', 'more', 'crop', - 'performance', 'toolbar', 'actionbar', 'badge', 'autocomplete', 'icon', 'item', 'highlighter', 'jumbotron', 'notification', + 'performance', 'toolbar', 'actionbar', 'badge', 'autocomplete', 'icon', 'item', 'highlighter', 'jumbotron', 'notification', 'blankslate', // Компоненты LS CMS 'favourite', 'vote', 'media', 'property', 'photo', 'note', 'icons-contact', 'user-list-add', 'subscribe', 'content', 'report', 'comment', diff --git a/application/frontend/components/activity/activity.tpl b/application/frontend/components/activity/activity.tpl index 7b107ee9..19b3960a 100644 --- a/application/frontend/components/activity/activity.tpl +++ b/application/frontend/components/activity/activity.tpl @@ -34,6 +34,6 @@ ]} {/if} {else} - {component 'alert' text=$aLang.common.empty mods='empty'} + {component 'blankslate' text=$aLang.common.empty} {/if} \ No newline at end of file diff --git a/application/frontend/components/activity/blocks/recent-comments.tpl b/application/frontend/components/activity/blocks/recent-comments.tpl index 6655cdb4..002bae9c 100644 --- a/application/frontend/components/activity/blocks/recent-comments.tpl +++ b/application/frontend/components/activity/blocks/recent-comments.tpl @@ -14,7 +14,7 @@ date = $comment->getDate() topicUrl = ( Config::Get('module.comment.use_nested') ) ? {router 'comments'} : "{$topic->getUrl()}#comment{$comment->getId()}"} {foreachelse} - {component 'alert' mods='empty' text={lang 'common.empty'}} + {component 'blankslate' text={lang 'common.empty'} mods='no-background'} {/foreach} {/capture} diff --git a/application/frontend/components/activity/blocks/recent-topics.tpl b/application/frontend/components/activity/blocks/recent-topics.tpl index 0c122757..8b6ed648 100644 --- a/application/frontend/components/activity/blocks/recent-topics.tpl +++ b/application/frontend/components/activity/blocks/recent-topics.tpl @@ -12,7 +12,7 @@ date = $topic->getDatePublish() topicUrl = $topic->getUrl()} {foreachelse} - {component 'alert' mods='empty' text={lang 'common.empty'}} + {component 'blankslate' text={lang 'common.empty'} mods='no-background'} {/foreach} {/capture} diff --git a/application/frontend/components/blog/admin.tpl b/application/frontend/components/blog/admin.tpl index ce428d55..a539174f 100644 --- a/application/frontend/components/blog/admin.tpl +++ b/application/frontend/components/blog/admin.tpl @@ -49,5 +49,5 @@ {component 'pagination' total=+$paging.iCountPage current=+$paging.iCurrentPage url="{$paging.sBaseUrl}/page__page__/{$paging.sGetParams}"} {else} - {component 'alert' text=$aLang.blog.admin.alerts.empty mods='empty'} + {component 'blankslate' text=$aLang.blog.admin.alerts.empty} {/if} \ No newline at end of file diff --git a/application/frontend/components/blog/blocks/block.blogs-search.tpl b/application/frontend/components/blog/blocks/block.blogs-search.tpl index 99c04bb4..d6e0bbef 100644 --- a/application/frontend/components/blog/blocks/block.blogs-search.tpl +++ b/application/frontend/components/blog/blocks/block.blogs-search.tpl @@ -34,7 +34,7 @@ mods = 'stacked pills' items = $items} {else} - {component 'alert' text=$aLang.blog.categories.empty mods='empty'} + {component 'blankslate' text=$aLang.blog.categories.empty} {/if}
diff --git a/application/frontend/components/blog/blog-list.tpl b/application/frontend/components/blog/blog-list.tpl index 56474ff8..c584b026 100644 --- a/application/frontend/components/blog/blog-list.tpl +++ b/application/frontend/components/blog/blog-list.tpl @@ -38,5 +38,5 @@ {component 'pagination' total=+$paging.iCountPage current=+$paging.iCurrentPage url="{$paging.sBaseUrl}/page__page__/{$paging.sGetParams}"} {/if} {else} - {component 'alert' text=(($smarty.local.textEmpty) ? $smarty.local.textEmpty : $aLang.blog.alerts.empty) mods='empty'} + {component 'blankslate' text=(($smarty.local.textEmpty) ? $smarty.local.textEmpty : $aLang.blog.alerts.empty)} {/if} \ No newline at end of file diff --git a/application/frontend/components/comment/comment-tree.tpl b/application/frontend/components/comment/comment-tree.tpl index 0dbb234e..43765fa1 100644 --- a/application/frontend/components/comment/comment-tree.tpl +++ b/application/frontend/components/comment/comment-tree.tpl @@ -55,5 +55,5 @@ {/section} {/if} {foreachelse} - {component 'alert' mods='empty' classes='js-comments-empty' text=$aLang.common.empty} + {component 'blankslate' classes='js-comments-empty' text=$aLang.common.empty} {/foreach} \ No newline at end of file diff --git a/application/frontend/components/talk/talk-list.tpl b/application/frontend/components/talk/talk-list.tpl index 67569a89..ba4070c2 100644 --- a/application/frontend/components/talk/talk-list.tpl +++ b/application/frontend/components/talk/talk-list.tpl @@ -125,7 +125,7 @@ {else} - {component 'alert' text=$aLang.talk.notices.empty mods='empty'} + {component 'blankslate' text=$aLang.talk.notices.empty} {/if} {component 'pagination' total=+$paging.iCountPage current=+$paging.iCurrentPage url="{$paging.sBaseUrl}/page__page__/{$paging.sGetParams}"} \ No newline at end of file diff --git a/application/frontend/components/topic/topic-list.tpl b/application/frontend/components/topic/topic-list.tpl index 33465cfd..4ae8f5e9 100644 --- a/application/frontend/components/topic/topic-list.tpl +++ b/application/frontend/components/topic/topic-list.tpl @@ -17,5 +17,5 @@ {component 'pagination' total=+$paging.iCountPage current=+$paging.iCurrentPage url="{$paging.sBaseUrl}/page__page__/{$paging.sGetParams}" classes='js-pagination-topics'} {else} - {component 'alert' text=$aLang.common.empty mods='empty'} + {component 'blankslate' text=$aLang.common.empty} {/if} \ No newline at end of file diff --git a/application/frontend/components/user/settings/profile.tpl b/application/frontend/components/user/settings/profile.tpl index 0a2639bb..af0aa534 100644 --- a/application/frontend/components/user/settings/profile.tpl +++ b/application/frontend/components/user/settings/profile.tpl @@ -107,7 +107,7 @@ {foreach $contacts as $contact} {call userfield field=$contact} {foreachelse} - {component 'alert' mods='empty' classes='js-user-fields-empty' text=$aLang.common.empty} + {component 'blankslate' classes='js-user-fields-empty' text=$aLang.common.empty} {/foreach} diff --git a/application/frontend/components/user/user-list-avatar.tpl b/application/frontend/components/user/user-list-avatar.tpl index 6dfc2304..d750f558 100644 --- a/application/frontend/components/user/user-list-avatar.tpl +++ b/application/frontend/components/user/user-list-avatar.tpl @@ -22,7 +22,7 @@ {/foreach} {else} - {component 'alert' text=$emptyText mods='empty'} + {component 'blankslate' text=$emptyText} {/if} {component 'pagination' total=+$pagination.iCountPage current=+$pagination.iCurrentPage url="{$pagination.sBaseUrl}/page__page__/"} \ No newline at end of file diff --git a/application/frontend/components/user/user-list-small.tpl b/application/frontend/components/user/user-list-small.tpl index dfa042aa..38286e5c 100644 --- a/application/frontend/components/user/user-list-small.tpl +++ b/application/frontend/components/user/user-list-small.tpl @@ -21,9 +21,8 @@ {* Уведомление о пустом списке *} {if ! $users || $smarty.local.hideableEmptyAlert} - {component 'alert' + {component 'blankslate' text = $aLang.common.empty - mods = 'empty' classes = 'js-user-list-small-empty' visible = ! $users} {/if} diff --git a/application/frontend/components/user/user-list.tpl b/application/frontend/components/user/user-list.tpl index 9c7cb213..fec82b00 100644 --- a/application/frontend/components/user/user-list.tpl +++ b/application/frontend/components/user/user-list.tpl @@ -36,5 +36,5 @@ {component 'pagination' total=+$pagination.iCountPage current=+$pagination.iCurrentPage url="{$pagination.sBaseUrl}/page__page__/"} {/if} {else} - {component 'alert' text=$smarty.local.textEmpty|default:{lang name='user.notices.empty'} mods='empty'} + {component 'blankslate' text=$smarty.local.textEmpty|default:{lang name='user.notices.empty'}} {/if} \ No newline at end of file diff --git a/application/frontend/components/wall/wall.tpl b/application/frontend/components/wall/wall.tpl index 1f51c58c..609d2aef 100644 --- a/application/frontend/components/wall/wall.tpl +++ b/application/frontend/components/wall/wall.tpl @@ -31,7 +31,7 @@ {* Уведомление о пустом списке *} {if $oUserCurrent || ( ! $oUserCurrent && ! $loadedCount )} - {component 'alert' text=$aLang.common.empty mods='empty' classes='mt-15 js-wall-alert-empty' attributes=[ 'id' => 'wall-empty' ] visible=!$loadedCount} + {component 'blankslate' text=$aLang.common.empty classes='mt-15 js-wall-alert-empty' attributes=[ 'id' => 'wall-empty' ] visible=!$loadedCount} {/if} {* Кнопка подгрузки записей *} diff --git a/application/frontend/skin/developer/actions/ActionSearch/index.tpl b/application/frontend/skin/developer/actions/ActionSearch/index.tpl index fd2fe181..bd71efbf 100644 --- a/application/frontend/skin/developer/actions/ActionSearch/index.tpl +++ b/application/frontend/skin/developer/actions/ActionSearch/index.tpl @@ -27,6 +27,6 @@ {hook run='search_result' type=$searchType} {/if} {elseif $_aRequest.q} - {component 'alert' text=$aLang.search.alerts.empty mods='empty'} + {component 'blankslate' text=$aLang.search.alerts.empty} {/if} {/block} \ No newline at end of file diff --git a/framework b/framework index aca4ebe7..f32fff1f 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit aca4ebe7c0e9268dd415595ce15c604edd2558c5 +Subproject commit f32fff1fcc8d6a17e211242bd88c544664678445