jro_apps/redmine Commit - r2758:7f4635022f7d

Makes 'delete links' the same on admin views....

Jean-Philippe Lang -

r2758:7f4635022f7d

parent child

Context file:

r2758:7f4635022f7d

Collapse all files

app/views/custom_fields/_index.rhtml +5 -2

             <table class="list">
               <thead><tr>
             	<th width="30%"><%=l(:field_name)%></th>
             	<th><%=l(:field_field_format)%></th>
             	<th><%=l(:field_is_required)%></th>
             	<% if tab[:name] == 'IssueCustomField' %>
             	<th><%=l(:field_is_for_all)%></th>
             	<th><%=l(:label_used_by)%></th>
             	<% end %>
             	<th><%=l(:button_sort)%></th>
             	<th width="10%"></th>
               </tr></thead>
               <tbody>
             	<% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
             		<tr class="<%= cycle("odd", "even") %>">
             			<td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td>
             			<td align="center"><%= l(CustomField::FIELD_FORMATS[custom_field.field_format][:name]) %></td>
             			<td align="center"><%= image_tag 'true.png' if custom_field.is_required? %></td>
             			<% if tab[:name] == 'IssueCustomField' %>
             			<td align="center"><%= image_tag 'true.png' if custom_field.is_for_all? %></td>
             			<td align="center"><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
             			<% end %>
             		  <td align="center" style="width:15%;"><%= reorder_links('custom_field', {:action => 'edit', :id => custom_field}) %></td>
-            			<td align="center">
+            			<td class="buttons">
-            				<%= button_to l(:button_delete), { :action => 'destroy', :id => custom_field }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
+            				<%= link_to(l(:button_delete), { :action => 'destroy', :id => custom_field },
+            																			 :method => :post,
+            																			 :confirm => l(:text_are_you_sure),
+            																			 :class => 'icon icon-del') %>
             		  </td>
             		</tr>
             	<% end; reset_cycle %>
               </tbody>
             </table>
             <p><%= link_to l(:label_custom_field_new), {:action => 'new', :type => tab[:name]}, :class => 'icon icon-add' %></p>

app/views/enumerations/list.rhtml +5 -2

             <h2><%=l(:label_enumerations)%></h2>
             <% Enumeration.get_subclasses.each do |klass| %>
             <h3><%= l(klass::OptionName) %></h3>
             <% enumerations = klass.all %>
             <% if enumerations.any? %>
             <table class="list">
             <% enumerations.each do |enumeration| %>
             <tr class="<%= cycle('odd', 'even') %>">
                 <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
                 <td style="width:15%;"><%= image_tag('true.png') if enumeration.is_default? %></td>
                 <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}) %></td>
-                <td align="center" style="width:10%;">
+                <td class="buttons">
-                <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration }, :method => :post, :confirm => l(:text_are_you_sure), :class => "icon icon-del" %>
+                <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration },
+                															 :method => :post,
+                															 :confirm => l(:text_are_you_sure),
+                															 :class => 'icon icon-del' %>
                 </td>
             </tr>
             <% end %>
             </table>
             <% reset_cycle %>
             <% end %>
             <p><%= link_to l(:label_enumeration_new), { :action => 'new', :type => klass.name } %></p>
             <% end %>
             <% html_title(l(:label_enumerations)) -%>

app/views/issue_statuses/list.rhtml +5 -2

             <div class="contextual">
             <%= link_to l(:label_issue_status_new), {:action => 'new'}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_issue_status_plural)%></h2>
             <table class="list">
               <thead><tr>
               <th><%=l(:field_status)%></th>
               <th><%=l(:field_is_default)%></th>
               <th><%=l(:field_is_closed)%></th>
               <th><%=l(:button_sort)%></th>
               <th></th>
               </tr></thead>
               <tbody>
             <% for status in @issue_statuses %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to status.name, :action => 'edit', :id => status %></td>
               <td align="center"><%= image_tag 'true.png' if status.is_default? %></td>
               <td align="center"><%= image_tag 'true.png' if status.is_closed? %></td>
               <td align="center" style="width:15%;"><%= reorder_links('issue_status', {:action => 'update', :id => status}) %></td>
-              <td align="center" style="width:10%;">
+              <td class="buttons">
-                <%= button_to l(:button_delete), { :action => 'destroy', :id => status }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
+                <%= link_to(l(:button_delete), { :action => 'destroy', :id => status },
+                															 :method => :post,
+                															 :confirm => l(:text_are_you_sure),
+                															 :class => 'icon icon-del') %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @issue_status_pages %></p>
             <% html_title(l(:label_issue_status_plural)) -%>

app/views/roles/list.rhtml +5 -2

             <div class="contextual">
             <%= link_to l(:label_role_new), {:action => 'new'}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_role_plural)%></h2>
             <table class="list">
               <thead><tr>
                 <th><%=l(:label_role)%></th>
                 <th><%=l(:button_sort)%></th>
             	<th></th>
               </tr></thead>
               <tbody>
             <% for role in @roles %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= content_tag(role.builtin? ? 'em' : 'span', link_to(role.name, :action => 'edit', :id => role)) %></td>
               <td align="center" style="width:15%;">
               <% unless role.builtin? %>
                 <%= reorder_links('role', {:action => 'edit', :id => role}) %>
               <% end %>
               </td>
-              <td align="center" style="width:10%;">
+              <td class="buttons">
-                <%= button_to(l(:button_delete), { :action => 'destroy', :id => role }, :confirm => l(:text_are_you_sure), :class => "button-small", :disabled => role.builtin? ) %>
+                <%= link_to(l(:button_delete), { :action => 'destroy', :id => role },
+                															:method => :post,
+                															:confirm => l(:text_are_you_sure),
+                															:class => 'icon icon-del') unless role.builtin? %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @role_pages %></p>
             <p><%= link_to l(:label_permissions_report), :action => 'report' %></p>
             <% html_title(l(:label_role_plural)) -%>

app/views/trackers/list.rhtml +5 -2

             <div class="contextual">
             <%= link_to l(:label_tracker_new), {:action => 'new'}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_tracker_plural)%></h2>
             <table class="list">
               <thead><tr>
               <th><%=l(:label_tracker)%></th>
               <th></th>
               <th><%=l(:button_sort)%></th>
               <th></th>
               </tr></thead>
               <tbody>
             <% for tracker in @trackers %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to tracker.name, :action => 'edit', :id => tracker %></td>
               <td align="center"><% unless tracker.workflows.count > 0 %><span class="icon icon-warning"><%= l(:text_tracker_no_workflow) %> (<%= link_to l(:button_edit), {:controller => 'workflows', :action => 'edit', :tracker_id => tracker} %>)</span><% end %></td>
               <td align="center" style="width:15%;"><%= reorder_links('tracker', {:action => 'edit', :id => tracker}) %></td>
-              <td align="center" style="width:10%;">
+              <td class="buttons">
-                <%= button_to l(:button_delete), { :action => 'destroy', :id => tracker }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
+                <%= link_to(l(:button_delete), { :action => 'destroy', :id => tracker },
+                															 :method => :post,
+                															 :confirm => l(:text_are_you_sure),
+                															 :class => 'icon icon-del') %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @tracker_pages %></p>
             <% html_title(l(:label_tracker_plural)) -%>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages