cms-fortress 1.1.8 → 1.2.0

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
   gem 'rails', '>=4.0.0'
-  gem 'comfortable_mexican_sofa', '~>1.11.0'
+  gem 'comfortable_mexican_sofa', '~>1.12.0'
   gem 'devise', '~>3.2'
   gem 'cancan', '>=1.6.9'
   gem 'delayed_job', '~>4'

data/Gemfile.lock

@@ -1,43 +1,47 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.0.3)
-      actionpack (= 4.0.3)
+    actionmailer (4.1.1)
+      actionpack (= 4.1.1)
+      actionview (= 4.1.1)
       mail (~> 2.5.4)
-    actionpack (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.1)
+      actionview (= 4.1.1)
+      activesupport (= 4.1.1)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
+    actionview (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
     active_link_to (1.0.2)
       actionpack
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+    activerecord (4.1.1)
+      activemodel (= 4.1.1)
+      activesupport (= 4.1.1)
+      arel (~> 5.0.0)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    addressable (2.3.5)
-    arel (4.0.2)
-    atomic (1.1.14)
-    bcrypt-ruby (3.1.2)
-    builder (3.1.4)
+      tzinfo (~> 1.1)
+    addressable (2.3.6)
+    arel (5.0.1.20140414130214)
+    bcrypt (3.1.7)
+    bootstrap-sass (3.1.1.1)
+      sass (~> 3.2)
+    bootstrap_form (2.1.1)
+    builder (3.2.2)
     cancan (1.6.10)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.3)
+    cocaine (0.5.4)
       climate_control (>= 0.0.3, < 1.0)
-    codemirror-rails (3.21)
+    codemirror-rails (4.1)
       railties (>= 3.0, < 5)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -46,11 +50,12 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    comfortable_mexican_sofa (1.11.2)
+    comfortable_mexican_sofa (1.12.0)
       active_link_to (>= 1.0.0)
+      bootstrap-sass (~> 3.1.0)
+      bootstrap_form (~> 2.1.1)
       codemirror-rails (>= 3.0.0)
       coffee-rails (>= 3.1.0)
-      formatted_form (>= 2.1.0)
       haml-rails (>= 0.3.0)
       jquery-rails (>= 3.0.0)
       jquery-ui-rails (>= 4.0.0)
@@ -59,25 +64,25 @@ GEM
       paperclip (>= 3.4.0)
       rails (~> 4.0)
       rails-i18n (~> 4.0.0)
-      sass-rails (>= 3.1.0)
-    delayed_job (4.0.0)
-      activesupport (>= 3.0, < 4.1)
-    descendants_tracker (0.0.3)
-    devise (3.2.2)
-      bcrypt-ruby (~> 3.0)
+      sass-rails (>= 4.0.3)
+      tinymce-rails (>= 4.0.0)
+    delayed_job (4.0.1)
+      activesupport (>= 3.0, < 4.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    devise (3.2.4)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    docile (1.1.1)
+    docile (1.1.3)
     erubis (2.7.0)
     execjs (2.0.2)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    formatted_form (2.1.2)
-      rails (>= 3.1)
     git (1.2.6)
-    github_api (0.11.2)
+    github_api (0.11.3)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.1)
       faraday (~> 0.8, < 0.10)
@@ -92,8 +97,8 @@ GEM
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
       railties (>= 4.0.1)
-    hashie (2.0.5)
-    highline (1.6.20)
+    hashie (2.1.1)
+    highline (1.6.21)
     hike (1.2.3)
     i18n (0.6.9)
     jeweler (2.0.1)
@@ -108,26 +113,26 @@ GEM
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.2.0)
+    jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (1.8.1)
-    jwt (0.1.11)
+    jwt (0.1.13)
       multi_json (>= 1.5)
     kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kramdown (1.3.2)
+    kramdown (1.3.3)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
-    minitest (4.7.5)
-    multi_json (1.8.4)
+    mini_portile (0.6.0)
+    minitest (5.3.4)
+    multi_json (1.10.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
     oauth2 (0.9.3)
       faraday (>= 0.8, < 0.10)
       jwt (~> 0.1.8)
@@ -135,7 +140,7 @@ GEM
       multi_xml (~> 0.5)
       rack (~> 1.2)
     orm_adapter (0.5.0)
-    paperclip (4.1.0)
+    paperclip (4.1.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
@@ -144,30 +149,33 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.3)
-      actionmailer (= 4.0.3)
-      actionpack (= 4.0.3)
-      activerecord (= 4.0.3)
-      activesupport (= 4.0.3)
+    rails (4.1.1)
+      actionmailer (= 4.1.1)
+      actionpack (= 4.1.1)
+      actionview (= 4.1.1)
+      activemodel (= 4.1.1)
+      activerecord (= 4.1.1)
+      activesupport (= 4.1.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.3)
-      sprockets-rails (~> 2.0.0)
-    rails-i18n (4.0.1)
+      railties (= 4.1.1)
+      sprockets-rails (~> 2.0)
+    rails-i18n (4.0.2)
       i18n (~> 0.6)
-      rails (~> 4.0)
-    railties (4.0.3)
-      actionpack (= 4.0.3)
-      activesupport (= 4.0.3)
+      rails (>= 4.0)
+    railties (4.1.1)
+      actionpack (= 4.1.1)
+      activesupport (= 4.1.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
+    rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
-    sass (3.2.14)
-    sass-rails (4.0.1)
+    sass (3.2.19)
+    sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
-      sprockets-rails (~> 2.0.0)
+      sass (~> 3.2.0)
+      sprockets (~> 2.8, <= 2.11.0)
+      sprockets-rails (~> 2.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -178,20 +186,20 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.1.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    thor (0.19.1)
+    thread_safe (0.3.3)
     tilt (1.4.1)
-    tinymce-rails (4.0.16)
+    tinymce-rails (4.0.19)
       railties (>= 3.1.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
     warden (1.2.3)
       rack (>= 1.0)
 
@@ -201,7 +209,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   cancan (>= 1.6.9)
-  comfortable_mexican_sofa (~> 1.11.0)
+  comfortable_mexican_sofa (~> 1.12.0)
   delayed_job (~> 4)
   devise (~> 3.2)
   jeweler

data/VERSION

@@ -1 +1 @@
-1.1.8
+1.2.0

data/app/assets/javascripts/cms/fortress/media.js.coffee

@@ -11,7 +11,7 @@ window.media =
   showImageDialog: (ed) ->
     this.ed = ed
     this.dlg.modal(show: true, backdrop: false)
-      .css("left", $(document).width() - (this.dlg.width() / 2))
+      #.css("left", $(document).width() - (this.dlg.width() / 2))
       .find(".title").html("Image Selector")
 
     $("#modal-body").html(this.loading).load this.imagesPath, ->
@@ -22,7 +22,7 @@ window.media =
   showVideoDialog: (ed) ->
     this.ed = ed
     this.dlg.modal(show: true, backdrop: false)
-      .css("left", $(document).width() - (this.dlg.width() / 2))
+      #.css("left", $(document).width() - (this.dlg.width() / 2))
       .find(".title").html("Video Selector")
 
     $("#modal-body").html(this.loading).load this.videosPath, ->

data/app/assets/stylesheets/cms/fortress/admin_overrides.css

@@ -1,20 +1,14 @@
-body#comfy .body-wrapper {
-  margin-top: 2.9em;
-}
-
-.navbar-container, .footer-container {
-  margin-left: 1.4em;
-}
 
-.footer-container {
-  margin-top: 1em;
+.alert-notice {
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+  color: #3c763d;
 }
 
-body#comfy form.formatted.form-horizontal .control-group .controls select.status-control,
-body#comfy form.formatted.form-horizontal .control-group .controls input[type='text'].status-control {
-  width: 30%;
+.alert-notice hr {
+  border-top-color: #c9e2b3;
 }
 
-body#comfy .nav-height {
-
+.alert-notice .alert-link {
+  color: #2b542c;
 }

data/app/assets/stylesheets/cms/fortress/session.css

@@ -1,10 +1,8 @@
 /*
- *= require ./bootstrap
- *= require ./bootstrap-responsive
+ *= require bootstrap
 */
 
 body {
-  padding-top: 40px;
   padding-bottom: 40px;
   background-color: #f5f5f5;
 }

data/app/assets/stylesheets/cms/fortress/themes/wide.css.scss

@@ -1,6 +1,7 @@
-
 body#comfy {
   background-color: inherit;
+
+/**
   font-size: 13px;
   line-height: 18px;
 
@@ -27,6 +28,7 @@ body#comfy {
     height: 20px;
   }
 
+**/
   .footer {
     height: 60px;
     padding: 20px 10px 10px;
@@ -37,4 +39,6 @@ body#comfy {
       border-top: solid 1px #f5f5f5;
     }
   }
+
+
 }

data/app/controllers/cms/fortress/admin_controller.rb

@@ -1,13 +1,13 @@
 module Cms
   module Fortress
-    class AdminController < Admin::Cms::BaseController
+    class AdminController < Comfy::Admin::Cms::BaseController
 
       def roles
         @roles = Role.all
       end
 
       def images
-        @files = Cms::File.images
+        @files = Comfy::Cms::File.images
         respond_to do |format|
           format.html { render partial: 'cms/fortress/shared/media_items', locals: {media: @files, type: :image} }
           format.json { render json: @files }
@@ -15,7 +15,7 @@ module Cms
       end
 
       def videos
-        @files = Cms::File.videos
+        @files = Comfy::Cms::File.videos
         respond_to do |format|
           format.html { render partial: 'cms/fortress/shared/media_items', locals: {media: @files, type: :video} }
           format.json { render json: @files }
@@ -23,7 +23,7 @@ module Cms
       end
 
       def other_files
-        @files = Cms::File.others.map {|f| {title: f.label, value: f.file.url}}
+        @files = Comfy::Cms::File.others.map {|f| {title: f.label, value: f.file.url}}
         respond_to do |format|
           format.html { render partial: 'cms/fortress/shared/media_items', locals: {media: @files, type: :others} }
           format.json { render json: @files }

data/app/controllers/cms/fortress/roles_controller.rb

@@ -1,4 +1,4 @@
-class Cms::Fortress::RolesController < Admin::Cms::BaseController
+class Cms::Fortress::RolesController < Comfy::Admin::Cms::BaseController
   before_filter do
     authorize! :manage, Cms::Fortress::Role
   end
@@ -65,8 +65,8 @@ class Cms::Fortress::RolesController < Admin::Cms::BaseController
 
     respond_to do |format|
       if @cms_fortress_role.save
-
-        format.html { redirect_to @cms_fortress_role, notice: 'Role was successfully created.' }
+        flash[:success] = "Role was successfully created."
+        format.html { redirect_to @cms_fortress_role }
         format.json { render json: @cms_fortress_role, status: :created, location: @cms_fortress_role }
       else
         format.html { render action: "new" }
@@ -82,7 +82,8 @@ class Cms::Fortress::RolesController < Admin::Cms::BaseController
 
     respond_to do |format|
       if @cms_fortress_role.update_attributes(role_params)
-        format.html { redirect_to @cms_fortress_role, notice: 'Role was successfully updated.' }
+        flash[:success] = "Role was successfully updated."
+        format.html { redirect_to @cms_fortress_role }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }

data/app/controllers/cms/fortress/users_controller.rb

@@ -1,4 +1,4 @@
-class Cms::Fortress::UsersController < Admin::Cms::BaseController
+class Cms::Fortress::UsersController < Comfy::Admin::Cms::BaseController
   before_filter do
     authorize! :manage, Cms::Fortress::User
   end
@@ -48,7 +48,8 @@ class Cms::Fortress::UsersController < Admin::Cms::BaseController
 
     respond_to do |format|
       if @cms_fortress_user.save
-        format.html { redirect_to cms_fortress_users_path, notice: 'User was successfully created.' }
+        flash[:success] = "User was successfully created."
+        format.html { redirect_to cms_fortress_users_path }
         format.json { render json: @cms_fortress_user, status: :created, location: @cms_fortress_user }
       else
         format.html { render action: "new" }
@@ -70,7 +71,8 @@ class Cms::Fortress::UsersController < Admin::Cms::BaseController
 
     respond_to do |format|
       if @cms_fortress_user.update_attributes(user)
-        format.html { redirect_to cms_fortress_users_path, notice: 'User was successfully updated.' }
+        flash[:success] = "User was successfully updated."
+        format.html { redirect_to cms_fortress_users_path }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }