1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-29 04:55:02 +03:00

Minor bug fixes

* Блоку "О себе" добавлен класс text
* Добавлено nav-menu в developer'е для совместимости с плагинами
* Адаптивный блок голосования
* Тегу body добавлен класс с названием шаблона (ls-template-template_name)
* Добавлен закрывающий тег в userfield.js
This commit is contained in:
Denis Shakhov 2013-01-07 00:51:50 +07:00
parent 5742655796
commit 48e75febb6
9 changed files with 70 additions and 36 deletions

View file

@ -51,7 +51,7 @@ ls.userfield =( function ($) {
if (!data.bStateError) {
liElement = $('<li id="field_'+data.id+'"><span class="userfield_admin_name"></span > / <span class="userfield_admin_title"></span> / <span class="userfield_admin_pattern"></span> / <span class="userfield_admin_type"></span>'
+'<div class="userfield-actions"><a class="icon-edit" href="javascript:ls.userfield.showEditForm('+data.id+')"></a> '
+'<a class="icon-remove" href="javascript:ls.userfield.deleteUserfield('+data.id+')"></a></div>')
+'<a class="icon-remove" href="javascript:ls.userfield.deleteUserfield('+data.id+')"></a></div></li>')
;
$('#user_field_list').append(liElement);
$('#field_'+data.id+' .userfield_admin_name').text(name);

View file

@ -15,7 +15,10 @@
{if $oUserProfile->getProfileAbout()}
<div class="profile-info-about">
<h3>{$aLang.profile_about}</h3>
{$oUserProfile->getProfileAbout()}
<div class="text">
{$oUserProfile->getProfileAbout()}
</div>
</div>
{/if}

View file

@ -33,8 +33,28 @@
.nav.nav-pills.nav-pills-profile { margin-bottom: 30px; }
/* Nav Menu */
.nav.nav-menu { margin-bottom: 15px; }
.nav.nav-menu li { margin-right: 3px; }
.nav.nav-menu li a { border-radius: 2px; padding: 5px 12px; background: #f5f5f5; color: #888; }
.nav.nav-menu li a:hover { background: #eaeaea; }
.nav.nav-menu li.active a {
background: #2891d3;
background: -moz-linear-gradient(top, #2891d3 0%, #2375c6 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#2891d3), color-stop(100%,#2375c6));
background: -webkit-linear-gradient(top, #2891d3 0%,#2375c6 100%);
background: -o-linear-gradient(top, #2891d3 0%,#2375c6 100%);
background: -ms-linear-gradient(top, #2891d3 0%,#2375c6 100%);
background: linear-gradient(top, #2891d3 0%,#2375c6 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#2891d3', endColorstr='#2375c6',GradientType=0 );
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
color: #fff;
}
/* Nav Topic Filter */
.nav.nav-filter { margin-bottom: 1px; }
.nav.nav-filter { margin-bottom: 1px; }
.nav.nav-filter li { margin-right: 1px; position: relative; }
.nav.nav-filter li a { background: #eee; color: #333; padding: 7px 13px; float: left; }
.nav.nav-filter li a:hover { background: #ddd; }

View file

@ -43,25 +43,25 @@
.topic .topic-share { display: none; padding: 3px; margin-bottom: 10px; border: 5px solid #eee; }
/* Poll */
.topic .poll { margin-bottom: 15px; background: #fafafa; padding: 15px; }
.topic .poll { margin-bottom: 15px; background: #fafafa; padding: 15px; }
.topic .poll .poll-vote { margin-bottom: 20px; margin-left: 0; list-style-type: none; }
.topic .poll .poll-vote li { margin-bottom: 10px; }
.topic .poll .poll-vote li:last-child { margin-bottom: 0; }
.topic .poll .poll-vote li label { display: inline; }
.topic .poll .poll-vote li input { position: relative; top: 1px; margin-right: 2px; }
.topic .poll .poll-vote { margin-bottom: 20px; margin-left: 0; list-style-type: none; }
.topic .poll .poll-vote li { margin-bottom: 10px; }
.topic .poll .poll-vote li:last-child { margin-bottom: 0; }
.topic .poll .poll-vote li label { display: inline; }
.topic .poll .poll-vote li input { position: relative; top: 1px; margin-right: 2px; }
.topic .poll .poll-result { margin-bottom: 10px; margin-left: 0; list-style-type: none; padding: 15px 15px 0; background: #fff; border: 1px solid #eee; }
.topic .poll .poll-result li { margin-bottom: 20px; }
.topic .poll .poll-result li dl { overflow: hidden; zoom: 1; }
.topic .poll .poll-result li dl dt { float: left; width: 50px; text-align: right; padding-right: 15px; }
.topic .poll .poll-result li dl dt span { color: #aaa; }
.topic .poll .poll-result li dl dd { float: left; width: 400px; }
.topic .poll .poll-result li dl dd div { height: 10px; margin-top: 5px; background: #ccc; overflow: hidden; border-radius: 2px; }
.topic .poll .poll-result { margin-bottom: 10px; margin-left: 0; list-style-type: none; padding: 15px 15px 0; background: #fff; border: 1px solid #eee; }
.topic .poll .poll-result li { margin-bottom: 20px; }
.topic .poll .poll-result li dl { overflow: hidden; zoom: 1; }
.topic .poll .poll-result li dl dt { float: left; width: 50px; text-align: right; padding-right: 15px; }
.topic .poll .poll-result li dl dt span { color: #aaa; }
.topic .poll .poll-result li dl dd { padding-left: 65px; }
.topic .poll .poll-result li dl dd div { height: 10px; margin-top: 5px; background: #ccc; overflow: hidden; border-radius: 2px; }
.topic .poll .poll-result li.most dl dd div { background: #60CC4E; }
.topic .poll .poll-total { color: #aaa; margin-left: 10px; }
.topic .poll .button.button-icon.active { background: #43bb34; }
.topic .poll .poll-total { color: #aaa; margin-left: 10px; }
.topic .poll .button.button-icon.active { background: #43bb34; }
/* Topic Photo */
.topic.topic-type-photoset { }

View file

@ -100,6 +100,9 @@
{assign var=body_classes value=$body_classes|cat:' ls-user-role-not-admin'}
{/if}
{assign var=body_classes value=$body_classes|cat:' ls-template-'|cat:{cfg name="view.skin"}}
{add_block group='toolbar' name='toolbar_admin.tpl' priority=100}
{add_block group='toolbar' name='toolbar_scrollup.tpl' priority=-100}

View file

@ -1,3 +1,7 @@
{if $menu}
{if in_array($menu,$aMenuContainers)}{$aMenuFetch.$menu}{else}{include file="menu.$menu.tpl"}{/if}
{/if}
{if $menu_content}
{include file="menu.$menu_content.content.tpl"}
{/if}

View file

@ -18,7 +18,7 @@
<h3>{$aLang.profile_about}</h3>
{if $oUserProfile->getProfileAbout()}
<p>{$oUserProfile->getProfileAbout()}</p>
<p class="text">{$oUserProfile->getProfileAbout()}</p>
{else}
<p>{$aLang.profile_about_empty}</p>
{/if}

View file

@ -78,27 +78,27 @@
.topic .topic-share .arrow { position: absolute; border: none; width: 15px; height: 11px; background: url(../images/icons-synio.png) no-repeat; background-position: -53px -107px; bottom: -11px; }
/* Poll */
.topic .poll { margin-bottom: 15px; }
.topic .poll { margin-bottom: 15px; }
.topic .poll .poll-vote { margin-bottom: 20px; margin-left: 0; list-style-type: none; }
.topic .poll .poll-vote li { margin-bottom: 10px; }
.topic .poll .poll-vote li:last-child { margin-bottom: 0; }
.topic .poll .poll-vote li label { display: inline; }
.topic .poll .poll-vote li input { position: relative; top: 1px; margin-right: 2px; }
.topic .poll .poll-vote { margin-bottom: 20px; margin-left: 0; list-style-type: none; }
.topic .poll .poll-vote li { margin-bottom: 10px; }
.topic .poll .poll-vote li:last-child { margin-bottom: 0; }
.topic .poll .poll-vote li label { display: inline; }
.topic .poll .poll-vote li input { position: relative; top: 1px; margin-right: 2px; }
.topic .poll .poll-result { margin-bottom: 10px; list-style-type: none; background: #fff; overflow: hidden; }
.topic .poll .poll-result li { margin-bottom: 20px; }
.topic .poll .poll-result li dl { overflow: hidden; zoom: 1; }
.topic .poll .poll-result li dl dt { float: left; width: 80px; }
.topic .poll .poll-result li dl dt span { font-size: 11px; color: #aaa; }
.topic .poll .poll-result li dl dd { float: left; width: 400px; }
.topic .poll .poll-result li dl dd div { height: 7px; margin-top: 3px; background: #ccc; overflow: hidden; border-radius: 4px; }
.topic .poll .poll-result { margin-bottom: 10px; list-style-type: none; background: #fff; overflow: hidden; }
.topic .poll .poll-result li { margin-bottom: 20px; }
.topic .poll .poll-result li dl { overflow: hidden; zoom: 1; }
.topic .poll .poll-result li dl dt { float: left; width: 80px; }
.topic .poll .poll-result li dl dt span { font-size: 11px; color: #aaa; }
.topic .poll .poll-result li dl dd { padding-left: 80px; }
.topic .poll .poll-result li dl dd div { height: 7px; margin-top: 3px; background: #ccc; overflow: hidden; border-radius: 4px; }
.topic .poll .poll-result li.most dl dd div { background: #1999e2; background: url(../images/poll-most.png) repeat-x; -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2); box-shadow: 0 1px 2px rgba(0,0,0,.2); }
.topic .poll .poll-result li.most dl dt { color: #12aaeb; }
.topic .poll .poll-result li.most dl dt { color: #12aaeb; }
.topic .poll .poll-total { position: relative; color: #818189; font-size: 11px; line-height: 16px; padding-left: 80px; margin-bottom: 30px; }
.topic .poll .poll-total .poll-sort { position: absolute; top: 2px; left: 0; width: 23px; height: 23px; background: url(../images/icons-synio.png) -161px 0 no-repeat; cursor: pointer; }
.topic .poll .poll-total .poll-sort.active { background-position: -184px 0; }
.topic .poll .poll-total { position: relative; color: #818189; font-size: 11px; line-height: 16px; padding-left: 80px; margin-bottom: 30px; }
.topic .poll .poll-total .poll-sort { position: absolute; top: 2px; left: 0; width: 23px; height: 23px; background: url(../images/icons-synio.png) -161px 0 no-repeat; cursor: pointer; }
.topic .poll .poll-total .poll-sort.active { background-position: -184px 0; }
/* Topic Photo */
.topic.topic-type-photoset { }

View file

@ -102,9 +102,13 @@
{assign var=body_classes value=$body_classes|cat:' ls-user-role-not-admin'}
{/if}
{assign var=body_classes value=$body_classes|cat:' ls-template-'|cat:{cfg name="view.skin"}}
{add_block group='toolbar' name='toolbar_admin.tpl' priority=100}
{add_block group='toolbar' name='toolbar_scrollup.tpl' priority=-100}
<body class="{$body_classes} width-{cfg name='view.grid.type'}">
{hook run='body_begin'}