cms-fortress 1.3.4 → 1.3.5

data/Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     cms-fortress (1.3.4)
       aasm (~> 3.2)
       cancancan (~> 1.9)
-      comfortable_mexican_sofa (<= 1.12.2)
+      comfortable_mexican_sofa (~> 1.12.3)
       delayed_job (~> 4)
       devise (~> 3.2)
       rails (>= 4.0.0)
@@ -15,27 +15,27 @@ GEM
   remote: https://rubygems.org/
   specs:
     aasm (3.4.0)
-    actionmailer (4.0.10)
-      actionpack (= 4.0.10)
+    actionmailer (4.0.12)
+      actionpack (= 4.0.12)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.10)
-      activesupport (= 4.0.10)
+    actionpack (4.0.12)
+      activesupport (= 4.0.12)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     active_link_to (1.0.2)
       actionpack
-    activemodel (4.0.10)
-      activesupport (= 4.0.10)
+    activemodel (4.0.12)
+      activesupport (= 4.0.12)
       builder (~> 3.1.0)
-    activerecord (4.0.10)
-      activemodel (= 4.0.10)
+    activerecord (4.0.12)
+      activemodel (= 4.0.12)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.10)
+      activesupport (= 4.0.12)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.10)
+    activesupport (4.0.12)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -44,9 +44,9 @@ GEM
     ansi (1.4.3)
     arel (4.0.2)
     bcrypt (3.1.9)
-    bootstrap-sass (3.1.1.1)
+    bootstrap-sass (3.3.1.0)
       sass (~> 3.2)
-    bootstrap_form (2.1.1)
+    bootstrap_form (2.2.0)
     builder (3.1.4)
     cancancan (1.9.2)
     climate_control (0.0.3)
@@ -62,10 +62,10 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    comfortable_mexican_sofa (1.12.2)
+    comfortable_mexican_sofa (1.12.3)
       active_link_to (>= 1.0.0)
-      bootstrap-sass (~> 3.1.0)
-      bootstrap_form (~> 2.1.1)
+      bootstrap-sass (>= 3.2.0)
+      bootstrap_form (>= 2.2.0)
       codemirror-rails (>= 3.0.0)
       coffee-rails (>= 3.1.0)
       haml-rails (>= 0.3.0)
@@ -74,9 +74,10 @@ GEM
       kaminari (>= 0.14.0)
       kramdown (>= 1.0.0)
       paperclip (>= 4.0.0)
-      rails (>= 4.0.0)
-      rails-i18n (~> 4.0.0)
-      sass-rails (>= 4.0.1)
+      plupload-rails (>= 1.2.1)
+      rails (>= 4.0.0, < 5)
+      rails-i18n (>= 4.0.0)
+      sass-rails (>= 4.0.3)
       tinymce-rails (>= 4.0.0)
     delayed_job (4.0.4)
       activesupport (>= 3.0, < 4.2)
@@ -90,14 +91,14 @@ GEM
     docile (1.1.5)
     erubis (2.7.0)
     execjs (2.2.2)
-    haml (4.0.5)
+    haml (4.0.6)
       tilt
     haml-rails (0.5.3)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
       railties (>= 4.0.1)
-    hashie (3.3.1)
+    hashie (3.3.2)
     hike (1.2.3)
     i18n (0.6.11)
     jquery-rails (3.1.2)
@@ -110,10 +111,10 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kramdown (1.5.0)
-    mail (2.6.1)
+    mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.3)
-    minitest (4.7.5)
+    mime-types (2.4.3)
+    minitest (4.7.3)
     minitest-rails (1.0.1)
       minitest (~> 4.7)
       minitest-test (~> 1.0)
@@ -135,29 +136,31 @@ GEM
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
+    plupload-rails (1.2.1)
+      rails (>= 3.1)
     powerbar (1.0.11)
       ansi (~> 1.4.0)
       hashie (>= 1.1.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.10)
-      actionmailer (= 4.0.10)
-      actionpack (= 4.0.10)
-      activerecord (= 4.0.10)
-      activesupport (= 4.0.10)
+    rails (4.0.12)
+      actionmailer (= 4.0.12)
+      actionpack (= 4.0.12)
+      activerecord (= 4.0.12)
+      activesupport (= 4.0.12)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.10)
+      railties (= 4.0.12)
       sprockets-rails (~> 2.0)
     rails-i18n (4.0.3)
       i18n (~> 0.6)
       railties (~> 4.0)
-    railties (4.0.10)
-      actionpack (= 4.0.10)
-      activesupport (= 4.0.10)
+    railties (4.0.12)
+      actionpack (= 4.0.12)
+      activesupport (= 4.0.12)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.0)
     rdoc (4.1.2)
       json (~> 1.4)
     responders (1.1.2)
@@ -173,16 +176,16 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    sprockets (2.11.0)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.4)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.9)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
@@ -190,7 +193,7 @@ GEM
       railties (>= 3.1.1)
     tinymce-rails-langs (4.20140129)
       tinymce-rails (~> 4.0)
-    tzinfo (0.3.41)
+    tzinfo (0.3.42)
     warden (1.2.3)
       rack (>= 1.0)
 

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.5

data/app/assets/javascripts/cms/fortress/themes/wide.js.erb

@@ -1,8 +1,11 @@
 #= require tinymce-jquery
 #= require '../site_selector'
 
+
 window.CMS.wysiwyg = function () {
     return <%= tinymce_init %>
 }
 
-
+$(document).ready( function() {
+  $('.dropdown-toggle').dropdown();
+});

data/app/assets/stylesheets/cms/fortress/{session.css → session.scss}

@@ -1,6 +1,5 @@
-/*
- *= require bootstrap
-*/
+@import "bootstrap-sprockets";
+@import "bootstrap";
 
 body {
   padding-bottom: 40px;

data/app/views/cms/fortress/themes/wide/_body.html.haml

@@ -25,7 +25,8 @@
   - if controller_name.eql?('revisions')
     .row
       .col-sm-9
-        = render :partial => 'layouts/comfy/admin/cms/center'
+        =# render :partial => 'layouts/comfy/admin/cms/center'
+        = yield
       .col-sm-3
         .panel.panel-default.revision-list
           .panel-heading
@@ -33,7 +34,8 @@
           .panel-body
             = yield :right_column
   - else
-    = render :partial => 'layouts/comfy/admin/cms/center'
+    =# render :partial => 'layouts/comfy/admin/cms/center'
+    = yield
 
 = render :partial => 'layouts/comfy/admin/cms/footer'
 

data/app/views/comfy/admin/cms/pages/_form.html.haml

@@ -4,9 +4,6 @@
       %input{:type => 'checkbox'}
       = ::Comfy::Cms::Page.human_attribute_name(:is_published)
     %button.btn.btn-sm.btn-primary.pull-right
-  = render 'comfy/admin/cms/files/index'
-
-= render 'comfy/admin/cms/partials/page_form_before', :object => form
 
 - if Cms::Fortress.configuration.enable_page_workflow && !@page.new_record?
   .container-fluid
@@ -14,7 +11,9 @@
       %span.btn.btn-success= t('.' + @page.aasm_state)
       - page_actions(@page).each do |page_action|
         = form.button t('.'+page_action.to_s), :class => 'btn btn-default', :value => page_action, :name => 'transition'
-  %hr
+%hr
+
+= render 'comfy/admin/cms/partials/page_form_before', :form => form
 
 = form.text_field :label, :data => {:slugify => @page.new_record?}
 
@@ -25,27 +24,29 @@
 
 - if (options = ::Comfy::Cms::Layout.options_for_select(@site)).present?
   = form.select :layout_id, options, {}, 'data-url' => form_blocks_comfy_admin_cms_site_page_path(@site, @page.id.to_i)
-  
+
 - if (options = ::Comfy::Cms::Page.options_for_select(@site, @page)).present?
   = form.select :parent_id, options
 
 - if (options = ::Comfy::Cms::Page.options_for_select(@site, @page, nil, 0, false)).present?
   = form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options
 
-= render 'comfy/admin/cms/partials/page_form_inner', :object => form
+= render 'comfy/admin/cms/partials/page_form_inner', :form => form
 
-= render :partial => 'comfy/admin/cms/categories/form', :object => form
+= render 'comfy/admin/cms/categories/form', :form => form
 
-= render :partial => 'form_blocks'
+= render 'form_blocks'
 
 - unless Cms::Fortress.configuration.enable_page_workflow
   = form.check_box :is_published, :label => t('.is_published')
+
 = render :partial => 'cms/fortress/shared/page_extend', :locals => {form: form}
 
-= render 'comfy/admin/cms/partials/page_form_after', :object => form
+= render 'comfy/admin/cms/partials/page_form_after', :form => form
 
 = form.form_group :class => 'form-actions' do
-  = form.button t('.preview'), :name => 'preview', :id => nil, :class => 'btn btn-default'
-  = form.button t(@page.new_record?? '.create' : '.update'), :class => 'btn btn-primary', :value => 'save', :name => 'commit'
+  = form.submit t('.preview'), :name => 'preview', :id => nil, :class => 'btn btn-default'
+  = form.submit t(@page.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
+  = link_to t('.cancel'), comfy_admin_cms_site_pages_path, :class => 'btn btn-link'
+
 
-= render :partial => 'cms/fortress/shared/page_extend_js'

data/app/views/layouts/comfy/admin/cms/_body.html.haml

@@ -6,17 +6,22 @@
     .body-wrapper
       .left-column
         .left-column-content
-          = render :partial => 'layouts/comfy/admin/cms/left'
+          = render 'layouts/comfy/admin/cms/left'
       .right-column
         .right-column-content
-          = render :partial => 'layouts/comfy/admin/cms/right'
+          = render 'layouts/comfy/admin/cms/right'
       .center-column
-        = render :partial => 'layouts/comfy/admin/cms/center'
+        = render 'layouts/comfy/admin/cms/flash'
+        .center-column-content
+          = yield
+        = render 'layouts/comfy/admin/cms/footer'
+
 
-        = render :partial => 'layouts/comfy/admin/cms/footer'
 
   - else
     = themed_partial('body')
 
   = render partial: 'cms/fortress/shared/mediaboxes'
   = render :partial => 'layouts/comfy/admin/cms/footer_js'
+
+

data/cms-fortress.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name      = "cms-fortress"
-  s.version   = "1.3.4"
+  s.version   = "1.3.5"
 
   s.authors           = ["Melvin Sembrano"]
-  s.date              = "2014-12-01"
+  s.date              = "2014-12-09"
   s.description       = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email             = "melvinsembrano@gmail.com"
   s.extra_rdoc_files  = [ "LICENSE.txt", "README.rdoc" ]
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths     = ["lib"]
 
   s.add_dependency 'rails',                     '>= 4.0.0'
-  s.add_dependency 'comfortable_mexican_sofa',  '<= 1.12.2'
+  s.add_dependency 'comfortable_mexican_sofa',  '~> 1.12.3'
   s.add_dependency 'devise',                    '~> 3.2'
   s.add_dependency 'cancancan',                 '~> 1.9'
   s.add_dependency 'delayed_job',               '~> 4'

data/lib/cms/fortress/page_methods.rb

@@ -4,6 +4,8 @@ module Cms
 
       def self.included(base)
 
+        base.extend ClassMethods
+
         base.class_eval do
           before_create { self.draft if self.new? }
 
@@ -62,6 +64,13 @@ module Cms
 
       end
 
+        module ClassMethods
+          def updated_scheduled
+
+          end
+        end
+
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.12.2
+        version: 1.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.12.2
+        version: 1.12.3
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -288,7 +288,7 @@ files:
 - app/assets/javascripts/cms/fortress/themes/wide.js.erb
 - app/assets/javascripts/html5shiv.js
 - app/assets/stylesheets/cms/fortress/admin_overrides.css
-- app/assets/stylesheets/cms/fortress/session.css
+- app/assets/stylesheets/cms/fortress/session.scss
 - app/assets/stylesheets/cms/fortress/themes/wide.css.scss
 - app/controllers/cms/fortress/admin_controller.rb
 - app/controllers/cms/fortress/roles_controller.rb