mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-06-16 14:50:48 +03:00
Доработка компонентов
This commit is contained in:
parent
9d916e0ca5
commit
12cf29605b
|
@ -160,7 +160,7 @@ class ActionAjax extends Action
|
|||
$oViewer->Assign('bSelectable', $bSelectable);
|
||||
$oViewer->Assign('sTarget', $sTarget);
|
||||
|
||||
$this->Viewer_AssignAjax('sText', $oViewer->Fetch("modals/modal.user_list.tpl"));
|
||||
$this->Viewer_AssignAjax('sText', $oViewer->Fetch("components/user/modals/modal.user-list.tpl"));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -135,7 +135,7 @@ class ActionProfile extends Action
|
|||
}
|
||||
|
||||
$oViewer = $this->Viewer_GetLocalViewer();
|
||||
$this->Viewer_AssignAjax('sText', $oViewer->Fetch("modals/modal.complaint_user.tpl"));
|
||||
$this->Viewer_AssignAjax('sText', $oViewer->Fetch("components/report/modal.report.tpl"));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1162,7 +1162,7 @@ class ActionProfile extends Action
|
|||
|
||||
$oViewer = $this->Viewer_GetLocalViewer();
|
||||
$oViewer->Assign('target', $iTarget, true);
|
||||
$this->Viewer_AssignAjax('sText', $oViewer->Fetch("components/user/modal.add-friend.tpl"));
|
||||
$this->Viewer_AssignAjax('sText', $oViewer->Fetch("components/user/modals/modal.add-friend.tpl"));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -601,7 +601,9 @@ $config['head']['default']['css'] = array(
|
|||
"___path.skin.web___/components/ls-vendor/colorbox/colorbox.css",
|
||||
"___path.skin.web___/components/ls-vendor/timepicker/jquery-ui-timepicker-addon.css",
|
||||
"___path.skin.web___/components/ls-vendor/notifier/jquery.notifier.css",
|
||||
"___path.skin.web___/components/table/css/table.css",
|
||||
"___path.skin.web___/components/text/css/text.css",
|
||||
"___path.skin.web___/components/page-header/css/page-header.css",
|
||||
"___path.skin.web___/components/admin/css/admin.css",
|
||||
"___path.skin.web___/components/tabs/css/tabs.css",
|
||||
"___path.skin.web___/components/perfomance/css/perfomance.css",
|
||||
|
|
|
@ -1,49 +0,0 @@
|
|||
/**
|
||||
* Основные стили
|
||||
*
|
||||
* @license GNU General Public License, version 2
|
||||
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
|
||||
* @author Denis Shakhov <denis.shakhov@gmail.com>
|
||||
*/
|
||||
|
||||
body {
|
||||
font-size: 13px;
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
line-height: 18px;
|
||||
color: #333;
|
||||
background-color: #f7f7f7;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Ссылки
|
||||
*/
|
||||
a { color: #1A80DB; text-decoration: none; }
|
||||
a:hover { color: #058; }
|
||||
|
||||
|
||||
/**
|
||||
* Заголовки
|
||||
*/
|
||||
h1, h2, h3, h4, h5, h6 { margin-bottom: 15px; font-family: "Open Sans", sans-serif; font-weight: 300; line-height: 1.2em; }
|
||||
|
||||
h1 { font-size: 28px; }
|
||||
h2 { font-size: 26px; }
|
||||
h3 { font-size: 24px; }
|
||||
h4 { font-size: 22px; }
|
||||
h5 { font-size: 20px; }
|
||||
h6 { font-size: 18px; }
|
||||
|
||||
.page-header { color: #333; font-size: 30px; line-height: 1em; margin-bottom: 20px; }
|
||||
.page-header span { color: #aaa; }
|
||||
|
||||
|
||||
/**
|
||||
* Шапка сайта
|
||||
*/
|
||||
.grid-role-header a { text-decoration: none; color: #fff; }
|
||||
|
||||
.grid-role-header .site-info { margin: 0 auto; }
|
||||
.grid-role-header .site-name { margin: 0 0 10px; font-size: 65px; line-height: 1em; font-weight: 300; }
|
||||
.grid-role-header .site-name a:hover { color: #fff; opacity: .9; }
|
||||
.grid-role-header .site-description { max-width: 600px; color: #fff; font-size: 15px; }
|
|
@ -6,24 +6,104 @@
|
|||
* @author Denis Shakhov <denis.shakhov@gmail.com>
|
||||
*/
|
||||
|
||||
.grid-role-container { padding: 0 50px; }
|
||||
|
||||
.grid-role-content { background: #fff; padding: 40px !important; }
|
||||
.grid-role-header {
|
||||
padding: 65px 50px;
|
||||
background-color: #000;
|
||||
background-image: url(../images/header.jpg);
|
||||
-webkit-background-size: cover;
|
||||
background-size: cover;
|
||||
body {
|
||||
font-size: 13px;
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
line-height: 18px;
|
||||
color: #333;
|
||||
background-color: #f7f7f7;
|
||||
}
|
||||
.grid-role-nav { padding: 0 50px; margin-bottom: 30px; background: #222; }
|
||||
.grid-role-nav .nav.nav--main { margin: 0 auto; }
|
||||
.grid-role-footer { padding: 20px 0 50px; color: #777; position: relative; }
|
||||
|
||||
.grid-role-container.no-sidebar .grid-role-content { width: 100%; margin-right: 0; }
|
||||
|
||||
/**
|
||||
* Ссылки
|
||||
*/
|
||||
a { color: #1A80DB; text-decoration: none; }
|
||||
a:hover { color: #058; }
|
||||
|
||||
|
||||
/**
|
||||
* Заголовки
|
||||
*/
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
margin-bottom: 15px;
|
||||
font-family: "Open Sans", sans-serif;
|
||||
font-weight: 300;
|
||||
line-height: 1.2em;
|
||||
}
|
||||
|
||||
h1 { font-size: 28px; }
|
||||
h2 { font-size: 26px; }
|
||||
h3 { font-size: 24px; }
|
||||
h4 { font-size: 22px; }
|
||||
h5 { font-size: 20px; }
|
||||
h6 { font-size: 18px; }
|
||||
|
||||
|
||||
/**
|
||||
* Сетка
|
||||
*/
|
||||
.grid-role-container {
|
||||
padding: 0 50px;
|
||||
}
|
||||
.grid-role-content {
|
||||
background: #fff;
|
||||
padding: 40px !important;
|
||||
}
|
||||
.grid-role-header {
|
||||
padding: 65px 50px;
|
||||
background-color: #000;
|
||||
background-image: url(../images/header.jpg);
|
||||
-webkit-background-size: cover;
|
||||
background-size: cover;
|
||||
}
|
||||
.grid-role-nav {
|
||||
padding: 0 50px;
|
||||
margin-bottom: 30px;
|
||||
background: #222;
|
||||
}
|
||||
.grid-role-nav .nav.nav--main {
|
||||
margin: 0 auto;
|
||||
}
|
||||
.grid-role-footer {
|
||||
padding: 20px 0 50px;
|
||||
color: #777;
|
||||
position: relative;
|
||||
}
|
||||
.grid-role-container.no-sidebar .grid-role-content {
|
||||
width: 100%;
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
/* Responsive */
|
||||
@media (max-width: 999px) {
|
||||
.grid-role-content { width: 100%; margin-bottom: 30px; }
|
||||
.grid-role-sidebar { width: 100%; margin-bottom: 30px; padding: 0; }
|
||||
.grid-role-content { width: 100%; margin-bottom: 30px; }
|
||||
.grid-role-sidebar { width: 100%; margin-bottom: 30px; padding: 0; }
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Шапка сайта
|
||||
*/
|
||||
.grid-role-header a {
|
||||
text-decoration: none;
|
||||
color: #fff;
|
||||
}
|
||||
.grid-role-header .site-info {
|
||||
margin: 0 auto;
|
||||
}
|
||||
.grid-role-header .site-name {
|
||||
margin: 0 0 10px;
|
||||
font-size: 65px;
|
||||
line-height: 1em;
|
||||
font-weight: 300;
|
||||
}
|
||||
.grid-role-header .site-name a:hover {
|
||||
color: #fff;
|
||||
opacity: .9;
|
||||
}
|
||||
.grid-role-header .site-description {
|
||||
max-width: 600px;
|
||||
color: #fff;
|
||||
font-size: 15px;
|
||||
}
|
|
@ -14,7 +14,7 @@
|
|||
{$component = 'alert'}
|
||||
|
||||
{* Уведомление *}
|
||||
<div class="{$component} {mod name=$component mods=$mods default='success'} {$smarty.local.classes} js-{$component}"
|
||||
<div class="{$component} {mod name=$component mods=$smarty.local.mods default='success'} {$smarty.local.classes} js-{$component}"
|
||||
{if ! $smarty.local.visible|default:true}style="display: none"{/if}
|
||||
{$smarty.local.attributes}
|
||||
role="alert">
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
</ul>
|
||||
|
||||
{* Добавить *}
|
||||
<a href="#" class="link-dotted {$component}-add js-{$component}-add" {if $note}style="display:none;"{/if}>{$aLang.usernote.add}</a>
|
||||
<a href="#" class="link-dotted {$component}-add js-{$component}-add" {if $note}style="display:none;"{/if}>{$aLang.user_note.add}</a>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
.page-header {
|
||||
color: #333;
|
||||
font-size: 30px;
|
||||
line-height: 1em;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.page-header span {
|
||||
color: #aaa;
|
||||
}
|
|
@ -0,0 +1,11 @@
|
|||
{**
|
||||
* Заголовок страницы
|
||||
*
|
||||
* @param string $text
|
||||
*}
|
||||
|
||||
{$component = 'page-header'}
|
||||
|
||||
<h2 class="{$component} {mod name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {$smarty.local.attributes}>
|
||||
{$smarty.local.text}
|
||||
</h2>
|
|
@ -1,7 +1,7 @@
|
|||
{**
|
||||
* Жалоба на пользователя
|
||||
*
|
||||
* @styles css/modals.css
|
||||
* TODO: Универсализировать
|
||||
*}
|
||||
|
||||
{extends 'components/modal/modal.tpl'}
|
||||
|
@ -23,7 +23,7 @@
|
|||
name = 'type'
|
||||
label = {lang name='report.form.fields.type.label'}
|
||||
classes = 'width-full'
|
||||
items = $aTypes }
|
||||
items = $aTypes}
|
||||
|
||||
{include 'components/field/field.textarea.tpl'
|
||||
name = 'text'
|
||||
|
@ -43,5 +43,5 @@
|
|||
{/block}
|
||||
|
||||
{block 'modal_footer_begin'}
|
||||
<button type="submit" class="button button--primary" onclick="ls.user.addComplaint('#form-complaint-user');">{lang 'report.form.submit'}</button>
|
||||
{include 'components/button/button.tpl' text={lang 'report.form.submit'} mods='primary' form='form-complaint-user'}
|
||||
{/block}
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
<ul class="profile-actions" id="profile_actions">
|
||||
{* Добавление в друзья *}
|
||||
{include 'components/user/friend_item.tpl' friendship=$user->getUserFriend() userTarget=$oUserProfile classes='js-user-friend'}
|
||||
{include './friend-item.tpl' friendship=$user->getUserFriend() userTarget=$oUserProfile classes='js-user-friend'}
|
||||
|
||||
{* Отправить сообщение *}
|
||||
<li>
|
||||
|
|
|
@ -88,7 +88,7 @@
|
|||
|
||||
{* Основной заголовок страницы *}
|
||||
{block 'layout_page_title' hide}
|
||||
<h2 class="page-header">{$smarty.block.child}</h2>
|
||||
{include 'components/page-header/page-header.tpl' text={$smarty.block.child}}
|
||||
{/block}
|
||||
|
||||
{block 'layout_content_header'}
|
||||
|
|
|
@ -24,7 +24,6 @@ $config['head']['default']['js'] = array_merge(Config::Get('head.default.js'), a
|
|||
|
||||
// Подключение стилей шаблона
|
||||
$config['head']['default']['css'] = array_merge(Config::Get('head.default.css'), array(
|
||||
"___path.skin.assets.web___/css/base.css",
|
||||
"___path.skin.assets.web___/css/layout.css",
|
||||
"___path.skin.assets.web___/css/print.css"
|
||||
));
|
||||
|
|
Loading…
Reference in a new issue