diff --git a/application/frontend/components/user/css/user.css b/application/frontend/components/user/css/user.css index c6e954b4..dc800e44 100644 --- a/application/frontend/components/user/css/user.css +++ b/application/frontend/components/user/css/user.css @@ -26,6 +26,6 @@ } /* Список */ -.user-info-group-items .info-list-item-label { width: 150px; } -.user-info-group-items .info-list-item { margin-bottom: 10px; } -.user-info-group-items .info-list-item-content { font-weight: normal; } \ No newline at end of file +.user-info-group-items .ls-info-list-item-label { width: 150px; } +.user-info-group-items .ls-info-list-item { margin-bottom: 10px; } +.user-info-group-items .ls-info-list-item-content { font-weight: normal; } \ No newline at end of file diff --git a/application/frontend/components/user/info-group.tpl b/application/frontend/components/user/info-group.tpl index 7dc6c720..efac9cf9 100644 --- a/application/frontend/components/user/info-group.tpl +++ b/application/frontend/components/user/info-group.tpl @@ -3,19 +3,29 @@ *} {$component = 'user-info-group'} -{component_define_params params=[ 'html', 'items', 'name', 'title', 'mods', 'classes', 'attributes' ]} +{component_define_params params=[ 'url', 'count', 'html', 'items', 'name', 'title', 'mods', 'classes', 'attributes' ]} {hook run="{$component}-{$name}-before"} {* Получаем пункты установленные плагинами *} {hook run="{$component}-{$name}-items" assign='itemsHook' items=$items array=true} -{$items = $itemsHook|default:$items} +{$items = ($itemsHook) ? $itemsHook : $items} {if $html || $items}
-

- {$title} -

+ {if $title} +

+ {if $url} + {$title} + {else} + {$title} + {/if} + + {if $count} + + {/if} +

+ {/if}
{if $html} diff --git a/application/frontend/skin/synio/components/avatar/css/avatar-list.css b/application/frontend/skin/synio/components/avatar/css/avatar-list.css new file mode 100644 index 00000000..7494d7a5 --- /dev/null +++ b/application/frontend/skin/synio/components/avatar/css/avatar-list.css @@ -0,0 +1,14 @@ +/** + * Список аватаров + * + * @module ls/avatar/name + * + * @license GNU General Public License, version 2 + * @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com} + * @author Denis Shakhov + */ + +.ls-avatar-list .ls-avatar { + float: left; + margin: 0 10px 10px 0; +} \ No newline at end of file diff --git a/application/frontend/skin/synio/components/avatar/css/avatar.css b/application/frontend/skin/synio/components/avatar/css/avatar.css new file mode 100644 index 00000000..6d25ff64 --- /dev/null +++ b/application/frontend/skin/synio/components/avatar/css/avatar.css @@ -0,0 +1,89 @@ +/** + * Аватар + * + * @module ls/avatar + * + * @license GNU General Public License, version 2 + * @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com} + * @author Denis Shakhov + */ + +.ls-avatar { + display: inline-block; +} + +.ls-avatar-image { + display: block; + width: 100px; + height: 100px; +} + +.ls-avatar-image-link { + display: block; + text-decoration: none; +} + +.ls-avatar-name { + font-size: 11px; +} +.ls-avatar-name-link { + color: #275ec2; +} +.ls-avatar-name-link:hover { + color: #f00; +} + +.ls-avatar--size-small .ls-avatar-image { + width: 64px; + height: 64px; +} + +.ls-avatar--size-xsmall .ls-avatar-image { + width: 48px; + height: 48px; +} + +.ls-avatar--size-xxsmall .ls-avatar-image { + width: 24px; + height: 24px; +} + +.ls-avatar--size-text .ls-avatar-image { + width: 18px; + height: 18px; +} + +/** + * @modifier has-name + */ +.ls-avatar--has-name { + max-width: 64px; + text-align: center; +} + +.ls-avatar--has-name .ls-avatar-image { + margin: 0 auto 2px; +} + +.ls-avatar--has-name .ls-avatar-name { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +/** + * @modifier inline + */ +.ls-avatar--has-name.ls-avatar--inline { + max-width: none; +} + +.ls-avatar--has-name.ls-avatar--inline .ls-avatar-image, +.ls-avatar--has-name.ls-avatar--inline .ls-avatar-image-link, +.ls-avatar--has-name.ls-avatar--inline .ls-avatar-name { + display: inline-block; + vertical-align: middle; +} +.ls-avatar--has-name.ls-avatar--inline .ls-avatar-image { + margin: 0 2px 0 0; +} \ No newline at end of file diff --git a/application/frontend/skin/synio/components/info-list/css/info-list.css b/application/frontend/skin/synio/components/info-list/css/info-list.css new file mode 100644 index 00000000..9a5004d2 --- /dev/null +++ b/application/frontend/skin/synio/components/info-list/css/info-list.css @@ -0,0 +1,57 @@ +/** + * Список с информацией + */ +.ls-info-list { + margin-bottom: 20px; + list-style: none; + padding: 0; +} +.ls-info-list:last-child { + margin-bottom: 0; +} + +.ls-info-list-item { + position: relative; + margin-bottom: 5px; + overflow: hidden; + display: table; + width: 100%; +} +.ls-info-list-item:last-child { + margin-bottom: 0; +} +.ls-info-list-item:after { + content: ""; + border-bottom: 1px dotted #d1d8dc; + position: absolute; + left: 0; + right: 0; + top: 1.2em; + z-index: 1; +} +.ls-info-list-item > * { + display: table-cell; + vertical-align: top; +} + +.ls-info-list-item-label { + width: 130px; + position: relative; + z-index: 10; +} + +.ls-info-list-item-content { + font-weight: normal; + background: #fff; + position: relative; + z-index: 10; + margin-left: 150px; + padding-left: 2px; +} +.ls-info-list-item-content a { + text-decoration: underline; +} +.ls-info-list-item-label-text { + background: #fff; + padding-right: 2px; +} \ No newline at end of file diff --git a/application/frontend/skin/synio/components/info-list/info-list.tpl b/application/frontend/skin/synio/components/info-list/info-list.tpl new file mode 100644 index 00000000..91b557d6 --- /dev/null +++ b/application/frontend/skin/synio/components/info-list/info-list.tpl @@ -0,0 +1,46 @@ +{** + * Список с информацией + * + * @param array $list (null) Массив в формате [ label, content ] + * @param string $title (null) Заголовок + *} + +{* Название компонента *} +{$component = 'ls-info-list'} +{component_define_params params=[ 'url', 'count', 'title', 'list', 'mods', 'classes', 'attributes' ]} + +{block 'info_list_options'}{/block} + +{if $list} +
+ {* Заголовок *} + {if $title} +

+ {if $url} + {$title} + {else} + {$title} + {/if} + + {if $count} + + {/if} +

+ {/if} + + {* Список *} +
    + {foreach $list as $item} +
  • +
    + {$item['label']} +
    + +
    + {$item['content']} +
    +
  • + {/foreach} +
+
+{/if} \ No newline at end of file diff --git a/application/frontend/skin/synio/components/typography/css/typography.css b/application/frontend/skin/synio/components/typography/css/typography.css index 12fdaa0e..66712a24 100644 --- a/application/frontend/skin/synio/components/typography/css/typography.css +++ b/application/frontend/skin/synio/components/typography/css/typography.css @@ -47,7 +47,8 @@ p:last-child { * Заголовки */ h1, h2, h3, h4, h5, h6, -.h1, .h2, .h3, .h4, .h5, .h6 { +.h1, .h2, .h3, .h4, .h5, .h6, +.ls-heading { margin: 0 0 15px; font-family: "PT Sans", sans-serif; font-weight: 300; @@ -69,6 +70,14 @@ h4 small, .h4 small, h5 small, .h5 small, h6 small, .h6 small { font-size: 65%; color: #aaa; } +.ls-heading a { + color: #275ec2; + text-decoration: underline; +} +.ls-heading a:hover { + color: #f00; +} + /* Заголовок страницы */ .page-header { color: #333; diff --git a/application/frontend/skin/synio/components/user/css/user.css b/application/frontend/skin/synio/components/user/css/user.css index 46a36c41..334bb6f9 100644 --- a/application/frontend/skin/synio/components/user/css/user.css +++ b/application/frontend/skin/synio/components/user/css/user.css @@ -6,7 +6,6 @@ * @author Denis Shakhov */ - /* Заголовок */ .profile-page-header { color: #333; @@ -16,19 +15,8 @@ margin-bottom: 20px; } -/* Блок с информацией */ -.user-info-group { - margin-bottom: 50px; -} -.user-info-group:last-child { - margin-bottom: 0; -} -.user-info-group-title { - font-size: 18px; -} - /* О себе */ -.user-info-group.user-info-about { +.user-info-about { padding: 17px 20px 20px 20px; background: #fcfce9; border-radius: 5px; @@ -36,15 +24,52 @@ color: #000; position: relative; } -.user-info-about .user-info-group-title { +.user-info-about-title { font-size: 19px; margin-bottom: 10px; } .user-info-about-empty-text { - opacity: .3; + opacity: .4; } -/* Список */ -.user-info-group-items .info-list-item-label { width: 150px; } -.user-info-group-items .info-list-item { margin-bottom: 10px; } -.user-info-group-items .info-list-item-content { font-weight: normal; } \ No newline at end of file +/* Блок с информацией */ +.user-info-group-wrapper { + margin-bottom: 50px; +} +.user-info-group-col { + float: left; + width: 50%; + box-sizing: border-box; +} +.user-info-group-col:first-child { + padding-right: 20px; +} +.user-info-group-col:last-child { + padding-left: 20px; +} + +.user-info-group { + margin-bottom: 50px; +} +.user-info-group:last-child { + margin-bottom: 0; +} + +.user-info-group-title { + margin-bottom: 15px; + font-size: 22px; + font-weight: normal; +} +.user-info-group-count { + color: #949aa1; +} + +.user-info-group-items .ls-info-list-item-label { + width: 150px; +} +.user-info-group-items .ls-info-list-item { + margin-bottom: 10px; +} +.user-info-group-items .ls-info-list-item-content { + font-weight: normal; +} \ No newline at end of file diff --git a/application/frontend/skin/synio/components/user/info-group.tpl b/application/frontend/skin/synio/components/user/info-group.tpl new file mode 100644 index 00000000..eb0a008f --- /dev/null +++ b/application/frontend/skin/synio/components/user/info-group.tpl @@ -0,0 +1,40 @@ +{** + * Блок с информацией + *} + +{$component = 'user-info-group'} +{component_define_params params=[ 'url', 'count', 'html', 'items', 'name', 'title', 'mods', 'classes', 'attributes' ]} + +{hook run="{$component}-{$name}-before"} + +{* Получаем пункты установленные плагинами *} +{hook run="{$component}-{$name}-items" assign='itemsHook' items=$items array=true} +{$items = ($itemsHook) ? $itemsHook : $items} + +{if $html || $items} +
+ {if $title} +

+ {if $url} + {$title} + {else} + {$title} + {/if} + + {if $count} + + {/if} +

+ {/if} + + +
+{/if} + +{hook run="{$component}-{$name}-after"} \ No newline at end of file diff --git a/application/frontend/skin/synio/components/user/info.tpl b/application/frontend/skin/synio/components/user/info.tpl index 6dda642e..9c9bed50 100644 --- a/application/frontend/skin/synio/components/user/info.tpl +++ b/application/frontend/skin/synio/components/user/info.tpl @@ -22,199 +22,205 @@ {** * О себе *} + -{** - * Личное - *} -{$items = []} -{$userfields = $user->getUserFieldValues(true, array(''))} + {** * Друзья @@ -225,10 +231,15 @@ {/capture} {component 'user.info-group' - title = "getUserWebPath()}friends/\">{$aLang.user.friends.title} ({$iCountFriendsUser})" + url = "{$user->getUserWebPath()}friends/" + title = $aLang.user.friends.title + count = $iCountFriendsUser html = $smarty.capture.user_info_friends} {/if} +{* @hook Конец информации о пользователе *} +{hook run='user_info_end' user=$user} + {** * Стена *} @@ -239,7 +250,4 @@ ]} {/capture} -{component 'user.info-group' name='wall' title={lang name='wall.title'} html=$smarty.capture.user_info_wall} - -{* @hook Конец информации о пользователе *} -{hook run='user_info_end' user=$user} \ No newline at end of file +{component 'user.info-group' name='wall' title={lang name='wall.title'} html=$smarty.capture.user_info_wall} \ No newline at end of file diff --git a/application/frontend/skin/synio/components/wall/css/wall.css b/application/frontend/skin/synio/components/wall/css/wall.css new file mode 100644 index 00000000..cc180976 --- /dev/null +++ b/application/frontend/skin/synio/components/wall/css/wall.css @@ -0,0 +1,73 @@ +/** + * Стена + * + * @license GNU General Public License, version 2 + * @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com} + * @author Denis Shakhov + */ + + +/** + * Форма добавления сообщения на стену + */ +.wall > .wall-form { + margin-bottom: 15px; +} +.wall-form { + margin-bottom: 10px; + padding: 15px; + background: #f8fbfe; + border-radius: 5px; +} +.wall-form .ls-field { + margin-bottom: 0; +} +.wall-form textarea { + height: 30px; + padding-top: 6px; + padding-left: 8px; + min-height: 30px; + max-height: 30px; + resize: none; +} +.wall-form-footer { + display: none; +} + +/* Open */ +.wall-form.open .ls-field { + margin-bottom: 15px; +} +.wall-form.open textarea { + height: 90px; + max-height: 300px; + resize: vertical; +} +.wall-form.open .wall-form-footer { + display: block; +} + +/** + * Сообщения + */ +.wall-comments { + padding-left: 70px; +} + +.wall-comments .wall-comment { + margin-bottom: 10px; +} +.wall-comments .wall-comment:first-child { + margin-top: 10px; +} + + +/** + * Кнопка подгрузки комментариев + */ +.ls-more.wall-more-comments { + margin-top: 0; + margin-bottom: 10px; + font-size: 11px; + padding: 8px; +} \ No newline at end of file diff --git a/application/frontend/skin/synio/settings/i18n/ru.php b/application/frontend/skin/synio/settings/i18n/ru.php index 40bcf093..3716af82 100644 --- a/application/frontend/skin/synio/settings/i18n/ru.php +++ b/application/frontend/skin/synio/settings/i18n/ru.php @@ -4,7 +4,8 @@ return [ 'synio' => [ 'guest' => 'Гость', 'site_pages' => 'Разделы', - 'drafts' => '%%count%% черновик;%%count%% черновика;%%count%% черновиков' + 'drafts' => '%%count%% черновик;%%count%% черновика;%%count%% черновиков', + 'user_about_empty' => 'Пока ничего не известно...' ], 'activity' => [ 'block_recent' => [