Various changes

Gemfile.lock

@@ -0,0 +1,114 @@
+PATH
+  remote: .
+  specs:
+    caboose-cms (0.2.15)
+      activesupport
+      colorbox-rails
+      jquery-rails
+      jquery-ui-rails
+      rails (~> 3.2.12)
+      tinymce-rails
+      trollop
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.14)
+      actionpack (= 3.2.14)
+      mail (~> 2.5.4)
+    actionpack (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
+      builder (~> 3.0.0)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.4)
+    colorbox-rails (0.1.0)
+      jquery-rails
+      rails (>= 3.1.1)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.4)
+    journey (1.0.4)
+    jquery-rails (3.0.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (4.0.4)
+      jquery-rails
+      railties (>= 3.1.0)
+    json (1.8.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.23)
+    multi_json (1.7.8)
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.14)
+      actionmailer (= 3.2.14)
+      actionpack (= 3.2.14)
+      activerecord (= 3.2.14)
+      activeresource (= 3.2.14)
+      activesupport (= 3.2.14)
+      bundler (~> 1.0)
+      railties (= 3.2.14)
+    railties (3.2.14)
+      actionpack (= 3.2.14)
+      activesupport (= 3.2.14)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.1.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.18.1)
+    tilt (1.4.1)
+    tinymce-rails (4.0.2)
+      railties (>= 3.1.1)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    trollop (2.0)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  caboose-cms!
+  colorbox-rails
+  jquery-rails
+  jquery-ui-rails
+  tinymce-rails
+  trollop

app/assets/javascripts/caboose/model/attribute.js

@@ -28,7 +28,7 @@ Attribute.prototype = {
 				{
 				  if (resp.attributes && resp.attributes[this2.name])
 				    for (var thing in resp.attributes[this2.name])
-				      this2[thing] = resp.attributes[this2.name][thing];
+				      this2[thing] = resp.attributes[this2.name][thing];				  
 				  this2.value_clean = this2.value;
 				}
 				if (after) after(resp);

app/assets/javascripts/caboose/model/bound_select.js

@@ -52,7 +52,7 @@ BoundSelect = BoundControl.extend({
         .css('width', $('#'+this2.el).outerWidth())
         .on('change', function() {
           $('#'+this2.el).val($('#'+this2.el+'_select').val());
-          this2.save(); 
+          this2.save();                     
         });
 
       $.each(this2.attribute.options, function(i, option) {
@@ -80,6 +80,8 @@ BoundSelect = BoundControl.extend({
     this.attribute.value = $('#'+this.el).val();
     var this2 = this;
     this.model.save(this.attribute, function(resp) {
+      if (this2.attribute.text)
+        $('#'+this2.el).val(this2.attribute.text);        
       $('#'+this2.el+'_check a').removeClass('loading');
       if (resp.error) this2.error(resp.error);
       else

app/assets/stylesheets/caboose/modal.css

@@ -206,16 +206,53 @@ select.fake option {
   right: 0;  
 }
 
+#modal_content table.data {
+  border-collapse: collapse;
+}
+
 #modal_content table.data th {
-  background: #222222;
-  border: #333 1px solid;
+  background: #000;
+  border: #333 1px solid;  
+  color: #efefef;
+  margin: 0;
+  padding: 0;
+}
+
+#modal_content table.data th a {
+  display: block;
+  text-decoration: none;
+  border: none;
   color: #fff;
+  padding: 8px 12px;
+}
+
+#modal_content table.data th a:hover {
+  color: #fff;
+  background: #333;
 }
 
 #modal_content table.data td {
   background: #111111;
   border: #333 1px solid;
   color: #fff;
+  margin: 0;
+  padding: 8px 12px;
+}
+
+#modal_content table.data tr:nth-child(even) td {
+  background-color: #000;
+}
+
+
+#modal_content table.data tr:nth-child(odd) td {
+  background-color: transparent;
+}
+
+#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;
 }
 
 /*******************************************************************************
@@ -237,3 +274,86 @@ Modeljs
   clear: both;
   line-height: 0;  
 }
+
+/*******************************************************************************
+Message boxes
+*******************************************************************************/
+
+#modal_content .note {
+	padding: 20px;
+	background: #fef49c;
+	color: #000000;
+	font-weight: bold;
+	font-size: 1.4em;	
+}
+
+#modal_content .note_small {
+  display: block;
+	padding: 4px 10px;
+	background: #fef49c;
+	color: #000000;
+	font-size: 1em;	
+}
+
+#modal_content .error {
+	background: #9c171b;
+	color: #ffffff;
+}
+
+#modal_content .error a {
+	color: #fff;	
+}
+
+#modal_content .error a:hover {
+	color: #000;	
+}
+
+#modal_content .success {
+	background: #009900;
+	color: #ffffff;
+}
+
+#modal_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: #505050 1px solid;
+  background: #000;
+  color: #505050;
+  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: #ccc 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; }