Merged in Joe's and Steven's forks and updated for compatibility with < 0.9.9. Also, specs now work by including the factories and I have also laid the foundation for cucumber features. Fixed an issue where the javascript file was clashing with the same code we merged to core from this engine relating to submenus. Regenerated gemspec.

3 files changed, 29 insertions, 23 deletions

diff --git a/app/views/admin/blog/posts/_form.css.erb b/app/views/admin/blog/posts/_form.css.erb
new file mode 100644
index 0000000..d6f2c20
--- /dev/null
+++ b/app/views/admin/blog/posts/_form.css.erb
@@ -0,0 +1,7 @@
+<style type='text/css'>
+  ul.blog_categories, ul.blog_categories li {
+    list-style: none;
+    margin: 0px;
+    padding: 0px;
+  }
+</style>
\ No newline at end of file
diff --git a/app/views/admin/blog/posts/_form.html.erb b/app/views/admin/blog/posts/_form.html.erb
index de46afc..5779e4c 100644
--- a/app/views/admin/blog/posts/_form.html.erb
+++ b/app/views/admin/blog/posts/_form.html.erb
@@ -57,27 +57,13 @@
                 :delete_title => t('admin.blog.posts.post.delete')
               } %>
 <% end -%>
-<% content_for :stylesheets do -%>
-  <style type='text/css'>
-     ul.blog_categories, ul.blog_categories li {
-       list-style: none;
-       margin: 0px;
-       padding: 0px;
-     }
-   </style>
-<% end -%>
-<% content_for :after_javascript_libraries do %>
-  <script type='text/javascript'>
-    $(document).ready(function(){
-      $('#toggle_advanced_options').click(function(e){
-        e.preventDefault();
-
-        $('#more_options').animate({opacity: 'toggle', height: 'toggle'}, 250);
 
-        $('html,body').animate({
-          scrollTop: $('#toggle_advanced_options').parent().offset().top
-        }, 250);
-      });
-    });
-  </script>
-<% end %>
\ No newline at end of file
+<% if Refinery.version < '0.9.9' %>
+  <% content_for :head do %>
+    <%= render :partial => 'form.css' %>
+    <%= render :partial => 'form.js' %>
+  <% end %>
+<% else %>
+  <% content_for :stylesheets, render(:partial => 'form.css') -%>
+  <% content_for :javascripts, render(:partial => 'form.js') -%>
+<% end %>
diff --git a/app/views/admin/blog/posts/_form.js.erb b/app/views/admin/blog/posts/_form.js.erb
new file mode 100644
index 0000000..394975f
--- /dev/null
+++ b/app/views/admin/blog/posts/_form.js.erb
@@ -0,0 +1,13 @@
+<script>
+  $(document).ready(function(){
+    $('#toggle_advanced_options').click(function(e){
+      e.preventDefault();
+
+      $('#more_options').animate({opacity: 'toggle', height: 'toggle'}, 250);
+
+      $('html,body').animate({
+        scrollTop: $('#toggle_advanced_options').parent().offset().top
+      }, 250);
+    });
+  });
+</script>
\ No newline at end of file