diff --git a/application/config/config.php b/application/config/config.php index b29a7a97..2cf56e16 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -486,7 +486,7 @@ $config['block']['rule_blog'] = array( $config['components'] = array( // Базовые компоненты 'css-reset', 'css-helpers', 'typography', 'forms', 'grid', 'ls-vendor', 'ls-core', 'ls-component', 'accordion', 'alert', 'dropdown', 'button', 'block', - 'nav', 'tooltip', 'tabs', 'modal', 'table', 'text', 'uploader', 'field', 'comment', 'pagination', 'editor', 'more', 'crop', + 'nav', 'tooltip', 'tabs', 'modal', 'table', 'text', 'uploader', 'email', 'field', 'comment', 'pagination', 'editor', 'more', 'crop', 'perfomance', 'toolbar', 'media', 'actionbar', 'progressbar', 'badge', 'property', 'autocomplete', 'icon', 'item', 'highlighter', 'jumbotron', // Компоненты LS CMS diff --git a/application/frontend/components/activity/blocks/block.activity-recent.tpl b/application/frontend/components/activity/blocks/block.activity-recent.tpl index a17a148e..9ecbc4ee 100644 --- a/application/frontend/components/activity/blocks/block.activity-recent.tpl +++ b/application/frontend/components/activity/blocks/block.activity-recent.tpl @@ -2,30 +2,21 @@ * Последняя активность *} -{extends 'Component@block.block'} - -{block 'block_title'} - {lang 'activity.block_recent.title'} -{/block} - -{block 'block_options' append} - {$mods = "{$mods} stream nopadding"} - {$classes = "{$classes} js-block-default"} -{/block} - -{* Навигация *} -{block 'block_content'} - {** - * TODO: Выпадающее меню - * Показывается если в меню что выше пунктов больше установленного значения (по умолчанию - 2) - *} - {component 'tabs' classes='js-tabs-block js-activity-block-recent-tabs' tabs=[ - [ 'text' => {lang 'activity.block_recent.comments'}, 'url' => "{router page='ajax'}stream/comment", 'content' => $smarty.local.content ], - [ 'text' => {lang 'activity.block_recent.topics'}, 'url' => "{router page='ajax'}stream/topic" ] - ]} -{/block} - {* Подвал *} -{block 'block_footer'} +{capture 'block_footer'} {lang 'activity.block_recent.feed'} -{/block} \ No newline at end of file +{/capture} + +{component 'block' + mods = 'primary activity-recent' + classes = 'js-block-default' + title = {lang 'activity.block_recent.title'} + titleUrl = {router 'stream'} + footer = $smarty.capture.block_footer + tabs = [ + 'classes' => 'js-tabs-block js-activity-block-recent-tabs', + 'tabs' => [ + [ 'text' => {lang 'activity.block_recent.comments'}, 'url' => "{router page='ajax'}stream/comment", 'list' => $smarty.local.content ], + [ 'text' => {lang 'activity.block_recent.topics'}, 'url' => "{router page='ajax'}stream/topic" ] + ] + ]} \ No newline at end of file diff --git a/application/frontend/components/activity/blocks/block.activity-settings.tpl b/application/frontend/components/activity/blocks/block.activity-settings.tpl index 0b7fd080..8a9b83ae 100644 --- a/application/frontend/components/activity/blocks/block.activity-settings.tpl +++ b/application/frontend/components/activity/blocks/block.activity-settings.tpl @@ -2,16 +2,7 @@ * Блок настройки ленты активности *} -{extends 'Component@block.block'} - -{block 'block_title'} - {$aLang.activity.settings.title} -{/block} - -{block 'block_options' append} - {$mods = "{$mods} activity-settings"} -{/block} - -{block 'block_content'} - {include '../settings.tpl' typesActive=$typesActive types=$types} -{/block} \ No newline at end of file +{component 'block' + mods = 'activity-settings' + title = {lang 'activity.settings.title'} + content = {include '../settings.tpl' typesActive=$typesActive types=$types}} \ No newline at end of file diff --git a/application/frontend/components/activity/blocks/block.activity-users.tpl b/application/frontend/components/activity/blocks/block.activity-users.tpl index 7fb84a26..61d17c40 100644 --- a/application/frontend/components/activity/blocks/block.activity-users.tpl +++ b/application/frontend/components/activity/blocks/block.activity-users.tpl @@ -2,16 +2,7 @@ * Выбор пользователей для чтения в ленте активности *} -{extends 'Component@block.block'} - -{block 'block_title'} - {$aLang.activity.users.title} -{/block} - -{block 'block_options' append} - {$mods = "{$mods} activity-users"} -{/block} - -{block 'block_content'} - {include '../users.tpl' users=$users} -{/block} \ No newline at end of file +{component 'block' + mods = 'activity-users' + title = {lang 'activity.users.title'} + content = {include '../users.tpl' users=$users}} \ 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 b62cf802..e8759a5a 100644 --- a/application/frontend/components/activity/blocks/recent-comments.tpl +++ b/application/frontend/components/activity/blocks/recent-comments.tpl @@ -3,30 +3,17 @@ * Топики отсортированные по времени последнего комментария *} -
- -
\ No newline at end of file +{component 'item' template='group' items=$smarty.capture.items} \ No newline at end of file diff --git a/application/frontend/components/activity/blocks/recent-item.tpl b/application/frontend/components/activity/blocks/recent-item.tpl new file mode 100644 index 00000000..79510ec5 --- /dev/null +++ b/application/frontend/components/activity/blocks/recent-item.tpl @@ -0,0 +1,22 @@ +{capture 'item_content'} + {$user->getDisplayName()} → + {$blog->getTitle()|escape} → + {$topic->getTitle()|escape} + +

+ | + + {lang 'comments.comments_declension' count=$topic->getCountComment() plural=true} +

+{/capture} + +{component 'item' + element = 'li' + mods = 'image-rounded' + desc = $smarty.capture.item_content + image=[ + 'path' => $user->getProfileAvatarPath(48), + 'url' => $user->getUserWebPath() + ]} \ No newline at end of file diff --git a/application/frontend/components/activity/blocks/recent-topics.tpl b/application/frontend/components/activity/blocks/recent-topics.tpl index acf96de0..bad88b41 100644 --- a/application/frontend/components/activity/blocks/recent-topics.tpl +++ b/application/frontend/components/activity/blocks/recent-topics.tpl @@ -3,27 +3,15 @@ * Последние топики *} -
- -
\ No newline at end of file +{component 'item' template='group' items=$smarty.capture.items} \ No newline at end of file diff --git a/application/frontend/components/activity/css/activity.css b/application/frontend/components/activity/css/activity.css index 5d5c9aa5..d45f308c 100644 --- a/application/frontend/components/activity/css/activity.css +++ b/application/frontend/components/activity/css/activity.css @@ -13,28 +13,25 @@ .activity-event-list { margin: 0 0 20px; } + +/* Дата-заголовок */ .activity-date { - font-family: 'Open Sans', sans-serif; - font-size: 20px; - margin-top: 45px; - padding-bottom: 10px; - border-bottom: 1px solid #eee; + font: 400 18px/1.3em 'Open Sans', sans-serif; + padding: 10px 0; + border-bottom: 1px solid #E7E7E7; +} +.activity-event + .activity-date { + margin-top: 30px; } /** * Событие */ .activity-event { - margin-bottom: 5px; - min-height: 48px; - background: #fafafa; - padding: 15px 15px 15px 75px; - position: relative; + padding: 15px; } -.activity-event-avatar { - position: absolute; - top: 15px; - left: 15px; +.activity-event + .activity-event { + border-top: 1px solid #f2f2f2; } .activity-event-date { display: block; @@ -43,9 +40,8 @@ } .activity-event-text { padding: 10px 15px; - background: #fff; - border: 1px solid #eee; - border-bottom-color: #ddd; margin-top: 10px; + color: #777; + background: #fafafa; font-size: 13px; } \ No newline at end of file diff --git a/application/frontend/components/activity/css/blocks.css b/application/frontend/components/activity/css/blocks.css index 4b945af5..7ccd39a4 100644 --- a/application/frontend/components/activity/css/blocks.css +++ b/application/frontend/components/activity/css/blocks.css @@ -4,40 +4,4 @@ * @license GNU General Public License, version 2 * @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com} * @author Denis Shakhov - * - * TODO: Component item */ - -.block-item-list li { - min-height: 51px; - padding: 17px 15px 20px 80px; - border-top: 1px solid #eee; - position: relative; - zoom: 1; - background: #fff; -} -.block-item-list li:first-child { - border: none; -} -.block-item-list li p { - margin: 0; - padding-top: 2px; - font-size: 11px; - line-height: 1.3em; -} -.block-item-list li a { - text-decoration: none; -} -.block-item-list li .avatar { - position: absolute; - top: 20px; - left: 20px; - margin-right: 10px; -} -.block-item-list li .author { - font-weight: bold; - color: #333; -} -.block-item-list li .blog-name { - font-weight: bold; -} \ No newline at end of file diff --git a/application/frontend/components/activity/event.tpl b/application/frontend/components/activity/event.tpl index 2a03c0dc..54634ca4 100644 --- a/application/frontend/components/activity/event.tpl +++ b/application/frontend/components/activity/event.tpl @@ -25,12 +25,7 @@ {* Событие *} -
  • - {* Аватар *} - - {$user->getDisplayName()} - - +{capture 'event_content'} {* Дата *}