From: Thomas Levine Date: Tue, 11 Jun 2013 18:38:17 +0000 (-0400) Subject: Use new joined buttons style for groups of buttons X-Git-Tag: live~4888 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c789acd39d1c685b490975dc06721dadd76c83ef Use new joined buttons style for groups of buttons --- diff --git a/app/views/browse/start.html.erb b/app/views/browse/start.html.erb index 12012a029..668cb9a99 100644 --- a/app/views/browse/start.html.erb +++ b/app/views/browse/start.html.erb @@ -1,4 +1,4 @@ -
+ diff --git a/app/views/oauth_clients/show.html.erb b/app/views/oauth_clients/show.html.erb index 6b9169211..131696ed3 100644 --- a/app/views/oauth_clients/show.html.erb +++ b/app/views/oauth_clients/show.html.erb @@ -26,9 +26,7 @@

<%= t'oauth_clients.show.support_notice' %>

- - - - - -
<%= button_to t('oauth_clients.show.edit'), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get %><%= button_to t('oauth_clients.show.delete'), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t('oauth_clients.show.confirm') } %>
+
+ <%= button_to t('oauth_clients.show.edit'), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get %> + <%= button_to t('oauth_clients.show.delete'), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t('oauth_clients.show.confirm') } %> +
diff --git a/app/views/redactions/show.html.erb b/app/views/redactions/show.html.erb index 2404df734..174fe97e4 100644 --- a/app/views/redactions/show.html.erb +++ b/app/views/redactions/show.html.erb @@ -13,10 +13,8 @@

<% if @user and @user.moderator? %> - - - - - -
<%= button_to t('redaction.show.edit'), edit_redaction_path(@redaction), :method => :get %><%= button_to t('redaction.show.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('redaction.show.confirm') } %>
+
+ <%= button_to t('redaction.show.edit'), edit_redaction_path(@redaction), :method => :get %> + <%= button_to t('redaction.show.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('redaction.show.confirm') } %> +
<% end %> diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb index 0887e5605..cbe6c1628 100644 --- a/app/views/trace/view.html.erb +++ b/app/views/trace/view.html.erb @@ -55,10 +55,8 @@

<%= if_user(@trace.user) do %> - - - - - -
<%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %><%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %>
+
+ <%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %> + <%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %> +
<% end %> diff --git a/app/views/user/list.html.erb b/app/views/user/list.html.erb index 240a7590d..93839cbe8 100644 --- a/app/views/user/list.html.erb +++ b/app/views/user/list.html.erb @@ -30,7 +30,7 @@ <%= render :partial => 'user', :collection => @users %> -
+
<%= submit_tag t('user.list.confirm'), :name => "confirm" %> <%= submit_tag t('user.list.hide'), :name => "hide" %>
diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb index 31cc605e7..d51e52b5f 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -36,7 +36,7 @@ (<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)

<%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %> -
+
<%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %> <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>