caboose-cms 0.9.166 → 0.9.167

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6cf6c1cb40b04b827d57e33dc840b3f7190e87a
-  data.tar.gz: a28036e64972406181fbf547186958768d257eab
+  metadata.gz: d0cdbb21670c498d32a302546db93e211868402b
+  data.tar.gz: 8f312dcd0e59b43826a38592adcc54cc260303c4
 SHA512:
-  metadata.gz: 8b85e406522e401ede9b1ad4c437ea7d377eb2fc5399d57e23358dd7d22e6fd19fe876a9ddacd99bca9eae0ea34031bb0a85c444735a623d0f93376dbbba86aa
-  data.tar.gz: 72dee3bc5c7c02274423cd8e60640b54719e3259c36140b01ecea04861e2d22b5dcf640d7412f36d64ac6c9eb86fc0cbcab6e9d8948bdfd48ba5d111f3973a44
+  metadata.gz: a876de2c71a21f0e6acdffdcd803876c9b5f81960b7f319a6369c147b3b381bf386c3b797ea8861959ebc6710d7197fc06ce6beea1c6f9f1b6d778cc0f7b50e5
+  data.tar.gz: 42e189883d2042118de765e58b04ef2f2c54c5cfc70ecc7442b5f05cd7520982b3ad8329cc2cde91adbbcfd0a12fd0904cd8aa0c52730c62144a5b7a295286e1

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

@@ -531,7 +531,7 @@ BlockContentController.prototype = {
       el.attr('onclick','').unbind('click');
       if ( el.hasClass('footer-wrapper') && el.prev('.content_wrapper.subpage').length > 0 ) {
         el.css('position','relative');
-        var over = $('<div />').attr('id','footer-msg').text('The footer must be edited on the homepage.').css('position','absolute').css('left','0').css('top','0').css('background','rgba(43, 43, 43, 0.9)').css('color','white').css('width','100%').css('height','100%').css('z-index','14').css('padding','40px 3% 40px 3%').css('text-align','center');
+        var over = $('<div />').attr('id','footer-msg').text('The footer must be edited on the homepage.');
         if ( el.find('#footer-msg').length == 0 ) { el.append(over); }
       }
       else if ( !el.hasClass('container') ) { 

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

@@ -637,7 +637,7 @@ IndexTable.prototype = {
       that.show_message(div, 'bulk_import_form');
       return;
     }
-    that.show_message("<p class='loading'>Adding...</p>", 'bulk_import_loading');
+    that.show_message("<p class='note loading'>Adding...</p>", 'bulk_import_loading');
     $.ajax({
       url: this.bulk_import_url,
       type: 'post',
@@ -691,7 +691,7 @@ IndexTable.prototype = {
       that.show_message(div, 'bulk_import_form');
       return;
     }
-    that.show_message("<p class='loading'>Adding...</p>", 'bulk_import_loading');
+    that.show_message("<p class='note loading'>Adding...</p>", 'bulk_import_loading');
 
     var formData = new FormData();
     formData.append('file', file);
@@ -1073,7 +1073,7 @@ IndexTable.prototype = {
   add_model: function() 
   {
     var that = this;
-    $('#' + that.container + '_new_message').html("<p class='loading'>Adding...</p>");
+    $('#' + that.container + '_new_message').html("<p class='note loading'>Adding...</p>");
     $.ajax({
       url: this.add_url,
       type: 'post',

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

@@ -1,5 +1,21 @@
 @import url('https://fonts.googleapis.com/css?family=Roboto:300,300i');
 
+body.editing .footer-wrapper #footer-msg {
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  background: rgba(43, 43, 43, 0.9);
+  color: rgb(255, 255, 255);
+  width: 100%;
+  height: 100%;
+  z-index: 14;
+  padding: 40px 3%;
+  text-align: center;
+  font-size: 15px;
+  font-family: Roboto;
+  font-weight: 300;
+}
+
 #cb_block_sidebar {
   position: fixed;
   top: 0;
@@ -19,7 +35,7 @@
       padding: 10px;
       text-align: center;
       height: 52px;
-      margin-bottom: 10px;
+      margin-bottom: 20px;
       color: #252525;
     }
   }
@@ -36,6 +52,8 @@
         text-transform: uppercase;
         color: #252525;
         line-height: 16px;
+        font-family: "Roboto";
+        font-weight: 300;
       }
     }
   	li.blocktype {
@@ -149,6 +167,7 @@ body > .ui-draggable-dragging {
   border: 1px solid #d4d4d4;
   margin-bottom: 0;
   border-radius: 8px;
+  font-family: 'Roboto'; font-weight: 300;
 }
 
 p.caboose_note.delete {

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

@@ -207,15 +207,15 @@ p.current_page_editing {
   padding: 10px 10px 10px 30px;
 }
 
-#content p.loading {
-  background-image: url('/assets/caboose/loading_black_on_white.gif');
-  background-position: 0 center;
-  background-repeat: no-repeat;
-  color: #000;  
-  font-weight: normal;
-  font-size: 16pt;
-  padding: 10px 10px 10px 40px;
-}
+// #content p.loading {
+//   background-image: url('/assets/caboose/loading_black_on_white.gif');
+//   background-position: 0 center;
+//   background-repeat: no-repeat;
+//   color: #000;  
+//   font-weight: normal;
+//   font-size: 16pt;
+//   padding: 10px 10px 10px 40px;
+// }
 
 #content div.yesnobox {
   position: absolute;
@@ -531,6 +531,139 @@ Page Bar Generator
 #search_form input[type='submit'] { height: 35px; padding: 0 12px; }
 
 
+.new-page-form-wrapper {
+  max-width: 950px;
+  margin: 0 auto;
+  padding: 0 50px 0 20px;
+  section {
+    padding: 20px 10px 20px 20px;
+    border: 1px solid #d6d6d6;
+    margin-bottom: 30px;
+    h4 {
+      margin: 0 0 10px 0;
+      font-size: 17px;
+    }
+    .field {
+      margin-bottom: 15px;
+      &:last-of-type { margin-bottom: 0; }
+      label {
+        display: block;
+        font-size: 15px;
+        margin-bottom: 2px;
+      }
+      input, select {
+        display: block;
+        width: 100%;
+        margin: 0;
+      }
+      p.meta {
+        font-size: 13px;
+        margin: 3px 0 0 0;
+      }
+    }
+    &.buttons {
+      .caboose-btn {
+        float: right;
+      }
+    }
+  }
+  #page-message {
+    margin: 30px 0;
+    .note {
+      text-align: center;
+    }
+  }
+}
+
+.page-templates-wrapper {
+  max-width: 912px;
+  margin: 0 auto;
+  padding: 0 20px;
+  .category {
+    border-top: 1px solid #d6d6d6;
+    padding-top: 20px;
+    margin-top: 10px;
+    &:first-of-type {
+      border-top: 0;
+    }
+    h3 {
+      margin: 0 auto 5px 0;
+      font-size: 18px;
+      padding-left: 2px;
+    }
+    p.description {
+      font-size: 14px;
+      margin: 0 0 20px 0;
+      padding-left: 2px;
+    }
+    .cat-templates {
+      display: -webkit-box;
+      display: -moz-box;
+      display: -ms-flexbox;
+      display: -webkit-flex;
+      display: flex;
+      flex-wrap: wrap;
+      .template {
+        display: block;
+        text-decoration: none;
+        -webkit-box-flex: 0 0 23%;
+        -moz-box-flex:  0 0 23%;
+        -webkit-flex:  0 0 23%;
+        -ms-flex:  0 0 23%;
+        flex:  0 0 23%;
+        text-align: center;
+        margin: 0 2% 20px 0;
+        color: #2d2d2d;
+        position: relative;
+        img {
+          display: block;
+          width: 100%;
+          height: auto;
+        }
+        .text {
+          background: #2d2d2d;
+          color: #fff;
+          padding: 8px;
+          .title {
+            font-size: 15px;
+            margin-bottom: 0;
+            display: block;
+          }
+          .desc {
+            font-size: 13px;
+            display: block;
+            margin-top: 3px;
+          }
+        }
+        &:hover {
+          img {
+            opacity: 0.6;
+          }
+        }
+        &.selected {
+          &::after {
+            content: " ";
+            background-image: url('https://cabooseit.s3.amazonaws.com/assets/shared/check.png');
+            background-size: 24px;
+            width: 24px;
+            height: 24px;
+            background-position: center center;
+            background-repeat: no-repeat;
+            position: absolute;
+            right: -4px;
+            top: -4px;
+          }
+        }
+      }
+    }
+    .btn-holder {
+      text-align: right;
+      padding-right: 10px;
+    }
+  }
+}
+
+
 /******************************************************************************/
 
 #htabs_container {  

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

@@ -3,26 +3,42 @@
 Message boxes
 *******************************************************************************/
 
-.loading {
-  background-image: url('/assets/caboose/loading_black_on_white.gif');
-  background-position: 0 center;
-  background-repeat: no-repeat;
-  color: #000;  
-  font-weight: normal;
-  font-size: 16pt;
-  padding: 10px 10px 10px 40px;
-}
+// .loading {
+//   background-image: url('/assets/caboose/loading_black_on_white.gif');
+//   background-position: 0 center;
+//   background-repeat: no-repeat;
+//   color: #000;  
+//   font-weight: normal;
+//   font-size: 16pt;
+//   padding: 10px 10px 10px 40px;
+// }
 
 .note {
-  padding: 20px;
-  margin-bottom: 10px;
-  background: #fef49c;
-  color: #000000;
-  font-weight: bold;
-  font-size: 1.4em;
-  border-radius: 3px;
-
-  h2 { margin: 0 0 10px 0; padding: 0; }	
+  padding: 15px;
+  background: #fff3ac;
+  //color: #fff;
+  font-size: 15px;
+  //text-align: center;
+  h2 { margin: 0 0 10px 0; padding: 0; }
+  a {
+    color: #fff;
+    &:hover {
+      color: #000;
+    }
+  }
+  &.error {
+    background: #bf4448;
+  }
+  &.success {
+    background: #26ae88;
+  }
+  &.loading {
+    background-image: url('https://cabooseit.s3.amazonaws.com/assets/shared/loading_blue.gif');
+    background-size: 40px;
+    background-position: 0 center;
+    background-repeat: no-repeat;
+    padding-left: 40px;
+  }
 }
 
 .note_small {
@@ -34,16 +50,16 @@ Message boxes
   border-radius: 3px;
 }
 
-.error {
-  background: #9c171b;
-  color: #ffffff;
-  a { color: #fff; }
-  a:hover { color: #000; }
-}
+// .error {
+//   background: #bf4448;
+//   color: #ffffff;
+//   a { color: #fff; }
+//   a:hover { color: #000; }
+// }
 
-.success {
-  background: #009900;
-  color: #ffffff;
-  a { color: #ffffff;	}
-}
+// .success {
+//   background: #26ae88;
+//   color: #ffffff;
+//   a { color: #ffffff;	}
+// }
  

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

@@ -8,8 +8,16 @@
 #the_modal div.icons a:hover span.icon { color: #000 !important; }
 #the_modal div.icons a:hover span.name { color: #000 !important; }
 
-#the_modal { box-sizing: border-box; color: #252525; }   
-#the_modal p { margin-bottom: 10px; }
+#the_modal { box-sizing: border-box; color: #252525; font-family: 'Roboto'; font-weight: 300; }   
+#the_modal p { margin-bottom: 10px; font-family: 'Roboto'; font-weight: 300; }
+#the_modal h1,
+#the_modal h2,
+#the_modal h3,
+#the_modal h4,
+#the_modal h5,
+#the_modal h6 {
+	font-family: 'Roboto'; font-weight: 300;
+}
 #the_modal .mb_container input { border: #ccc 1px solid; }                                                          
 #the_modal div.mb_container div.mb_placeholder { top: 9px; }
 #the_modal div.mb_container div.mb_placeholder span { font-size: 16px; }                                                         

data/app/controllers/caboose/block_type_store_controller.rb

@@ -1,8 +1,7 @@
-
 module Caboose
   class BlockTypeStoreController < ApplicationController
         
-    # @route GET /admin/block-types/store
+    # @route GET /admin/block-type-store
     def admin_index
       return unless user_is_allowed('blocktypestore', 'add')
       @pager = PageBarGenerator.new(params, {

data/app/controllers/caboose/login_controller.rb

@@ -85,7 +85,7 @@ module Caboose
 		  		  		  
 		  LoginMailer.configure_for_site(@site.id).forgot_password_email(bob).deliver		  
 		  		  
-		  resp.success = "We just sent you an email.  The reset link inside is good for 3 days."
+		  resp.success = "We just sent you an email. The reset link inside is good for 3 days."
 		  render :json => resp
 		end
 	

data/app/controllers/caboose/login_logs_controller.rb

@@ -6,11 +6,19 @@ module Caboose
     def before_action
       @page = Page.page_with_uri(request.host_with_port, '/admin')
     end
+
+    # @route GET /admin/login-logs/user/:userid
+    def admin_index_for_user
+      return if !user_is_allowed_to 'view', 'loginlogs'
+      @pager = self.login_logs_pager
+      @edituser = Caboose::User.find(params[:userid]) if !params[:userid].blank?
+      render :layout => 'caboose/admin'    
+    end
     
     # @route GET /admin/login-logs
     def admin_index
       return if !user_is_allowed_to 'view', 'loginlogs'
-      @pager = self.login_logs_pager    
+      @pager = self.login_logs_pager
       render :layout => 'caboose/admin'    
     end
     

data/app/controllers/caboose/page_templates_controller.rb

@@ -0,0 +1,76 @@
+module Caboose
+  class PageTemplatesController < ApplicationController
+    layout 'caboose/admin'
+    
+    # @route GET /admin/templates
+    def admin_index
+      return if !user_is_allowed('templates', 'view') || !@site.is_master
+      @categories = PageTemplateCategory.order(:sort_order).all
+    end
+
+    # @route GET /admin/templates/new
+    def admin_new
+      return if !user_is_allowed('templates', 'add') || !@site.is_master
+    end
+
+    # @route POST /admin/templates
+    def admin_create
+      return unless user_is_allowed('templates', 'add')
+      resp = Caboose::StdClass.new({'error' => nil,'redirect' => nil})
+      @template = PageTemplate.new
+      @template.title = params[:title]
+      @template.category_id = params[:category_id]
+      @template.save
+      resp.redirect = "/admin/templates/#{@template.id}"
+      render :json => resp
+    end
+
+    # @route PUT /admin/templates/:id
+    def admin_update
+      return unless ((user_is_allowed_to 'edit', 'templates') && @site.is_master)
+      resp = Caboose::StdClass.new
+      templates = params[:id] == 'bulk' ? params[:model_ids].collect{ |rid| PageTemplate.find(rid) } : [PageTemplate.find(params[:id])] 
+      params.each do |k,v|
+        case k
+          when "title" then templates.each { |r| r.title = v }
+          when "page_id" then templates.each { |r| r.page_id = v }
+          when "description" then templates.each { |r| r.description = v }
+          when "category_id" then templates.each { |r| r.category_id = v }
+          when "sort_order" then templates.each { |r| r.sort_order = v }
+        end
+      end
+      templates.each do |r|
+        r.save
+      end
+      resp.success = true
+      render :json => resp
+    end
+
+    # @route POST /admin/templates/:id/screenshot
+    def admin_update_screenshot
+      render :json => false and return unless user_is_allowed_to 'edit', 'templates'    
+      resp = Caboose::StdClass.new({ 'attributes' => {} })
+      template = PageTemplate.find(params[:id])
+      template.screenshot = params[:screenshot]
+      template.save
+      resp.attributes['image'] = { 'value' => template.screenshot.url(:small) }
+      render :text => resp.to_json
+    end
+
+    # @route GET /admin/templates/:id
+    def admin_edit
+      return if !user_is_allowed('templates', 'edit') || !@site.is_master
+      @template = PageTemplate.find(params[:id])
+    end
+
+    # @route DELETE /admin/templates/:id
+    def admin_delete
+      return if !user_is_allowed('templates', 'delete') || !@site.is_master
+      prop = PageTemplate.find(params[:id])    
+      resp = Caboose::StdClass.new('redirect' => "/admin/templates")
+      prop.destroy    
+      render :json => resp
+    end
+            
+  end
+end