diff --git a/app/assets/images/icons_pack.png b/app/assets/images/icons_pack.png index 5c29b80fe..a59aa1c9b 100644 Binary files a/app/assets/images/icons_pack.png and b/app/assets/images/icons_pack.png differ diff --git a/app/assets/images/icons_pack_white.png b/app/assets/images/icons_pack_white.png index af5a3113d..069da628e 100644 Binary files a/app/assets/images/icons_pack_white.png and b/app/assets/images/icons_pack_white.png differ diff --git a/app/assets/images/main-search.png b/app/assets/images/main-search.png new file mode 100644 index 000000000..0a8c313a1 Binary files /dev/null and b/app/assets/images/main-search.png differ diff --git a/app/assets/images/menber-pic.png b/app/assets/images/menber-pic.png new file mode 100644 index 000000000..3e53af70d Binary files /dev/null and b/app/assets/images/menber-pic.png differ diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js index 56c7ae1c4..866f4d2aa 100644 --- a/app/assets/javascripts/orbit-1.0.js +++ b/app/assets/javascripts/orbit-1.0.js @@ -29,18 +29,21 @@ $(document).ready(function(){ placement: "left" }); - var $role = $('.select-role'); - $('.privacy').each(function($i) { - $(this).click(function() { - switch ($i) { - case 0: - $role.slideUp(300); - break; - case 1: - $role.slideDown(300); - break; - } - }); + $(document).on('click', '.privacy', function() { + switch ($(this).val()) { + case 'true': + $(this).parents('.controls').children('.select-role').slideUp(300); + break; + case 'false': + $(this).parents('.controls').children('.select-role').slideDown(300); + break; + } + }); + + $(document).on('click', '.toggle-tr-edit', function() { + $(this).parents('tr').next('.qe-block').removeClass('hide'); + $(this).parents('tr').next('.qe-block').find('.qe-edit-div').addClass('hide'); + $(this).parents('tr').next('.qe-block').find('#qe-' + $(this).attr('rel')).toggleClass('hide'); }); /*tinyscrollbar&windows-Size*/ diff --git a/app/assets/stylesheets/list.css b/app/assets/stylesheets/list.css index 66e0bfb3e..ccf35f242 100644 --- a/app/assets/stylesheets/list.css +++ b/app/assets/stylesheets/list.css @@ -44,7 +44,7 @@ margin-top: 15px; margin-bottom: 3px; } -.main-list tr:hover .hide { +.main-list tr.with_action:hover .hide { display:block !important; } .main-list .label-group { diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index 70279d81f..0153dfcd1 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -38,11 +38,34 @@ background-image: linear-gradient(top, #545b60, #191a1c); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#545b60', endColorstr='#191a1c', GradientType=0); } +#orbit-bar .navbar-search { + float: none; + margin: 6px auto 0; + text-align: center; +} +#orbit-bar .nav.pull-right { + margin-right: -20px; +} +#orbit-bar .search-query { + background-image: url(<%= asset_path 'main-search.png' %>); + background-repeat: no-repeat; + background-position: 5px 6px; + background-color: rgba(255, 255, 255, 0.8); + color: #333; + padding-left: 25px; + text-shadow: 0px 1px 0px #FFF; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3) inset, 0 1px 0 rgba(255, 255, 255, 0.15); +} +#orbit-bar .search-query:focus { + background-color: rgba(255, 255, 255, 0.9); + text-shadow: 0px 1px 0px #FFF; + background-position: 6px 7px; +} #orbit-bar .container { width:100%; } #orbit-bar .orbit-logo .brand { - background: url(<%= 'orbit-bar.png' %>) no-repeat -162px top; + background: url(<%= asset_path 'orbit-bar.png' %>) no-repeat -162px top; text-indent:-9999px; } #orbit-bar .orbit-logo .brand:hover { @@ -58,7 +81,7 @@ background-color: rgba(0,157,220,1); } #orbit-bar .nav > li > a { - background-image: url(<%= 'orbit-bar.png' %>); + background-image: url(<%= asset_path 'orbit-bar.png' %>); background-repeat:no-repeat; display: inline-block; width: 16px; @@ -72,20 +95,33 @@ #orbit-bar .nav > li > a.orbit-bar-desktop { background-position: -100px -4px; } -#orbit-bar .nav > li > a.orbit-bar-logout { - background-position: -38px -4px; - margin: 0 10px 0 0; -} #orbit-bar .nav > li > a.orbit-bar-member { background-position: -4px -37px; } #orbit-bar .nav > li > a.orbit-bar-search { background-position: -68px -4px; } +#orbit-bar .nav > li > a.orbit-bar-account { + background-image: none; + height: 34px; + padding: 3px; + text-indent: inherit; + min-width: 120px; + width: auto !important; +} +#orbit-bar .nav span.member-name { + display: inline-block; + float: right; + line-height: 34px; + padding: 0 10px; +} +#orbit-bar .account-menu { + right: 5px; +} #orbit-bar .bar-login { } -#orbit-bar .bar-login .open { +#orbit-bar .bar-login .open, #orbit-bar .open .orbit-bar-account { background-color: #009DDC; } #orbit-bar .bar-login .dropdown-menu { @@ -97,7 +133,7 @@ list-style: none outside none; } #orbit-bar .bar-login .dropdown-menu .log .title { - background: url(<%= 'sign-in-logo2.png' %>) no-repeat center center; + background: url(<%= asset_path 'sign-in-logo2.png' %>) no-repeat center center; height: 70px; } #orbit-bar .bar-login .dropdown-menu .log form { @@ -150,11 +186,8 @@ font-size:16px; text-align: center; } -#signin-body{ - background: url(<%= 'background.jpg' %>) repeat left top; -} #main-sidebar { - background: url(<%= 'background.jpg' %>) repeat left top; + background: url(<%= asset_path 'background.jpg' %>) repeat left top; width: 155px; padding-right: 4px; border-right: 1px solid rgba(0,0,0,.2); @@ -166,7 +199,7 @@ padding-top: 5px; } #main-sidebar .nav > li.active > a [class^="icons-"] { - background-image: url(<%= 'icons_pack_white.png' %>); + background-image: url(<%= asset_path 'icons_pack_white.png' %>); } #main-sidebar .nav > li > .nav { margin-left: -14px; @@ -200,6 +233,7 @@ padding-top: 42px; padding-bottom: 18px; position: relative; + min-height: 100%; } #main-wrap > .form-actions { background-color: #FFF; @@ -476,7 +510,7 @@ width: 16px; height: 16px; vertical-align: text-top; - background-image: url(<%= 'icons_pack.png' %>); + background-image: url(<%= asset_path 'icons_pack.png' %>); background-position: 16px 16px; background-repeat: no-repeat; *margin-right: .3em; @@ -486,7 +520,7 @@ *margin-left: 0; } .icons-white { - background-image: url(<%= 'icons_pack_white.png' %>); + background-image: url(<%= asset_path 'icons_pack_white.png' %>); } /*1*/ .icons-pencil { @@ -600,6 +634,9 @@ .icons-calendars { background-position: -384px -96px; } +.icons-out { + background-position: -416px -96px; +} /*5*/ .icons-page-blank { background-position: 0px -128px; @@ -719,6 +756,9 @@ background-position: -0px -512px; } /*18*/ +.icons-help { + background-position: -160px -544px; +} .icons- { background-position: -0px -544px; } @@ -729,6 +769,9 @@ .icons-plus { background-position: -288px -576px; } +.icons-power { + background-position: -0px -608px; +} /*20*/ .icons- { background-position: -0px -608px; diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb index d8ab0540c..a93741fce 100644 --- a/app/views/layouts/_orbit_bar.html.erb +++ b/app/views/layouts/_orbit_bar.html.erb @@ -19,7 +19,29 @@ +
+ +
\ No newline at end of file diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index fcd762050..48af1d860 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -1,5 +1,13 @@
  • <%= link_to content_tag(:i, nil, :class => 'icons-purchase') + t('admin.purchase'), admin_purchases_path %>
    • -
  • <%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
    • +
  • + <%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %> + +
  • <%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %>
  • <%= link_to content_tag(:i, nil, :class => 'icons-page') + t('admin.page'), admin_items_path %>
  • <%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t('admin.design'), admin_designs_path %>
    • diff --git a/config/locales/en.yml b/config/locales/en.yml index eb3d75b4f..d228c2c8e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -23,6 +23,7 @@ en: hide: Hide homepage: Homepage login: Login + logout: Logout no_: "No" nothing: Nothing or_lower: or diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb index 3bb7d54be..92bf922f8 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb @@ -1,6 +1,6 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < ApplicationController - layout 'admin' + layout 'new_admin' def index @bulletin_categorys = BulletinCategory.all diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index a9ab39ae2..dcfa74854 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -1,4 +1,4 @@ - + <% if bulletin.is_top? %> @@ -14,13 +14,13 @@