diff options
author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-02-16 14:13:37 +0100 |
---|---|---|
committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-02-16 14:13:37 +0100 |
commit | b825370f45cbb9fe010acef921786161853cb43f (patch) | |
tree | f7731a761c9d8ebb03fb99550a171f7725d86c7f | |
parent | b7f9fed088923c14f86a970d6b41ecfdc8c30b13 (diff) | |
download | sonarqube-b825370f45cbb9fe010acef921786161853cb43f.tar.gz sonarqube-b825370f45cbb9fe010acef921786161853cb43f.zip |
Improve some links with the CSS class link-action
4 files changed, 27 insertions, 18 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb index 9b3dc1dbc51..6e42be66294 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb @@ -39,8 +39,8 @@ <td id="desc"><%= h(plan.description) -%></td> <td id="desc"><%= h(plan.user.name) -%></td> <td class="thin nowrap right"> - <%= link_to message('edit'), :action => 'edit', :id => @resource.id, :plan_id => plan.id, :class => 'action' -%> - + <%= link_to message('edit'), {:action => 'edit', :id => @resource.id, :plan_id => plan.id}, :class => 'link-action' -%> + | <% close_confirmation_message = {} if plan.open? && plan.has_open_reviews? @@ -48,9 +48,9 @@ end %> <%= link_to message('action_plans.close'), - {:action => 'change_status', :id => @resource.id, :plan_id => plan.id}, {:method => 'POST', :class => 'action'}.merge(close_confirmation_message) -%> - - <%= link_to message('delete'), {:action => 'delete', :id => @resource.id, :plan_id => plan.id}, {:method => 'POST', :confirm => message('action_plans.confirm_delete'), :class => 'action'} -%> + {:action => 'change_status', :id => @resource.id, :plan_id => plan.id}, {:method => 'POST', :class => 'link-action'}.merge(close_confirmation_message) -%> + | + <%= link_to message('delete'), {:action => 'delete', :id => @resource.id, :plan_id => plan.id}, {:method => 'POST', :confirm => message('action_plans.confirm_delete'), :class => 'link-action'} -%> </td> </tr> <% end %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb index e3d5898e5d5..1c4a69329db 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb @@ -47,13 +47,17 @@ </td> <td class="thin nowrap right"> <% if active.owner?(current_user) %> - <%= link_to message('dashboard.configure_widgets'), {:controller => :dashboard, :action => 'configure', :did => active.dashboard_id, :id => params[:resource]}, :id => "configure-#{u active.name}" %> + <%= link_to message('dashboard.configure_widgets'), {:controller => :dashboard, :action => 'configure', :did => active.dashboard_id, :id => params[:resource]}, + :id => "configure-#{u active.name}", :class => 'link-action' %> | - <%= link_to_remote message('edit'), {:update => "admin_form", :url => {:action => "edit", :id => active.dashboard_id, :resource => params[:resource]}}, {:id => "edit-#{u active.name}", :method => :get} %> + <%= link_to_remote message('edit'), {:update => "admin_form", :url => {:action => "edit", :id => active.dashboard_id, :resource => params[:resource]}}, + {:id => "edit-#{u active.name}", :method => :get, :class => 'link-action'} %> | - <%= link_to message('delete'), {:action => 'delete', :id => active.dashboard_id, :resource => params[:resource]}, :method => :post, :confirm => message('dashboard.do_you_want_to_delete_dashboard'), :id => "delete-#{u active.name}" %> + <%= link_to message('delete'), {:action => 'delete', :id => active.dashboard_id, :resource => params[:resource]}, :method => :post, + :confirm => message('dashboard.do_you_want_to_delete_dashboard'), :id => "delete-#{u active.name}", :class => 'link-action' %> <% else %> - <%= link_to message('unfollow'), {:action => 'unfollow', :id => active.dashboard_id, :resource => params[:resource]}, :method => :post, :id => "unfollow-#{u active.name}" %> + <%= link_to message('unfollow'), {:action => 'unfollow', :id => active.dashboard_id, :resource => params[:resource]}, :method => :post, + :id => "unfollow-#{u active.name}", :class => 'link-action' %> <% end %> </td> </tr> @@ -92,7 +96,8 @@ <%= dashboard.user_name -%> </td> <td class="thin nowrap right"> - <%= link_to message('follow'), {:action => 'follow', :id => dashboard.id, :resource => params[:resource]}, :method => :post, :id => "follow-#{u dashboard.name}" %> + <%= link_to message('follow'), {:action => 'follow', :id => dashboard.id, :resource => params[:resource]}, :method => :post, :id => "follow-#{u dashboard.name}", + :class => 'link-action' %> </td> </tr> <% end 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 49ce4a2a9f2..a1d0b4604bc 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 @@ -60,8 +60,12 @@ <%= l(measure.updated_at) -%> </td> <td class="thin nowrap"> - <a href="<%= url_for :controller => 'manual_measures', :action => 'new', :metric => measure.metric.key, :id => @resource.id -%>"><%= message('edit') -%></a> - <%= link_to message('delete'), {:action => 'delete', :metric => measure.metric.key, :id => @resource.id}, {:method => 'POST', :confirm => "This measure will be deleted during next project analysis", :class => 'action'} -%> + <a href="<%= url_for :controller => 'manual_measures', :action => 'new', :metric => measure.metric.key, :id => @resource.id -%>" class="link-action"><%= message('edit') + -%></a> + | + <%= link_to message('delete'), {:action => 'delete', :metric => measure.metric.key, :id => @resource.id}, {:method => 'POST', + :confirm => "This measure will be deleted during next project + analysis", :class => 'link-action'} -%> </td> </tr> <% end %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb index 1c2f3847cc3..00e8c299b45 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb @@ -12,33 +12,33 @@ <td valign="top"><b>Administrators</b><br/><span class="small gray">Ability to perform administration functions for a project by accessing its settings.</span></td> <td valign="top" style="word-break:break-all;width:35%;"> <span><%= users('admin', params[:resource]).map(&:login).join(', ') %></span> - (<%= link_to "select", {:action => 'edit_users', :resource => @project.id, :role => 'admin'}, :class => 'action' %>) + (<%= link_to "select", {:action => 'edit_users', :resource => @project.id, :role => 'admin'}, :class => 'link-action' %>) </td> <td valign="top" style="word-break:break-all;width:35%;"> <span><%= groups('admin', params[:resource]).map{|g| group_name(g)}.join(', ') %></span> - (<%= link_to "select", {:action => 'edit_groups', :resource => @project.id, :role => 'admin'}, :class => 'action' %>) + (<%= link_to "select", {:action => 'edit_groups', :resource => @project.id, :role => 'admin'}, :class => 'link-action' %>) </td> </tr> <tr class="odd"> <td valign="top"><b>Users</b><br/><span class="small gray">Ability to navigate through every service of a project, except viewing source code and settings.</span></td> <td valign="top" style="word-break:break-all;width:35%;"> <span><%= users('user', params[:resource]).map(&:login).join(', ') %></span> - (<%= link_to "select", {:action => 'edit_users', :resource => @project.id, :role => 'user'}, :class => 'action' %>) + (<%= link_to "select", {:action => 'edit_users', :resource => @project.id, :role => 'user'}, :class => 'link-action' %>) </td> <td valign="top" style="word-break:break-all;width:35%;"> <span><%= groups('user', params[:resource]).map{|g| group_name(g)}.join(', ') %></span> - (<%= link_to "select", {:action => 'edit_groups', :resource => @project.id, :role => 'user'}, :class => 'action' %>) + (<%= link_to "select", {:action => 'edit_groups', :resource => @project.id, :role => 'user'}, :class => 'link-action' %>) </td> </tr> <tr class="even" > <td valign="top"><b>Code viewers</b><br/><span class="small gray">Ability to view source code of a project.</span></td> <td valign="top" style="word-break:break-all;width:35%;"> <span><%= users('codeviewer', params[:resource]).map(&:login).join(', ') %></span> - (<%= link_to "select", {:action => 'edit_users', :resource => @project.id, :role => 'codeviewer'}, :class => 'action' %>) + (<%= link_to "select", {:action => 'edit_users', :resource => @project.id, :role => 'codeviewer'}, :class => 'link-action' %>) </td> <td valign="top" style="word-break:break-all;width:35%;"> <span><%= groups('codeviewer', params[:resource]).map{|g| group_name(g)}.join(', ') %></span> - (<%= link_to "select", {:action => 'edit_groups', :resource => @project.id, :role => 'codeviewer'}, :class => 'action' %>) + (<%= link_to "select", {:action => 'edit_groups', :resource => @project.id, :role => 'codeviewer'}, :class => 'link-action' %>) </td> </tr> </tbody> |