imagine_cms 3.0.5 → 3.0.6

data/.rvmrc

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-ruby_string="ruby-1.9.3-p327"
+ruby_string="ruby-1.9.3-p392"
 gemset_name="imagine_cms"
 
 alias rails='bundle exec rails'

data/app/assets/stylesheets/management.css

@@ -1,4 +1,63 @@
-@import url(reset.css);
+/* From Eric Meyer, Web coding guru, at http://meyerweb.com/eric/tools/css/reset/ */
+/*
+	Any style rule denoted with [+] has been added.
+	Any rule with [*] has been modified.
+*/
+/* v1.0 | 20080212 */
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-size: 100%;
+	vertical-align: baseline;
+	background: transparent;
+	font-weight: normal; /* [+] */
+}
+strong { font-weight: bold; }
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
+blockquote, q {
+	quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+
+/* remember to define focus styles! */
+:focus {
+	outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {
+	text-decoration: none;
+}
+del {
+	text-decoration: line-through;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+
+
 
 /* Body, Text, Images */
 
@@ -77,23 +136,3 @@ div.auto_complete ul strong.highlight {
     color: white;
     background-color: #506D91;
 }
-
-
-/** color keys **/
-h1 { border-width: 0 0 2px 0; border-style: solid; }
-h1.signup { border-color: #C34D00; }
-h1.volunteer { border-color: #5E14CD; }
-h1.booth { border-color: #0AC153; }
-h1.shift { border-color: #0A612C; }
-
-.colorbox { height: 18px; width: 18px; margin: 2px 4px 0 0; float: left; }
-h1 .signup { background-color: #C34D00; }
-h1 .volunteer { background-color: #5E14CD; }
-h1 .booth { background-color: #0AC153; }
-h1 .shift { background-color: #0A612C; }
-
-table.imagine-management tr:hover { background-color: #fff8c6; }
-table.imagine-management th { background-color: #dedede; text-transform: uppercase; }
-
-table.stats th { text-align: center; padding: 1px 8px; border: 1px solid gray; border-collapse: true; }
-table.stats td { text-align: center; padding: 4px 8px; border: 1px solid gray; border-collapse: true; }

data/app/controllers/cms/content_controller.rb

@@ -242,7 +242,7 @@ module Cms # :nodoc:
         # table just for search. (this would be better because it would sort by relevance)
         # @pages.concat CmsPage.find(:all, :conditions => [ 'match (title, search_index) against (?)', params[:q] ])
       end
-      @pages = @pages.uniq.reject { |pg| pg.search_index.blank? }
+      @pages = @pages.uniq.reject { |pg| pg.search_index.blank? }.first(100)
       
       @pg = CmsPage.new
       @pg.template = CmsTemplate.find_by_name('Search') || CmsTemplate.new

data/imagine_cms.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "rails",               "~> 3.2.0"
+  s.add_dependency "rails",               "~> 3.2.12"
   s.add_dependency "prototype-rails",     "~> 3.2.0"
   s.add_dependency "aws-s3",              "~> 0.6.3"
   s.add_dependency "rmagick"

data/lib/imagine_cms/engine.rb

@@ -10,6 +10,17 @@ module ImagineCms
       Rails.application.config.assets.precompile += %w( codepress/** dojo/** management.css reset.css )
     end
     
+    def self.activate
+      Dir.glob(File.join(Rails.root, "app/overrides/*.rb")) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
+      Dir.glob(File.join(Rails.root, "app/**/*_decorator*.rb")) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
+    end
+    
+    config.to_prepare &method(:activate).to_proc
+    
     #
     # activate gems as needed
     #

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.5"
+  VERSION = "3.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: prototype-rails
   requirement: !ruby/object:Gem::Requirement
@@ -330,7 +330,6 @@ files:
 - app/assets/stylesheets/codepress/languages/text.css
 - app/assets/stylesheets/cropper.css
 - app/assets/stylesheets/management.css
-- app/assets/stylesheets/reset.css
 - app/controllers/cms/content_controller.rb
 - app/controllers/management/application_controller.rb
 - app/controllers/management/cms_controller.rb
@@ -537,7 +536,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: imagine_cms
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Imagine Content Management System for Rails

data/app/assets/stylesheets/reset.css

@@ -1,58 +0,0 @@
-/* From Eric Meyer, Web coding guru, at http://meyerweb.com/eric/tools/css/reset/ */
-/*
-	Any style rule denoted with [+] has been added.
-	Any rule with [*] has been modified.
-*/
-/* v1.0 | 20080212 */
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	font-size: 100%;
-	vertical-align: baseline;
-	background: transparent;
-	font-weight: normal; /* [+] */
-}
-strong { font-weight: bold; }
-body {
-	line-height: 1;
-}
-ol, ul {
-	list-style: none;
-}
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
-}
-
-/* remember to define focus styles! */
-:focus {
-	outline: 0;
-}
-
-/* remember to highlight inserts somehow! */
-ins {
-	text-decoration: none;
-}
-del {
-	text-decoration: line-through;
-}
-
-/* tables still need 'cellspacing="0"' in the markup */
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}