From 69794935cc807b943e5806e24e1dac9463ba1513 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Fri, 22 Jul 2011 15:35:32 +0200
Subject: [PATCH] Various minor improvements of UI

- Rename the sidebar section 'SYSTEM' to 'CONFIGURATION'
- Change the violations drilldown header in order to be consistent with all other pages
- Remove the link 'Plugins' from footer (useless with Update Center)
- Add a title to manual measures page
---
 .../src/main/resources/org/sonar/i18n/core.properties       | 3 +--
 .../webapp/WEB-INF/app/views/drilldown/violations.html.erb  | 5 ++---
 .../main/webapp/WEB-INF/app/views/layouts/_layout.html.erb  | 6 ++----
 .../webapp/WEB-INF/app/views/manual_measures/index.html.erb | 3 +++
 .../WEB-INF/app/views/project/settings/_plugins.html.erb    | 2 +-
 .../webapp/WEB-INF/app/views/settings/_plugins.html.erb     | 2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/plugins/sonar-i18n-en-plugin/src/main/resources/org/sonar/i18n/core.properties b/plugins/sonar-i18n-en-plugin/src/main/resources/org/sonar/i18n/core.properties
index 9fa9bd00681..af97a14fad7 100644
--- a/plugins/sonar-i18n-en-plugin/src/main/resources/org/sonar/i18n/core.properties
+++ b/plugins/sonar-i18n-en-plugin/src/main/resources/org/sonar/i18n/core.properties
@@ -248,12 +248,11 @@ layout.print=Print
 layout.permalink=Permalink
 layout.sonar.slogan=Embrace Quality
 layout.powered_by=Powered by
-layout.plugins=Plugins
 layout.documentation=Documentation
 layout.ask_a_questions=Ask a question
 layout.bug_feature_request=Bug/feature request
 
-sidebar.project_system=System
+sidebar.project_settings=Configuration
 sidebar.security=Security
 sidebar.system=System
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb
index 081728efc6b..88b27e98560 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb
@@ -6,10 +6,9 @@
 <%
    profile_measure=@snapshot.measure(Metric::PROFILE)
  %>
-<%= link_to_favourite(@project) -%> Version <%= @snapshot.version -%> - <%= l @snapshot.created_at %>
-<% if profile_measure %> - Profile <%= link_to profile_measure.data, :controller => '/rules_configuration', :action => 'index', :id => profile_measure.value.to_i %><% end %>
+<% if profile_measure %>Profile <%= link_to profile_measure.data, :controller => '/rules_configuration', :action => 'index', :id => profile_measure.value.to_i %> - <% end %>
 <% if @snapshot.project_snapshot.periods? %>
-- <form method="GET" action="<%= url_for :only_path=>true, :overwrite_params => {:period => nil} -%>" style="display: inline">
+<form method="GET" action="<%= url_for :only_path=>true, :overwrite_params => {:period => nil} -%>" style="display: inline">
     <select id="select-comparison" name="period" onchange="submit()" class="small">
       <option value=""><%= message('time_changes') -%>...</option>
       <%= violation_period_select_options(@snapshot, 1) -%>
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 70f1a4f0cc7..1ac79bf85d8 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
@@ -49,7 +49,7 @@
           <li class="<%= 'selected' if request.request_uri.include?("page=#{page.getId()}") -%>"><a href="<%= ApplicationController.root_context -%>/plugins/resource/<%= @project.id-%>?page=<%= page.getId() -%>"><%= message(page.getId() + '.page', :default => page.getTitle()) %></a></li>
           <% end %>
           <% if has_role?(:admin, @project) %>
-            <li class="h2"><%= message('sidebar.project_system') -%></li>
+            <li class="h2"><%= message('sidebar.project_settings') -%></li>
             <li class="<%= 'selected' if request.request_uri.include?('/manual_measures') -%>"><a href="<%= ApplicationController.root_context -%>/manual_measures/index/<%= @project.id -%>"><%= message('manual_measures.page') -%></a></li>
             <% if (@project.project? || @project.module?) %>
               <li class="<%= 'selected' if request.request_uri.include?('/project/settings') -%>"><a href="<%= ApplicationController.root_context -%>/project/settings/<%= @project.id -%>"><%= message('project_settings.page') -%></a></li>
@@ -117,9 +117,7 @@
   Open Source <a href="http://www.sonarsource.org/documentation/license/" target="license" class="external">LGPL</a> 
   - 
   v.<%= sonar_version -%> 
-  - 
-  <a href="http://sonar-plugins.codehaus.org" class="external" target="plugins"><%= message('layout.plugins') -%></a> 
-  - 
+  -
   <a href="http://sonar.codehaus.org/documentation" class="external" target="sonar_doc" class="external"><%= message('layout.documentation') -%></a> 
   - 
   <a href="http://sonar.codehaus.org/support/" target="support" class="external"><%= message('layout.ask_a_questions') -%></a> 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb
index 0b19dcd646b..69375a40a26 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb
@@ -10,6 +10,7 @@
     width: 2px;
   }
 </style>
+
 <div class="line-block marginbottom10">
   <ul class="operations">
     <li class="last">
@@ -17,8 +18,10 @@
       <a href="<%= ApplicationController.root_context -%>/manual_measures/new/<%= @resource.id -%>" id="addMeasureLink">Add measure</a>
     </li>
   </ul>
+  <h1>Manual measures</h1>
 </div>
 
+
 <table class="width100 data sortable" id="manualMeasures">
   <thead>
   <tr>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/settings/_plugins.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/settings/_plugins.html.erb
index 445b5598a21..7582ee2d3d4 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/settings/_plugins.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/settings/_plugins.html.erb
@@ -1,4 +1,4 @@
-<h2>Plugin settings</h2>
+<h1 class="marginbottom10">Settings</h1>
 <div class="yui-g widget" id="widget_plugins">
 <%= render :partial => 'settings/plugins', :locals => {:project=>@project} %>
 </div>
\ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_plugins.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_plugins.html.erb
index e4bc30eb961..d0d7ad83c44 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_plugins.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_plugins.html.erb
@@ -55,7 +55,7 @@
                         </tbody>
                     </table>
                     <br/>
-                    <%= submit_tag('save parameters') %>
+                    <%= submit_tag('Save parameters') %>
                 </td>
                 <td class="column">
 
-- 
2.39.5