caboose-cms 0.9.229 → 1.0.1

data/app/assets/stylesheets/caboose/admin_media_index.css.scss

@@ -18,27 +18,7 @@
 
 #uploader {
   .caboose-btn {
-    margin-right: 5px;
-    font-size: 14px;
-    line-height: 25px;
-    &.red {
-      background: #bc5252;
-      &:hover {
-        background: shade(#bc5252, 15%);
-      }
-    }
-    &.green {
-      background: #51bd63;
-      &:hover {
-        background: shade(#51bd63, 15%);
-      }
-    }
-    &.blue {
-      background: #516dbb;
-      &:hover {
-        background: shade(#516dbb, 15%);
-      }
-    }
+    margin-right: 6px;
   }
 }
 
@@ -122,7 +102,6 @@
 }
     
 #media {
-  margin-top: 10px;
   padding-right: 2%;
   ul {
     list-style: none; 
@@ -195,7 +174,7 @@
         font-size: 12px;
         text-align: center;        
         background: rgba(0,0,0,0.7);
-        padding: 3px 5px 4px 5px;
+        padding: 3px;
         color: #fff; 
         text-decoration: none !important;                                   
       }
@@ -227,7 +206,7 @@
         text-align: center;
         color: #000;
         border-radius: 4px;
-        padding: 3px 5px 4px 5px;
+        padding: 4px;
         &:focus {
           outline-width: 0;
         }
@@ -236,7 +215,7 @@
           color: #fff;
           float: left;
           &:hover {
-            background: shade(#516dbb, 15%);
+            background: shade(#516dbb, 10%);
           }
         }
         &.dl {
@@ -247,7 +226,7 @@
           color: #fff;
           // width: 100%;
           &:hover {
-            background: shade(#51bd63, 15%);
+            background: shade(#51bd63, 10%);
           }
           &.i {
             width: auto;

data/app/assets/stylesheets/caboose/application.css

@@ -7,17 +7,12 @@
  *
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
- *
+ * 
+ *= require colorbox-rails
+ *= require caboose/page_bar_generator
+ *= require caboose/model_binder  
  */
 
-
-
-/* Removed:; */
-/*
-require colorbox-rails
-require caboose/page_bar_generator
-require caboose/model_binder  
-
 #cboxLoadedContent { margin-bottom: 0; }
 
 #cboxTopLeft,
@@ -29,5 +24,4 @@ require caboose/model_binder
 #cboxTopCenter,
 #cboxBottomCenter,
 #cboxClose { background: #111; }
-#cboxWrapper { border-radius: 7px !important; }
-*/
+#cboxWrapper { border-radius: 7px !important; }

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

@@ -82,7 +82,6 @@
         border-radius: 0;
         line-height: 40px;
         text-align: left;
-        color: #000;
         &:focus {
           outline-width: 0;
           border-color: #b1d9f5;

data/app/assets/stylesheets/caboose/modal_main.css

@@ -7,10 +7,10 @@ html { width: 100%; }
 @import url('https://fonts.googleapis.com/css?family=Roboto:400,400i,700,700i');
 
 body {
-  background: #111111;
+  background: #fff;
   margin: 0;
   padding: 0;
-  color: #fff;
+  color: #000;
   width: 100%;  
   font-family: "Roboto", Arial;
   font-weight: 400;
@@ -30,8 +30,7 @@ body {
 #modal_content h1 {
   margin: 0 0 12px 0;
   padding: 0;
-  font-weight: normal;
-  background: #111111;   
+  font-weight: normal;     
 }
 
 #modal_content a {
@@ -41,7 +40,7 @@ body {
 }
 
 #modal_content p.loading {
-  background-image: url('/assets/caboose/loading_white_on_black.gif');
+  background-image: url('/assets/caboose/loading.gif');
   background-position: 0 center;
   background-repeat: no-repeat;
   color: #ccc;  
@@ -87,9 +86,9 @@ div.model_attribute_text {
 input, select, textarea {
   font-family: "Roboto", Arial;
   font-weight: 400;
-  border: 2px solid #ccc;
-  background: #000;
-  color: #fff;
+  border: 1px solid #ccc;
+  background: #fff;
+  color: #000;
   /*
   -moz-border-radius: 2px;
   -webkit-border-radius: 2px;
@@ -211,9 +210,9 @@ select.fake option {
 }
   
 #modal_content table.data th {
-  background: #000;
+  background: #666;
   border: #333 1px solid;  
-  color: #efefef;
+  color: #fff;
   margin: 0;
   padding: 0;
 }
@@ -231,8 +230,7 @@ select.fake option {
   background: #333;
 }
 
-#modal_content table.data td {
-  background: #111111;
+#modal_content table.data td {  
   border: #333 1px solid;
   color: #fff;
   margin: 0;
@@ -240,7 +238,7 @@ select.fake option {
 }
 
 #modal_content table.data tr:nth-child(even) td {
-  background-color: #000;
+  background-color: #efefef;
 }
 
 
@@ -251,8 +249,8 @@ select.fake option {
 #modal_content table.data tr:hover td,
 #modal_content table.data tr:nth-child(even):hover td,
 #modal_content table.data tr:nth-child(odd):hover td {
-  background: #333;
-  color: #fff;
+  background: #fff;
+  color: #000;
 }
 
 /*******************************************************************************
@@ -260,14 +258,14 @@ Modeljs
 *******************************************************************************/
 
 #modal_content div.model_attribute_text {
-    color: #fff;
+  color: #000;
 }
 
 #modal_content .model_attribute {
-    background: none repeat scroll 0 0 transparent;
-    display: block;
-    padding: 2px 4px;
-    text-decoration: none;
+  background: none repeat scroll 0 0 transparent;
+  display: block;
+  padding: 2px 4px;
+  text-decoration: none;
 }
 
 #modal_content .clear {
@@ -325,7 +323,7 @@ Message boxes
 #cboxMiddleRight,
 #cboxTopCenter,
 #cboxBottomCenter,
-#cboxClose { background: #111 !important; }
+#cboxClose { background: #fff !important; }
 
 /*******************************************************************************
 Page Bar Generator

data/app/assets/stylesheets/caboose/model_binder.css

@@ -1,16 +1,7 @@
-#cboxLoadedContent { margin-bottom: 0; }
-
-#cboxTopLeft,
-#cboxTopRight,
-#cboxBottomLeft,
-#cboxBottomRight,
-#cboxMiddleLeft,
-#cboxMiddleRight,
-#cboxTopCenter,
-#cboxBottomCenter,
-#cboxClose { background: #111; }
-#cboxWrapper { border-radius: 7px !important; }
-
+/*    
+require caboose/spectrum 
+*/
+ 
 .mb_container {
   width: 100%;
   overflow: hidden;

data/app/assets/stylesheets/caboose/page_bar_generator.css

@@ -1,4 +1,4 @@
-/* DEPRECATED
+
 .page_links {
   
 }
@@ -32,4 +32,3 @@
   color: #fff;
   text-decoration: none;
 }
-*/

data/app/controllers/caboose/admin_controller.rb

@@ -1,11 +1,12 @@
+
 module Caboose
   class AdminController < ApplicationController
       
     # @route GET /admin
-    def index
-      return if !user_is_allowed_to('view', 'admin')
+    def index      
+      return if !user_is_allowed('admin', 'view')
       @return_url = params[:return_url].nil? ? '/admin/pages' : params[:return_url]
     end
     
   end
-end
+end

data/app/controllers/caboose/application_controller.rb

@@ -12,7 +12,9 @@ module Caboose
       
       # Modify the built-in params array with URL params if necessary
       parse_url_params if Caboose.use_url_params
-                  
+      
+   #   @use_page_cache = !request.fullpath.starts_with?('/admin')
+            
       # Get the site we're working with      
       @domain = Domain.where(:domain => request.host_with_port).first      
       @site = @domain ? @domain.site : nil      
@@ -24,17 +26,15 @@ module Caboose
       CabooseMailer.site = @site
         
       # Make sure someone is logged in
-      if !logged_in? && @site
-        elo_id = cookies[:caboose_elo_id]
-        if elo_id.blank?
-          elo_id = User.logged_out_user_id(@site.id)
-          cookies[:caboose_elo_id] = elo_id  # Cache the site's ELO id in browser to prevent multiple lookups
-        end
-        elo = User.find(elo_id)        
+      if !logged_in? && @site                
+        elo = User.logged_out_user(@site.id)        
         login_user(elo) if elo
       end
       
-      session['use_redirect_urls'] = true if session['use_redirect_urls'].nil?            
+      session['use_redirect_urls'] = true if session['use_redirect_urls'].nil?
+      
+      # Initialize AB Testing
+      AbTesting.init(request.session_options[:id]) if Caboose.use_ab_testing            
       
       # Try to find the page
       @request = request      
@@ -47,8 +47,13 @@ module Caboose
       @is_real_page = false
       @ga_events    = []      
       
-      @page = Page.page_with_uri(request.host_with_port, request.fullpath)
+      #if @find_page
+        @page = Page.page_with_uri(request.host_with_port, request.fullpath)
+    #    @crumb_trail  = Caboose::Page.crumb_trail(@page)		    
+      #end
+
 
+      
       # Sets an instance variable of the logged in user
       @logged_in_user = logged_in_user  
 
@@ -150,12 +155,7 @@ module Caboose
     def logged_in?
       validate_token
       validate_cookie
-      elo_id = cookies[:caboose_elo_id]
-      if elo_id.blank?
-        elo_id = User.logged_out_user_id(@site.id)
-        cookies[:caboose_elo_id] = elo_id  # Cache the site's ELO id in browser to prevent multiple lookups
-      end
-      return true if !session["app_user"].nil? && session["app_user"] != false && session["app_user"].id != -1 && session["app_user"].id.to_s != elo_id.to_s
+      return true if !session["app_user"].nil? && session["app_user"] != false && session["app_user"].id != -1 && session["app_user"].id != User.logged_out_user_id(@site.id)
       return false
     end
     
@@ -164,8 +164,10 @@ module Caboose
     def validate_token
       token = params[:token]
       return false if token.nil?
+      
       user = User.validate_token(token)
       return false if user.nil?
+     
       login_user(user)
       return true
     end
@@ -240,6 +242,7 @@ module Caboose
         end
         return false
       end
+
       @user = logged_in_user
       unless @user.is_allowed(resource, action)
         if json

data/app/controllers/caboose/assets_controller.rb

@@ -0,0 +1,65 @@
+module Caboose
+  class AssetsController < Caboose::ApplicationController
+    layout 'caboose/admin'
+    
+    ## @route GET /admin/assets/ace
+    #def admin_ace
+    #  return if !user_is_allowed('assets', 'edit')      
+    #end
+    #        
+    ## @route GET /admin/assets
+    #def admin_index
+    #  return if !user_is_allowed('assets', 'edit')
+    #  config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]          
+    #  bucket = config['bucket']
+    #  @assets_path = "http://#{bucket}.s3.amazonaws.com/assets"
+    #end
+    #
+    ## @route GET /admin/assets/manifest
+    #def admin_manifest
+    #  return if !user_is_allowed('assets', 'edit')
+    #  
+    #  config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]          
+    #  bucket = config['bucket']
+    #  resp = HTTParty.get("http://#{bucket}.s3.amazonaws.com/assets/manifest.yml")      
+    #  str = resp.body             
+    #  manifest = self.parse_manifest(str, true)
+    #  
+    #  render :json => manifest            
+    #end
+    #
+    #def parse_manifest(str, exclude_images = true)
+    #  lines = str.split("\n")
+    #  h = {}
+    #  lines.each_with_index do |line, i|
+    #    next if i == 0
+    #    path = line.split(": ").first.split('/')
+    #    
+    #    if exclude_images
+    #      ext = line.split('.')
+    #      next if ext.count > 0 && ['png','jpg','gif','ico'].include?(ext.last.downcase)
+    #    end
+    #    self.verify_path_exists(path, h)
+    #  end
+    #  return h
+    #end
+    #
+    #def verify_path_exists(path, h, i = 0)
+    #  return if i >= path.count
+    #  h[path[i]] = i == (path.count - 1) ? true : {} if h[path[i]].nil?
+    #  self.verify_path_exists(path, h[path[i]], i+1)
+    #end
+    #
+    ## @route PUT /admin/assets
+    #def admin_update
+    #  return if !user_is_allowed('assets', 'edit')
+    #              
+    #  path = params[:path]
+    #  value = params[:value]
+    #  
+    #  resp = AssetManifest.save_asset(path, value)                  
+    #  render :json => resp      
+    #end
+
+  end
+end

data/app/controllers/caboose/block_types_controller.rb

@@ -155,8 +155,7 @@ module Caboose
     
     # @route PUT /admin/block-types/:id
     def admin_update
-      can_edit = (params[:site_id] && params[:site_id][0] && params[:site_id][0] == @site.id.to_s && logged_in_user.is_allowed('site_settings', 'edit')) || logged_in_user.is_super_admin?
-      render :json => false and return if !can_edit
+      render :json => false and return if !logged_in_user.is_super_admin?
       
       resp = StdClass.new({'attributes' => {}})
       bt = BlockType.find(params[:id])
@@ -187,8 +186,7 @@ module Caboose
           when 'options_url'                     then bt.options_url                    = v
           when 'default_constrain'               then bt.default_constrain              = v
           when 'default_full_width'              then bt.default_full_width             = v
-          when 'is_dynamic'                      then bt.is_dynamic                     = v
-          when 'default_included'                then bt.default_included               = v
+          when 'default_included'                 then bt.default_included             = v
           when 'site_id'                         then resp.btsm_id = bt.toggle_site(v[0], v[1])
         end
       end
@@ -295,7 +293,7 @@ module Caboose
 
     # @route GET /admin/block-type-site-memberships/:id/html
     def admin_edit_btsm_html
-      redirect_to '/admin' and return if !logged_in_user.is_allowed('site_settings', 'edit')  
+      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."
@@ -306,7 +304,7 @@ module Caboose
 
     # @route PUT /admin/block-type-site-memberships/:id/html
     def admin_update_btsm_html
-      render :json => false and return if !logged_in_user.is_allowed('site_settings', 'edit')      
+      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')
@@ -319,7 +317,7 @@ module Caboose
 
     # @route GET /admin/block-type-site-memberships/:id/css
     def admin_edit_btsm_css
-      redirect_to '/admin' and return if !logged_in_user.is_allowed('site_settings', 'edit')  
+      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."
@@ -330,7 +328,7 @@ module Caboose
 
     # @route PUT /admin/block-type-site-memberships/:id/css
     def admin_update_btsm_css
-      render :json => false and return if !logged_in_user.is_allowed('site_settings', 'edit')      
+      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']