diff options
| author | Philip Arndt <parndt@gmail.com> | 2010-11-22 15:23:25 +1300 |
|---|---|---|
| committer | Philip Arndt <parndt@gmail.com> | 2010-11-22 15:26:53 +1300 |
| commit | e5b9af1054bbd259bde0265acf4386cdaab0ca41 (patch) | |
| tree | a5a89e83d262aab943c7e3f5d22dc52788de24d8 /app/views/blog/posts/show.html.erb | |
| parent | ebb4c59cef0eb4e89700275e23579ca6dd18d619 (diff) | |
| parent | 6d94a0ba7b781f93519183c96bbc718465dccdb4 (diff) | |
| download | refinerycms-blog-e5b9af1054bbd259bde0265acf4386cdaab0ca41.tar.gz refinerycms-blog-e5b9af1054bbd259bde0265acf4386cdaab0ca41.tar.bz2 refinerycms-blog-e5b9af1054bbd259bde0265acf4386cdaab0ca41.zip | |
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.
Diffstat (limited to 'app/views/blog/posts/show.html.erb')
| -rw-r--r-- | app/views/blog/posts/show.html.erb | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/app/views/blog/posts/show.html.erb b/app/views/blog/posts/show.html.erb index 1c725d5..603a44f 100644 --- a/app/views/blog/posts/show.html.erb +++ b/app/views/blog/posts/show.html.erb @@ -1,17 +1,8 @@ -<% content_for :after_javascript_libraries do %> - <% if BlogPost::ShareThis.enabled? %> - <script src="http://w.sharethis.com/button/buttons.js"></script> - <script> - stLight.options({publisher:'<%= BlogPost::ShareThis.key %>'}); - </script> - <% end %> -<% end %> - <% content_for :body_content_left do %> <div id="show_blog_post"> <%= render 'post' %> </div> - + <% if BlogPost.comments_allowed? %> <aside id="comments"> <h2><%= t('.comments.title') %></h2> @@ -73,5 +64,22 @@ <% end %> <%= render :partial => "/shared/content_page", :locals => { :remove_automatic_sections => true } %> -<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %> -<% content_for :javascripts, javascript_include_tag('jquery','refinerycms-blog') %>
\ No newline at end of file + +<% if Refinery.version < '0.9.9' %> + <% content_for :head_libraries, jquery_include_tags(:jquery_ui => false) %> + <% content_for :head do %> + <%= stylesheet_link_tag 'refinerycms-blog' %> + <%= javascript_include_tag('refinerycms-blog') %> + <% if BlogPost::ShareThis.enabled? %> + <script src="http://w.sharethis.com/button/buttons.js"></script> + <script>stLight.options({publisher:'<%= BlogPost::ShareThis.key %>'});</script> + <% end %> +<% else %> + <% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %> + <% content_for :before_javascript_libraries, jquery_include_tags(:jquery_ui => false) %> + <% content_for :javascripts do %> + <%= javascript_include_tag 'refinerycms-blog' %> + <script src="http://w.sharethis.com/button/buttons.js"></script> + <script>stLight.options({publisher:'<%= BlogPost::ShareThis.key %>'});</script> + <% end if BlogPost::ShareThis.enabled? %> +<% end %>
\ No newline at end of file |