imagine_cms 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4924ffa8137573b21030d4e6f6b553e67cd092e
-  data.tar.gz: c285cd363f13dfdbed4c2ff566edee7388695aff
+  metadata.gz: 56cac83570e5d82ba00864a4fb5c011224a2be35
+  data.tar.gz: bf841b79fe81a80b32aab3a47eeb68fbc083a6bc
 SHA512:
-  metadata.gz: 554ceaa5c17f2e223629180efcbf603f9bfe3cfcf5b3bbba489b06a08a323842fb7017c8a860e5e77251c636c3a2f0a95b55871723dfb263121932789a8f708e
-  data.tar.gz: f5c97979963f224c888129093f72a964684c06ff717454787751d972ff6adb967a86bbb98a68a4131214b6d5c38fc967d7e1156857c2b5be4d150ae50d7a9795
+  metadata.gz: d508180c42dae4b31ae251f739f15d9348c2218dffd8163b35c83f6aa19e76a4a7a30ee5ebc524c495c8688847b89a7e0c94011ef02577f95e23a39445ce7a03
+  data.tar.gz: 803ef4f9137779889c391d403ca5d7b493c48aff6c4bce318c13f553c7cad4b48d80f26643d41e8ef9ebc50edbd26687a0829ba187ef1fd3bd25f4a127a5717a

data/app/views/imagine_cms/_toolbar.html.erb

@@ -23,8 +23,6 @@
         </td>
       </tr>
     <%- end -%>
-      </td>
-    </tr>
   </table>
   <%= javascript_tag "if (loggedIn()) $('mainCCSToolbar').show();" %>
 <%- end -%>

data/app/views/layouts/management.html.erb

@@ -27,20 +27,20 @@
     <%= csrf_meta_tag %>
   </head>
   
-  <body<%= @onload.blank? ? '' : " onload=\"#{@onload}\"" %>>
+  <body<%= @onload.blank? ? '' : " onload=\"#{@onload.html_safe}\"" %>>
     <table cellpadding="0" cellspacing="0" border="0" width="100%" class="noprint">
       <tr height="35" bgcolor="#4D4D4D">
         <td style="padding: 7px 15px 0 15px; border-bottom: solid #ffffff 1px; color: white">
         <%- if is_logged_in_user? -%>
           <!-- Header Navigation -->
           <div style="float: left; padding-top: 2px;">
-            <a href="/manage"><img src="/assets/management/start.gif" width="44" height="14" alt="Start" /></a>
+            <%= link_to image_tag("management/start.gif", :size => "44x14", :alt => "Start"), '/manage' %>
           </div>
           <div style="float: left; padding-left: 20px;">
-            <%= raw @nav_sections.map { |nav| link_to(nav[0], nav[1], :style => 'color: white') }.join(' | ') %>
+            <%= @nav_sections.map { |nav| link_to(nav[0], nav[1], :style => 'color: white') }.safe_join(' | ') %>
           </div>
           <div style="float: right">
-            <%= link_to 'Change password', { :controller => '/management/users', :action => 'edit', :id => session[:user_id] }, :style => 'color: white'%> |
+            <%= link_to 'Change password', { :controller => '/management/users', :action => 'edit', :id => session[:user_id] }, :style => 'color: white' %> |
             <%= link_to 'Log out', { :controller => '/management/user', :action => 'logout' }, :style => 'color: white' %>
           </div>
         <%- end -%>
@@ -51,7 +51,7 @@
         <td style="padding: 7px 15px 0 15px; border-bottom: solid #ffffff 1px; color: white">
           <!-- Header Navigation -->
           <div style="float: left; padding-left: 20px;">
-            <%= @subnav_sections.map { |nav| link_to(nav[0], nav[1], :style => 'color: white') }.join(' | ') %>
+            <%= @subnav_sections.map { |nav| link_to(nav[0], nav[1], :style => 'color: white') }.safe_join(' | ') %>
           </div>
           <div style="float: right">
           </div>

data/imagine_cms.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails-observers",     "~> 0.1"
   s.add_dependency "actionpack-action_caching", "~> 1.0"
   s.add_dependency "actionpack-page_caching", "~> 1.0"
+  s.add_dependency "non-stupid-digest-assets", "~> 1.0"
   s.add_dependency "prototype-rails",     "~> 4.0.0"
   s.add_dependency "aws-s3",              "~> 0.6.3"
   s.add_dependency "rmagick"

data/lib/imagine_cms/engine.rb

@@ -33,6 +33,7 @@ module ImagineCms
     require 'rails-observers'
     require 'actionpack/action_caching'
     require 'actionpack/page_caching'
+    require 'non-stupid-digest-assets'
     require 'prototype-rails'
     require 'aws/s3'
     require 'RMagick'

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: non-stupid-digest-assets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: prototype-rails
   requirement: !ruby/object:Gem::Requirement