imagine_cms 4.0.0 → 4.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c4924ffa8137573b21030d4e6f6b553e67cd092e
4
- data.tar.gz: c285cd363f13dfdbed4c2ff566edee7388695aff
3
+ metadata.gz: 56cac83570e5d82ba00864a4fb5c011224a2be35
4
+ data.tar.gz: bf841b79fe81a80b32aab3a47eeb68fbc083a6bc
5
5
  SHA512:
6
- metadata.gz: 554ceaa5c17f2e223629180efcbf603f9bfe3cfcf5b3bbba489b06a08a323842fb7017c8a860e5e77251c636c3a2f0a95b55871723dfb263121932789a8f708e
7
- data.tar.gz: f5c97979963f224c888129093f72a964684c06ff717454787751d972ff6adb967a86bbb98a68a4131214b6d5c38fc967d7e1156857c2b5be4d150ae50d7a9795
6
+ metadata.gz: d508180c42dae4b31ae251f739f15d9348c2218dffd8163b35c83f6aa19e76a4a7a30ee5ebc524c495c8688847b89a7e0c94011ef02577f95e23a39445ce7a03
7
+ data.tar.gz: 803ef4f9137779889c391d403ca5d7b493c48aff6c4bce318c13f553c7cad4b48d80f26643d41e8ef9ebc50edbd26687a0829ba187ef1fd3bd25f4a127a5717a
@@ -23,8 +23,6 @@
23
23
  </td>
24
24
  </tr>
25
25
  <%- end -%>
26
- </td>
27
- </tr>
28
26
  </table>
29
27
  <%= javascript_tag "if (loggedIn()) $('mainCCSToolbar').show();" %>
30
28
  <%- end -%>
@@ -27,20 +27,20 @@
27
27
  <%= csrf_meta_tag %>
28
28
  </head>
29
29
 
30
- <body<%= @onload.blank? ? '' : " onload=\"#{@onload}\"" %>>
30
+ <body<%= @onload.blank? ? '' : " onload=\"#{@onload.html_safe}\"" %>>
31
31
  <table cellpadding="0" cellspacing="0" border="0" width="100%" class="noprint">
32
32
  <tr height="35" bgcolor="#4D4D4D">
33
33
  <td style="padding: 7px 15px 0 15px; border-bottom: solid #ffffff 1px; color: white">
34
34
  <%- if is_logged_in_user? -%>
35
35
  <!-- Header Navigation -->
36
36
  <div style="float: left; padding-top: 2px;">
37
- <a href="/manage"><img src="/assets/management/start.gif" width="44" height="14" alt="Start" /></a>
37
+ <%= link_to image_tag("management/start.gif", :size => "44x14", :alt => "Start"), '/manage' %>
38
38
  </div>
39
39
  <div style="float: left; padding-left: 20px;">
40
- <%= raw @nav_sections.map { |nav| link_to(nav[0], nav[1], :style => 'color: white') }.join(' | ') %>
40
+ <%= @nav_sections.map { |nav| link_to(nav[0], nav[1], :style => 'color: white') }.safe_join(' | ') %>
41
41
  </div>
42
42
  <div style="float: right">
43
- <%= link_to 'Change password', { :controller => '/management/users', :action => 'edit', :id => session[:user_id] }, :style => 'color: white'%> |
43
+ <%= link_to 'Change password', { :controller => '/management/users', :action => 'edit', :id => session[:user_id] }, :style => 'color: white' %> |
44
44
  <%= link_to 'Log out', { :controller => '/management/user', :action => 'logout' }, :style => 'color: white' %>
45
45
  </div>
46
46
  <%- end -%>
@@ -51,7 +51,7 @@
51
51
  <td style="padding: 7px 15px 0 15px; border-bottom: solid #ffffff 1px; color: white">
52
52
  <!-- Header Navigation -->
53
53
  <div style="float: left; padding-left: 20px;">
54
- <%= @subnav_sections.map { |nav| link_to(nav[0], nav[1], :style => 'color: white') }.join(' | ') %>
54
+ <%= @subnav_sections.map { |nav| link_to(nav[0], nav[1], :style => 'color: white') }.safe_join(' | ') %>
55
55
  </div>
56
56
  <div style="float: right">
57
57
  </div>
data/imagine_cms.gemspec CHANGED
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
31
31
  s.add_dependency "rails-observers", "~> 0.1"
32
32
  s.add_dependency "actionpack-action_caching", "~> 1.0"
33
33
  s.add_dependency "actionpack-page_caching", "~> 1.0"
34
+ s.add_dependency "non-stupid-digest-assets", "~> 1.0"
34
35
  s.add_dependency "prototype-rails", "~> 4.0.0"
35
36
  s.add_dependency "aws-s3", "~> 0.6.3"
36
37
  s.add_dependency "rmagick"
@@ -33,6 +33,7 @@ module ImagineCms
33
33
  require 'rails-observers'
34
34
  require 'actionpack/action_caching'
35
35
  require 'actionpack/page_caching'
36
+ require 'non-stupid-digest-assets'
36
37
  require 'prototype-rails'
37
38
  require 'aws/s3'
38
39
  require 'RMagick'
@@ -1,3 +1,3 @@
1
1
  module ImagineCms
2
- VERSION = "4.0.0"
2
+ VERSION = "4.0.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: imagine_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.0
4
+ version: 4.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Aaron Namba
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-26 00:00:00.000000000 Z
11
+ date: 2014-09-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -72,6 +72,20 @@ dependencies:
72
72
  - - "~>"
73
73
  - !ruby/object:Gem::Version
74
74
  version: '1.0'
75
+ - !ruby/object:Gem::Dependency
76
+ name: non-stupid-digest-assets
77
+ requirement: !ruby/object:Gem::Requirement
78
+ requirements:
79
+ - - "~>"
80
+ - !ruby/object:Gem::Version
81
+ version: '1.0'
82
+ type: :runtime
83
+ prerelease: false
84
+ version_requirements: !ruby/object:Gem::Requirement
85
+ requirements:
86
+ - - "~>"
87
+ - !ruby/object:Gem::Version
88
+ version: '1.0'
75
89
  - !ruby/object:Gem::Dependency
76
90
  name: prototype-rails
77
91
  requirement: !ruby/object:Gem::Requirement