diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-12-05 18:12:19 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-12-05 18:12:19 +0100 |
| commit | 0b7985c925f104c1d0ce780b4d743dbffce393c2 (patch) | |
| tree | bbf423de331a3844a386a756ebbab25f939ccd56 | |
| parent | 7cb4cf4d9f7b44ddc381eadc5b6dd87192a6dfed (diff) | |
| download | sonarqube-0b7985c925f104c1d0ce780b4d743dbffce393c2.tar.gz sonarqube-0b7985c925f104c1d0ce780b4d743dbffce393c2.zip | |
SONAR-3825 move Save and Copy links
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb | 14 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb | 10 |
2 files changed, 12 insertions, 12 deletions
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 3b3efe0d19c..9c9fbf4513b 100644 --- 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 0af8480d965..3e6fa4652b9 100644 --- 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? %> |