From 5acc0d0d460a449a78aebb01ad4875ae71e824c4 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sat, 1 Dec 2012 16:35:32 +0100 Subject: [PATCH] Improve layout.css --- .../resources/org/sonar/l10n/core.properties | 2 +- .../app/controllers/measures_controller.rb | 2 +- .../app/controllers/reviews_controller.rb | 2 +- .../WEB-INF/app/models/measure_filter.rb | 1 + .../app/views/dashboard/_header.html.erb | 2 + .../app/views/layouts/_layout.html.erb | 191 +++++++++--------- .../WEB-INF/app/views/layouts/_tools.html.erb | 2 +- .../WEB-INF/app/views/reviews/index.html.erb | 2 +- .../src/main/webapp/stylesheets/dashboard.css | 7 +- .../src/main/webapp/stylesheets/layout.css | 89 ++------ .../src/main/webapp/stylesheets/style.css | 5 +- 11 files changed, 128 insertions(+), 177 deletions(-) diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties index e76e1e232cd..bb78ed8c5e9 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties @@ -306,7 +306,7 @@ layout.user_panel.anonymous_user=Anonymous sidebar.tools=Tools sidebar.tools.comparison=Comparison sidebar.tools.dependency=Dependency -sidebar.tools.review=Review +sidebar.tools.reviews=Reviews sidebar.project_settings=Configuration sidebar.security=Security sidebar.system=System diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb index ce19f9f8982..100abce9db2 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb @@ -35,7 +35,7 @@ class MeasuresController < ApplicationController add_breadcrumbs({:name => @filter.name, :url => {:action => 'filter', :id => @filter.id}}) else @filter = MeasureFilter.new - add_breadcrumbs(message('search_verb')) + add_breadcrumbs(:name => message('search_verb'), :url => {:action => 'index'}) end @filter.criteria=(params) @filter.enable_default_display diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb index fc9ea5318f5..a1998eb13e4 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb @@ -31,7 +31,7 @@ class ReviewsController < ApplicationController init_params() search_reviews() - add_breadcrumbs message('sidebar.tools'), {:name => message('sidebar.tools.review'), :url => {:controller => 'reviews', :action => 'index'}} + add_breadcrumbs message('sidebar.tools'), {:name => message('sidebar.tools.reviews'), :url => {:controller => 'reviews', :action => 'index'}} end # Used for the "OLD" permalink "http://localhost:9000/reviews/view/1" diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb index 85ad47178fe..878feb6b249 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb @@ -110,6 +110,7 @@ class MeasureFilter < ActiveRecord::Base # API used by Displays def set_criteria_value(key, value) + @criteria ||= {} if key if value && !value.empty? && value!=[''] @criteria[key.to_s]=value diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb index 4293e203b7c..682fa9162b0 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb @@ -1,3 +1,4 @@ +<% if logged_in? || @snapshot %>
<% if logged_in? %>
<% end %> +<% end %> \ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb index 1ae072d79b6..71e2ab2fc76 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb @@ -7,48 +7,47 @@ period_param = "period=#{params[:period]}" if params[:period] %>
-<%= yield :header -%> -
- - -<%= render 'layouts/breadcrumb' if @breadcrumbs || selected_section==Navigation::SECTION_RESOURCE -%> -
- <% if selected_section || @sidebar %> -
+ <%= render 'layouts/breadcrumb' if @breadcrumbs || selected_section==Navigation::SECTION_RESOURCE -%> +
+ <% if selected_section %> - - <% if @sidebar %> -
<%= render :partial => @sidebar %>
- <% else %> - - <% end %> -
- <% end %> -
> - <% if @project %> -

<%= @project.name(true) %>

<% end %> - - -
-
<% unless params[:hd]=='false' %> <%= yield :footer %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_tools.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_tools.html.erb index 2e358d6751f..d0f369f2cc5 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_tools.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_tools.html.erb @@ -5,7 +5,7 @@
\ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb index 9a7831cd11c..e1db0ced33d 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb @@ -29,7 +29,7 @@
  • <%= message('status') -%>:
    - diff --git a/sonar-server/src/main/webapp/stylesheets/dashboard.css b/sonar-server/src/main/webapp/stylesheets/dashboard.css index 4572c090454..4579e3373da 100644 --- a/sonar-server/src/main/webapp/stylesheets/dashboard.css +++ b/sonar-server/src/main/webapp/stylesheets/dashboard.css @@ -46,10 +46,9 @@ #dashboard .widget-title { background-color: #4B9FD5; color: #FEFEFE; - padding: 5px; - height: 16px; - line-height: 16px; - vertical-align: middle; + padding: 0 5px; + height: 24px; + line-height: 24px; } #dashboard .widget-title a { diff --git a/sonar-server/src/main/webapp/stylesheets/layout.css b/sonar-server/src/main/webapp/stylesheets/layout.css index 3fd78010772..240cbc0f254 100644 --- a/sonar-server/src/main/webapp/stylesheets/layout.css +++ b/sonar-server/src/main/webapp/stylesheets/layout.css @@ -19,7 +19,7 @@ left: 0; } - #hd, #sb { + #hd { display: none; } @@ -53,7 +53,7 @@ body, a { #hd { color: #FFF; background: #262626; - padding: 0 8px 0 18px; + padding: 0 10px 0 21px; height: 30px; line-height: 30px; font-size: 93%; @@ -77,7 +77,7 @@ body, a { #nav { float: right; - padding: 0 0 0 10px; + padding: 0 0 0 20px; vertical-align: middle; } @@ -110,7 +110,7 @@ body, a { line-height: 26px; font-size: 93%; margin: 0; - padding: 0 8px 0 18px; + padding: 0 10px 0 21px; border-bottom: 1px solid #CCC; } @@ -120,15 +120,10 @@ body, a { #bc li { float: left; - margin: 0; - background: #EFEFEF url("../images/bc-gray.png") no-repeat left; + background: #EFEFEF url("../images/bc-gray.png") no-repeat right; border-bottom: 1px solid #CCC; - padding: 0 10px 0 25px; -} - -#bc li.first { - background: #EFEFEF; - padding: 0 10px 0 0; + padding: 0 20px 0 0; + margin: 0 10px 0 0; } #bc li img { @@ -215,71 +210,31 @@ body, a { } .with_sidebar { - margin: 0 8px 0 168px; + margin: 0 0 0 160px; } .wo_sidebar { margin: 0 8px; } -#sb { +#sidebar { width: 150px; position: absolute; - margin: 0 8px; + margin: 0 0 0 10px; top: 0; left: 0; } -#sidebar { - background-color: #CAE3F2; - color: #262626; - text-align: left; - line-height: 1.1em; - border: 2px solid #4b9fd5; - border-top: none; - padding: 10px 0; -} - -#sidebar li { - list-style-type: none; - padding: 3px 0 3px 8px; -} - -#sidebar li.h2 { - color: #003366; - padding: 20px 0 3px 8px; - text-transform: uppercase; - font-size: 100% !important; - font-weight: bold; -} - -#sidebar .selected { - background-color: #4b9fd5; -} - -#sidebar a, #sidebarpages a:visited { - text-decoration: none; - border-bottom: 0; -} - -#sidebar a:hover { - text-decoration: underline; -} - -#sidebar .selected a, #sidebar .selected a:hover, #sidebar.selected a:visited { - color: #FEFEFE; -} - ul.sidebar { text-align: left; - line-height: 1.1em; border-top: none; padding: 10px 0; } ul.sidebar li { list-style-type: none; - padding: 3px 10px 3px 10px; + line-height: 1.1em; + padding: 3px 10px; } ul.sidebar li a { @@ -298,7 +253,7 @@ ul.sidebar li.active a, ul.sidebar li.active a:hover { color: #FFF; } -.sidebar-title { +li.sidebar-title { text-transform: uppercase; font-size: 93%; font-weight: bold; @@ -325,15 +280,6 @@ ul.sidebar li.spacer { display: block; } -#sidebarconf { - background-color: #EFEFEF; - border: 2px solid #CCC; - color: #666; - line-height: 1.1em; - margin-top: 10px; - padding: 10px; -} - .nolayout { padding: 10px; } @@ -346,6 +292,7 @@ ul.sidebar li.spacer { vertical-align: top; border-top: none; border-left: none; + padding-left: 10px; } .page-split-right { @@ -362,5 +309,11 @@ ul.sidebar li.spacer { border: 1px solid #CCC; color: #666; border-top: none; - border-left: none; +} + +.blue-sidebar { + background-color: #CAE3F2; + color: #262626; + border: 2px solid #4b9fd5; + border-top: none; } diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css index e96f52f5e51..e2f3cf9511b 100644 --- a/sonar-server/src/main/webapp/stylesheets/style.css +++ b/sonar-server/src/main/webapp/stylesheets/style.css @@ -2122,13 +2122,14 @@ table.nowrap td, td.nowrap, th.nowrap { min-width: 160px; padding: 0; position: absolute; - line-height: 20px; z-index: 1000; } .dropdown-menu li { list-style-type: none !important; - padding: 2px 8px !important; + line-height: 24px; + height: 24px; + padding: 0 8px; cursor: pointer !important; color: red !important; } -- 2.39.5