ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-17 07:10:48 +03:00
Code Issues Releases Wiki Activity

Мелкие доработки оформления

Browse source
This commit is contained in:
Denis Shakhov 2014-11-23 22:16:08 +07:00
parent 0cdf895433
commit 51496839d2
23 changed files with 166 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
application/frontend/skin/developer/actions/ActionContent/drafts.tpl
View file

@ -5,6 +5,7 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$sNav = 'create'}
{/block}

9
application/frontend/skin/developer/actions/ActionProfile/info.tpl
View file

@ -1,8 +1,5 @@
{**
* Профиль пользователя с информацией о нем
*
* @styles css/profile.css
* @styles css/tables.css
*}
{extends 'layouts/layout.user.tpl'}
@ -12,11 +9,7 @@
{$oGeoTarget = $oUserProfile->getGeoTarget()}
{/block}
{block 'layout_user_page_title'}
{lang name='user.profile.title'}
{/block}
{block 'layout_content' append}
{include 'navs/nav.user.info.tpl'}
{*include 'navs/nav.user.info.tpl'*}
{include 'components/user/info.tpl'}
{/block}

8
application/frontend/skin/developer/assets/css/layout.css
View file

@ -59,7 +59,7 @@ h6 { font-size: 18px; }
}
.grid-role-nav {
padding: 0 50px;
margin-bottom: 30px;
margin-bottom: 10px;
background: #222;
}
.grid-role-nav .nav.nav--main {
@ -74,6 +74,12 @@ h6 { font-size: 18px; }
width: 100%;
margin-right: 0;
}
.grid-role-sidebar {
padding-left: 10px;
}
.grid-role-sidebar .block {
margin-bottom: 10px;
}
/* Responsive */
@media (max-width: 999px) {

2
application/frontend/skin/developer/assets/js/init.js
View file

@ -540,7 +540,7 @@ jQuery(document).ready(function($){
*/
$('.js-toolbar').toolbar({
target: '.grid-role-wrapper',
offsetX: 20
offsetX: 10
});
$('.js-toolbar-scrollup').lsToolbarScrollUp();
$('.js-toolbar-comments').lsToolbarComments();

20
application/frontend/skin/developer/components/activity/settings.tpl
View file

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

11
application/frontend/skin/developer/components/block/css/block.css
View file

@ -41,5 +41,12 @@
}
.block-update.active { background-position: -16px 0; }
/* Блок без отступов у контента */
.block--nopadding .block-content { padding: 0; }
/**
* @modifier nopadding Блок без отступов у контента
*/
.block--nopadding .block-content { padding: 0; }
/**
* @modifier transparent Блок без фона
*/
.block--transparent { background-color: transparent; }

2
application/frontend/skin/developer/components/blog/blocks/block.blog-actions.tpl
View file

@ -8,7 +8,7 @@
{block 'block_options' append}
{* TODO: Fix styles *}
{$mods = "{$mods} user-actions"}
{$mods = "{$mods} nopadding transparent user-actions"}
{/block}
{block 'block_content'}

16
application/frontend/skin/developer/components/blog/blocks/block.blogs-search.tpl
View file

@ -51,14 +51,18 @@
{* Тип блога *}
<h3>{lang 'blog.blocks.search.type.title'}</h3>
{include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-blog-type' name='blog_search_type' value='' label='Любой' checked=true}
{include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-blog-type' name='blog_search_type' value='open' label='Открытый'}
{include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-blog-type' name='blog_search_type' value='close' label='Закрытый'}
<div class="field-checkbox-group">
{include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-blog-type' name='blog_search_type' value='' label='Любой' checked=true}
{include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-blog-type' name='blog_search_type' value='open' label='Открытый'}
{include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-blog-type' name='blog_search_type' value='close' label='Закрытый'}
</div>
{* Тип принадлежности блога *}
<h3>{lang 'blog.blocks.search.relation.title'}</h3>
{include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-blog-relation' name='blog_search_relation' value='all' label='Все' checked=true}
{include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-blog-relation' name='blog_search_relation' value='my' label='Мои'}
{include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-blog-relation' name='blog_search_relation' value='join' label='Читаю'}
<div class="field-checkbox-group">
{include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-blog-relation' name='blog_search_relation' value='all' label='Все' checked=true}
{include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-blog-relation' name='blog_search_relation' value='my' label='Мои'}
{include 'components/field/field.radio.tpl' inputClasses='js-search-ajax-blog-relation' name='blog_search_relation' value='join' label='Читаю'}
</div>
{/block}

9
application/frontend/skin/developer/components/blog/blog-list-item.tpl
View file

@ -21,9 +21,14 @@
{$title = $smarty.capture.blog_list_item_title}
{* Описание *}
{capture 'blog_list_item_content'}
<p class="object-list-item-description">{$blog->getDescription()|strip_tags|truncate:120}</p>
{capture 'blog_list_item_desc'}
{$blog->getDescription()|strip_tags|truncate:120}
{/capture}
{$desc = $smarty.capture.blog_list_item_desc}
{* Описание *}
{capture 'blog_list_item_content'}
{* Информация *}
{$info = [
[ 'label' => "{$aLang.blog.users.readers_total}:", 'content' => "<span class=\"js-blog-users-count\" data-blog-id=\"{$blog->getId()}\">{$blog->getCountUser()}</span>" ],

16
application/frontend/skin/developer/components/feed/blogs.tpl
View file

@ -14,13 +14,15 @@
</small>
{if $smarty.local.blogsJoined}
{foreach $smarty.local.blogsJoined as $blog}
{include 'components/field/field.checkbox.tpl'
inputClasses = 'js-feed-blogs-subscribe'
inputAttributes = "data-id=\"{$blog->getId()}\""
checked = isset($blogsSubscribed[ $blog->getId() ])
label = "<a href=\"{$blog->getUrlFull()}\">{$blog->getTitle()|escape}</a>"}
{/foreach}
<div class="field-checkbox-group">
{foreach $smarty.local.blogsJoined as $blog}
{include 'components/field/field.checkbox.tpl'
inputClasses = 'js-feed-blogs-subscribe'
inputAttributes = "data-id=\"{$blog->getId()}\""
checked = isset($blogsSubscribed[ $blog->getId() ])
label = "<a href=\"{$blog->getUrlFull()}\">{$blog->getTitle()|escape}</a>"}
{/foreach}
</div>
{else}
{include 'components/alert/alert.tpl' text=$aLang.feed.blogs.empty mods='info'}
{/if}

11
application/frontend/skin/developer/components/field/css/field.css
View file

@ -86,4 +86,13 @@ select[multiple].field-input { max-width: 300px; }
cursor: pointer;
background-repeat: no-repeat;
background-color: #eee;
}
}
/**
* Group
*/
.field-checkbox-group { margin-bottom: 25px; }
.field-checkbox-group .field { margin-bottom: 12px; }
.field-checkbox-group:last-child,
.field-checkbox-group .field:last-child { margin-bottom: 0; }

5
application/frontend/skin/developer/components/item/css/item.css
View file

@ -23,7 +23,7 @@
.item-title {
font-size: 24px;
line-height: 1.1em;
margin-bottom: 10px;
margin-bottom: 15px;
}
.item-description {
margin-bottom: 15px;
@ -35,6 +35,9 @@
width: 150px;
text-align: right;
}
.item .info-list {
margin-bottom: 0;
}
.item-list { margin-bottom: 20px; border-bottom: 1px solid #eee; }

9
application/frontend/skin/developer/components/item/item.tpl
View file

@ -9,17 +9,24 @@
{$classes = $smarty.local.classes}
{$mods = $smarty.local.mods}
{$content = $smarty.local.content}
{$desc = $smarty.local.desc}
{$title = $smarty.local.title}
{/block}
<li class="{$component} {$smarty.local.classes} {mod name=$component mods=$smarty.local.mods}" {$smarty.local.attributes}>
<img src="{$image[ 'path' ]}" alt="{$image[ 'alt' ]}" title="{$image[ 'title' ]}" class="{$component}-image {$image[ 'classes' ]}">
<a href="{$image[ 'url' ]}">
<img src="{$image[ 'path' ]}" alt="{$image[ 'alt' ]}" title="{$image[ 'title' ]}" class="{$component}-image {$image[ 'classes' ]}">
</a>
<div class="{$component}-content js-{$component}-content">
{if $title}
<h3 class="{$component}-title">{$title}</h3>
{/if}
<div class="{$component}-description">
{$desc}
</div>
{$content}
</div>
</li>

79
application/frontend/skin/developer/components/nav/css/nav.css
View file

@ -79,28 +79,6 @@
.nav.nav--pills .dropdown-toggle.open:after { border-top-color: #fff; }
/**
* Userbar
*/
.nav--userbar { float: left; }
.nav--userbar > .nav-item > a { color: #000; padding: 20px 15px; }
.nav--userbar > .nav-item > a:hover { background: #fafafa; }
/* Логин */
.nav--userbar > .nav-item.nav-item--userbar-username > a { position: relative; padding-left: 40px; padding-right: 25px; font-weight: bold; color: #333; }
.nav--userbar > .nav-item.nav-item--userbar-username .avatar { position: absolute; top: 18px; left: 8px; }
/* Новые сообщения */
.nav--userbar > .nav-item--has-counter > a { background: #65CA34; color: #fff; font-weight: bold; }
.nav--userbar > .nav-item--has-counter > a:hover { background: #5EBD30; }
.nav--userbar > .nav-item > a > .badge { background: #47B113; }
/* Dropdown support */
.nav.nav--userbar .dropdown-toggle:after { border-top-color: #000; }
.nav.nav--userbar .dropdown-toggle.open { background: #08c; color: #fff; }
.nav.nav--userbar .dropdown-toggle.open:after { border-top-color: #fff; }
/**
* Main
*/
@ -110,59 +88,4 @@
.nav--main > .nav-item.active > a { background: #3a3a3a; color: #bbb; -webkit-box-shadow: 0 0 7px rgba(0,0,0,.15) inset; box-shadow: 0 0 7px rgba(0,0,0,.15) inset; }
/* Badge */
.nav-item.active .badge { background: #2279AF; }
/**
* Tabs
*/
.nav-tabs { border-bottom: 1px solid #ddd; margin-bottom: 15px; }
.nav-tabs > li { position: relative; margin: 0 3px -1px 0; }
.nav-tabs > li > a {
border: 1px solid transparent;
padding: 10px 15px;
border-radius: 3px 3px 0 0;
cursor: pointer;
font-size: 14px;
background: transparent;
color: #08c;
}
.nav-tabs > li > a:hover { background: #f1f1f1; border-bottom-color: #ddd; color: #058; }
.nav-tabs > li.active > a { background: #fff; border-color: #ddd; border-bottom-color: #fff; color: #333; cursor: default; }
/* Pull Left */
.nav-tabs.pull-left { margin: 0 20px 0 0; border: none; border-right: 1px solid #ddd; }
.nav-tabs.pull-left > li { margin: 3px -1px 0 0; }
.nav-tabs.pull-left > li:first-child { margin-top: 0; }
.nav-tabs.pull-left > li,
.nav-tabs.pull-left > li > a { float: none; display: block; border-radius: 3px 0 0 3px; }
.nav-tabs.pull-left > li > a:hover { border-color: transparent; border-right-color: #ddd; }
.nav-tabs.pull-left > li.active > a { border-color: #ddd; border-right-color: #fff; }
/* Pull Right */
.nav-tabs.pull-right { margin: 0 0 0 20px; border: none; border-left: 1px solid #ddd; }
.nav-tabs.pull-right > li { margin: 3px 0 0 -1px; }
.nav-tabs.pull-right > li:first-child { margin-top: 0; }
.nav-tabs.pull-right > li,
.nav-tabs.pull-right > li > a { float: none; display: block; border-radius: 0 3px 3px 0; }
.nav-tabs.pull-right > li > a:hover { border-color: transparent; border-left-color: #ddd; }
.nav-tabs.pull-right > li.active > a { border-color: #ddd; border-left-color: #fff; }
/* Pull Bottom */
.nav-tabs.pull-bottom { margin: 15px 0 0; border: none; border-top: 1px solid #ddd; }
.nav-tabs.pull-bottom > li { margin: -1px 3px 0 0; }
.nav-tabs.pull-bottom > li,
.nav-tabs.pull-bottom > li > a { border-radius: 0 0 3px 3px; }
.nav-tabs.pull-bottom > li > a:hover { border-color: transparent; border-top-color: #ddd; }
.nav-tabs.pull-bottom > li.active > a { border-color: #ddd; border-top-color: #fff; }
/* Dropdown support */
.nav-tabs .dropdown-toggle:after { border-top-color: #08c; }
.nav-tabs .dropdown-toggle.open { background: #08c; color: #fff; border-color: transparent !important; }
.nav-tabs .active .dropdown-toggle:after,
.nav-tabs .active .dropdown-toggle:hover:after { border-top-color: #333; }
.nav-tabs .active .dropdown-toggle.open:after,
.nav-tabs .dropdown-toggle.open:after,
.nav-tabs .dropdown-toggle.open:hover:after,
.nav-tabs .active .dropdown-toggle.open:hover:after { border-top-color: #fff; }
.nav-tabs .dropdown-toggle:hover:after { border-top-color: #058; }
.nav-item.active .badge { background: #2279AF; }

2
application/frontend/skin/developer/components/user/blocks/block.user-actions.tpl
View file

@ -7,7 +7,7 @@
{extends 'components/block/block.tpl'}
{block 'block_options' append}
{$mods = "{$mods} user-actions"}
{$mods = "{$mods} nopadding transparent user-actions"}
{if ! $oUserCurrent or ( $oUserCurrent && $oUserCurrent->getId() == $oUserProfile->getId() )}
{$show = false}

2
application/frontend/skin/developer/components/user/blocks/block.user-nav.tpl
View file

@ -7,7 +7,7 @@
{extends 'components/block/block.tpl'}
{block 'block_options' append}
{$mods = "{$mods} user-nav"}
{$mods = "{$mods} nopadding transparent user-nav"}
{/block}
{block 'block_content_after'}

2
application/frontend/skin/developer/components/user/blocks/block.user-note.tpl
View file

@ -7,7 +7,7 @@
{extends 'components/block/block.tpl'}
{block 'block_options' append}
{$mods = "{$mods} user-note nopadding"}
{$mods = "{$mods} user-note nopadding transparent"}
{if ! $oUserCurrent or ( $oUserCurrent->getId() == $oUserProfile->getId() )}
{$show = false}

9
application/frontend/skin/developer/components/user/blocks/block.users-search.tpl
View file

@ -24,7 +24,10 @@
{* Пол *}
<p class="mb-10">Пол</p>
{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' inputAttributes='data-search-type="users"' 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='Женский'}
<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' inputAttributes='data-search-type="users"' 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='Женский'}
</div>
{/block}

30
application/frontend/skin/developer/components/user/css/user-blocks.css
View file

@ -35,9 +35,7 @@
* @modifier user-actions
* @template blocks/block.userActions.tpl
*/
.block--user-actions { border: none; border: 1px solid #eee; border-radius: 5px; }
.block--user-actions .block-content { padding: 0; }
.block--user-actions ul { overflow: hidden; }
.block--user-actions ul { overflow: hidden; background: #fff; border: 1px solid #eee; border-radius: 5px; }
.block--user-actions ul li { margin-bottom: 0; }
.block--user-actions ul li span,
.block--user-actions ul li a { display: block; padding: 10px 15px; color: #777; cursor: pointer; }
@ -51,4 +49,28 @@
* @modifier user-nav
* @template blocks/block.userNav.tpl
*/
.block--user-nav { padding: 0; background: none; }
.nav.nav--pills.nav--stacked.user-nav {
overflow: hidden;
border: 1px solid #eee;
border-radius: 5px;
}
.nav.nav--pills.nav--stacked.user-nav > li {
margin-bottom: 0;
background-color: transparent;
border-bottom: 1px solid #f4f4f4;
}
.nav.nav--pills.nav--stacked.user-nav > li .badge {
top: 9px;
background: #aaa;
}
.nav.nav--pills.nav--stacked.user-nav > li a {
display: block;
padding: 10px 15px;
background: #fff;
color: #555;
cursor: pointer;
}
.nav.nav--pills.nav--stacked.user-nav > li a:hover {
background: #fafafa;
color: #333;
}

52
application/frontend/skin/developer/components/user/settings/tuning.tpl
View file

@ -12,35 +12,37 @@
<fieldset>
<legend>{lang name='user.settings.tuning.email_notices'}</legend>
{include 'components/field/field.checkbox.tpl'
name = 'settings_notice_new_topic'
checked = $oUserCurrent->getSettingsNoticeNewTopic() != 0
noMargin = true
label = {lang name='user.settings.tuning.fields.new_topic'}}
<div class="field-checkbox-group">
{include 'components/field/field.checkbox.tpl'
name = 'settings_notice_new_topic'
checked = $oUserCurrent->getSettingsNoticeNewTopic() != 0
noMargin = true
label = {lang name='user.settings.tuning.fields.new_topic'}}
{include 'components/field/field.checkbox.tpl'
name = 'settings_notice_new_comment'
checked = $oUserCurrent->getSettingsNoticeNewComment() != 0
noMargin = true
label = {lang name='user.settings.tuning.fields.new_comment'}}
{include 'components/field/field.checkbox.tpl'
name = 'settings_notice_new_comment'
checked = $oUserCurrent->getSettingsNoticeNewComment() != 0
noMargin = true
label = {lang name='user.settings.tuning.fields.new_comment'}}
{include 'components/field/field.checkbox.tpl'
name = 'settings_notice_new_talk'
checked = $oUserCurrent->getSettingsNoticeNewTalk() != 0
noMargin = true
label = {lang name='user.settings.tuning.fields.new_talk'}}
{include 'components/field/field.checkbox.tpl'
name = 'settings_notice_new_talk'
checked = $oUserCurrent->getSettingsNoticeNewTalk() != 0
noMargin = true
label = {lang name='user.settings.tuning.fields.new_talk'}}
{include 'components/field/field.checkbox.tpl'
name = 'settings_notice_reply_comment'
checked = $oUserCurrent->getSettingsNoticeReplyComment() != 0
noMargin = true
label = {lang name='user.settings.tuning.fields.reply_comment'}}
{include 'components/field/field.checkbox.tpl'
name = 'settings_notice_reply_comment'
checked = $oUserCurrent->getSettingsNoticeReplyComment() != 0
noMargin = true
label = {lang name='user.settings.tuning.fields.reply_comment'}}
{include 'components/field/field.checkbox.tpl'
name = 'settings_notice_new_friend'
checked = $oUserCurrent->getSettingsNoticeNewFriend() != 0
noMargin = true
label = {lang name='user.settings.tuning.fields.new_friend'}}
{include 'components/field/field.checkbox.tpl'
name = 'settings_notice_new_friend'
checked = $oUserCurrent->getSettingsNoticeNewFriend() != 0
noMargin = true
label = {lang name='user.settings.tuning.fields.new_friend'}}
</div>
</fieldset>
<fieldset>

23
application/frontend/skin/developer/components/userbar/css/userbar.css
View file

@ -26,4 +26,25 @@
position: relative;
margin: 13px 5px 0 5px;
padding: 0;
}
}
/**
* Userbar
*/
.nav--userbar { float: left; }
.nav--userbar > .nav-item > a { color: #000; padding: 20px 15px; }
.nav--userbar > .nav-item > a:hover { background: #fafafa; }
/* Логин */
.nav--userbar > .nav-item.nav-item--userbar-username > a { position: relative; padding-left: 40px; padding-right: 25px; font-weight: bold; color: #333; }
.nav--userbar > .nav-item.nav-item--userbar-username .avatar { position: absolute; top: 17px; left: 8px; border-radius: 100%; }
/* Новые сообщения */
.nav--userbar > .nav-item--has-counter > a { background: #65CA34; color: #fff; font-weight: bold; }
.nav--userbar > .nav-item--has-counter > a:hover { background: #5EBD30; }
.nav--userbar > .nav-item > a > .badge { background: #47B113; }
/* Dropdown support */
.nav.nav--userbar .dropdown-toggle:after { border-top-color: #000; }
.nav.nav--userbar .dropdown-toggle.open { background: #08c; color: #fff; }
.nav.nav--userbar .dropdown-toggle.open:after { border-top-color: #fff; }

2
application/frontend/skin/developer/navs/nav.user.tpl
View file

@ -3,7 +3,7 @@
* TODO: В бекенде проставить sMenuProfileItemSelect
*}
{include 'components/nav/nav.tpl' name='user' activeItem=$sMenuProfileItemSelect mods='pills stacked' hookParams=[ 'oUserProfile' => $oUserProfile ] items=[
{include 'components/nav/nav.tpl' name='user' activeItem=$sMenuProfileItemSelect mods='pills stacked' classes='user-nav' hookParams=[ 'oUserProfile' => $oUserProfile ] items=[
[ 'name' => 'whois', 'text' => {lang name='user.profile.nav.info'}, 'url' => "{$oUserProfile->getUserWebPath()}" ],
[ 'name' => 'wall', 'text' => {lang name='user.profile.nav.wall'}, 'url' => "{$oUserProfile->getUserWebPath()}wall/", 'count' => $iCountWallUser ],
[ 'name' => 'created', 'text' => {lang name='user.profile.nav.publications'}, 'url' => "{$oUserProfile->getUserWebPath()}created/topics/", 'count' => $iCountCreated ],

2
application/frontend/skin/developer/settings/config/config.php
View file

@ -12,7 +12,7 @@ $config['view']['grid']['type'] = 'fluid';
/* Fluid settings */
$config['view']['grid']['fluid_min_width'] = '320px';
$config['view']['grid']['fluid_max_width'] = '1200px';
$config['view']['grid']['fluid_max_width'] = '1000px';
/* Fixed settings */
$config['view']['grid']['fixed_width'] = '1000px';