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 12012a0299c480842d03e418b03e7cf7b3088bdf..668cb9a9998628ec94405a0a3e984bbddca4541f 100644 (file)
--- a/app/views/browse/start.html.erb
+++ b/app/views/browse/start.html.erb
@@ -1,4 +1,4 @@
-<div id="browse_controls" class='inner12'>
+<div id="browse_controls" class='inner12 buttons'>

   <a id="browse_filter_toggle" class="button" href="#"><%= t'browse.start_rjs.manually_select' %></a>
   <a id="browse_hide_areas_box" class="button" href="#"><%= t'browse.start_rjs.hide_areas' %></a>
 </div>
   <a id="browse_filter_toggle" class="button" href="#"><%= t'browse.start_rjs.manually_select' %></a>
   <a id="browse_hide_areas_box" class="button" href="#"><%= t'browse.start_rjs.hide_areas' %></a>
 </div>

diff --git a/app/views/oauth_clients/show.html.erb b/app/views/oauth_clients/show.html.erb
index 6b91692111d0b7e18f7845e572f4c11a114a3275..131696ed305fd9f4dc1fc712e03dc7a6bc0af1d4 100644 (file)
--- a/app/views/oauth_clients/show.html.erb
+++ b/app/views/oauth_clients/show.html.erb
@@ -26,9 +26,7 @@
 
 <p><%= t'oauth_clients.show.support_notice' %></p>
 
 
 <p><%= t'oauth_clients.show.support_notice' %></p>
 

-<table>
-<tr>
-<td><%= button_to t('oauth_clients.show.edit'), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get %></td>
-<td><%= 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') } %></td>
-</tr>
-</table>
+<div class="buttons">
+  <%= 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') } %>
+</div>

diff --git a/app/views/redactions/show.html.erb b/app/views/redactions/show.html.erb
index 2404df734e3fb78ab213bf915faecddabcf025de..174fe97e4f60559a02c57509d997b4c375a53591 100644 (file)
--- a/app/views/redactions/show.html.erb
+++ b/app/views/redactions/show.html.erb
@@ -13,10 +13,8 @@
 </p>
 
 <% if @user and @user.moderator? %>
 </p>
 
 <% if @user and @user.moderator? %>

-<table>
-<tr>
-<td><%= button_to t('redaction.show.edit'), edit_redaction_path(@redaction), :method => :get %></td>
-<td><%= button_to t('redaction.show.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('redaction.show.confirm') } %></td>
-</tr>
-</table>
+<div class="buttons">  
+  <%= button_to t('redaction.show.edit'), edit_redaction_path(@redaction), :method => :get %></td>
+  <%= button_to t('redaction.show.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('redaction.show.confirm') } %>
+</div>

 <% end %>
 <% end %>

diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb
index 0887e56051348a5295dc3b5299932eb4d56c6c79..cbe6c1628e928ea701d6a5a82a65d50cb736f3ad 100644 (file)
--- a/app/views/trace/view.html.erb
+++ b/app/views/trace/view.html.erb
@@ -55,10 +55,8 @@
 <br /><br />
 
 <%= if_user(@trace.user) do %>
 <br /><br />
 
 <%= if_user(@trace.user) do %>

-  <table>
-    <tr>
-      <td><%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %></td>
-      <td><%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %></td>
-    </tr>
-  </table>
+  <div class="buttons">
+    <%= 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 %>
+  </div>

 <% end %>
 <% end %>

diff --git a/app/views/user/list.html.erb b/app/views/user/list.html.erb
index 240a7590ddb16532d3bef28ce6f5b345901ab048..93839cbe8d5276ef7b50f399e7cd23aefe4e9d7c 100644 (file)
--- a/app/views/user/list.html.erb
+++ b/app/views/user/list.html.erb
@@ -30,7 +30,7 @@
       <%= render :partial => 'user', :collection => @users %>
     </table>
 
       <%= render :partial => 'user', :collection => @users %>
     </table>
 

-    <div id="user_list_actions">
+    <div id="user_list_actions buttons">

       <%= submit_tag t('user.list.confirm'), :name => "confirm" %>
       <%= submit_tag t('user.list.hide'), :name => "hide" %>
     </div>
       <%= submit_tag t('user.list.confirm'), :name => "confirm" %>
       <%= submit_tag t('user.list.hide'), :name => "hide" %>
     </div>

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index 31cc605e7495c1c6bab5edf14235dfc41a90e4ae..d51e52b5f7898f358a1d491f1f5addaefec6439b 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -36,7 +36,7 @@
       <span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span>
     </p>
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
       <span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span>
     </p>
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>

-    <div class="signing-buttons">
+    <div class="signing-buttons buttons">

       <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
       <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
     </div>
       <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
       <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
     </div>