cms-fortress 1.0.9 → 1.0.12

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.0.12

data/app/models/cms/page_workflow.rb

@@ -18,7 +18,7 @@ class Cms::PageWorkflow < ActiveRecord::Base
 
   def self.statuses_for_select(can_publish, can_review)
     ret = [["Draft", 0]]
-    ret << ["Review", 1] if can_review
+    ret << ["Reviewed", 1] if can_review
     ret << ["Published", 3] if can_publish
     # self.statuses.map {|k,v| [v.to_s.titleize, k]}
     ret

data/app/views/layouts/admin/cms/_left.html.haml

@@ -33,7 +33,7 @@
     = cms_hook :navigation
 
   - else
-    = render 'cms/fortress/admin/leftnav'
+    = render 'cms/fortress/admin/left_nav'
 
 
   = render '/admin/cms/partials/navigation_inner'

data/cms-fortress.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cms-fortress"
-  s.version = "1.0.9"
+  s.version = "1.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Melvin Sembrano"]
-  s.date = "2014-01-01"
+  s.date = "2014-01-21"
   s.description = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email = "melvinsembrano@gmail.com"
   s.extra_rdoc_files = [
@@ -49,9 +49,9 @@ Gem::Specification.new do |s|
     "app/views/admin/cms/partials/_body_before.html.haml",
     "app/views/cms/fortress/admin/_left_contents_nav.html.haml",
     "app/views/cms/fortress/admin/_left_designs_nav.html.haml",
+    "app/views/cms/fortress/admin/_left_nav.html.haml",
     "app/views/cms/fortress/admin/_left_settings_nav.html.haml",
-    "app/views/cms/fortress/admin/_leftnav.html.haml",
-    "app/views/cms/fortress/admin/_topnav.html.haml",
+    "app/views/cms/fortress/admin/_top_nav.html.haml",
     "app/views/cms/fortress/admin/contents.html.haml",
     "app/views/cms/fortress/admin/design.html.haml",
     "app/views/cms/fortress/admin/roles.html.haml",

data/lib/cms/fortress/content_renderer.rb

@@ -7,13 +7,17 @@ module Cms
         base.class_eval do
 
           def render_html(status = 200)
-            fresh_when etag: @cms_page, last_modified: @cms_page.updated_at.utc, public: true
-            response.cache_control[:max_age] = @cms_page.cached_timeout.seconds
+            cached_timeout = @cms_page.cached_timeout.to_i
+
+            if cached_timeout > 0
+              fresh_when etag: @cms_page, last_modified: @cms_page.updated_at.utc, public: true
+              response.cache_control[:max_age] = cached_timeout.seconds
+            end
 
             if @cms_layout = @cms_page.layout
 
               app_layout = (@cms_layout.app_layout.blank? || request.xhr?) ? false : @cms_layout.app_layout
-              render(:inline => @cms_page.content, :layout => app_layout, :status => status, :content_type => 'text/html') unless performed?
+              render(:inline => @cms_page.content, :layout => app_layout, :status => status, :content_type => 'text/html') unless cached_timeout > 0 && performed?
             else
               render :text => I18n.t('cms.content.layout_not_found'), :status => 404
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-01 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -195,9 +195,9 @@ files:
 - app/views/admin/cms/partials/_body_before.html.haml
 - app/views/cms/fortress/admin/_left_contents_nav.html.haml
 - app/views/cms/fortress/admin/_left_designs_nav.html.haml
+- app/views/cms/fortress/admin/_left_nav.html.haml
 - app/views/cms/fortress/admin/_left_settings_nav.html.haml
-- app/views/cms/fortress/admin/_leftnav.html.haml
-- app/views/cms/fortress/admin/_topnav.html.haml
+- app/views/cms/fortress/admin/_top_nav.html.haml
 - app/views/cms/fortress/admin/contents.html.haml
 - app/views/cms/fortress/admin/design.html.haml
 - app/views/cms/fortress/admin/roles.html.haml
@@ -273,7 +273,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3791821648256819263
+      hash: 1796863992481518580
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: