caboose-cms 0.4.137 → 0.4.138

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjliM2NmOTBlMWY3NjQzMWUzMDM3NmExN2E4M2ZjNWNlNjI5YzEwYQ==
+    NTc5NzQ4N2E0YTVmZjM4NDllYjc0ZjA3NzczMTU5ZDZmM2FlNDJiYw==
   data.tar.gz: !binary |-
-    NTgxZDk2NDE0ZDRhNTdmYjIxMzQwNzczNTIwMWNhMzcwNWY5OGFhMg==
+    NWViNWVjYmYxZGJjODE0YzQ0ZjEzYTliZmE4Y2YzZDdkMjBmNGYzYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTNlY2RhYmM0OWM5YWNlNTVjMjMzZWU4OWJhNzRmMWMwYWY3Njc4Mzk1ZjYy
-    MzdjMzVkN2QxNWVlOTQyNzdkOTI0NDBkMWUyNjk3ZDNmZTZmMWE5MjRlOTlk
-    YzU4YjExMzA3NWE1YTlhYmMzZWQwM2Q4MjdlOWM2NDVjYmNlYTk=
+    N2RlZTk3M2FlZGIwYzY1MjYxM2RmZTZjYmI4NmQwMTZjNmI3OTk0MzBhZDVi
+    MDhhMGVmMThlNGQzNTFkNDE0OTI5ZjRmM2Y3M2U5MTI3NGI2ZmU5NDZlMzQ0
+    MzYzZDQ1ZmJiNjNkNmUxY2ZlZGI4NzlkZWRmN2NiZWIxMGY1NGI=
   data.tar.gz: !binary |-
-    Yzk5MjA1NjQ1ZTEwN2VhZGE2MTBkZTYyODQ1NDY2NzdjZDFkNDgwMzkyM2Yz
-    MDFhZGMwZDg4MmQ1Njc4MTYyMjgwNTJlNTNlZWNlMDEwNDk2MGEzMjVhMzhl
-    NjRiZjJjY2ZmYmIxN2ZiNmY3YjJlMTY1ZDFjNDI1ZTAwZGU5Mzg=
+    ODAzYzE4ZDllYzNlODY1MzNiY2VjNmQyNWI3YThjZjQ3NTgxNWI2OGViNDAy
+    NGNiZmIzZDM2MmUyMTI0YTY1NmIwNWFmZjY5YjYwOWU5YWRlMDQzNTBlY2Rk
+    YTAwNTVhYTBlMTM3MTU2MzI3ZDU1YTAyOGExZTFmMTZjZjNjYmY=

data/app/assets/javascripts/caboose/model/model_binder.js

@@ -104,7 +104,8 @@ ModelBinder.prototype = {
       if (attrib.type == 'text')                   control = new BoundText(opts);
       else if (attrib.type == 'select')            control = new BoundSelect(opts);
       else if (attrib.type == 'checkbox')          control = new BoundCheckbox(opts);
-      else if (attrib.type == 'checkbox-multiple') control = new BoundCheckboxMultiple(opts);      
+      else if (attrib.type == 'checkbox-multiple') control = new BoundCheckboxMultiple(opts);
+      else if (attrib.type == 'checkbox_multiple') control = new BoundCheckboxMultiple(opts);      
       else if (attrib.type == 'textarea')          control = new BoundTextarea(opts);
       else if (attrib.type == 'richtext')          control = new BoundRichText(opts);
       else if (attrib.type == 'image')             control = new BoundImage(opts);

data/app/controllers/caboose/login_controller.rb

@@ -1,6 +1,6 @@
 module Caboose
   class LoginController < Caboose::ApplicationController
-    layout 'caboose/modal'
+    #layout 'caboose/modal'
     
     # GET /login
     def index
@@ -12,6 +12,7 @@ module Caboose
       @return_url = params[:return_url].nil? ? "/" : params[:return_url]
       @modal = params[:modal].nil? ? false : params[:modal]
       redirect_to @return_url and return if logged_in?
+      render :layout => Caboose::login_layout
     end
     
     # POST /login
@@ -51,6 +52,7 @@ module Caboose
       @return_url = params[:return_url].nil? ? "/" : params[:return_url]
       @modal = params[:modal].nil? ? false : params[:modal]
       redirect_to @return_url if logged_in?
+      render :layout => Caboose::login_layout
     end
         
     # POST /login/forgot-password
@@ -94,7 +96,8 @@ module Caboose
       redirect_to @return_url if logged_in?
             
       @reset_id = params[:reset_id]      
-      @user = Caboose::User.user_for_reset_id(@reset_id)            
+      @user = Caboose::User.user_for_reset_id(@reset_id)
+      render :layout => Caboose::login_layout
     end
     
     # POST /login/reset-password

data/app/controllers/caboose/register_controller.rb

@@ -1,12 +1,13 @@
 module Caboose
   class RegisterController < Caboose::ApplicationController
-    layout 'caboose/modal'
+    #layout 'caboose/modal'
     
     # GET /register
     def index
       @return_url = params[:return_url].nil? ? "/" : params[:return_url];
       @modal = params[:modal].nil? ? false : params[:modal]
       redirect_to @return_url if logged_in?
+      render :layout => Caboose::register_layout 
     end
     
     # POST /register

data/lib/caboose.rb

@@ -65,6 +65,14 @@ module Caboose
 
   # Default timezone
   mattr_accessor :timezone
-  @@timezone = 'Central Time (US & Canada)'  
+  @@timezone = 'Central Time (US & Canada)'
+
+  # Register layout
+  mattr_accessor :register_layout
+  @@register_layout = 'caboose/modal'
+
+  # Login layout
+  mattr_accessor :login_layout
+  @@login_layout = 'caboose/modal'  
   
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.137'
+  VERSION = '0.4.138'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.137
+  version: 0.4.138
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails