caboose-cms 0.9.193 → 0.9.194

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc6206c9e67d2d3297d21563ecb2d7a89e6031a6
-  data.tar.gz: 60f7d494a0debe8fde6c9501ace78325b1098c91
+  metadata.gz: bf3d9753758ba664b6736b5756ecb4c4fc398499
+  data.tar.gz: 6eb53a89f67dde04a4fe88223d3d11aaeb7dcb81
 SHA512:
-  metadata.gz: 1ee995af0058f6fed0da180d93e5fc8daabc651e1feb2af6417868e5434cf06879a830dffff0c8fd94803a682e6b8094e303c4a2df447a465bfd74f8ef094424
-  data.tar.gz: 0f6cce388e3102441ece39f71e92fdbbab073b596534c9df486fb1f820af4a4da397e000bdecd0e63c4135a3c18da588a1715d43602d8717b27d009d58e5d35d
+  metadata.gz: bfbde88b45b6c9cba1c63b25883fb15998bcefd7a5c00f6a02207d69f1acc3aa0a988aa826f7dfafe566df8639363047cded4ea0423aad5310c2cd0395e2422f
+  data.tar.gz: a33f9b2094e41767a3a5a759ccc151db972219d6e2edeecc9e981ea3eed0e7963ff86a26d24c34b12862a2344d4cbab294ba8aac54e3db0dc7a1fa83d7dfdd54

data/app/assets/javascripts/caboose/main.js

@@ -12,20 +12,20 @@ var Caboose = function() {
 	self.initialize = function() {
 		self.loggedIn = window.loggedIn || false;
 		
-		$('a[href="/register"], [caboose=register]').click(function(event) {
-			event.preventDefault();
-			self.register( $(window).width() < 1024 );
-		});
+		// $('a[href="/register"], [caboose=register]').click(function(event) {
+		// 	event.preventDefault();
+		// 	self.register( $(window).width() < 1024 );
+		// });
 		
-		$('a[href="/login"], [caboose=login]').click(function(event) {
-			event.preventDefault();
-			self.login( $(window).width() < 1024 );
-		});
+		// $('a[href="/login"], [caboose=login]').click(function(event) {
+		// 	event.preventDefault();
+		// 	self.login( $(window).width() < 1024 );
+		// });
 		
-		$('a[href="/logout"], [caboose=logout]').click(function(event) {
-			event.preventDefault();
-			self.logout( $(window).width() < 1024 );
-		});
+		// $('a[href="/logout"], [caboose=logout]').click(function(event) {
+		// 	event.preventDefault();
+		// 	self.logout( $(window).width() < 1024 );
+		// });
 	};
 	
 	//
@@ -69,18 +69,19 @@ var Caboose = function() {
 	//
 	
 	self.login = function() {
-		if ($.browser.mobile) window.location.href = '/login?return_url=' + window.location.pathname;
+		window.location = '/login?return_url=' + window.location.pathname;
+		// if ($.browser.mobile) window.location.href = '/login?return_url=' + window.location.pathname;
 		
-		$.colorbox({
-			href: '/login?return_url=' + window.location.pathname,
-			iframe: true,
-			innerWidth: 200,
-			innerHeight: 50,
-			scrolling: false,
-			transition: 'fade',
-			closeButton: false,
-			opacity: 0.50
-		});
+		// $.colorbox({
+		// 	href: '/login?return_url=' + window.location.pathname,
+		// 	iframe: true,
+		// 	innerWidth: 200,
+		// 	innerHeight: 50,
+		// 	scrolling: false,
+		// 	transition: 'fade',
+		// 	closeButton: false,
+		// 	opacity: 0.50
+		// });
 	};
 	
 	//
@@ -96,18 +97,18 @@ var Caboose = function() {
 	//
 	
 	self.register = function(callback) {
-		if ($.browser.mobile) window.location.href = '/register?return_url=' + window.location.pathname;
+		window.location = '/register?return_url=' + window.location.pathname;
 		
-		$.colorbox({
-			href: '/register?return_url=' + window.location.pathname,
-			iframe: true,
-			innerWidth: 200,
-			innerHeight: 50,
-			scrolling: false,
-			transition: 'fade',
-			closeButton: false,
-			opacity: 0.50
-		});
+		// $.colorbox({
+		// 	href: '/register?return_url=' + window.location.pathname,
+		// 	iframe: true,
+		// 	innerWidth: 200,
+		// 	innerHeight: 50,
+		// 	scrolling: false,
+		// 	transition: 'fade',
+		// 	closeButton: false,
+		// 	opacity: 0.50
+		// });
 	};
 	
 	// Init and return

data/app/assets/stylesheets/caboose/login.scss

@@ -0,0 +1,95 @@
+.caboose-login-wrapper {
+  padding: 40px 2%;
+  text-align: center;
+  background-color: rgba(255,255,255,0.5);
+  display: block;
+  width: 100%;
+  margin: 0;
+  .caboose-login-form-wrapper {
+    max-width: 400px;
+    margin: 0 auto;
+    padding: 30px;
+    background: #fff;
+    border: 1px solid #e6e6e6;
+    h5 {
+      margin: 0 0 20px 0;
+      color: #282828;
+      text-align: center;
+    }
+    & > p {
+      font-family: "Roboto";
+      font-weight: 300;
+      font-size: 15px;
+      margin-bottom: 20px;
+      text-align: left;
+      line-height: 20px;
+    }
+    & > form {
+      text-align: right;
+      &#caboose-register-form {
+        .field {
+          margin-bottom: 15px;
+        }
+      }
+      .field {
+        margin-bottom: 25px;
+        text-align: left;
+        label {
+          text-align: left;
+          margin-bottom: 4px;
+          display: block;
+          font-family: "Roboto";
+          font-weight: 300;
+          font-size: 13px;
+          font-style: normal;
+          color: #282828;
+        }
+      }
+      input[type="text"], input[type="password"], input[type="email"] {
+        display: block;
+        width: 100%;
+        font-family: "Roboto";
+        font-weight: 300;
+        font-size: 16px;
+        border: 1px solid #d8d8d8;
+        height: 36px;
+        padding: 6px;
+        font-style: normal;
+        background-color: transprent;
+        -webkit-appearance: none;
+        border-radius: 0;
+        line-height: 36px;
+        text-align: left;
+        &:focus {
+          outline-width: 0;
+          border-color: #b1d9f5;
+        }
+      }
+      .caboose-links {
+        margin-bottom: 15px;
+      }
+      .caboose-links > a {
+        font-size: 14px;
+        color: #282828;
+        text-decoration: none;
+        display: block;
+        margin-bottom: 8px;
+        font-family: "Roboto";
+        font-weight: 300;
+        font-size: 14px;
+        &:hover {
+          color: #bf4e4e;
+        }
+        &:focus {
+          outline-width: 0;
+        }
+        &:last-of-type {
+          margin-bottom: 0;
+        }
+      }
+    }
+  }
+  #caboose-login-message {
+    clear: both;
+  }
+}

data/app/controllers/caboose/application_controller.rb

@@ -260,7 +260,7 @@ module Caboose
     # Redirects to login if not logged in.
     def verify_logged_in
       if !logged_in?
-        redirect_to "/modal/login?return_url=" + URI.encode(request.fullpath)
+        redirect_to "/login?return_url=" + URI.encode(request.fullpath)
         return false
       end      
       return true    

data/app/controllers/caboose/block_type_categories_controller.rb

@@ -1,13 +1,36 @@
-
 module Caboose
   class BlockTypeCategoriesController < ApplicationController
-    
+
+    # @route GET /admin/block-type-categories
+    def admin_index
+      redirect_to '/admin' and return if !logged_in_user.is_super_admin?
+      @btc = BlockTypeCategory.where(:parent_id => nil).order(:sort_order).all
+      render :layout => 'caboose/admin'
+    end
+
     # @route GET /admin/block-type-categories/tree-options
     def admin_tree_options
       return unless user_is_allowed('pages', 'edit')
       render :json => BlockTypeCategory.tree
     end
 
+    # @route GET /admin/block-type-categories/:id
+    def admin_edit
+      redirect_to '/admin' and return if !logged_in_user.is_super_admin?
+      @btc = BlockTypeCategory.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+
+    # @route PUT /admin/block-type-categories/:id
+    def admin_update
+      render :json => false and return if !logged_in_user.is_super_admin?
+    end
+
+    # @route DELETE /admin/block-type-categories/:id
+    def admin_delete
+      render :json => false and return if !logged_in_user.is_super_admin?
+    end
+
     # @route GET /admin/block-type-categories/:id/options
     def admin_options
     	btc = BlockTypeCategory.find(params[:id])

data/app/controllers/caboose/block_types_controller.rb

@@ -8,13 +8,14 @@ module Caboose
     
     # @route GET /admin/block-types
     def admin_index
-      return if !user_is_allowed('pages', 'view')
+      redirect_to '/admin' and return if !logged_in_user.is_super_admin?
       @block_types = BlockType.where("parent_id is null or parent_id = 0").reorder(:name).all
       render :layout => 'caboose/admin'      
     end
     
     # @route GET /admin/block-types/json
     def admin_json
+      render :json => false and return if !logged_in_user.is_super_admin?
       h = {        
         'name'              => '',
         'description'       => '',
@@ -43,20 +44,20 @@ module Caboose
     
     # @route GET /admin/block-types/:id/json
     def admin_json_single
-      return if !user_is_allowed('pages', 'view')
+      render :json => false and return if !logged_in_user.is_super_admin?
       block_type = BlockType.find(params[:id])
       render :json => block_type.as_json(:include => :sites)      
     end
     
     # @route GET /admin/block-types/parse
     def admin_parse_form
-      return if !user_is_allowed('blocktypeparser', 'view')      
+      redirect_to '/admin' and return if !logged_in_user.is_super_admin?  
       render :layout => 'caboose/admin'      
     end
     
     # @route POST /admin/block-types/parse-tags
     def admin_parse_tags
-      return if !user_is_allowed('blocktypeparser', 'view')      
+      redirect_to '/admin' and return if !logged_in_user.is_super_admin?   
       children = params[:children] && params[:children] != 'false' ? params[:children] : nil
       resp = BlockTypeParser.parse_html(params[:html], params[:tags], children)
       render :json => resp
@@ -65,7 +66,7 @@ module Caboose
     # @route GET /admin/block-types/new
     # @route GET /admin/block-types/:id/new
     def admin_new
-      return unless user_is_allowed('pages', 'add')      
+      redirect_to '/admin' and return if !logged_in_user.is_super_admin? 
       @block_type = BlockType.new
       @parent_id = params[:id]
       render :layout => 'caboose/admin'
@@ -73,28 +74,28 @@ module Caboose
     
     # @route GET /admin/block-types/:id/icon
     def admin_edit_icon
-      return unless user_is_allowed('pages', 'edit')      
+      redirect_to '/admin' and return if !logged_in_user.is_super_admin?    
       @block_type = BlockType.find(params[:id])
       render :layout => 'caboose/modal'
     end
     
     # @route GET /admin/block-types/:id
     def admin_edit
-      return unless user_is_allowed('pages', 'edit')      
+      redirect_to '/admin' and return if !logged_in_user.is_super_admin?   
       @block_type = BlockType.find(params[:id])
       render :layout => 'caboose/admin'
     end
 
     # @route GET /admin/block-types/:id/render-function
     def admin_edit_render_function
-      return unless user_is_allowed('sites', 'edit')      
+      redirect_to '/admin' and return if !logged_in_user.is_super_admin?  
       @block_type = BlockType.find(params[:id])
       render :layout => 'caboose/admin'
     end
 
     # @route PUT /admin/block-types/:id/render-function
     def admin_update_render_function
-      return if !user_is_allowed('sites', 'edit')
+      render :json => false and return if !logged_in_user.is_super_admin?
       resp = StdClass.new  
       @block_type = BlockType.find(params[:id])
       code = params['code'].blank? ? '' : params['code'].gsub('<%==','<%= raw')
@@ -107,14 +108,14 @@ module Caboose
 
     # @route GET /admin/block-types/:id/sass
     def admin_edit_sass
-      return unless user_is_allowed('sites', 'edit')      
+      redirect_to '/admin' and return if !logged_in_user.is_super_admin? 
       @block_type = BlockType.find(params[:id])
       render :layout => 'caboose/admin'
     end
 
     # @route PUT /admin/block-types/:id/sass
     def admin_update_sass
-      return if !user_is_allowed('sites', 'edit')
+      render :json => false and return if !logged_in_user.is_super_admin?
       resp = StdClass.new  
       @block_type = BlockType.find(params[:id])
       @block_type.custom_sass = params['code']
@@ -126,20 +127,18 @@ module Caboose
 
     # @route GET /admin/block-types/:id/errors
     def admin_error_log
-      return unless user_is_allowed('sites', 'edit')      
+      redirect_to '/admin' and return if !logged_in_user.is_super_admin?   
       @block_type = BlockType.find(params[:id])
       render :layout => 'caboose/admin'
     end
     
     # @route POST /admin/block-types
     def admin_create
-      return unless user_is_allowed('pages', 'add')
-
+      render :json => false and return if !logged_in_user.is_super_admin?
       resp = Caboose::StdClass.new({
           'error' => nil,
           'redirect' => nil
       })
-
       bt = BlockType.new(
         :parent_id           => params[:parent_id] ? params[:parent_id] : nil,
         :name                => params[:name].downcase.gsub(' ', '_'),
@@ -148,8 +147,7 @@ module Caboose
         :allow_child_blocks  => false,
         :icon => 'checkbox-unchecked'        
       )       
-      bt.save      
-      
+      bt.save
       # Send back the response
       resp.redirect = "/admin/block-types/#{bt.id}"
       render :json => resp
@@ -157,7 +155,7 @@ module Caboose
     
     # @route PUT /admin/block-types/:id
     def admin_update
-      return unless user_is_allowed('pages', 'edit')
+      render :json => false and return if !logged_in_user.is_super_admin?
       
       resp = StdClass.new({'attributes' => {}})
       bt = BlockType.find(params[:id])
@@ -193,18 +191,24 @@ module Caboose
         end
       end
       
-      # Trigger the page cache to be updated      
- #     query = ["update page_cache set refresh = true where page_id in (select distinct(page_id) from blocks where block_type_id = ?)", bt.id]
- #     ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))      
-  #    PageCacher.delay(:queue => 'caboose_cache').refresh
-    
       resp.success = save && bt.save
       render :json => resp
     end
+
+    # @route DELETE /admin/block-types/bulk
+    def admin_bulk_delete
+      render :json => false and return if !logged_in_user.is_super_admin?     
+      params[:model_ids].each do |bt_id|
+        block_type = BlockType.where(:id => bt_id).first
+        block_type.destroy if block_type
+      end
+      resp = Caboose::StdClass.new('success' => true)
+      render :json => resp
+    end
     
     # @route DELETE /admin/block-types/:id
     def admin_delete
-      return unless user_is_allowed('pages', 'delete')                  
+      render :json => false and return if !logged_in_user.is_super_admin?             
       BlockType.find(params[:id]).destroy            
       resp = StdClass.new({
         'redirect' => "/admin/block-types"
@@ -215,12 +219,7 @@ module Caboose
     # @route_priority 1
     # @route GET /admin/block-types/new-options    
     def admin_options_for_new_block
-      return unless user_is_allowed('blocktypes', 'edit')
-      #cats = BlockTypeCategory.where("parent_id is not null and name != ?", 'Layouts').all.collect{ |cat| {
-      #  :block_type_category => cat,
-      #  :block_types => Caboose::BlockType.includes(:block_type_site_memberships).where(:parent_id => nil, :block_type_category_id => cat.id).where("block_type_site_memberships.site_id = ?", @site.id).reorder(:description).all
-      #}}
-      
+      return unless user_is_allowed('pages', 'edit')      
       cats = BlockTypeCategory.where("name != ?", 'Layouts').all.collect{ |cat| {
         :block_type_category => cat,
         :block_types => Caboose::BlockType.includes(:block_type_site_memberships)
@@ -285,7 +284,7 @@ module Caboose
       render :json => options
     end
     
-    def admin_tree_options_helper(options, bt, prefix)      
+    def admin_tree_options_helper(options, bt, prefix)
       options << { 'value' => bt.id, 'text' => "#{prefix}#{bt.description}" }
       bt.children.each do |bt2|
         admin_tree_options_helper(options, bt2, " - #{prefix}")
@@ -294,7 +293,7 @@ module Caboose
 
     # @route GET /admin/block-type-site-memberships/:id/html
     def admin_edit_btsm_html
-      return if !user_is_allowed_to('edit', 'sites')
+      redirect_to '/admin' and return if !logged_in_user.is_super_admin?
       @btsm = BlockTypeSiteMembership.find(params[:id])
       if (@site.id != @btsm.site_id && !@site.is_master)
         @error = "You are not allowed to edit this site."
@@ -305,7 +304,7 @@ module Caboose
 
     # @route PUT /admin/block-type-site-memberships/:id/html
     def admin_update_btsm_html
-      return if !user_is_allowed_to('edit', 'sites')
+      render :json => false and return if !logged_in_user.is_super_admin?      
       resp = StdClass.new  
       @btsm = BlockTypeSiteMembership.find(params[:id])
       code = params['code'].blank? ? '' : params['code'].gsub('<%==','<%= raw')
@@ -318,7 +317,7 @@ module Caboose
 
     # @route GET /admin/block-type-site-memberships/:id/css
     def admin_edit_btsm_css
-      return if !user_is_allowed_to('edit', 'sites')
+      redirect_to '/admin' and return if !logged_in_user.is_super_admin?
       @btsm = BlockTypeSiteMembership.find(params[:id])  
       if (@site.id != @btsm.site_id && !@site.is_master)
         @error = "You are not allowed to edit this site."
@@ -329,7 +328,7 @@ module Caboose
 
     # @route PUT /admin/block-type-site-memberships/:id/css
     def admin_update_btsm_css
-      return if !user_is_allowed_to('edit', 'sites')
+      render :json => false and return if !logged_in_user.is_super_admin?      
       resp = StdClass.new  
       @btsm = BlockTypeSiteMembership.find(params[:id])
       @btsm.custom_css = params['code']