Merge branch 'admin-fixes'

ayamomiji · Feb 25, 2012 · a8ef4e2 · a8ef4e2
2 parents bd91490 + 83caf02
commit a8ef4e2
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 28 deletions.
diff --git a/app/assets/javascripts/admin/comments.js b/app/assets/javascripts/admin/comments.js
diff --git a/app/assets/javascripts/admin/common.js b/app/assets/javascripts/admin/common.js
@@ -107,3 +107,10 @@ function destroyAndUndoBehaviour(type) {
   }
 }
 
+$(document).ready(function() {
+  $(['posts', 'comments', 'pages']).each(function() {
+    if ($('#' + this).length > 0) {
+      destroyAndUndoBehaviour(this)();
+    }
+  });
+});
diff --git a/app/assets/javascripts/admin/dashboard.js b/app/assets/javascripts/admin/dashboard.js
@@ -4,30 +4,32 @@ function extractId(obj) {
 }
 
 $(document).ready(function (){
-  $('.comment-body').hide();
+  if ($('#recent-comments').length) {
+    $('.comment-body').hide();
 
-  $('.comment-link').click (function() {
+    $('.comment-link').click (function() {
-    comment_body_id = '#comment-body-' + extractId($(this));
+      comment_body_id = '#comment-body-' + extractId($(this));
 
-    $('.comment-body').not(comment_body_id).hide();
+      $('.comment-body').not(comment_body_id).hide();
-    $(comment_body_id).toggle();
+      $(comment_body_id).toggle();
 
-    return false;
+      return false;
-  })
+    })
 
-  $(document).click(function() {
+    $(document).click(function() {
-    $('.comment-body').hide();
+      $('.comment-body').hide();
-  });
+    });
 
-  asyncUndoBehaviour();
+    asyncUndoBehaviour();
 
-  $('form.delete-item').submit(function () {
+    $('form.delete-item').submit(function () {
-    asyncDeleteForm($(this));
+      asyncDeleteForm($(this));
 
-    // Assume success and remove comment
+      // Assume success and remove comment
-    comment_link_id = '#comment-link-' + extractId($(this));
+      comment_link_id = '#comment-link-' + extractId($(this));
-    $(comment_link_id).remove();
+      $(comment_link_id).remove();
-    $(this).parent('div').parent('div').remove();
+      $(this).parent('div').parent('div').remove();
-    return false;
+      return false;
-  });
+    });
+  }
 })
diff --git a/app/assets/javascripts/admin/pages.js b/app/assets/javascripts/admin/pages.js
diff --git a/app/assets/javascripts/admin/posts.js b/app/assets/javascripts/admin/posts.js
diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb
@@ -1,5 +1,6 @@
 <h1>Comments</h1>
-<table>
+
+<table id='comments'>
   <thead>
     <tr>
       <th>Created At</th>

diff --git a/app/views/admin/pages/index.html.erb b/app/views/admin/pages/index.html.erb
@@ -1,6 +1,6 @@
 <h1>Your pages</h1>
 
-<table>
+<table id='pages'>
   <thead>
     <tr>
       <th>Created At</th>

diff --git a/app/views/admin/posts/_post.html.erb b/app/views/admin/posts/_post.html.erb
@@ -6,7 +6,7 @@
   <td>
     <%= link_to(image_tag('silk/pencil.png', :alt => 'edit'), admin_post_path(post)) %>
     <%= form_for(post, :as => :post, :url => admin_post_path(post), :html => {:class => 'delete-item', :method => :delete}) do |form| -%>
-      <%= image_submit_tag("silk/delete.png", :alt => 'Delete Comment') %>
+      <%= image_submit_tag("silk/delete.png", :alt => 'Delete Post') %>
     <% end -%>
   </td>
 </tr>
diff --git a/app/views/admin/posts/index.html.erb b/app/views/admin/posts/index.html.erb
@@ -1,5 +1,6 @@
 <h1>Your posts</h1>
-<table>
+
+<table id='posts'>
   <thead>
     <tr>
       <th>Published At</th>