diff --git a/engine/lib/internal/template/js/user.js b/engine/lib/internal/template/js/user.js index 978ab4b9..0ce92c8a 100644 --- a/engine/lib/internal/template/js/user.js +++ b/engine/lib/internal/template/js/user.js @@ -309,10 +309,10 @@ ls.user = (function ($) { $.each(aFields,function(i,aField){ if (result.aErrors && result.aErrors[aField.field][0]) { sForm.find('.validate-error-field-'+aField.field).removeClass('validate-error-hide').addClass('validate-error-show').text(result.aErrors[aField.field][0]); - sForm.find('.validate-ok-field-'+aField.field).addClass('hidden'); + sForm.find('.validate-ok-field-'+aField.field).hide(); } else { sForm.find('.validate-error-field-'+aField.field).removeClass('validate-error-show').addClass('validate-error-hide'); - sForm.find('.validate-ok-field-'+aField.field).removeClass('hidden'); + sForm.find('.validate-ok-field-'+aField.field).show(); } }); ls.hook.run('ls_user_validate_registration_fields_after', [aFields, sForm, result]); diff --git a/templates/skin/developer-jquery/actions/ActionBlog/admin.tpl b/templates/skin/developer-jquery/actions/ActionBlog/admin.tpl index 3c46eba0..8bd8b6ee 100644 --- a/templates/skin/developer-jquery/actions/ActionBlog/admin.tpl +++ b/templates/skin/developer-jquery/actions/ActionBlog/admin.tpl @@ -10,11 +10,11 @@ - - - - - + + + + + @@ -23,15 +23,18 @@ {assign var="oUser" value=$oBlogUser->getUser()} - + {if $oUser->getId()==$oUserCurrent->getId()} {else} - - - - + + + + {/if} {/foreach} diff --git a/templates/skin/developer-jquery/actions/ActionBlog/blog.tpl b/templates/skin/developer-jquery/actions/ActionBlog/blog.tpl index 12e7d9f9..0470e9aa 100644 --- a/templates/skin/developer-jquery/actions/ActionBlog/blog.tpl +++ b/templates/skin/developer-jquery/actions/ActionBlog/blog.tpl @@ -52,7 +52,7 @@ avatar -

{$oBlog->getTitle()|escape:'html'}

+

{if $oBlog->getType()=='close'} {/if}{$oBlog->getTitle()|escape:'html'}

{if $oUserCurrent} diff --git a/templates/skin/developer-jquery/css/base.css b/templates/skin/developer-jquery/css/base.css index 840c0854..95831c9a 100644 --- a/templates/skin/developer-jquery/css/base.css +++ b/templates/skin/developer-jquery/css/base.css @@ -1 +1 @@ -/* ГЛОБАЛЬНЫЕ СТИЛИ -------------------------------------- */ body { font-size: 13px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; line-height: 18px; color: #333; background-color: #f7f7f7; } /* ССЫЛКИ -------------------------------------- */ a { color: #5055b2; text-decoration: none; } a:hover { color: #06e; } a.link-dashed { border-bottom: 1px dashed #5055b2; } a.link-dashed:hover { border-color: #06e; } a.link-dotted { text-decoration: none; border-bottom: 1px dotted #5055b2; } a.link-dotted:hover { border-color: #06e; } /* ЗАГОЛОВКИ -------------------------------------- */ h2.page-header { color: #333; font-size: 27px; line-height: 1em; font-weight: bold; margin-bottom: 20px; } h2.page-header span { color: #aaa; } h2.header-table { margin-bottom: 0; border-bottom: 1px solid #eee; padding-bottom: 5px; font-size: 14px; font-weight: bold; } /* Шапка сайта -------------------------------------- */ #header a { text-decoration: none; } #header .site-name { margin: 0 0 10px; font-size: 54px; line-height: 1em; font-weight: bold; } #header .site-name a:hover { color: #444AA3; } #header .site-description { width: 500px; color: #777; font-size: 15px; } /* Футер -------------------------------------- */ #footer .copyright { float: right; } \ No newline at end of file +/* Глобальные стили -------------------------------------- */ body { font-size: 13px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; line-height: 18px; color: #333; background-color: #f7f7f7; } /* Ссылки -------------------------------------- */ a { color: #5055b2; text-decoration: none; } a:hover { color: #06e; } a.link-dashed { border-bottom: 1px dashed #5055b2; } a.link-dashed:hover { border-color: #06e; } a.link-dotted { text-decoration: none; border-bottom: 1px dotted #5055b2; } a.link-dotted:hover { border-color: #06e; } /* Заголовки -------------------------------------- */ h2.page-header { color: #333; font-size: 27px; line-height: 1em; font-weight: bold; margin-bottom: 20px; } h2.page-header span { color: #aaa; } h2.header-table { margin-bottom: 0; border-bottom: 1px solid #eee; padding-bottom: 5px; font-size: 14px; font-weight: bold; } /* Шапка сайта -------------------------------------- */ #header a { text-decoration: none; color: #333; } #header .site-name { margin: 0 0 10px; font-size: 54px; line-height: 1em; font-weight: bold; } #header .site-name a:hover { color: #444AA3; } #header .site-description { width: 500px; color: #777; font-size: 15px; } /* Футер -------------------------------------- */ #footer .copyright { float: right; } \ No newline at end of file diff --git a/templates/skin/developer-jquery/css/blocks.css b/templates/skin/developer-jquery/css/blocks.css index 8f5e1c49..58dfba21 100644 --- a/templates/skin/developer-jquery/css/blocks.css +++ b/templates/skin/developer-jquery/css/blocks.css @@ -6,11 +6,11 @@ .block:last-child { margin-bottom: 0; } .sidebar-left .block { margin-bottom: 10px; } -.block .block-header { padding: 13px 20px; background: #EAF6F9; border-bottom: 1px solid #D2E8EF; position: relative; } +.block .block-header { padding: 13px 20px; background: #f5f5f5; border-top: 1px solid #eee; position: relative; } .block .block-header h3 { font-size: 16px; line-height: 1em; font-weight: normal; } -.block .block-header h3 a { text-decoration: none; } -.block footer { margin-top: 15px; font-size: 12px; } +.block .block-header h3 a { text-decoration: none; color: #333; } .block .block-content { padding: 20px; } +.block footer { margin-top: 15px; font-size: 12px; } .block .max-height-200 { overflow: auto; max-height: 200px; _height: expression( this.scrollHeight > 200 ? "200px" : "auto" ); position: relative; } @@ -34,7 +34,7 @@ .block.block-type-profile-note p { margin-bottom: 10px; } .block.block-type-profile-note .actions { margin-bottom: 0; } -.block.block-type-profile-nav { padding: 0; } +.block.block-type-profile-nav { padding: 0; background: none; } .block.block-type-profile-actions .block-content { padding: 10px 15px; } .block.block-type-profile-actions ul li { margin-bottom: 5px; } diff --git a/templates/skin/developer-jquery/css/blog.css b/templates/skin/developer-jquery/css/blog.css index d5790d33..8d11fbf9 100644 --- a/templates/skin/developer-jquery/css/blog.css +++ b/templates/skin/developer-jquery/css/blog.css @@ -4,9 +4,10 @@ .blog { background: #fafafa; margin-bottom: 10px; border-radius: 3px; border: 1px solid #eee; overflow: hidden; } -.blog .blog-header { position: relative; padding: 15px 130px 15px 78px; border-bottom: 1px solid #eee; } -.blog .blog-header h2 { font-size: 20px; font-weight: bold; line-height: 1em; margin-top: 3px; margin-bottom: 7px; } -.blog .blog-header .avatar { position: absolute; top: 15px; left: 15px; } +.blog .blog-header { position: relative; padding: 15px 130px 15px 78px; border-bottom: 1px solid #eee; } +.blog .blog-header h2 { font-size: 20px; font-weight: bold; line-height: 1em; margin-top: 3px; margin-bottom: 7px; } +.blog .blog-header h2 i { position: relative; top: 5px; } +.blog .blog-header .avatar { position: absolute; top: 15px; left: 15px; } .blog .blog-header .vote-label { text-transform: uppercase; text-align: right; font-size: 11px; color: #aaa; } @@ -29,5 +30,5 @@ .blog .blog-footer { padding: 15px; border-bottom: 1px solid #eee; } -.blog-more { display: block; padding: 10px 0; text-align: center; text-decoration: none; background: #fafafa; } -.blog-more:hover { background: #eee; } \ No newline at end of file +.blog-more { display: block; padding: 10px 0; text-align: center; text-decoration: none; background: #fafafa; } +.blog-more:hover { background: #eee; } \ No newline at end of file diff --git a/templates/skin/developer-jquery/css/buttons.css b/templates/skin/developer-jquery/css/buttons.css index 028f15f6..da200e9b 100644 --- a/templates/skin/developer-jquery/css/buttons.css +++ b/templates/skin/developer-jquery/css/buttons.css @@ -19,19 +19,29 @@ text-align: center; border: none; - border-radius: 3px; + border-radius: 2px; font-size: 12px; line-height: 16px; color: #fff; + background: #555; + background: -moz-linear-gradient(top, #666666 0%, #555555 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#666666), color-stop(100%,#555555)); + background: -webkit-linear-gradient(top, #666666 0%,#555555 100%); + background: -o-linear-gradient(top, #666666 0%,#555555 100%); + background: -ms-linear-gradient(top, #666666 0%,#555555 100%); + background: linear-gradient(top, #666666 0%,#555555 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#666666', endColorstr='#555555',GradientType=0 ); + + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); cursor: pointer; *margin-right: 5px; } -.button:hover { text-decoration: none; color: #fff; background: #4a4a4a; } +.button:hover { text-decoration: none; color: #fff; background: #666; } .button:active { -moz-box-shadow: 0 0 7px rgba(0, 0, 0, .5) inset; -webkit-box-shadow: 0 0 7px rgba(0, 0, 0, .5) inset; @@ -41,8 +51,17 @@ /* Button Primary */ -.button.button-primary { background: #6a57a9; } -.button.button-primary:hover { background: #5e4e95; } +.button.button-primary { + background: #43bb34; + background: -moz-linear-gradient(top, #43bb34 0%, #3aa62c 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#43bb34), color-stop(100%,#3aa62c)); + background: -webkit-linear-gradient(top, #43bb34 0%,#3aa62c 100%); + background: -o-linear-gradient(top, #43bb34 0%,#3aa62c 100%); + background: -ms-linear-gradient(top, #43bb34 0%,#3aa62c 100%); + background: linear-gradient(top, #43bb34 0%,#3aa62c 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#43bb34', endColorstr='#3aa62c',GradientType=0 ); +} +.button.button-primary:hover { background: #3AA62C; } /* Button Icon */ diff --git a/templates/skin/developer-jquery/css/common.css b/templates/skin/developer-jquery/css/common.css index 1b9f5e00..03249b8e 100644 --- a/templates/skin/developer-jquery/css/common.css +++ b/templates/skin/developer-jquery/css/common.css @@ -1,20 +1,18 @@ /* Голосование ---------------------------------------------------------------*/ -.vote { } +.vote .vote-count { display: inline-block; font-weight: bold; color: #aaa; font-size: 14px; } +.vote .vote-count a { text-decoration: none; color: #999; outline: none; } -.vote .vote-count { display: inline-block; font-weight: bold; color: #aaa; font-size: 14px; } -.vote .vote-count a { text-decoration: none; color: #999; outline: none; } - -.vote.vote-count-positive .vote-count { color: #390; } -.vote.vote-count-negative .vote-count { color: #f00; } +.vote.vote-count-positive .vote-count { color: #390; } +.vote.vote-count-negative .vote-count { color: #f00; } .vote .vote-up, -.vote .vote-down { display: inline-block; cursor: pointer; vertical-align: text-top; width: 14px; height: 14px; background: url(../images/icons.png) no-repeat; opacity: .3; filter: alpha(opacity=30); } -.vote .vote-up { background-position: -408px -96px; } -.vote .vote-down { background-position: -433px -96px; } -.vote .vote-up:hover { opacity: .8; filter: alpha(opacity=80); } -.vote .vote-down:hover { opacity: .8; filter: alpha(opacity=80); } +.vote .vote-down { display: inline-block; cursor: pointer; vertical-align: text-top; width: 14px; height: 14px; background: url(../images/icons.png) no-repeat; opacity: .3; filter: alpha(opacity=30); } +.vote .vote-up { background-position: -408px -96px; } +.vote .vote-down { background-position: -433px -96px; } +.vote .vote-up:hover { opacity: .8; filter: alpha(opacity=80); } +.vote .vote-down:hover { opacity: .8; filter: alpha(opacity=80); } .vote.voted.voted-up .vote-up { opacity: 1; filter: alpha(opacity=100); } .vote.voted.voted-down .vote-down { opacity: 1; filter: alpha(opacity=100); } @@ -34,16 +32,13 @@ /* Пагинация ---------------------------------------------------------------*/ -.pagination ul { overflow: hidden; zoom: 1; line-height: 1em; } -.pagination ul li { float: left; margin-right: 5px; } +.pagination ul { overflow: hidden; zoom: 1; line-height: 1em; } +.pagination ul li { float: left; margin-right: 5px; } .pagination ul li span, -.pagination ul li a { float: left; padding: 7px 10px; border: 1px solid #eee; border-radius: 3px; } -.pagination ul li a { background: #f2f2f9; border-color: #dee0ef; } -.pagination ul li a:hover { background: #EAEAF7; } -.pagination ul li.active { color: #aaa; } -.pagination ul li i { opacity: .5; filter: alpha(opacity=50); } - -.pagination.pagination-comments { margin-bottom: 15px; } +.pagination ul li a { float: left; padding: 7px 10px; background: #eee; color: #333; } +.pagination ul li a:hover { background: #ddd; } +.pagination ul li.active span { color: #bbb; background: #fafafa; } +.pagination ul li i { opacity: .5; filter: alpha(opacity=50); } @@ -51,7 +46,7 @@ ---------------------------------------------------------------*/ .actions { overflow: hidden; zoom: 1; margin-bottom: 10px; } .actions li { float: left; margin-right: 10px; } -.actions li a { color: #f00; } +.actions li a { color: #D23232; } .actions li a:hover { text-decoration: underline; } .actions li a.link-dotted { border-color: #f00; } .actions li a.link-dotted:hover { border-color: #06e; color: #06e; text-decoration: none; } @@ -61,7 +56,7 @@ /* Toolbar ---------------------------------------------------------------*/ .toolbar { float: right; position: fixed; top: 220px; right: 10px; z-index: 100; } -.toolbar section { width: 34px; line-height: 14px; background: #fff; box-shadow: 0 0 5px rgba(0,0,0,.1); margin-bottom: 10px; } +.toolbar section { width: 34px; line-height: 14px; background: #fff; box-shadow: 0 0 5px rgba(0,0,0,.05); margin-bottom: 10px; } .toolbar section a { display: block; padding: 10px; } .toolbar section a:hover { background: #fafafa; } .toolbar section i { display: block; } @@ -86,13 +81,6 @@ /* Список пользователей ---------------------------------------------------------------*/ -.user-list { border-top: 1px solid #eee; } -.user-list li { min-height: 48px; padding: 7px 0 10px 58px; border-bottom: 1px solid #eee; position: relative; zoom: 1; } -.user-list li p { padding-top: 2px; font-size: 11px; } -.user-list li a { text-decoration: none; } -.user-list li .avatar { position: absolute; top: 10px; left: 0; margin-right: 10px; } -.user-list li .author { font-weight: bold; color: #333; } - .user-list-avatar { overflow: hidden; zoom: 1; } .user-list-avatar li { width: 64px; overflow: hidden; float: left; margin-right: 20px; margin-bottom: 15px; text-align: center; font-size: 11px; } .user-list-avatar li img { margin-bottom: 2px; display: block; } @@ -140,27 +128,21 @@ -/* Выпадающее меню создания топика +/* Item List ---------------------------------------------------------------*/ -.create-dropdown { position: relative; margin-right: 120px; } -.create-dropdown a { font-weight: normal; } +.item-list { border-top: 1px solid #eee; } +.item-list li { min-height: 51px; padding: 7px 0 10px 58px; border-bottom: 1px solid #eee; position: relative; zoom: 1; } +.item-list li p { padding-top: 2px; font-size: 11px; } +.item-list li a { text-decoration: none; } +.item-list li .avatar { position: absolute; top: 10px; left: 0; margin-right: 10px; } +.item-list li .author { font-weight: bold; color: #333; } +.item-list li .blog-name { font-weight: bold; } -.create-dropdown-link { text-transform: lowercase; } - -.create-dropdown-menu { position: absolute; top: 32px; overflow: hidden; background: #fff; border: 1px solid #ddd; min-width: 150px; box-shadow: 0 0 5px #ddd; border-radius: 3px; } -.create-dropdown-menu li { font-size: 14px; line-height: 1em; } -.create-dropdown-menu li a { display: block; padding: 10px 15px; } -.create-dropdown-menu li a:hover { background: #fafafa; } -.create-dropdown-menu li.active a { color: #333; } -.create-dropdown-menu li.active a:hover { cursor: default; } - -.drafts { float: right; margin-top: 10px; } /* Разное -------------------- */ - /* Stat */ .stat-performance { width: 910px; margin: 0 auto 20px; padding: 15px 20px; background: #fff; border-top: 1px solid #eee; border-bottom: 1px solid #eee; } .stat-performance table { } @@ -199,27 +181,39 @@ .avatar-edit img { vertical-align: bottom; } .avatar-edit label { margin-top: 10px; } +.drafts { float: right; margin-top: 10px; } /* Хелперы ---------------------------------------------------------------*/ +.mt-10 { margin-bottom: 10px !important; } +.mt-20 { margin-bottom: 20px !important; } + .mb-10 { margin-bottom: 10px !important; } .mb-15 { margin-bottom: 15px !important; } .mb-20 { margin-bottom: 20px !important; } .mb-30 { margin-bottom: 30px !important; } -.clearfix:before, -.clearfix:after { content: ""; display: table; } -.clearfix:after { clear: both; } -.clearfix { zoom: 1; } - .ta-c { text-align: center !important; } .ta-r { text-align: right !important; } .va-m { vertical-align: middle; } .fl-r { float: right !important; } .fl-l { float: left !important; } -.hidden { display: none !important; } +.clearfix:before, +.clearfix:after { content: ""; display: table; } +.clearfix:after { clear: both; } +.clearfix { zoom: 1; } + +.word-wrap { + white-space: -moz-pre-wrap !important; + white-space: -pre-wrap; + white-space: -o-pre-wrap; + white-space: pre-wrap; + word-wrap: break-word; + word-break: break-all; + white-space: normal; +} .user, .ls-user { font-weight: bold; color: #333; } .user .icon-user { margin-right: 3px; } diff --git a/templates/skin/developer-jquery/css/navs.css b/templates/skin/developer-jquery/css/navs.css index f556e024..a1916787 100644 --- a/templates/skin/developer-jquery/css/navs.css +++ b/templates/skin/developer-jquery/css/navs.css @@ -1 +1 @@ -/* ��������� ------------------------------------------------- */ .nav { overflow: hidden; zoom: 1; } .nav li { float: left; } .nav li:last-child { border-right: none; } .nav li a { display: block; padding: 10px 15px; } .nav li a:hover { background: #f3f3f3; } .nav li.active a { background: #f3f3f3; } /* ���� ������� */ #userbar { border: 1px solid #ddd; border-top: none; background: #ffffff; background: -moz-linear-gradient(top, #ffffff 0%, #f3f3f3 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f3f3f3)); background: -webkit-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: -o-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: -ms-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: linear-gradient(top, #ffffff 0%,#f3f3f3 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f3f3f3',GradientType=0 ); border-radius: 0 0 4px 4px; box-shadow: 0 0 5px #ddd; } #userbar .search { float: left; margin: 5px 0 0 7px; *margin: 4px 0 0 4px; } .nav.nav-userbar { float: right; } .nav.nav-userbar li { border-radius: 0 0 0 4px; border-left: 1px solid #eaeaea; } .nav.nav-userbar li:first-child a { border-radius: 0 0 0 4px; } .nav.nav-userbar li:last-child a { border-radius: 0 0 4px 0; } .nav.nav-userbar li:first-child { } .nav.nav-userbar li.nav-userbar-username a { position: relative; padding-left: 47px; font-weight: bold; } .nav.nav-userbar li.nav-userbar-username .avatar { position: absolute; top: 7px; left: 15px; } .nav.nav-userbar li .new-messages { font-weight: bold; } /* ������� ���� */ .nav.nav-main { border-radius: 4px; background: #222; background: -moz-linear-gradient(top, #333 0%, #222 100%); } .nav.nav-main li a { color: #ddd; } .nav.nav-main li a:hover { background: #333; } .nav.nav-main li:first-child a { border-radius: 4px 0 0 4px; } .nav.nav-main li:last-child a { border-radius: 0 4px 4px 0; } .nav.nav-main li.active a { background: #3a3a3a; color: #bbb; box-shadow: 0 0 7px rgba(0,0,0,.15) inset; } /* ��������� ���� */ .nav.nav-nested { height: 65px; margin: 0 0 50px 0; } .nav.nav-nested li { margin-right: 1px; position: relative; } .nav.nav-nested li a { background: #ddd; color: #333; padding: 7px 13px; float: left; } .nav.nav-nested li a:hover { background: #ccc; } .nav.nav-nested li.active > a { background: #333; color: #fff; } .nav.nav-nested ul { position: absolute; top: 100%; left: 0; width: 400px; margin-top: 1px; } .nav.nav-nested li a.new { background: #d1d1d1; font-weight: bold; } .nav.nav-nested li a.new:hover { background: #ccc; } .nav.nav-nested li.active a.new { background: #444; } .nav.nav-nested li.active a.new:hover { background: #555; } /* ������������� */ .nav.nav-pills { margin-bottom: 15px; } .nav.nav-pills li { margin-right: 3px; } .nav.nav-pills li a { border-radius: 4px; padding: 5px 12px; background: #eee; } .nav.nav-pills li a:hover { background: #eaeaea; } .nav.nav-pills li.active a { background: #2375C6; color: #fff; } .nav.nav-pills.nav-pills-profile { margin-bottom: 30px; } /* ��������� �� ������� ������������ */ .nav.nav-profile { margin-bottom: 15px; } .nav.nav-profile li { float: none; margin-bottom: 2px; background: #eee; } .nav.nav-profile li a { padding: 7px 12px; border-radius: 0; } .nav.nav-profile li a:hover { background: #e5e5e5; } .nav.nav-profile li.active a { background: #333; color: #fff; } /* Nav Blog */ .nav-blog-wrapper { margin-bottom: 40px; } .nav.nav-blog { margin-bottom: 5px; } \ No newline at end of file +/* Navigation ------------------------------------------------- */ .nav { overflow: hidden; zoom: 1; } .nav li { float: left; } .nav li:last-child { border-right: none; } .nav li a { display: block; padding: 10px 15px; } .nav li a:hover { background: #f3f3f3; } .nav li.active a { background: #f3f3f3; } /* Nav Pills */ .nav.nav-pills { margin-bottom: 15px; } .nav.nav-pills li { margin-right: 3px; } .nav.nav-pills li a { border-radius: 2px; padding: 5px 12px; background: #f5f5f5; color: #888; } .nav.nav-pills li a:hover { background: #eaeaea; } .nav.nav-pills 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.nav-pills.nav-pills-profile { margin-bottom: 30px; } /* Nav Topic Filter */ .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; border-radius: 2px; } .nav.nav-filter li a:hover { background: #ddd; } .nav.nav-filter li.active a { background: #333; color: #fff; } .nav.nav-filter li a.new { background: #d1d1d1; font-weight: bold; } .nav.nav-filter li a.new:hover { background: #ccc; } .nav.nav-filter li.active a.new { background: #444; } .nav.nav-filter li.active a.new:hover { background: #555; } .nav.nav-filter.nav-filter-sub li a { padding: 5px 10px; font-size: 11px; color: #777; } .nav.nav-filter.nav-filter-sub li.active a { color: #fff; } .nav-filter-wrapper { margin-bottom: 40px; } /* Userbar */ #userbar { border: 1px solid #ddd; border-top: none; background: #ffffff; background: -moz-linear-gradient(top, #ffffff 0%, #f3f3f3 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f3f3f3)); background: -webkit-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: -o-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: -ms-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: linear-gradient(top, #ffffff 0%,#f3f3f3 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f3f3f3',GradientType=0 ); border-radius: 0 0 4px 4px; box-shadow: 0 0 5px #ddd; } #userbar .search { float: left; margin: 5px 0 0 6px; *margin: 4px 0 0 4px; } .nav.nav-userbar { float: right; } .nav.nav-userbar li { border-radius: 0 0 0 4px; border-left: 1px solid #eaeaea; } .nav.nav-userbar li a { color: #555; } .nav.nav-userbar li:first-child a { border-radius: 0 0 0 4px; } .nav.nav-userbar li:last-child a { border-radius: 0 0 4px 0; } .nav.nav-userbar li.nav-userbar-username a { position: relative; padding-left: 47px; font-weight: bold; color: #333; } .nav.nav-userbar li.nav-userbar-username .avatar { position: absolute; top: 7px; left: 15px; } .nav.nav-userbar li .new-messages { color: #4AA731; font-weight: bold; } /* Nav Main */ .nav.nav-main { border-radius: 4px; background: #222; background: -moz-linear-gradient(top, #333 0%, #222 100%); } .nav.nav-main li a { color: #ddd; } .nav.nav-main li a:hover { background: #333; } .nav.nav-main li:first-child a { border-radius: 4px 0 0 4px; } .nav.nav-main li:last-child a { border-radius: 0 4px 4px 0; } .nav.nav-main li.active a { background: #3a3a3a; color: #bbb; box-shadow: 0 0 7px rgba(0,0,0,.15) inset; } /* Nav Profile */ .nav.nav-profile { margin-bottom: 15px; } .nav.nav-profile li { float: none; margin-bottom: 2px; } .nav.nav-profile li a { padding: 7px 12px; color: #333; } /* Dropdown */ .nav.nav-pills li.dropdown { position: relative; } .nav.nav-pills li.dropdown a { padding-right: 25px; } .nav.nav-pills li.dropdown i { position: absolute; top: 13px; right: 9px; height: 0; width: 0; border: 4px solid transparent; border-top-color: #fff; cursor: pointer; } .nav.nav-pills li.dropdown ul { display: none; position: absolute; } .nav.nav-pills li.dropdown.opened a { box-shadow: 0 0 7px rgba(0, 0, 0, .5) inset; } .dropdown-menu { position: absolute; top: 32px; overflow: hidden; background: #fff; border: 1px solid #ccc; min-width: 150px; box-shadow: 0 0 5px rgba(0,0,0,.2); border-radius: 3px; } .dropdown-menu li { font-size: 14px; line-height: 1em; } .dropdown-menu li a { display: block; padding: 10px 15px; } .dropdown-menu li a:hover { background: #fafafa; } .dropdown-menu li.active a { color: #aaa; } .dropdown-menu li.active a:hover { cursor: default; } .dropdown-create { position: relative; margin-right: 120px; } .dropdown-create a { font-weight: normal; } .dropdown-create h2 a { text-transform: lowercase; } \ No newline at end of file diff --git a/templates/skin/developer-jquery/css/profile.css b/templates/skin/developer-jquery/css/profile.css index 06951b31..7ffc456f 100644 --- a/templates/skin/developer-jquery/css/profile.css +++ b/templates/skin/developer-jquery/css/profile.css @@ -2,14 +2,14 @@ СТРАНИЦА ПОЛЬЗОВАТЕЛЯ -------------------------------------------- */ -.profile { min-height: 48px; margin-bottom: 0; padding: 0 250px 20px 65px; position: relative; border-bottom: 1px solid #ddd; } +.profile { min-height: 48px; margin-bottom: 0; padding: 0 300px 20px 65px; position: relative; } .profile .avatar { position: absolute; top: 0; left: 0; } .profile .vote-label { text-transform: uppercase; text-align: right; font-size: 11px; color: #aaa; } .profile .count { font-size: 34px; line-height: 1em; font-weight: bold; text-align: right; } -.profile .vote { position: absolute; top: 0; right: 110px; background: #fff; } +.profile .vote { position: absolute; top: 0; right: 130px; background: #fff; } .profile .vote .vote-count { padding-left: 25px; display: block; } .profile .vote .vote-up { position: absolute; top: 22px; left: 0; display: none; } .profile .vote .vote-down { position: absolute; top: 35px; left: 0; display: none; } @@ -25,7 +25,7 @@ .profile .user-login.no-user-name { position: relative; top: 9px; } .profile .user-name { color: #777; } -.profile-page-header { font-size: 12px; font-weight: bold; margin-bottom: 20px; background: #eee; color: #555; padding: 5px 10px 6px; } +.profile-page-header { font-size: 12px; font-weight: bold; margin-bottom: 20px; background: #f5f5f5; border-top: 1px solid #eee; color: #555; padding: 5px 10px 6px; } -.profile-info-about { padding: 13px 20px 20px; background: #EEFCE5; border-radius: 5px; margin-bottom: 30px; color: #000; } +.profile-info-about { padding: 13px 20px 20px; background: #F1F9F1; border-radius: 5px; margin-bottom: 30px; color: #000; } .profile-info-about h3 { font-size: 18px; margin-bottom: 5px; } \ No newline at end of file diff --git a/templates/skin/developer-jquery/css/tables.css b/templates/skin/developer-jquery/css/tables.css index fcae797b..fd716d9a 100644 --- a/templates/skin/developer-jquery/css/tables.css +++ b/templates/skin/developer-jquery/css/tables.css @@ -1,7 +1,6 @@ /* ------------------------------------------------------------------- ТАБЛИЦЫ ------------------------------------------------------------------- */ - .table { width: 100%; margin-bottom: 15px; } .table th { text-align: left; background: #fafafa; } .table td, .table th { border-bottom: 1px solid #eee; padding: 10px; } @@ -10,29 +9,41 @@ .table a.asc:after { content: "▲"; } .table a.desc:after { content: "▼"; } -.table.table-blogs .cell-name { width: 30%; } -.table.table-blogs .cell-name .avatar { float: left; margin-right: 10px; } -.table.table-blogs .cell-rating { width: 15%; font-weight: bold; } -.table.table-blogs .cell-readers { width: 15%; text-align: center; vertical-align: middle; } -.table.table-blogs .cell-join { text-align: center; vertical-align: middle; } +/* Table Blogs */ +.table.table-blogs .cell-name { } +.table.table-blogs .cell-name .avatar { float: left; margin-right: 10px; clear: right; } +.table.table-blogs .cell-name p { overflow: hidden; } +.table.table-blogs .cell-rating { width: 70px; font-weight: bold; } +.table.table-blogs .cell-readers { width: 70px; text-align: center; vertical-align: middle; } +.table.table-blogs .cell-join { width: 130px; text-align: center; vertical-align: middle; } .table.table-blogs .cell-rating { text-align: center; vertical-align: middle; } -.table.table-plugins .cell-checkbox { width: 20px; padding: 12px 0 10px 10px; } -.table.table-plugins h3 { font-weight: bold; font-size: 17px; line-height: 20px; margin-bottom: 5px; } +/* Table Plugins */ +.table.table-plugins .cell-checkbox { width: 20px; padding: 12px 0 10px 10px; } +.table.table-plugins h3 { font-weight: bold; font-size: 17px; line-height: 20px; margin-bottom: 5px; } -.table.table-profile-notes { border-top: 1px solid #eee; } -.table.table-profile-notes td { vertical-align: top; } -.table.table-profile-notes .cell-username { width: 20%; font-weight: bold; } -.table.table-profile-notes .cell-note { width: 50%; } -.table.table-profile-notes .cell-date { text-align: right; } +/* Table Profile Notes */ +.table.table-profile-notes { border-top: 1px solid #eee; } +.table.table-profile-notes td { vertical-align: top; } +.table.table-profile-notes .cell-username { width: 20%; font-weight: bold; } +.table.table-profile-notes .cell-note { width: 50%; } +.table.table-profile-notes .cell-date { text-align: right; } -.table.table-profile-info { margin-bottom: 40px; } -.table.table-profile-info td { vertical-align: top; } -.table.table-profile-info .cell-label { width: 30%; color: #777; } +/* Table Profile Info */ +.table.table-profile-info { margin-bottom: 40px; } +.table.table-profile-info td { vertical-align: top; } +.table.table-profile-info .cell-label { width: 30%; color: #777; } -.table.table-users .cell-name { font-weight: bold; } -.table.table-users .cell-name img { vertical-align: middle; margin-right: 5px; } +/* Table Users */ +.table.table-users th { font-size: 11px; } +.table.table-users .cell-name { font-weight: bold; } +.table.table-users .cell-name img { float: left; } +.table.table-users .cell-name .username { margin-left: 32px; width: 120px; position: relative; top: 1px; } +.table.table-users tbody .cell-date { font-size: 11px; } +.table.table-users .cell-rating, +.table.table-users .cell-skill { text-align: center; width: 50px; } +/* Table Talk */ .table.table-talk .cell-checkbox { width: 20px; padding: 12px 0 10px 10px; } .table.table-talk thead .cell-checkbox { padding: 10px 0 10px 10px; } .table.table-talk .cell-favourite { width: 20px; padding: 10px 0; text-align: center; } diff --git a/templates/skin/developer-jquery/css/topic.css b/templates/skin/developer-jquery/css/topic.css index c0e47d4d..e42747e8 100644 --- a/templates/skin/developer-jquery/css/topic.css +++ b/templates/skin/developer-jquery/css/topic.css @@ -53,8 +53,8 @@ .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: 5px; margin-top: 5px; background: #ccc; overflow: hidden; } -.topic .poll .poll-result li.most dl dd div { background: #555; } +.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; } diff --git a/templates/skin/developer-jquery/images/loader.gif b/templates/skin/developer-jquery/images/loader.gif index 64ca95ea..09d621ed 100644 Binary files a/templates/skin/developer-jquery/images/loader.gif and b/templates/skin/developer-jquery/images/loader.gif differ diff --git a/templates/skin/developer-jquery/menu.blog.tpl b/templates/skin/developer-jquery/menu.blog.tpl index 84c0983a..047980d6 100644 --- a/templates/skin/developer-jquery/menu.blog.tpl +++ b/templates/skin/developer-jquery/menu.blog.tpl @@ -1,57 +1,64 @@ - + {if $sMenuItemSelect=='blog'} + + {/if} -{if $sPeriodSelectCurrent} - -{/if} \ No newline at end of file + {if $sMenuItemSelect=='log'} + + {/if} + + {if $sPeriodSelectCurrent} + + {/if} + \ No newline at end of file diff --git a/templates/skin/developer-jquery/menu.create.tpl b/templates/skin/developer-jquery/menu.create.tpl index 0826c40b..48399d0f 100644 --- a/templates/skin/developer-jquery/menu.create.tpl +++ b/templates/skin/developer-jquery/menu.create.tpl @@ -1,28 +1,34 @@ -
+ +
{strip} -

Создать +

Создать {if $sMenuItemSelect=='topic'} {$aLang.topic_menu_add} {elseif $sMenuItemSelect=='blog'} @@ -32,7 +38,8 @@ {/if}

{/strip} -

- - + + @@ -28,10 +28,10 @@ - - + + diff --git a/templates/skin/developer-jquery/window_login.tpl b/templates/skin/developer-jquery/window_login.tpl index 725e1db7..e44aa52c 100644 --- a/templates/skin/developer-jquery/window_login.tpl +++ b/templates/skin/developer-jquery/window_login.tpl @@ -80,25 +80,25 @@

- +

- +

- +

- +

{hookb run="popup_registration_captcha"}
{$aLang.blog_admin_users}{$aLang.blog_admin_users_administrator}{$aLang.blog_admin_users_moderator}{$aLang.blog_admin_users_reader}{$aLang.blog_admin_users_bun}{$aLang.blog_admin_users}{$aLang.blog_admin_users_administrator}{$aLang.blog_admin_users_moderator}{$aLang.blog_admin_users_reader}{$aLang.blog_admin_users_bun}
{$oUser->getLogin()} + avatar + {$oUser->getLogin()} + {$aLang.blog_admin_users_current_administrator}getIsAdministrator()}checked{/if} />getIsModerator()}checked{/if} />getUserRole()==$BLOG_USER_ROLE_USER}checked{/if} />getUserRole()==$BLOG_USER_ROLE_BAN}checked{/if} />getIsAdministrator()}checked{/if} />getIsModerator()}checked{/if} />getUserRole()==$BLOG_USER_ROLE_USER}checked{/if} />getUserRole()==$BLOG_USER_ROLE_BAN}checked{/if} />
- - - {if $oBlog->getType() == 'close'} - - {/if} - avatar + +

+ - {$oBlog->getTitle()|escape:'html'} + {if $oBlog->getType() == 'close'} + + {/if} + + {$oBlog->getTitle()|escape:'html'} +

{$aLang.user}{$aLang.user_date_last}{$aLang.user_date_registration}{$aLang.user_date_last}{$aLang.user_date_registration} {$aLang.user_skill} {$aLang.user_rating}
avatar - {$oUserList->getLogin()} +

{$oUserList->getLogin()}

{if $oSession}{date_format date=$oSession->getDateLast()}{/if}{date_format date=$oUserList->getDateRegister()}{if $oSession}{date_format date=$oSession->getDateLast() format="d.m.y, H:i"}{/if}{date_format date=$oUserList->getDateRegister() format="d.m.y, H:i"} {$oUserList->getSkill()} {$oUserList->getRating()}