caboose-cms 0.9.142 → 0.9.143

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4101ff715f3350bdf7f403582837404239a21b14
-  data.tar.gz: acdfda2009f0ea2c7f645638f1835d43d093f27c
+  metadata.gz: a92776f5ed142c3e522858dd4ba25d6be8957e39
+  data.tar.gz: 345197a5844595eaf4de3ea6ce9ca32049e1a3e7
 SHA512:
-  metadata.gz: 46ee55cdbb2d71c15fe7cc6102aea19b78c19528ccdf4d948bcac9da2350a98182c9faefaedeeac5108ef64acc67667a2424225d01c2aac7f001b0cb7088a879
-  data.tar.gz: 4c945c4379334ab43ac7fc7cfa20dbed51f31da4439c39b2dc46694c56d7c9d33d37eef544b5ee0f7d98e8e763190bd6c8e478fe1b14e93b0e46ee916a8f702c
+  metadata.gz: 533b503d91b9eb8e8805fe3af5b9dc002c998df0bf45319cfb77feb5f0247ee1c910c41b800b023f2ec4e70e84f3ae489baa085fce8ebd5b004a80cd5c471cd1
+  data.tar.gz: 22ef7c2d5a27c51aeec9e40d966b6fdb8518c6c01cb45e3db78f3e2ff4296a06c47ca0496c7d757a05f9a8cd253ef4bc8ddb9b8d1a43a5c1499dd68c1cbd1a3b

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

@@ -164,7 +164,7 @@ $current-text-color: #ccc;
 			a.icon3-settings {
 				position: absolute;
 		    right: 30px;
-		    top: 8px;
+		    top: 9px;
 		    font-size: 0;
 		    color: transparent;
 		    width: 23px;
@@ -201,13 +201,13 @@ $current-text-color: #ccc;
 					font-size: 20px;
 			    position: absolute;
 			    left: 5px;
-			    top: 7px;
+			    top: 8px;
 				}
 			}
 			a.pub {
 				position: absolute;
 		    right: 9px;
-		    top: 10px;
+		    top: 11px;
 		    font-size: 0;
 		    color: transparent;
 		    width: 17px;

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

@@ -273,7 +273,7 @@ body > .container, body > .mm-page > .container {
   a {
     display: inline-block;
     color: #fff;
-    padding: 0 10px;
+    padding: 0 10px 1px 10px;
     font-family: 'Roboto';
     font-weight: 300;
     font-size: 12px;
@@ -282,7 +282,7 @@ body > .container, body > .mm-page > .container {
     margin-left: 8px;
     text-transform: uppercase;
     border-radius: 3px;
-    line-height: 24px;
+    line-height: 28px;
     &[href*="revert"] {
       background: #903b3b;
     }
@@ -372,7 +372,7 @@ body > .container, body > .mm-page > .container {
   a {
     position: absolute;
     top: 1px;
-    right: 5px;
+    left: 5px;
     text-decoration: none;
     color: #fff;
     display: inline-block;

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

@@ -178,7 +178,7 @@ h1,h2,h3,h4,h5,h6 {
   margin: 0 0 20px 0;
   width: calc(100% + 30px);
   padding: 0 2% 0 50px;
-  height: 53px;  
+  height: 54px;  
   background: #dcdcdc;
   border-bottom: #aaa 1px solid;
   font-size: 25px;
@@ -255,12 +255,32 @@ input, select, textarea {
   font-family: 'Roboto', arial;
   font-weight: 400;
   border: 1px solid #ccc;
-  padding: 6px 4px 4px 8px;
+  padding: 4px 4px 4px 8px;
   height: 36px;
   font-size: 15px;
   z-index: 20;
 }
 
+span.explanation {
+  display: block;
+  color: #545454;
+  font-size: 13px;
+  padding: 4px 5px 0px 9px;
+  a {
+    color: #5151a9;
+    text-decoration: none;
+    &:hover {
+      color: #69a951;
+    }
+  }
+}
+
+div.field_with_explanation {
+  padding: 13px 5px 10px 5px;
+  border-bottom: 1px solid #e8e8e8;
+  max-width: 800px;
+}
+
 input:focus, textarea:focus {
   outline-width: 0;
   border-color: #28acc1;
@@ -582,7 +602,7 @@ Page Bar Generator
 #tabs a {
   display: block;
   margin: 0;
-  padding: 13px 12px 12px 12px;
+  padding: 12px;
   text-decoration: none;
   background: #efefef;
   border-bottom: #ccc 1px solid;
@@ -631,12 +651,12 @@ Page Bar Generator
   text-align: center; 
   font-family: "Roboto", Arial;
   font-weight: 400;
-  padding: 1px 15px 0 15px;
+  padding: 1px 15px 3px 15px;
   height: auto;
   display: inline-block;
   margin: 0 auto;
   font-size: 15px;
-  line-height: 32px;
+  line-height: 30px;
   cursor: pointer;
   border: 1px solid #fff;
   -webkit-border-radius: 5px;
@@ -654,7 +674,7 @@ Page Bar Generator
   text-align: center; 
   font-family: "Roboto", Arial;
   font-weight: 400;
-  padding: 1px 15px 0 15px;
+  padding: 1px 15px 3px 15px;
   height: auto;
   display: inline-block;
   margin: 0 auto;
@@ -665,7 +685,7 @@ Page Bar Generator
   -webkit-appearance: none;
   -moz-border-radius: 5px;
   border-radius: 5px;
-  line-height: 32px;
+  line-height: 30px;
   text-decoration: none !important;
 }
 

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

@@ -88,10 +88,8 @@ div.mb_container div.mb_placeholder {
   display: block;
   margin: 0;
   padding: 0 5px 0 0;
-  /*height: 34px;*/
-  
   position: absolute;
-  top: 10px;
+  top: 8px;
   left: 9px;
   z-index: 19;  
 }

data/app/views/caboose/pages/_admin_header.html.erb

@@ -4,9 +4,9 @@
 p.uri {
   background: #efefef;
   border: #999 1px solid;
-  padding: 9px 10px;
+  padding: 8px 10px;
   position: absolute;
-  top: -44px;
+  top: -45px;
   left: 0;
   height: 36px;
   margin: 0;

data/app/views/caboose/pages/admin_edit_general.html.erb

@@ -17,22 +17,7 @@
 
 <%= render :partial => 'caboose/pages/admin_footer' %>
 
-<% content_for :caboose_css do %>
-<style type='text/css'>
 
-div.field_with_explanation {
-  width: 420px;
-  background: #efefef;
-  margin-bottom: 12px;
-}
-
-span.explanation {
-  display: block;
-  padding: 8px;    
-}
-
-</style>
-<% end %>
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 
@@ -51,18 +36,18 @@ $(document).ready(function() {
     update_url: '/admin/pages/<%= @page.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'title'                 , nice_name: 'Title'                , type: 'text'       , value: <%= raw Caboose.json(@page.title           ) %> , width: 400 },
-      { name: 'menu_title'            , nice_name: 'Menu title'           , type: 'text'       , value: <%= raw Caboose.json(@page.menu_title      ) %> , width: 400 },
-      { name: 'parent_id'             , nice_name: 'Parent'               , type: 'select'     , value: <%= @page.parent_id                          %> , width: 400, after_update: function() { update_uri(<%= @page.id %>); }, text: <%= raw (@page.parent_id == -1 ? "[No Parent]" : @page.parent.title).to_json %>, options_url: '/admin/pages/sitemap-options' },           
-      { name: 'slug'                  , nice_name: 'Slug'                 , type: 'text'       , value: <%= raw Caboose.json(@page.slug            ) %> , width: 400, after_update: function() { update_uri(<%= @page.id %>); } }, 
-      { name: 'alias'                 , nice_name: 'Alias'                , type: 'text'       , value: <%= raw Caboose.json(@page.alias           ) %> , width: 400, after_update: function() { update_uri(<%= @page.id %>); } }, 
-      { name: 'redirect_url'          , nice_name: 'Redirect URL'         , type: 'text'       , value: <%= raw Caboose.json(@page.redirect_url    ) %> , width: 400 },
-      { name: 'hide'                  , nice_name: 'Hide'                 , type: 'checkbox'   , value: <%= raw @page.hide                           %> , width: 400 },      
-      { name: 'custom_sort_children'  , nice_name: 'Custom sort children' , type: 'checkbox'   , value: <%= raw @page.custom_sort_children           %> , width: 400 },
+      { name: 'title'                 , nice_name: 'Title'                , type: 'text'       , value: <%= raw Caboose.json(@page.title           ) %> , width: 500 },
+      { name: 'menu_title'            , nice_name: 'Menu title'           , type: 'text'       , value: <%= raw Caboose.json(@page.menu_title      ) %> , width: 500 },
+      { name: 'parent_id'             , nice_name: 'Parent'               , type: 'select'     , value: <%= @page.parent_id                          %> , width: 500, after_update: function() { update_uri(<%= @page.id %>); }, text: <%= raw (@page.parent_id == -1 ? "[No Parent]" : @page.parent.title).to_json %>, options_url: '/admin/pages/sitemap-options' },           
+      { name: 'slug'                  , nice_name: 'Slug'                 , type: 'text'       , value: <%= raw Caboose.json(@page.slug            ) %> , width: 500, after_update: function() { update_uri(<%= @page.id %>); } }, 
+      { name: 'alias'                 , nice_name: 'Alias'                , type: 'text'       , value: <%= raw Caboose.json(@page.alias           ) %> , width: 500, after_update: function() { update_uri(<%= @page.id %>); } }, 
+      { name: 'redirect_url'          , nice_name: 'Redirect URL'         , type: 'text'       , value: <%= raw Caboose.json(@page.redirect_url    ) %> , width: 500 },
+      { name: 'hide'                  , nice_name: 'Hide'                 , type: 'checkbox'   , value: <%= raw @page.hide                           %> , width: 500 },      
+      { name: 'custom_sort_children'  , nice_name: 'Custom sort children' , type: 'checkbox'   , value: <%= raw @page.custom_sort_children           %> , width: 500 },
     <% if false %>
-      { name: 'content_format'        , nice_name: 'Content format'       , type: 'select'     , value: <%= raw Caboose.json(@page.content_format  ) %> , width: 400, text: <%= raw Caboose.json(@page.content_format) %>, options_url: '/admin/pages/format-options' },
+      { name: 'content_format'        , nice_name: 'Content format'       , type: 'select'     , value: <%= raw Caboose.json(@page.content_format  ) %> , width: 500, text: <%= raw Caboose.json(@page.content_format) %>, options_url: '/admin/pages/format-options' },
     <% end %>
-      { name: 'tags'                  , nice_name: 'Tags'                 , type: 'text'       , value: <%= raw Caboose.json(tags                  ) %> , width: 400 }
+      { name: 'tags'                  , nice_name: 'Tags'                 , type: 'text'       , value: <%= raw Caboose.json(tags                  ) %> , width: 500 }
     ]
   });
 });

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.142'
+  VERSION = '0.9.143'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.142
+  version: 0.9.143
 platform: ruby
 authors:
 - William Barry