From: Fabrice Bellingard Date: Fri, 23 Nov 2012 14:54:21 +0000 (+0100) Subject: SONAR-3972 Add a "Tools" menu entry in the top header X-Git-Tag: 3.4~287 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=49b4dad4385d9b01ec096b3ff52b6adce453a5ca;p=sonarqube.git SONAR-3972 Add a "Tools" menu entry in the top header Still needs to be done: - apply the correct section to "quality profiles" and "libraries" to avoid having the left menu - remove the "My Filters" link on the user panel when the filters menu is available elsewhere --- 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 f23df0c35cb..7f341d4b451 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 @@ -294,6 +294,8 @@ layout.plugins=Plugins layout.evaluation=Embedded database should be used for evaluation purpose only layout.ie6_warn=Your web browser is outdated. This website may not display correctly. layout.dashboards=Dashboards +layout.tools=Tools +layout.tools.quality_profiles=Quality Profiles layout.user_panel.my_profile=My profile layout.user_panel.recent_history.title=Recent history layout.user_panel.recent_history.clear=Clear 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 2967ca71cd8..b7b68198498 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 @@ -14,6 +14,7 @@
  • <%= message('layout.dashboards') -%>
    • + <%= render 'layouts/tools' -%> @@ -50,10 +50,6 @@ <%= message('reviews.page') -%> -
  • - <%= message('dependencies.page') -%> -
    • - <% controller.java_facade.getPages(Navigation::SECTION_HOME, nil, nil, nil, nil).each do |page| page_url = (page.isController() ? page.getId() : "/plugins/home/#{page.getId()}") selected=request.request_uri.include?("/plugins/home/#{page_url}") @@ -128,17 +124,11 @@ <% end %> <% end %> - <% elsif selected_section==Navigation::SECTION_CONFIGURATION %> - -
  • - <%= message('quality_profiles.page') -%>
    • - <% if current_user %> -
  • - <%= message('my_profile.page') -%>
    • -
  • - <%= message('default_filters.page') -%>
    • - <% end %> - <% if is_admin? %> + <% elsif selected_section==Navigation::SECTION_CONFIGURATION && is_admin? %> + +
  • <%= message('sidebar.project_settings') -%>
    • +
  • + <%= message('settings.page') -%>
  • <%= message('manual_metrics.page') -%>
  • @@ -164,21 +154,18 @@ <%= message('roles.page') -%>
  • <%= message('sidebar.system') -%>
    • -
  • - <%= message('settings.page') -%>
  • <%= message('backup.page') -%>
  • <%= message('bulk_deletion.page') -%>
    • -
  • - <%= message('system_info.page') -%>
    • <% update_center_activated = controller.java_facade.getSettings().getBoolean('sonar.updatecenter.activate') if update_center_activated %>
  • <%= message('update_center.page') -%>
    • +
  • + <%= message('system_info.page') -%>
    • <% end %> - <% end %> <% end %> 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 new file mode 100644 index 00000000000..86dc82f8f44 --- /dev/null +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_tools.html.erb @@ -0,0 +1,15 @@ +
  • + <%= message('layout.tools') -%> + + + +
    • \ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_user_panel.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_user_panel.html.erb index 869224cf5a8..da5f96da4de 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_user_panel.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_user_panel.html.erb @@ -19,6 +19,8 @@
    <%= message('layout.user_panel.my_profile') -%>  â€“  + <%= message('default_filters.page') -%> +  â€“  <%= message('layout.logout') -%> <% else %> <%= message('layout.user_panel.anonymous_user') -%> diff --git a/sonar-server/src/main/webapp/stylesheets/layout.css b/sonar-server/src/main/webapp/stylesheets/layout.css index 3d6bcc52538..551d37ad0fa 100644 --- a/sonar-server/src/main/webapp/stylesheets/layout.css +++ b/sonar-server/src/main/webapp/stylesheets/layout.css @@ -148,6 +148,10 @@ body, a { padding: 0 5px 0 0; } +#hd .dropdown-menu a { + color: #000; +} + #user-panel { position: absolute; float: right; diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css index dc7d85ca0a4..1260a280515 100644 --- a/sonar-server/src/main/webapp/stylesheets/style.css +++ b/sonar-server/src/main/webapp/stylesheets/style.css @@ -2144,10 +2144,7 @@ table.nowrap td, td.nowrap, th.nowrap { border-color: #DDD; border-style: solid; border-width: 1px; - -moz-box-shadow: 0 5px 10px rgab(0, 0, 0, 0.2); - -webkit-box-shadow: 0 5px 10px rgab(0, 0, 0, 0.2); - -o-box-shadow: 0 5px 10px rgab(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgab(0, 0, 0, 0.2); + box-shadow: 10px 10px 20px rgba(0, 0, 0, 0.5); float: left; margin: 0; max-width: 220px;