caboose-cms 0.5.15 → 0.5.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmZkN2Y1OTAyYTUwNjIyM2JhYTA4MjIxMmI4NDYyNDg1OWUxNWFhMw==
+    MDU5MWI2YTUyYzc5NTg3NDYwOTEzYjJlMTYzMDc2ZGIwOTlkMDA2YQ==
   data.tar.gz: !binary |-
-    YjM1NWE0ZGQyMTg5N2FjOGFjMWM3ODk0N2Q3YzZlYWZhMjE3MzFiNA==
-!binary "U0hBNTEy":
+    YWJkNTI4N2Y3YWZjYTYzYzM1NzgxNTYyYTEwZGI5NDU4ODFlNDU5YQ==
+SHA512:
   metadata.gz: !binary |-
-    ZTQ5ZDYyOGRkN2ViNDlkZGYyMDQ1N2U1OTk1ZTYzMmNhYTA2NzY5YmQxNTU1
-    NjY5YTlkNmI3OGMwMzBhNzFmMzU3ZmI2M2E1OWRlNWNjMjY5ZDQ0MzkzOWZi
-    YmI5NDBiYzViMDVhZGY0NzdkYjg4MDQ4YmEyMjM3YTVlYzJkYzU=
+    ZGE2YTExNTVkNjI5YTA3N2RmM2NhYTkxNWU0NjVmZWM3MTYzN2Y3ZDE2MDIy
+    OGRlYTg1ZjU4OGI2OGY0N2RjMjQyZTk5YzgzNjBkMTUwMTdjOTBhMGZiNTdm
+    YTIwODI5NWU5NDhlZjA2OWRhNjllMmE2ODViYTcwYmY2YjRlYjE=
   data.tar.gz: !binary |-
-    ZTdmZTE2NDA2MDc3NmE4NGVmOWIwZGRhZGYzOTYzN2NjMzhmY2EyZGI4MTg3
-    YjUxM2QxNDVhZDJjYWExNzRkN2U5YjBhZmMzZWIzZmIxMjY1YWY3ZWYyOWIy
-    MjRkMTBiYmY3YzczZGQyZGFmOTNhNDEyZjhhYjRhOGU5MjhlMjc=
+    NWQ2MzJiNjljYzBiYTQzZDc0YjIwYTgzMDcxMzEzMjNhMjY3ODZhNjIwNDU5
+    NzIwMTVmYTdhMDVlN2NlYWIyODRmMTIwMDA2NjI1MjI1NzdjZjRhZmQwODRj
+    NTU4MjBiYmJjMDg0NWU0MzY0ZDMwOThhMTliZjE5NWZlY2FhNmQ=

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

@@ -0,0 +1,98 @@
+
+Cart = function(params) { this.init(params); };
+
+Cart.prototype = {
+  
+  order: false,
+  
+  init: function(params) 
+  {
+    for (var i in params)
+      this[i] = params[i];
+    this.refresh();    
+  },
+  
+  refresh: function()
+  {
+    var that = this;
+    $('#message').html("<p class='loading'>Getting cart...</p>");
+    $.ajax({
+      url: '/cart/items',
+      success: function(resp) {
+        that.order = resp.order;
+        that.print();
+      }        
+    });    
+  },
+  
+  print: function()
+  {
+    var that = this;
+    if (!this.order || !this.order.line_items || this.order.line_items.length == 0)
+    {
+      $('#cart').html("<p class='note'>You don't have any items in your shopping cart.  <a href='/products'>Continue shopping.</a></p>");
+      return;
+    }
+
+    var tbody = $('<tbody/>')
+      .append($('<tr/>')              
+        .append($('<th/>').html('&nbsp'))
+        .append($('<th/>').html('Item'))
+        .append($('<th/>').html('Unit Price'))
+        .append($('<th/>').html('Quantity'))        
+        .append($('<th/>').html('Subtotal'))
+      );
+                
+    $.each(this.order.line_items, function(i, li) {      
+      var v = li.variant;      
+      var img = v.images ? v.images[0] : (p.featured_image ? p.featured_image : false);
+      console.log(img);
+      img = img ? $('<img/>').attr('src', img.urls.tiny) : '&nbsp;';
+            
+      tbody.append($('<tr/>')
+        .append($('<td/>').attr('valign', 'top').append(img))
+        .append($('<td/>').attr('valign', 'top')
+          .append(v.title).append('<br/>')
+          .append($('<a/>').attr('href','#').html('Remove').click(function(e) { e.preventDefault(); that.remove_item(li.id); }))          
+        )                                  
+        .append($('<td/>').css('text-align', 'right').html('$' + parseFloat(v.price).toFixed(2)))
+        .append($('<td/>').css('text-align', 'right').append($('<div/>').attr('id', 'lineitem_' + li.id + '_quantity')))
+        .append($('<td/>').css('text-align', 'right').html('$' + (v.price * li.quantity).toFixed(2)))
+      );
+    });
+    tbody.append($('<tr/>')
+      .append($('<td/>').css('text-align', 'right').attr('colspan', 4).html('Subtotal'))
+      .append($('<td/>').css('text-align', 'right').html('$' + parseFloat(that.order.subtotal).toFixed(2)))
+    );
+    $('#cart').empty()
+      .append($('<table/>').append(tbody))
+      .append($('<p/>').addClass('controls')
+        .append($('<input/>').attr('type', 'button').val('Continue Shopping').click(function() { window.location = '/products'; }))        
+        .append(' ')
+        .append($('<input/>').attr('type', 'button').val('Checkout').click(function() { window.location = '/checkout'; }))        
+      );
+      
+    $.each(this.order.line_items, function(i, li) {      
+      m = new ModelBinder({
+        name: 'LineItem',
+        id: li.id,
+        update_url: '/cart/' + li.id,
+        authenticity_token: that.form_authenticity_token,    
+        attributes: [
+          { name: 'quantity', nice_name: 'Qty', type: 'text', value: li.quantity, width: 50, fixed_placeholder: false, after_update: function() { that.refresh(); } }                
+        ]
+      }); 
+    });
+  },
+  
+  remove_item: function(li_id)
+  {
+    var that = this;
+    $.ajax({
+     url: '/cart/' + li_id,
+     type: 'delete',
+     success: function(resp) { that.refresh(); }
+    });    
+  }
+  
+};

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

@@ -20,6 +20,9 @@ IndexTable.prototype = {
   // Where to send bulk deletes
   bulk_delete_url: false,
   
+  // When to send bulk import CSV data
+  bulk_import_url: false,
+  
   // Where to post new models
   add_url: false,
   
@@ -73,8 +76,10 @@ IndexTable.prototype = {
     
   allow_bulk_edit: true,
   allow_bulk_delete: true,
-  allow_duplicate: true,
-  allow_advanced_edit: true,  
+  allow_bulk_import: true,
+  allow_duplicate: true,  
+  allow_advanced_edit: true,
+  bulk_import_fields: false,  
   no_models_text: "There are no models right now.",
   new_model_text: 'New',
   new_model_fields: [{ name: 'name', nice_name: 'Name', type: 'text', width: 400 }],
@@ -236,8 +241,9 @@ IndexTable.prototype = {
       var columns = this.column_checkboxes();            
       var controls = $('<p/>');
       if (this.allow_bulk_edit   ) controls.append($('<input/>').attr('type', 'button').attr('id', this.container + '_bulk_edit'  ).val('Bulk Edit'  ).click(function(e) { that.bulk_edit();   })).append(' ');
-      if (this.allow_bulk_delete ) controls.append($('<input/>').attr('type', 'button').attr('id', this.container + '_bulk_delete').val('Bulk Delete').click(function(e) { that.bulk_delete(); })).append(' ');
-      if (this.allow_duplicate   ) controls.append($('<input/>').attr('type', 'button').attr('id', this.container + '_duplicate'  ).val('Duplicate'  ).click(function(e) { that.duplicate();   }));
+      if (this.allow_bulk_delete ) controls.append($('<input/>').attr('type', 'button').attr('id', this.container + '_bulk_delete').val('Delete'     ).click(function(e) { that.bulk_delete(); })).append(' ');
+      if (this.allow_duplicate   ) controls.append($('<input/>').attr('type', 'button').attr('id', this.container + '_duplicate'  ).val('Duplicate'  ).click(function(e) { that.duplicate();   })).append(' ');
+      if (this.allow_bulk_import ) controls.append($('<input/>').attr('type', 'button').attr('id', this.container + '_bulk_import').val('Bulk Import').click(function(e) { that.bulk_import(); })).append(' ');
       
       $('#' + that.container).empty()
         .append($('<p/>')
@@ -465,7 +471,7 @@ IndexTable.prototype = {
     var that = this;
     if (this.model_ids.length == 0)
     {
-      $('#message').html("<p class='note error'>Please select at least one row.</p>");
+      $('#' + that.container + '_message').html("<p class='note error'>Please select at least one row.</p>");
       return;
     }   
     var div = $('<div/>')
@@ -475,8 +481,8 @@ IndexTable.prototype = {
       if (field.bulk_edit == true)
         div.append($('<p/>').append($('<div/>').attr('id', 'bulkmodel_1_' + field.name)));
     });      
-    div.append($('<input/>').attr('type','button').val('Finished').click(function() { $('#message').empty(); }));    
-    $('#message').empty().append(div);
+    div.append($('<input/>').attr('type','button').val('Finished').click(function() { $('#' + that.container + '_message').empty(); }));    
+    $('#' + that.container + '_message').empty().append(div);
         
     var params = this.model_ids.map(function(model_id) { return 'model_ids[]=' + model_id; }).join('&');
     var attribs = [];
@@ -505,16 +511,16 @@ IndexTable.prototype = {
     var that = this;
     if (this.model_ids.length == 0)
     {
-      $('#message').html("<p class='note error'>Please select at least one row.</p>");
+      $('#' + that.container + '_message').html("<p class='note error'>Please select at least one row.</p>");
       return;
     } 
     if (!confirm)
     {
       var p = $('<p/>').addClass('note').addClass('warning')
         .append('Are you sure you want to delete the selected rows? ')      
-        .append($('<input/>').attr('type','button').val('Yes').click(function() { that.bulk_delete(true); }))
-        .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
-      $('#message').empty().append(p);
+        .append($('<input/>').attr('type','button').val('Yes').click(function() { that.bulk_delete(true); })).append(' ')
+        .append($('<input/>').attr('type','button').val('No').click(function() { $('#' + that.container + '_message').empty(); }));
+      $('#' + that.container + '_message').empty().append(p);
       return;
     }        
     var params = this.model_ids.map(function(model_id) { return 'model_ids[]=' + model_id; }).join('&');
@@ -526,12 +532,59 @@ IndexTable.prototype = {
         model_ids: that.model_ids
       },
       success: function(resp) {
-        $('#message').empty();
+        $('#' + that.container + '_message').empty();
         that.refresh();        
       }      
     });        
   },
   
+  bulk_import: function(data, data_url)
+  {
+    var that = this;
+    if (!data && !data_url)
+    {
+      var div = $('<div/>').addClass('note')
+        .append($('<h2/>').html('Bulk Import'))
+        .append($('<p/>').html("Enter either the URL where CSV data can be downloaded or the CSV data.</p>"))
+        .append($('<p/>')
+          .append('CSV Data URL').append('<br />')
+          .append($('<input/>').attr('id', that.container + '_bulk_import_data_url').attr('placeholder', 'CSV Data URL').css('width', '100%'))
+        )
+        .append($('<p/>')
+          .append('CSV Data').append('<br />')
+          .append($('<textarea/>').attr('id', that.container + '_bulk_import_data').attr('placeholder', 'CSV Data').css('width', '100%').css('height', '150px'))
+        )
+        .append($('<p/>')
+          .append($('<input/>').attr('type','button').val('Cancel').click(function() { $('#' + that.container + '_message').empty(); })).append(' ')
+          .append($('<input/>').attr('type','button').val('Add').click(function() { that.bulk_import($('#' + that.container + '_bulk_import_data').val(), $('#' + that.container + '_bulk_import_data_url').val()); }))
+        );        
+      if (that.bulk_import_fields)
+        div.append($('<p/>').css('font-size', '75%').html("Format: " + that.bulk_import_fields.join(', ')));
+      
+      $('#' + that.container + '_message').empty().append(div);
+      return;
+    }
+    $('#' + that.container + '_message').empty().append("<p class='loading'>Adding...</p>");
+    $.ajax({
+      url: this.bulk_import_url,
+      type: 'post',
+      data: { 
+        csv_data: data,
+        csv_data_url: data_url
+      },
+      success: function(resp) {
+        if (resp.error)
+          $('#' + that.container + '_message').html("<p class='note error'>" + resp.error + "</p>");        
+        else
+        {
+          $('#' + that.container + '_message').html("<p class='note success'>Added successfully.</p>");
+          setTimeout(function() { $('#' + that.container + '_message').empty(); }, 3000);
+          that.refresh();
+        }
+      }        
+    });                      
+  },
+  
   model_for_id: function(model_id)
   {
     for (var i=0; i<this.models.length; i++)
@@ -546,13 +599,13 @@ IndexTable.prototype = {
     if (this.model_ids.length == 0)
     {
       var p = $('<p/>').addClass('note error').html("Please select a row.");
-      $('#message').empty().append(p);
+      $('#' + that.container + '_message').empty().append(p);
       return;
     }
     if (this.model_ids.length > 1)
     {
       var p = $('<p/>').addClass('note error').html("Please select a single row.");
-      $('#message').empty().append(p);
+      $('#' + that.container + '_message').empty().append(p);
       return;
     }
     if (!count)
@@ -561,19 +614,19 @@ IndexTable.prototype = {
         .append('How many times do you want this duplicated?')          
         .append($('<input/>').attr('type', 'text').attr('id', 'count').css('width', '50'))
         .append('<br />')
-        .append($('<input/>').attr('type', 'button').val('Cancel').click(function(e) { $('#message').empty(); })).append(' ')
+        .append($('<input/>').attr('type', 'button').val('Cancel').click(function(e) { $('#' + that.container + '_message').empty(); })).append(' ')
         .append($('<input/>').attr('type', 'button').val('Duplicate').click(function(e) { that.duplicate($('#count').val()); return false; }));
-      $('#message').empty().append(p);
+      $('#' + that.container + '_message').empty().append(p);
       return;      
     }    
-    $('#message').html("<p class='loading'>Duplicating...</p>");
+    $('#' + that.container + '_message').html("<p class='loading'>Duplicating...</p>");
     $.ajax({
       url: that.duplicate_url(that.model_ids[0], that),
       type: 'post',
       data: { count: count },
       success: function(resp) {
-        if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
-        if (resp.success) { $('#message').empty(); that.refresh(); }
+        if (resp.error) $('#' + that.container + '_message').html("<p class='note error'>" + resp.error + "</p>");
+        if (resp.success) { $('#' + that.container + '_message').empty(); that.refresh(); }
       }
     });    
   },
@@ -648,8 +701,10 @@ IndexTable.prototype = {
   
   pager_params: function(h)
   {
-    var that = this;    
-    var p = $.extend({}, this.pager.params);
+    var that = this;
+    var skip = this.pager.options && this.pager.options.skip ? this.pager.options.skip : [];    
+    var p = {};
+    for (var i in this.pager.params) if (skip.indexOf(i) == -1) p[i] = this.pager.params[i];
     if (this.pager.options)
     {      
       if (this.pager.options.sort) p.sort = this.pager.options.sort;
@@ -657,17 +712,14 @@ IndexTable.prototype = {
       if (this.pager.options.page) p.page = this.pager.options.page;
     }
     if (h)      
-    {
+    {                  
       for (var i in h)
-      {        
-        //console.log('' + i + ' = ' + h[i]);        
-        //console.log(typeof(h[i]));        
-        //console.log('-------------------');
+      {                 
         if (typeof(h[i]) == 'boolean')
           p[i] = h[i] ? 1 : 0;
         else
           p[i] = h[i];
-      }
+      }      
     }
     return p;
   },
@@ -705,7 +757,7 @@ IndexTable.prototype = {
       form.append($('<p/>').append($('<input/>').attr('type', 'text').attr('name', f.name).attr('placeholder', f.nice_name).css('width', '' + f.width + 'px')));
     });
     form
-      .append($('<div/>').attr('id', 'new_message'))
+      .append($('<div/>').attr('id', that.container + '_new_message'))
       .append($('<p>')        
         .append($('<input/>').attr('type', 'button').val('Cancel').click(function(e) { $('#' + that.container + '_new_form_container').empty(); }))
         .append(' ')
@@ -721,13 +773,13 @@ IndexTable.prototype = {
   add_model: function() 
   {
     var that = this;
-    $('#new_message').html("<p class='loading'>Adding...</p>");
+    $('#' + that.container + '_new_message').html("<p class='loading'>Adding...</p>");
     $.ajax({
       url: this.add_url,
       type: 'post',
       data: $('#new_form').serialize(),
       success: function(resp) {
-        if (resp.error) $('#new_message').html("<p class='note error'>" + resp.error + "</p>");
+        if (resp.error) $('#' + that.container + '_new_message').html("<p class='note error'>" + resp.error + "</p>");
         if (resp.redirect || resp.refresh) that.refresh();
       }
     });

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

@@ -126,16 +126,16 @@ ModelBinder.prototype = {
   
   control_with_id: function(id)
   {
-    attrib = false
+    var control = false
     var this2 = this;
-    $.each(this.controls, function(i, c) {        
+    $.each(this.controls, function(i, c) {
       if (id == (this2.model.name + "_" + this2.model.id + "_" + c.attribute.name).toLowerCase())
       {        
-        attrib = c.attribute; 
+        control = c; 
         return false;
       }
     });
-    return attrib;
+    return control;
   },
   
   cancel: function()

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

@@ -12,6 +12,7 @@
  *= require jquery-ui
  *= require caboose/fonts
  *= require caboose/caboose
+ *= require caboose/message_boxes
  *= require caboose/model_binder
  *= require caboose/admin_main
  *= require caboose/admin_crumbtrail

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

@@ -336,48 +336,6 @@ Modeljs
   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
 *******************************************************************************/

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

@@ -0,0 +1,41 @@
+
+#cart {
+
+  margin: 20px 0 10px 0; 
+  table { border-collapse: collapse; width: 100%; }
+  table th { font-weight: bold; text-align: center; }
+  table td { border: #ccc 1px solid; padding: 10px; }
+  
+  input[type="text"] {    
+    border-color: #b9b9b9;
+    border-radius: 0;
+    border-width: 1px;
+    color: #565656;
+    font: 1em "Klinic Slab",serif;
+    padding: 8px 6px 6px;
+    text-align: right !important;
+  }
+    
+  input[type="button"] {
+    background-color: #c25454;    
+    background-position: 6px center;
+    background-repeat: no-repeat;
+    background-size: 30px auto;
+    border-radius: 0;
+    border-width: 0;
+    color: #fff;
+    cursor: pointer;
+    display: block-inline;
+    font: 20px/1em "Klinic Slab",serif;
+    margin-top: 20px;
+    padding: 8px 15px 6px 15px;
+    text-align: center;
+    text-decoration: none;
+    text-transform: uppercase;
+  }
+  
+  p.controls {
+    text-align: right;
+    margin-bottom: 20px; 
+  }
+}