caboose-cms 0.4.91 → 0.4.92

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmUyZjdjZjZmYTAzZmJhOTk4NzkwMDE0MjBiYmY0MDQ3NmYyN2Q5Ng==
+    NjViNTc2NTVlNTk0MjE5NjJhY2ZiM2QwOGY5YWEzYjkwZDA4YzBkMw==
   data.tar.gz: !binary |-
-    NGYzZmQ4ZGQ1OGRjNGU1MjRlZmRjODc0ZTNhOGZjMmMwOTBhYTY1ZA==
+    NmI5NTUzY2VjNzY0OWMzZDYwNWY3Nzk3MDM1ZjE0MGQyZjJiMTkyOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjhlNjc2NjZhOTNlMDU1N2E3ODdmYWRhNTc4NDQ5NDczOWU2NTFlMTU0ZTJl
-    OGRiM2VmYTA2ZjhiYjY3ZDE1NTI0NDMzNGQ2ZTNjNzVlZmYzM2IwYTEzN2Fl
-    ODE4ODU2YjY5YmQ5N2VjNjkzMzNmZTM1Y2M5MzY0NjYwNDQ1MGE=
+    YWEzZDY3NWJkZWI5MDkxN2E5ODZjNTJhMjFhMmJjNDMwNmI0OTIwMmNlNmQx
+    ZWVjZTMwOTYyZDhmZTAyMDFmN2M1NzQxOGU3NTNlNTYwZGFmODZkMTkzYWUy
+    ZjAzM2ZmMmNhZDE1NWI3ZjE0MDlhMTk1MDcxMDQ4N2UxNTliOTY=
   data.tar.gz: !binary |-
-    ZDg4ZjQ0YzJmN2JiODk2N2ZjMGVlNTYzMmZjOGZkNzA3YTllZTFhNTEzZDZh
-    YmM3OWE0OTI1NTg4MDhmZGFhYzY0YmQ2M2NkZjNmZjU3ZTE3MmY5ZTc4MmE3
-    MGUyODIxNTU5ODgzYmYxZTg3NzEzYWZhOWNjMzYwNTVmMDcwMTM=
+    OTE1OTQ0ZTczYTA5ZDI4MTFkYWEyZTQ1ZWVjMmNkOGQ1NjFkNzkwYTcxOThk
+    MmRiOWM5Y2EzYWQ5OGY1NmZiZjYyZGQ4NDIzMTFjYzI3NDRkNzA1MGI1Mjcx
+    N2Y3NDcyYjViZTYxNGQ3MGZlYWZlNzY0YzUwNGZlZmZmYmNlZDk=

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

@@ -13,474 +13,6 @@
  *= require caboose/fonts
  *= require caboose/caboose
  *= require caboose/model_binder
- */
-
-#cboxLoadedContent { margin-bottom: 0; }
-
- 
-body {
-  margin: 0;
-  padding: 0;  
-  font-family: "Avenir", serif;
-}
-
-#cboxOverlay {
-  opacity: 0.85 !important;
-  background: url('/assets/caboose/modal_overlay.png') !important;
-}
-
-#cboxWrapper {
-  -webkit-border-radius: 7px !important;
-  -moz-border-radius: 7px !important;
-  border-radius: 7px !important;
-}
-
-#top_nav {
-  background: #000;
-  border-bottom: #333 1px solid;
-  height: 50px;
-  position: relative;
-}
-
-#top_nav .caboose_logo {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 50px;
-  height: 50px;
-  background: url(/assets/caboose/caboose_logo_small.png);
-}
-
-#top_nav ul {
-  margin: 0;
-  padding: 0 8px 0 0;
-  list-style: none;
-  text-align: right;
-}
-
-#top_nav ul li {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  display: inline-block;
-}
-
-#top_nav ul li a {
-  display: block;
-  margin: 8px 4px;
-  padding: 8px 16px;
-  border: #333 1px solid;
-  text-decoration: none;
-  height: 16px;
-}
-
-#top_nav ul li a        { color: #ccc; border: #333 1px solid; background: #000; }
-#top_nav ul li a:hover  { color: #fff; border: #444 1px solid; background: #000; }
-#top_nav ul li a:active { color: #fff; border: #666 1px solid; background: #333; }
-
-#content_wrapper {
-  position: relative;
-}
-
-#content {
-  padding: 0 0 0 30px;
-}
-
-#content h1 {
-  margin: 0 0 20px -30px;
-  padding: 40px 0 0 30px;
-  height: 80px;
-  background: #e1e1e1;
-  border-bottom: #aaa 1px solid;
-  font-size: 36pt;
-}
-
-#content h1.model_attribute_h1 {
-  margin: inherit;
-  padding: inherit;
-  height: auto;
-  background: transparent;
-  border-bottom: none;
-  font-size: 36pt;
-}
-
-p.current_page_editing {
-  position: absolute;
-  top: 84px;
-  left: 4px;
-  
-  margin: 0;
-  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 div.yesnobox {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 22;
-  background-color: rgba(0, 0, 0, 0.9);
-  font-size: 20px;
-  text-align: center;
-}
-
-#content div.yesnobox div {
-  padding: 20px;
-}
-  
-#content div.yesnobox input {
-  width: auto;  
-}
-
-div.model_attribute_text {
-  color: #000;
-}
-
-#content div.top_right_controls {
-  position: absolute;
-  top: 0;
-  right: 0;
-}
-
-#content div.top_right_controls a {
-  display: inline-block;
-  margin: 0;
-  padding: 4px 8px;
-}
-
-input, select, textarea {
-  font-family: Helvetica, arial;
-  border: 1px solid #ccc;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  border-radius: 2px;
-  padding: 4px 8px;
-  height: 34px;
-  font-size: 20px;
-  z-index: 20;
-}
-
-input.dirty,
-textarea.dirty {
-  background: #fff799;  
-}
-
-select {
-  padding: 0;
-  height: 44px;
-}
-
-option {
-  
-}
-
-select.fake {
-  background: transparent;
-  position: absolute;
-  top: 0;
-  left: 0;
-  color: transparent;
-}
-
-select.fake option {
-  background: #fff;
-  color: #000;
-}
-
-#content .bound_input_check a,
-#content .bound_input_cancel a {
-  border: 1px solid #ccc;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  border-radius: 2px;
-  
-  font-size: 28px;
-  text-align: center;
-  background: #00cc00;
-  color: #fff;
-  
-  display: block;
-  padding: 4px 0;
-  height: 34px;
-}
-
-#content .bound_input_check a.loading {
-  background-image: url(/assets/caboose/loading_green.gif);
-  background-color: #00cc00;
-  background-repeat: no-repeat;
-  background-position: 6px 5px;
-  color: rgba(255, 255, 255, 0.0);
-}
-
-#content .bound_textarea_controls a {
-  display: inline-block;
-  margin: 3px 0 0 1px;
-  padding: 8px 0 6px 0;
-  background: #ccc;
-  color: #000;
-  text-align: center;
-  border: #666 1px solid;
-}
-
-#content .bound_textarea_controls a.save    { width: 60px; }
-#content .bound_textarea_controls a.discard { width: 80px; }
-  
-#content .note,
-#content .error {
-  margin: 0;
-}
-
-#content .placeholder {
-  display: block;
-  margin: 0;
-  padding: 0 5px 0 0;
-  height: 34px;
-  
-  position: absolute;
-  top: 12px;
-  left: 10px;
-  z-index: 19;
-}
-
-#content .placeholder span {
-  display: block;
-  font-size: 20px;
-  color: #757575;
-}
-
-#content .mb_container input[type='checkbox'] {
-  position: absolute;
-  top: 4px;
-  left: 0;
-  z-index: 19;  
-}
-
-#content input[type='checkbox'] {
-  margin: 0;
-  padding: 0;
-  width: 20px;
-}
-
-#content .search_form {
-  position: absolute;
-  top: 0;
-  right: 0;  
-}
-
-#content table.data {
-  border-collapse: collapse;
-}
-  
-#content table.data th {
-  background: #333;
-  border: #333 1px solid;  
-  color: #fff;
-  margin: 0;
-  padding: 0;
-}
-
-#content table.data th a {
-  color: #fff;
-  display: block;
-  text-decoration: none;
-  border: none;
-  padding: 8px 12px;
-}
-
-#content table.data th a:hover {
-  color: #000;
-  background: #fff;
-}
-
-#content table.data td {
-  background: #fff;
-  border: #333 1px solid;
-  margin: 0;
-  padding: 8px 12px;
-}
-
-#content table.data tr:nth-child(even) td {
-  background-color: #efefef;
-}
-
-
-#content table.data tr:nth-child(odd) td {
-  background-color: transparent;
-}
-
-#content table.data tr:hover td,
-#content table.data tr:nth-child(even):hover td,
-#content table.data tr:nth-child(odd):hover td {
-  background: #fff799;
-  cursor: pointer; 
-  cursor: hand;
-}
-
-/*******************************************************************************
-Modeljs
-*******************************************************************************/
-
-#content div.model_attribute_text {
-    color: #fff;
-}
-
-#content .model_attribute {
-    background: none repeat scroll 0 0 transparent;
-    display: block;
-    padding: 2px 4px;
-    text-decoration: none;
-}
-
-#content .clear {
-  clear: both;
-  line-height: 0;  
-}
-
-/*******************************************************************************
-Message boxes
-*******************************************************************************/
-
-#content .note {
-	padding: 20px;
-	background: #fef49c;
-	color: #000000;
-	font-weight: bold;
-	font-size: 1.4em;	
-}
-
-#content .note_small {
-  display: block;
-	padding: 4px 10px;
-	background: #fef49c;
-	color: #000000;
-	font-size: 1em;	
-}
-
-#content .error {
-	background: #9c171b;
-	color: #ffffff;
-}
-
-#content .error a {
-	color: #fff;	
-}
-
-#content .error a:hover {
-	color: #000;	
-}
-
-#content .success {
-	background: #009900;
-	color: #ffffff;
-}
-
-#content .success a {
-	color: #ffffff;	
-}
-
-/*******************************************************************************
-Page Bar Generator
-*******************************************************************************/
-
-.page_links {
-  
-}
-
-.page_links a {
-  display: inline-block;
-  margin: 0 2px;
-  padding: 5px 8px 3px 8px;
-  
-  border: #333 1px solid;
-  background: #333;
-  color: #fff;
-  text-decoration: none;
-}
-
-.page_links a:hover {
-  background: #505050;
-  color: #fff;
-}
-
-.page_links .middle_links a {
-  
-}
-
-.page_links span.current_page {
-  display: inline-block;
-  padding: 5px 8px 3px 8px;
-  
-  border: #333 1px solid;
-  background: #ccc;
-  color: #000;
-  text-decoration: none;
-}
-
-#search_form input[type='text']   { height: 20px; padding: 6px 12px; }
-#search_form input[type='submit'] { height: 35px; padding: 0 12px; }
-
-
-/******************************************************************************/
-
-#tabs { 
-  width: 200px;
-  float: left;  
-  /*
-  position: absolute;
-  top: 41px;
-  left: 0;
-  */
-  list-style: none; 
-  margin: -20px 0 0 -30px; 
-  padding: 0;
-  border-top: #ccc 0px solid;
-}
-#tabs ul li { 
-  list-style: none; 
-  margin: 0; 
-  padding: 0; 
-}
-#tabs li.back {
-  padding: 10px;
-}
-#tabs a {
-  display: block;
-  margin: 0;
-  padding: 16px 12px 12px 12px;
-  text-decoration: none;
-  background: #efefef;
-  border-bottom: #ccc 1px solid;
-  color: #000;
-}
-#tabs a:hover {
-  background: #666;
-  color: #fff;  
-}
-#tabs li.selected a {
-  background: transparent;
-  color: #000;
-  font-weight: bold;  
-}
-#content2 {
-  margin-left: 220px; 
-}
-
-#crumbtrail {
-  position: absolute;
-  top: -36px;
-  left: 54px;
-  color: #fff;
-}
-
-#crumbtrail a {
-  color: #fff; 
-}
+ *= require caboose/admin_main
+ *= require caboose/admin_crumbtrail
+ */

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

@@ -0,0 +1,82 @@
+
+$off-bg-color: #282828;
+$off-text-color: #999;
+$hover-bg-color: #666;
+$hover-text-color: #fff;
+$current-bg-color: #333;
+$current-text-color: #ccc;
+  
+ul#crumbtrail {
+  position: absolute;
+  top: -42px;
+  left: 54px;
+  color: #fff;
+  
+  margin: 0 0 20px 0;
+  padding: 0;
+  list-style: none;
+  text-align: center;
+  
+  li {      
+    margin: 0 5px;
+    padding: 0; 
+    list-style: none;
+    display: inline;
+    
+    a {
+      white-space: nowrap;
+      display: inline-block;
+      margin: 0;        
+      position: relative;      
+      height: 32px;
+      background: $off-bg-color;
+      color: $off-text-color;
+      z-index: 20;
+      text-decoration: none !important;              
+      span { display: block; padding: 7px 4px 0 5px; font-size: 10pt;  }
+    }
+    a:hover { background: $hover-bg-color; color: $hover-text-color; }
+  
+    a:before {
+	    content: ' ';
+	    height: 0;
+	    position: absolute;
+	    top: 0;
+	    left: -6px;
+	    width: 0;
+	    border: 16px solid transparent;
+	    border-width: 16px 6px;
+	    border-top-color:    $off-bg-color;
+	    border-right-color:  transparent;
+	    border-bottom-color: $off-bg-color;
+	    border-left-color:   transparent;
+	    z-index: 19;	    
+	  }	   
+	  a:hover:before { 
+	    border-top-color:    $hover-bg-color; 
+	    border-bottom-color: $hover-bg-color; 
+	  }
+
+    a:after {
+	    content: ' ';
+	    height: 0;
+	    position: absolute;
+	    top: 0;
+	    right: -12px;
+	    width: 0;
+	    border: 16px solid transparent;
+	    border-width: 16px 6px;
+	    border-left-color: $off-bg-color;
+	    z-index: 19;
+	  }
+	  a:hover:after { 
+	    border-left-color: $hover-bg-color; 	     
+	  }
+	  	  
+	  &.current {                
+	    a { background: $current-bg-color; color: $current-text-color; }    
+	    a:before { border-top-color: $current-bg-color; border-bottom-color: $current-bg-color; }
+	    a:after { border-left-color: $current-bg-color; }
+	  }
+  }
+}

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

@@ -0,0 +1,469 @@
+#cboxLoadedContent { margin-bottom: 0; }
+
+ 
+body {
+  margin: 0;
+  padding: 0;  
+  font-family: "Avenir", serif;
+}
+
+#cboxOverlay {
+  opacity: 0.85 !important;
+  background: url('/assets/caboose/modal_overlay.png') !important;
+}
+
+#cboxWrapper {
+  -webkit-border-radius: 7px !important;
+  -moz-border-radius: 7px !important;
+  border-radius: 7px !important;
+}
+
+#top_nav {
+  background: #000;
+  border-bottom: #333 1px solid;
+  height: 50px;
+  position: relative;
+}
+
+#top_nav .caboose_logo {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 50px;
+  height: 50px;
+  background: url(/assets/caboose/caboose_logo_small.png);
+}
+
+#top_nav ul {
+  margin: 0;
+  padding: 0 8px 0 0;
+  list-style: none;
+  text-align: right;
+}
+
+#top_nav ul li {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  display: inline-block;
+}
+
+#top_nav ul li a {
+  display: block;
+  margin: 8px 4px;
+  padding: 8px 16px;
+  border: #333 1px solid;
+  text-decoration: none;
+  height: 16px;
+}
+
+#top_nav ul li a        { color: #ccc; border: #333 1px solid; background: #000; }
+#top_nav ul li a:hover  { color: #fff; border: #444 1px solid; background: #000; }
+#top_nav ul li a:active { color: #fff; border: #666 1px solid; background: #333; }
+
+#content_wrapper {
+  position: relative;
+}
+
+#content {
+  padding: 0 0 0 30px;
+}
+
+#content h1 {
+  margin: 0 0 20px -30px;
+  padding: 40px 0 0 30px;
+  height: 80px;
+  background: #e1e1e1;
+  border-bottom: #aaa 1px solid;
+  font-size: 36pt;
+}
+
+#content h1.model_attribute_h1 {
+  margin: inherit;
+  padding: inherit;
+  height: auto;
+  background: transparent;
+  border-bottom: none;
+  font-size: 36pt;
+}
+
+p.current_page_editing {
+  position: absolute;
+  top: 84px;
+  left: 4px;
+  
+  margin: 0;
+  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 div.yesnobox {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 22;
+  background-color: rgba(0, 0, 0, 0.9);
+  font-size: 20px;
+  text-align: center;
+}
+
+#content div.yesnobox div {
+  padding: 20px;
+}
+  
+#content div.yesnobox input {
+  width: auto;  
+}
+
+div.model_attribute_text {
+  color: #000;
+}
+
+#content div.top_right_controls {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+
+#content div.top_right_controls a {
+  display: inline-block;
+  margin: 0;
+  padding: 4px 8px;
+}
+
+input, select, textarea {
+  font-family: Helvetica, arial;
+  border: 1px solid #ccc;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
+  padding: 4px 8px;
+  height: 34px;
+  font-size: 20px;
+  z-index: 20;
+}
+
+input.dirty,
+textarea.dirty {
+  background: #fff799;  
+}
+
+select {
+  padding: 0;
+  height: 44px;
+}
+
+option {
+  
+}
+
+select.fake {
+  background: transparent;
+  position: absolute;
+  top: 0;
+  left: 0;
+  color: transparent;
+}
+
+select.fake option {
+  background: #fff;
+  color: #000;
+}
+
+#content .bound_input_check a,
+#content .bound_input_cancel a {
+  border: 1px solid #ccc;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
+  
+  font-size: 28px;
+  text-align: center;
+  background: #00cc00;
+  color: #fff;
+  
+  display: block;
+  padding: 4px 0;
+  height: 34px;
+}
+
+#content .bound_input_check a.loading {
+  background-image: url(/assets/caboose/loading_green.gif);
+  background-color: #00cc00;
+  background-repeat: no-repeat;
+  background-position: 6px 5px;
+  color: rgba(255, 255, 255, 0.0);
+}
+
+#content .bound_textarea_controls a {
+  display: inline-block;
+  margin: 3px 0 0 1px;
+  padding: 8px 0 6px 0;
+  background: #ccc;
+  color: #000;
+  text-align: center;
+  border: #666 1px solid;
+}
+
+#content .bound_textarea_controls a.save    { width: 60px; }
+#content .bound_textarea_controls a.discard { width: 80px; }
+  
+#content .note,
+#content .error {
+  margin: 0;
+}
+
+#content .placeholder {
+  display: block;
+  margin: 0;
+  padding: 0 5px 0 0;
+  height: 34px;
+  
+  position: absolute;
+  top: 12px;
+  left: 10px;
+  z-index: 19;
+}
+
+#content .placeholder span {
+  display: block;
+  font-size: 20px;
+  color: #757575;
+}
+
+#content .mb_container input[type='checkbox'] {
+  position: absolute;
+  top: 4px;
+  left: 0;
+  z-index: 19;  
+}
+
+#content input[type='checkbox'] {
+  margin: 0;
+  padding: 0;
+  width: 20px;
+}
+
+#content .search_form {
+  position: absolute;
+  top: 0;
+  right: 0;  
+}
+
+#content table.data {
+  border-collapse: collapse;
+}
+  
+#content table.data th {
+  background: #333;
+  border: #333 1px solid;  
+  color: #fff;
+  margin: 0;
+  padding: 0;
+}
+
+#content table.data th a {
+  color: #fff;
+  display: block;
+  text-decoration: none;
+  border: none;
+  padding: 8px 12px;
+}
+
+#content table.data th a:hover {
+  color: #000;
+  background: #fff;
+}
+
+#content table.data td {
+  background: #fff;
+  border: #333 1px solid;
+  margin: 0;
+  padding: 8px 12px;
+}
+
+#content table.data tr:nth-child(even) td {
+  background-color: #efefef;
+}
+
+
+#content table.data tr:nth-child(odd) td {
+  background-color: transparent;
+}
+
+#content table.data tr:hover td,
+#content table.data tr:nth-child(even):hover td,
+#content table.data tr:nth-child(odd):hover td {
+  background: #fff799;
+  cursor: pointer; 
+  cursor: hand;
+}
+
+/*******************************************************************************
+Modeljs
+*******************************************************************************/
+
+#content div.model_attribute_text {
+    color: #fff;
+}
+
+#content .model_attribute {
+    background: none repeat scroll 0 0 transparent;
+    display: block;
+    padding: 2px 4px;
+    text-decoration: none;
+}
+
+#content .clear {
+  clear: both;
+  line-height: 0;  
+}
+
+/*******************************************************************************
+Message boxes
+*******************************************************************************/
+
+#content .note {
+	padding: 20px;
+	background: #fef49c;
+	color: #000000;
+	font-weight: bold;
+	font-size: 1.4em;	
+}
+
+#content .note_small {
+  display: block;
+	padding: 4px 10px;
+	background: #fef49c;
+	color: #000000;
+	font-size: 1em;	
+}
+
+#content .error {
+	background: #9c171b;
+	color: #ffffff;
+}
+
+#content .error a {
+	color: #fff;	
+}
+
+#content .error a:hover {
+	color: #000;	
+}
+
+#content .success {
+	background: #009900;
+	color: #ffffff;
+}
+
+#content .success a {
+	color: #ffffff;	
+}
+
+/*******************************************************************************
+Page Bar Generator
+*******************************************************************************/
+
+.page_links {
+  
+}
+
+.page_links a {
+  display: inline-block;
+  margin: 0 2px;
+  padding: 5px 8px 3px 8px;
+  
+  border: #333 1px solid;
+  background: #333;
+  color: #fff;
+  text-decoration: none;
+}
+
+.page_links a:hover {
+  background: #505050;
+  color: #fff;
+}
+
+.page_links .middle_links a {
+  
+}
+
+.page_links span.current_page {
+  display: inline-block;
+  padding: 5px 8px 3px 8px;
+  
+  border: #333 1px solid;
+  background: #ccc;
+  color: #000;
+  text-decoration: none;
+}
+
+#search_form input[type='text']   { height: 20px; padding: 6px 12px; }
+#search_form input[type='submit'] { height: 35px; padding: 0 12px; }
+
+
+/******************************************************************************/
+
+#tabs { 
+  width: 200px;
+  float: left;  
+  /*
+  position: absolute;
+  top: 41px;
+  left: 0;
+  */
+  list-style: none; 
+  margin: -20px 0 0 -30px; 
+  padding: 0;
+  border-top: #ccc 0px solid;
+}
+#tabs ul li { 
+  list-style: none; 
+  margin: 0; 
+  padding: 0; 
+}
+#tabs li.back {
+  padding: 10px;
+}
+#tabs a {
+  display: block;
+  margin: 0;
+  padding: 16px 12px 12px 12px;
+  text-decoration: none;
+  background: #efefef;
+  border-bottom: #ccc 1px solid;
+  color: #000;
+}
+#tabs a:hover {
+  background: #666;
+  color: #fff;  
+}
+#tabs li.selected a {
+  background: transparent;
+  color: #000;
+  font-weight: bold;  
+}
+#content2 {
+  margin-left: 220px; 
+}
+
+#crumbtrail {
+  position: absolute;
+  top: -36px;
+  left: 54px;
+  color: #fff;
+}
+
+#crumbtrail a {
+  color: #fff; 
+}

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

@@ -3,6 +3,6 @@ body {
   font-family: Helvetica, Tahoma, Arial;  
 }
 
-.placeholder_js {
-  color: #fff;
+input[type='text'].placeholder_js {
+  color: #757575;
 }

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

@@ -27,7 +27,7 @@
   left: 0;
   color: transparent;
   background: transparent;
-  height: 50px !important;
+  /*height: 50px !important;*/
 }
 
 .mb_container select.mb_fake option {

data/app/models/caboose/crumbtrail.rb

@@ -0,0 +1,33 @@
+module Caboose
+  class Crumbtrail
+
+    @_crumbtrail = []
+    
+    def self.add(url, text = nil)
+      #@_crumbtrail = []
+      if url.is_a?(Hash)
+        url.each do |url2, text2|
+          @_crumbtrail << [url2, text2]
+        end
+      else
+        @_crumbtrail << [url, text]
+      end
+    end
+    
+    def self.print(url = nil, text = nil)
+      if url
+        self.add(url, text)
+      end
+      
+      str = "<ul id='crumbtrail'>"
+      count = @_crumbtrail.count
+      @_crumbtrail.each_with_index do |arr, i|
+        is_last = i == (count - 1)
+        str << "<li#{ is_last ? " class='current'" : '' }><a href='#{ is_last ? '#' : arr[0] }'><span>#{arr[1]}</span></a></li>"
+      end
+      str << "</ul>"
+      return str
+    end
+    
+  end
+end

data/app/models/caboose/schema.rb

@@ -6,8 +6,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
     {
       :roles_users             => :role_memberships,
       :permissions_roles       => :role_permissions,
-      :page_block_field_values => :fields,
-      :page_block_fields       => :field_types,
+      #:page_block_field_values => :fields,
+      #:page_block_fields       => :field_types,
       :page_block_types        => :block_types,
       :page_blocks             => :blocks
     }

data/app/models/caboose/utilities/schema.rb

@@ -99,7 +99,8 @@ class Caboose::Utilities::Schema
     return if self.renamed_tables.nil?
     c = ActiveRecord::Base.connection
     self.renamed_tables.each do |old_name, new_name|
-      c.rename_table old_name, new_name if c.table_exists?(old_name)
+      next if !c.table_exists?(old_name) || c.table_exists?(new_name)      
+      c.rename_table old_name, new_name
     end
   end
   
@@ -110,7 +111,7 @@ class Caboose::Utilities::Schema
     self.renamed_columns.each do |model, cols|
       next if !c.table_exists? model.table_name
       cols.each do |old_name, new_name|
-        next if !c.column_exists? model.table_name, old_name
+        next if !c.column_exists?(model.table_name, old_name) || c.column_exists?(model.table_name, new_name)
         c.rename_column model.table_name, old_name, new_name
       end
     end

data/app/views/layouts/caboose/application.html.erb

@@ -1,5 +1,5 @@
 
-<% if !@page.nil? && @page.title != 'Access Denied' %>
+<% if @page && @page.title != 'Access Denied' %>
 <% content_for :js do %>
 <%= javascript_include_tag "caboose/application" %>
 <%= javascript_include_tag @site.name == 'application' ? 'application' : "#{@site.name}/js/application" %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.91'
+  VERSION = '0.4.92'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.91
+  version: 0.4.92
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -232,7 +232,9 @@ files:
 - app/assets/javascripts/caboose/testing.js
 - app/assets/javascripts/tinymce/plugins/caboose/plugin.js
 - app/assets/stylesheets/caboose/admin.css
+- app/assets/stylesheets/caboose/admin_crumbtrail.css.scss
 - app/assets/stylesheets/caboose/admin_images_index.css.scss
+- app/assets/stylesheets/caboose/admin_main.css
 - app/assets/stylesheets/caboose/admin_page_edit_content.css
 - app/assets/stylesheets/caboose/application.css
 - app/assets/stylesheets/caboose/bound_input.css
@@ -300,6 +302,7 @@ files:
 - app/models/caboose/block_type_summary.rb
 - app/models/caboose/caboose_plugin.rb
 - app/models/caboose/core_plugin.rb
+- app/models/caboose/crumbtrail.rb
 - app/models/caboose/database_session.rb
 - app/models/caboose/domain.rb
 - app/models/caboose/media_category.rb