Merge pull request #438 from refinery/merge-pr-432

Replaces #432

18 files changed, 7 insertions, 62 deletions

diff --git a/app/assets/images/refinery/blog/icons/add.png b/app/assets/images/refinery/blog/icons/add.png
deleted file mode 100644
index 6332fef..0000000
--- a/app/assets/images/refinery/blog/icons/add.png
+++ /dev/null
diff --git a/app/assets/images/refinery/blog/icons/cog.png b/app/assets/images/refinery/blog/icons/cog.png
deleted file mode 100644
index 67de2c6..0000000
--- a/app/assets/images/refinery/blog/icons/cog.png
+++ /dev/null
diff --git a/app/assets/images/refinery/blog/icons/comment.png b/app/assets/images/refinery/blog/icons/comment.png
deleted file mode 100644
index 7bc9233..0000000
--- a/app/assets/images/refinery/blog/icons/comment.png
+++ /dev/null
diff --git a/app/assets/images/refinery/blog/icons/comment_cross.png b/app/assets/images/refinery/blog/icons/comment_cross.png
deleted file mode 100644
index 6f8102d..0000000
--- a/app/assets/images/refinery/blog/icons/comment_cross.png
+++ /dev/null
diff --git a/app/assets/images/refinery/blog/icons/comment_tick.png b/app/assets/images/refinery/blog/icons/comment_tick.png
deleted file mode 100644
index bcb3ae4..0000000
--- a/app/assets/images/refinery/blog/icons/comment_tick.png
+++ /dev/null
diff --git a/app/assets/images/refinery/blog/icons/comments.png b/app/assets/images/refinery/blog/icons/comments.png
deleted file mode 100644
index 39433cf..0000000
--- a/app/assets/images/refinery/blog/icons/comments.png
+++ /dev/null
diff --git a/app/assets/images/refinery/blog/icons/down.gif b/app/assets/images/refinery/blog/icons/down.gif
deleted file mode 100644
index 990bd87..0000000
--- a/app/assets/images/refinery/blog/icons/down.gif
+++ /dev/null
diff --git a/app/assets/images/refinery/blog/icons/folder.png b/app/assets/images/refinery/blog/icons/folder.png
deleted file mode 100644
index 784e8fa..0000000
--- a/app/assets/images/refinery/blog/icons/folder.png
+++ /dev/null
diff --git a/app/assets/images/refinery/blog/icons/folder_add.png b/app/assets/images/refinery/blog/icons/folder_add.png
deleted file mode 100644
index 529fe8f..0000000
--- a/app/assets/images/refinery/blog/icons/folder_add.png
+++ /dev/null
diff --git a/app/assets/images/refinery/blog/icons/folder_edit.png b/app/assets/images/refinery/blog/icons/folder_edit.png
deleted file mode 100644
index ad669cc..0000000
--- a/app/assets/images/refinery/blog/icons/folder_edit.png
+++ /dev/null
diff --git a/app/assets/images/refinery/blog/icons/page.png b/app/assets/images/refinery/blog/icons/page.png
deleted file mode 100644
index 03ddd79..0000000
--- a/app/assets/images/refinery/blog/icons/page.png
+++ /dev/null
diff --git a/app/assets/images/refinery/blog/icons/page_add.png b/app/assets/images/refinery/blog/icons/page_add.png
deleted file mode 100644
index d5bfa07..0000000
--- a/app/assets/images/refinery/blog/icons/page_add.png
+++ /dev/null
diff --git a/app/assets/images/refinery/blog/icons/page_copy.png b/app/assets/images/refinery/blog/icons/page_copy.png
deleted file mode 100644
index 195dc6d..0000000
--- a/app/assets/images/refinery/blog/icons/page_copy.png
+++ /dev/null
diff --git a/app/assets/images/refinery/blog/icons/up.gif b/app/assets/images/refinery/blog/icons/up.gif
deleted file mode 100644
index 1edf617..0000000
--- a/app/assets/images/refinery/blog/icons/up.gif
+++ /dev/null
diff --git a/app/assets/javascripts/refinery/blog/backend.js b/app/assets/javascripts/refinery/blog/backend.js
index f27f837..ee9313a 100644
--- a/app/assets/javascripts/refinery/blog/backend.js
+++ b/app/assets/javascripts/refinery/blog/backend.js
@@ -1,6 +1,8 @@
 //= require jquery-ui/autocomplete
 
 $(document).ready(function(){
+  $('#more_options').hide()
+
   $('nav#actions.multilist > ul:not(.search_list) li a[href$="' + window.location.pathname + '"]')
     .parent().addClass('selected');
   if($('nav#actions.multilist > ul:not(.search_list) li.selected').length == 0) {
diff --git a/app/assets/stylesheets/refinery/blog/backend.css.scss b/app/assets/stylesheets/refinery/blog/backend.css.scss
index e4ff700..5bfe203 100644
--- a/app/assets/stylesheets/refinery/blog/backend.css.scss
+++ b/app/assets/stylesheets/refinery/blog/backend.css.scss
@@ -1,58 +1,3 @@
-.comments_icon {
-  background-image: image_url('refinery/blog/icons/comments.png');
-}
-.comment_icon {
-  background-image: image_url('refinery/blog/icons/comment.png');
-}
-.comment_cross_icon {
-  background-image: image_url('refinery/blog/icons/comment_cross.png');
-}
-.comment_tick_icon {
-  background-image: image_url('refinery/blog/icons/comment_tick.png');
-}
-.folder_icon {
-  background-image: image_url('refinery/blog/icons/folder.png');
-}
-.folder_add_icon {
-  background-image: image_url('refinery/blog/icons/folder_add.png');
-}
-.folder_edit_icon {
-  background-image: image_url('refinery/blog/icons/folder_edit.png');
-}
-.settings_icon {
-  background-image: image_url('refinery/blog/icons/cog.png');
-}
-.page_icon {
-  background-image: image_url('refinery/blog/icons/page.png');
-}
-.page_copy_icon {
-  background-image: image_url('refinery/blog/icons/page_copy.png');
-}
-.page_add_icon {
-  background-image: image_url('refinery/blog/icons/page_add.png');
-}
-ul.collapsible_menu li {
-  position: relative;
-  span.arrow {
-    background-repeat: no-repeat;
-    position: absolute;
-    right: 10px;
-    top: 13px;
-    width: 11px;
-    height: 7px;
-    cursor: pointer;
-    background-image: image_url('refinery/blog/icons/up.gif');
-  }
-  &.closed {
-    span.arrow {
-      background-image: image_url('refinery/blog/icons/down.gif');
-    }
-  }
-  > div {
-    width: 93%;
-    margin: 0px auto;
-  }
-}
 ul.blog_categories {
   height:200px;
   overflow:auto;
@@ -74,4 +19,4 @@ a#copy_body_link {
 .form-actions a.confirm-delete, #content .form-actions a.confirm-delete {
   position: relative;
   right: auto;
-}
\ No newline at end of file
+}
diff --git a/app/views/refinery/blog/admin/_submenu.html.erb b/app/views/refinery/blog/admin/_submenu.html.erb
index 03426b7..5f67405 100644
--- a/app/views/refinery/blog/admin/_submenu.html.erb
+++ b/app/views/refinery/blog/admin/_submenu.html.erb
@@ -1,8 +1,6 @@
 <nav id='actions' class='multilist'>
   <ul class='search_list'>
-    <li class='not_a_link'>
-      <%= render "/refinery/admin/search", :url => request.path %>
-    </li>
+    <li class='not_a_link'><%= render "/refinery/admin/search", :url => request.path -%></li>
   </ul>
 
   <ul class='collapsible_menu'>
diff --git a/app/views/refinery/blog/admin/posts/_form.html.erb b/app/views/refinery/blog/admin/posts/_form.html.erb
index 5cb061e..26b9f78 100644
--- a/app/views/refinery/blog/admin/posts/_form.html.erb
+++ b/app/views/refinery/blog/admin/posts/_form.html.erb
@@ -40,14 +40,14 @@
     </div>
   </div>
 
-  <%= render '/refinery/admin/form_advanced_options_menu', :f => f %>
-
   <div class='field'>
     <%= f.label :tag_list, t('refinery.blog.shared.tags.title') -%>
     <%= f.text_field :tag_list, value: @post.tag_list.to_s, :class => 'larger' -%>
   </div>
 
-  <div id='more_options' style="display:none;">
+  <%= render '/refinery/admin/form_advanced_options_menu', :f => f %>
+
+  <div id='more_options'>
     <div class="hemisquare">
       <h3><%= t('title', :scope => 'refinery.blog.admin.submenu.categories') %></h3>
       <ul class='blog_categories'>