caboose-cms 0.7.42 → 0.7.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 356c21a5a881cbc9b4ef8da7edf2551e33e6bfb9
-  data.tar.gz: c20e6fd98918a645aff0dd89088bc09164f5a22c
+  metadata.gz: dab3266d8c95bbdef871f2dc1d8cc2ec5658e62a
+  data.tar.gz: 278ff6700254daf5770925e589dc8958207cbe48
 SHA512:
-  metadata.gz: 9204f0ce6d60206519cd652c21a4622575536408483723817e5e8b56e2b1165ef59ab71af647195925e1d4605940e92135ad6bf2520466df23a24fe90b5b81d6
-  data.tar.gz: 786b08ce636884e6b27217578621cc28fd4697d9eef03206ae0b2b84ccfd58773e8307bf5bf1507cd7a13543b6bccdd3eca51f177681f3ebecc956ccde3f1742
+  metadata.gz: 92c6aec06acb45efbf1fe27ec7bde8dd476dcc28da9e5d7930b05dbc79d6aabb26f6e4a72d8832966919ea37ad4232e073f8b35c210165486a89685336486d1c
+  data.tar.gz: ab7f88af93d1d150323e43fd6197305c95c92c6cbe35b0cdfb83c71852e0dd8429db63014d0842aaddc4c1febfb7f437ff4aed977a99323699424a1e2804dbbd

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

@@ -0,0 +1,280 @@
+
+var MediaBrowser = function(params) { this.init(params); };
+
+MediaBrowser.prototype = {
+       
+  media_id: false,  
+  top_cat_id: false,
+  cat: false,
+  cat_id: false,
+  categories: false,  
+  s3_upload_url: false,
+	aws_access_key_id: false,		
+	policy: false,
+	signature: false,
+	selected_media: false,
+	uploader: false,
+  refresh_unprocessed_images: false,
+  upload_extensions: "jpg,jpeg,png,gif,tif,tiff,pdf,doc,docx,odt,odp,ods,ppt,pptx,xls,xlsx,zip,tgz,csv,txt",
+  file_view: 'thumbnail',    
+	  
+  init: function(params) {
+    var that = this;
+    for (var i in params)
+      this[i] = params[i];
+    
+    $("#uploader")
+      .empty()      
+      .append($('<div/>').attr('id', 'the_uploader'));      
+    that.refresh();    
+  },    
+  
+  refresh: function()
+  {
+    var that = this;        
+    that.refresh_categories(function() {        
+      that.refresh_media();
+    });
+    that.print_controls();
+  },
+   
+  toggle_uploader: function()
+  {
+    var that = this;
+    if (that.uploader)
+    {      
+      $("#the_uploader").slideUp(400, function() {
+        $("#the_uploader").plupload('destroy');
+        that.uploader = false;
+      });            
+    }
+    else
+    {      
+      $("#the_uploader").hide();
+      that.uploader = $("#the_uploader").plupload({
+		    runtimes: 'html5,flash,silverlight',
+		    url: that.s3_upload_url,		      
+		    multipart: true,
+		    multipart_params: {
+		    	key: that.cat_id + '_${filename}', // use filename as a key
+		    	Filename: that.cat_id + '_${filename}', // adding this to keep consistency across the runtimes
+		    	acl: 'public-read',
+		    	//'Content-Type': 'image/jpeg',
+		    	AWSAccessKeyId: that.aws_access_key_id,		
+		    	policy: that.policy,
+		    	signature: that.signature
+		    },		
+		    file_data_name: 'file', // optional, but better be specified directly
+		    filters: {			
+		    	max_file_size: '100mb', // Maximum file size			
+		    	mime_types: [{ title: "Upload files", extensions: that.upload_extensions }] // Specify what files to browse for		    	
+		    },		
+		    flash_swf_url: '../../js/Moxie.swf', // Flash settings		
+		    silverlight_xap_url: '../../js/Moxie.xap', // Silverlight settings
+        init: {
+          BeforeUpload: function(up, file) {        
+            $.ajax({
+              url: '/admin/media/pre-upload',
+              type: 'post',
+              data: {
+                media_category_id: that.cat_id,
+                name: file.name 
+              },
+              success: function(resp) {},
+              async: false          
+            });
+            controller.refresh();
+          },
+          FileUploaded: function(ip, file)
+          {
+            that.refresh();            
+          },          
+          UploadComplete: function(up, files) {
+            that.refresh();
+            if (that.uploader)
+            {
+              $("#the_uploader").slideUp(400, function() {
+                $("#the_uploader").plupload('destroy');
+                that.uploader = false;
+              });
+            }
+          }
+        }
+      });
+      $("#the_uploader").slideDown();      
+    }
+  },
+  
+  refresh_categories: function(after) 
+  {
+    var that = this;
+    $.ajax({
+      url: '/admin/media-categories/flat-tree',
+      type: 'get',
+      async: false,      
+      success: function(resp) { 
+        that.categories = resp;
+        if (!that.cat_id)
+          that.cat_id = that.categories[0].id;
+        that.print_categories();
+        if (after) after();
+      }        
+    });
+  },
+  
+  refresh_media: function() 
+  {
+    var that = this;    
+    $.ajax({
+      url: '/admin/media/json',
+      type: 'get',
+      async: false,
+      data: { media_category_id: that.cat_id },
+      success: function(resp) { 
+        that.cat = resp;
+        that.cat_id = that.cat.id;
+        that.selected_media = [];
+        that.print_media();
+      }        
+    });
+  },
+    
+  print_categories: function() 
+  {
+    var that = this;
+    var ul = $('<ul/>');
+    if (that.categories.length > 0)
+    {      
+      $.each(that.categories, function(i, cat) {        
+        var li = $('<li/>')
+          .addClass('category')
+          .attr('id', 'cat' + cat.id)
+          .data('media_category_id', cat.id)
+          .append($('<a/>').attr('href', '#').html(cat.name + ' (' + cat.media_count + ')').click(function(e) { e.preventDefault(); that.select_category($(this).parent().data('media_category_id')); }));
+        if (cat.id == that.cat_id)
+          li.addClass('selected');
+        ul.append(li);
+      });      
+    }
+    else
+      ul = $('<p/>').html("There are no media categories.");
+    $('#categories').empty().append(ul);              
+  },
+  
+  print_controls: function()
+  {
+    var that = this;
+    $('#controls').empty()
+      //.append($('<p/>').append($('<a/>').attr('href', '#').html('New Category').click(function(e) { e.preventDefault(); that.add_category(); })))
+      //.append($('<div/>').attr('id', 'new_cat_message'))
+      //.append($('<p/>').append($('<a/>').attr('href', '#').html('Upload').click(function(e) { e.preventDefault(); that.toggle_uploader(); })))
+      //.append($('<p/>').append($('<a/>').attr('href', '#').html('Toggle Thumbnail/List View').click(function(e) { e.preventDefault(); that.toggle_file_view(); })));
+      .append($('<p/>')
+        .append($('<a/>').attr('href', '#').html('New Category').click(function(e) { e.preventDefault(); that.add_category();    })).append(' | ')              
+        .append($('<a/>').attr('href', '#').html('Upload to this Category'      ).click(function(e) { e.preventDefault(); that.toggle_uploader(); })).append(' | ')
+        .append($('<a/>').attr('href', '#').html(that.file_view == 'thumbnail' ? 'List View' : 'Thumbnail View').click(function(e) { e.preventDefault(); that.toggle_file_view();     }))
+      )
+      .append($('<div/>').attr('id', 'new_cat_message'));      
+  },
+
+  print_media: function() 
+  {
+    var that = this;
+    var ul = $('<ul/>').addClass(that.file_view + '_view');    
+    var processing = false;
+    var d = new Date();
+    d = d.getTime();
+        
+    if (that.cat.media.length > 0)
+    {      
+      $.each(that.cat.media, function(i, m) {
+        if (m.media_type == 'image' && m.processed == false)
+          processing = true
+        var li = $('<li/>')          
+          .attr('id', 'media' + m.id)
+          .addClass('media')          
+          .data('media_id', m.id)
+          .click(function(e) { that.select_media(that, $(this).data('media_id')); })
+          .append($('<span/>').addClass('name').html(m.original_name));
+        if (m.image_urls)
+          li.append($('<img/>').attr('src', m.image_urls.tiny_url + '?' + d));
+        //if (that.selected_media.indexOf(m.id) > -1)
+        //  li.addClass('selected ui-selected');
+        if (m.id == that.media_id)
+          li.addClass('selected ui-selected');
+        ul.append(li);      
+      });
+    }
+    else
+      ul = $('<p/>').html("This category is empty.");
+    $('#media').empty().append(ul);
+    if (that.refresh_unprocessed_images == true && processing)
+      setTimeout(function() { that.refresh(); }, 2000);
+    if (modal)
+      modal.autosize();
+    
+    $.each(that.cat.media, function(i, m) {
+      $('li.media').draggable({
+        multiple: true,
+        revert: 'invalid',
+        start: function() { $(this).data("origPosition", $(this).position()); }
+      });
+    });
+  },
+  
+  //============================================================================
+        
+  select_media: function(browser, media_id) {},
+             
+  //============================================================================
+  
+  select_category: function(cat_id)
+  {
+    var that = this;
+    that.cat_id = cat_id;
+    that.print_categories();
+    that.refresh_media();        
+  }, 
+  
+  add_category: function(name)
+  {
+    var that = this;
+    if (!name)
+    {
+      if (!$('#new_cat_message').is(':empty'))
+      {
+        $('#new_cat_message').empty();
+        return;
+      }
+      var div = $('<p/>').addClass('note warning')
+        .append('Name: ')
+        .append($('<input/>').attr('type', 'text').attr('id', 'new_cat_name')).append(" ")
+        .append($('<input/>').attr('type', 'button').val('Add').click(function() { that.add_category($('#new_cat_name').val()); })).append(" ")
+        .append($('<input/>').attr('type', 'button').val('Cancel').click(function() { $('#new_cat_message').empty(); }));
+      $('#new_cat_message').empty().append(div);
+      return;
+    }
+    $('#new_cat_message').empty().html("<p class='loading'>Adding category...</p>");
+    $.ajax({
+      url: '/admin/media-categories',
+      type: 'post',
+      data: {
+        parent_id: that.cat.id,
+        name: name
+      },
+      success: function(resp) {
+        if (resp.error) $('#new_cat_message').empty().html("<p class='note error'>" + resp.error + "</p>");
+        if (resp.refresh) { that.cat_id = resp.new_id; that.refresh(); }
+      }    
+    });
+  },
+
+  toggle_file_view: function()
+  {
+    var that = this;
+    that.file_view = (that.file_view == 'thumbnail' ? 'list' : 'thumbnail');
+    that.print_controls();
+    that.print_media();        
+  },  
+  
+};

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

@@ -0,0 +1,140 @@
+
+BoundMediaImage = BoundControl.extend({
+
+  //el: false,
+  //model: false,
+  //attribute: false,
+  //binder: false,
+  
+  width: 100,
+  style: 'medium',
+  authenticity_token: false,
+ 
+  init: function(params) {
+    for (var thing in params)
+      this[thing] = params[thing];
+    
+    this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;
+    
+    if (!this.attribute.update_url)
+      this.attribute.update_url = this.model.update_url;
+         
+    var this2 = this;
+    $('#'+this.el).wrap($('<div/>')
+      .attr('id', this.el + '_container')
+      .addClass('mb_container')
+      .css('position', 'relative')
+    );
+    $('#'+this.el+'_container').empty();
+    
+    $('#'+this.el+'_container').append($('<img/>')
+      .attr('src', this.attribute.value)
+      .css('width', this.width)
+      .css('float', 'left')
+      .css('margin-right', 10)
+    );    
+    $('#'+this.el+'_container')
+      .append($('<form target="' + this.el + '_iframe"></form>')
+        .attr('id', this.el + '_form')
+        .attr('action', this.attribute.update_url)
+        .attr('method', 'post')
+        .attr('enctype', 'multipart/form-data')
+        .attr('encoding', 'multipart/form-data')
+        //.attr('target', this.el + '_iframe')
+        .on('submit', function() {           
+           $('#'+this2.el+'_message').html("<p class='loading'>Uploading...</p>");
+           $('#'+this2.el+'_iframe').on('load', function() { this2.post_upload(); });
+           return true;
+        })
+        .append($('<input/>').attr('type', 'hidden').attr('name', 'authenticity_token').val(this.binder.authenticity_token))        
+        .append($('<div/>')
+          .attr('id', this.el + '_fake_file_input')
+          .addClass('mb_fake_file_input')          
+          .append($('<input/>')            
+            .attr('type', 'button')
+            .attr('id', this.el + '_update_button')
+            .val('Update ' + this.attribute.nice_name)
+            .click(function() { $('#'+this2.el+'_file').click(); })
+          )
+          .append($('<input/>')
+            .attr('type', 'file')
+            .attr('id', this.el + '_file')
+            .attr('name', this.attribute.name)            
+            .change(function() { $('#'+this2.el+'_form').trigger('submit'); })
+          )
+          .append($('<input/>')
+            .attr('type', 'submit')            
+            .val('Submit')
+          )
+        )
+      );
+    $('#'+this.el+'_container').append($('<div/>')
+      .attr('id', this.el + '_message')
+    );
+    iframe = $("<iframe name=\"" + this.el + "_iframe\" id=\"" + this.el + "_iframe\" src=''></iframe>");          
+    if (this.attribute.debug)      
+      iframe.css('width', '100%').css('height', 600).css('background', '#fff');
+    else
+      iframe.css('width', 0).css('height', 0).css('border', 0);         
+    $('#'+this.el+'_container').append(iframe);    
+    $('#'+this.el+'_container').append($('<br/>').css('clear', 'both'));
+        
+    var w = $('#' + this.el + '_update_button').outerWidth(true);
+    $('#' + this.el + '_fake_file_input').css('width', '' + w + 'px');      
+  },
+  
+  post_upload: function() {
+    $('#'+this.el+'_message').empty();
+    
+    var str = frames[this.el+'_iframe'].document.documentElement.innerHTML;
+    str = str.replace(/[\s\S]*?{([\s\S]*?)/, '{$1');
+    str = str.substr(0, str.lastIndexOf('}')+1);
+    var resp = $.parseJSON(str);    
+    if (resp.success)
+		{		  
+		  if (resp.attributes && resp.attributes[this.attribute.name])
+		    for (var thing in resp.attributes[this.attribute.name])
+		      this.attribute[thing] = resp.attributes[this.attribute.name][thing];
+		  this.attribute.value_clean = this.attribute.value;
+		}
+				
+    if (resp.error)
+      this.error(resp.error);
+    else
+    {
+      if (this.attribute.image_refresh_delay)
+      {
+        var that = this;
+        setTimeout(function() { that.refresh_image(); }, this.attribute.image_refresh_delay);
+      }
+      else
+      {
+        this.refresh_image();
+      }        
+    }
+  },
+  
+  refresh_image: function() {
+    var src = this.attribute.value;
+    if (src.indexOf('?') > 0)
+      src = src.split('?')[0];    
+    src = src + '?' + Math.random();    
+    $('#'+this.el+'_container img').attr('src', src);
+  },
+    
+  error: function(str) {
+    if (!$('#'+this.el+'_message').length)
+    {
+      $('#'+this.el+'_container').append($('<div/>')
+        .attr('id', this.el + '_message')
+        .css('width', $('#'+this.el).outerWidth())
+      );
+    }
+    $('#'+this.el+'_message').hide();
+    $('#'+this.el+'_message').html("<p class='note error'>" + str + "</p>");
+    $('#'+this.el+'_message').slideDown();
+    var this2 = this;
+    setTimeout(function() { $('#'+this2.el+'_message').slideUp(function() { $(this).empty(); }); }, 3000);
+  }
+  
+});

data/app/controllers/caboose/login_controller.rb

@@ -83,8 +83,8 @@ module Caboose
 		  bob.password_reset_id = rand
 		  bob.password_reset_sent = DateTime.now
 		  bob.save
-		  		  
-		  LoginMailer.forgot_password_email(bob).deliver
+		  		  		  
+		  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."
 		  render :json => resp

data/app/controllers/caboose/products_controller.rb

@@ -381,6 +381,9 @@ module Caboose
           when 'option1'            then product.option1            = value
           when 'option2'            then product.option2            = value
           when 'option3'            then product.option3            = value
+          when 'option1_media'      then product.option1_media      = value
+          when 'option2_media'      then product.option2_media      = value
+          when 'option3_media'      then product.option3_media      = value
           when 'default1'
             product.default1 = value
             Variant.where(:product_id => product.id, :option1 => nil).each do |p|