Makes all in listing actions look and behave the same.

velvet117 · Aug 29, 2013 · d951655 · d951655
1 parent 8e5c7d8
commit d951655
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 13 deletions.
diff --git a/app/helpers/admin/feedback_helper.rb b/app/helpers/admin/feedback_helper.rb
@@ -8,12 +8,25 @@ def comment_class state
 
   def show_feedback_actions(item, context='listing')
     return if current_user.profile.label == "contributor"
-    content_tag(:small) do
-      [change_status(item, context),
-        content_tag(:small, link_to(_("Edit"), :controller => 'admin/feedback', :action => 'edit', :id => item.id)),
-        content_tag(:small, link_to(_("Delete"), {:controller => 'admin/feedback', :action => 'destroy', :id => item.id}, {:class => 'delete'})),
-        link_to(_("Show conversation"), :controller => 'admin/feedback', :action => 'article', :id => item.article_id)].join(" | ").html_safe
-    end      
+    content_tag(:div, { :class => 'action', :style => '' }) do
+      [content_tag(:small, change_status(item, context)), 
+        small_to_edit_comment(item),
+        small_to_delete_comment(item),
+        small_to_conversation(item)
+        ].join(" | ").html_safe
+      end
+  end
+
+  def small_to_edit_comment(item)
+    content_tag(:small, link_to(_("Edit"), :controller => "admin/feedback", :action => 'edit', :id => item.id))
+  end
+
+  def small_to_delete_comment(item)
+    content_tag(:small, link_to(_("Delete"), {:controller => 'admin/feedback', :action => 'destroy', :id => item.id}, :class => 'delete'))
+  end
+
+  def small_to_conversation(item)
+    content_tag(:small, link_to(_("Show conversation"), :controller => 'admin/feedback', :action => 'article', :id => item.article_id))
   end
 
   def filter_link(text, filter='', style='')

diff --git a/app/views/admin/categories/new.html.erb b/app/views/admin/categories/new.html.erb
@@ -31,9 +31,9 @@
       </thead>
       <%= render_void_table(@categories.size, 4)  %>
       <% for category in @categories -%>
-      <tr <%= alternate_class -%> id="category_<%= category.id -%>">
+      <tr id="category_<%= category.id -%>">
         <td>
-          <%= link_to_edit category.name, category %><br />
+          <%= link_to_edit category.name, category %>
           <%= show_category_actions category %>
         </td>
         <td><%= h category.description %></td>

diff --git a/app/views/admin/content/_article_list.html.erb b/app/views/admin/content/_article_list.html.erb
@@ -1,7 +1,7 @@
 <%= render_empty_table(7) if @articles.empty? %>
 <% for article in @articles %>
 <tr <%= alternate_class %>>
-  <td class='article-title'>
+  <td>
     <strong><%= link_to_edit h(article.title), article %></strong>
     <%= show_actions article %>
   </td>

diff --git a/app/views/admin/feedback/_feedback.html.erb b/app/views/admin/feedback/_feedback.html.erb
@@ -16,7 +16,7 @@
       <small><%= format_date_time comment.created_at %></small>
     </div>
   </td>
-  <td class='article-title'>
+  <td>
     <%= comment.html(:all) %>
     <div class='action'>
       <%= show_feedback_actions comment %>

diff --git a/app/views/admin/tags/new.html.erb b/app/views/admin/tags/new.html.erb
@@ -23,7 +23,7 @@
       </thead>
       <%= render_void_table(@tags.size, 3)  %>
       <% for tag in @tags %>
-      <tr <%= alternate_class %>>
+      <tr>
         <td>
           <%= link_to_edit tag.display_name, tag %>
           <%= show_tag_actions tag %>

diff --git a/public/stylesheets/administration_structure.css b/public/stylesheets/administration_structure.css
@@ -30,11 +30,11 @@ td small {
   font-size: 11px;
 }
 
-td.article-title .action {
+tr .action {
   display: none;
 }
 
-td.article-title:hover .action {
+tr:hover .action {
   display: block;
 }