SONAR-3825 move Save and Copy links

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb
index 3b3efe0d19cc4ec813ad2e6b01a760e0d2e3b565..9c9fbf4513bab00f166554e0a4d881910391df6a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb
@@ -108,7 +108,7 @@
       <input type="text" name="keyRegexp" value="<%= h @filter.criteria['keyRegexp'] -%>">
     </li>
     <li id="criteria-fav" <%= "style='display:none'" unless @filter.criteria('onFavourites') -%>>
-      <%= message 'measure_filter.criteria.only_favourites' %>:<br>
+      <img src="<%= ApplicationController.root_context -%>/images/star.png"> <%= message 'measure_filter.criteria.only_favourites' %>:
       <%= check_box_tag 'onFavourites', 'true', @filter.criteria['onFavourites']=='true' -%>
     </li>
 
@@ -151,16 +151,8 @@
     </li>
     <li>
       <input type="button" name="search" value="<%= message('search_verb') -%>" onclick="submitSearch()">
-    </li>
-    <li>
-      <a href="<%= ApplicationController.root_context -%>/measures" class="link-action"><%= message 'measure_filter.new_search' -%></a>
-      <% if logged_in? %>
-        <% if @filter.id==nil || @filter.user_id==current_user.id %>
-          - <a id="save" href="<%= url_for params.merge({:action => 'save_form', :id => @filter.id}) -%>" class="link-action open-modal"><%= message('save') -%></a>
-        <% end %>
-        <% if @filter.id %>
-          - <a id="copy" href="<%= url_for params.merge({:action => 'copy_form', :id => @filter.id}) -%>" class="link-action open-modal"><%= message('copy') -%></a>
-        <% end %>
+      <% if @filter.results %>
+        <a href="<%= ApplicationController.root_context -%>/measures" class="link-action"><%= message 'measure_filter.new_search' -%></a>
       <% end %>
     </li>
   </form>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
index 0af8480d9651f2b1f218bfe0adce1af40724d23b..3e6fa4652b96f0859613fda215e0d8d14dabaa01 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
@@ -16,12 +16,20 @@
                 <a id="edit" href="<%= url_for params.merge({:edit => true, :id => @filter.id}) -%>"><%= message('measure_filter.configure_columns') -%></a>
               </li>
             <% end %>
-            <li class="last">
+            <li>
               <%= message 'measure_filter.display_as' -%>:
               <% MeasureFilterDisplay.keys.each do |display_key| %>
                 <%= link_to_if display_key!=@filter.display.key, message("measure_filter.display.#{display_key}"), params.merge(:action => 'search', :display => display_key, :id => @filter.id) -%>
               <% end %>
             </li>
+            <% if logged_in? %>
+              <% if @filter.id %>
+                <li><a id="copy" href="<%= url_for params.merge({:action => 'copy_form', :id => @filter.id}) -%>" class="link-action open-modal"><%= message('copy') -%></a></li>
+              <% end %>
+              <% if @filter.id==nil || @filter.user_id==current_user.id %>
+                <li><a id="save" href="<%= url_for params.merge({:action => 'save_form', :id => @filter.id}) -%>" class="link-action open-modal"><%= message('save') -%></a></li>
+              <% end %>
+            <% end %>
           </ul>
           <div class="page_title" style="padding-left: 10px">
             <% if @filter.description.present? %>