tb_banners 1.1.6 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 50d873e8b6bba3f5f08288918c8100c5546b9057
-  data.tar.gz: daadd24a362d3186dfebb7f5dcb394472f0260c2
+SHA256:
+  metadata.gz: e3a78e90e1242e80c10dfebdf922550e8883dc7f24c783a42b8b85c48cc67263
+  data.tar.gz: aa49eb68f74b9c070a83ba2be68110f00e904c5f10e7e9d02dc1c787ef9ed3e3
 SHA512:
-  metadata.gz: 2482155bf98292c20eb8a57b25f90f5d3a530543a548e0e4b8a5e7cae11b23f685e9e892e9e82a339ee782e4768450aaabc3b6da0d76c137d60d1c4d67da3de0
-  data.tar.gz: 3b054e98e9dd8d2f4bc2de4ae5f07dc98985d5ba8ed1dc4bb40030fa957a3e1b89619ddb82cd1a5fe6109c3d4e0aac1ea8d07c6ca360c8d27d045a70a3b6f7be
+  metadata.gz: 36e529fa4ced38e9f632173d9bced428144a32e092836f09246f89e52d549da34a733569511175137665d0a5e0aea20b930543123dc47152959f9b413df07633
+  data.tar.gz: 1d2ab1f911dcaedc5ac572b216464f7d492c1354855d3bd3848d4c38aef7626be600b6cf972fb5ec92fb9721ee6aad0a85a37048e078e7a22bc3f468eb627328

data/README.markdown

@@ -24,6 +24,7 @@ TB Banners accepts the following configuration options:
 Spud::Banners.configure do |config|
 	config.paperclip_storage = :filesystem #use :s3 to use s3 storage (aws gem required)
 	config.s3_credentials = "#{Rails.root}/config/s3.yml"
+	config.s3_protocol = 'https'
 	config.storage_path = ":rails_root/public/system/spud_banners/:id/:style/:basename.:extension"
 	config.storage_url = "/system/spud_banners/:id/:style/:basename.:extension"
 end
@@ -102,21 +103,11 @@ Displaying banners using the helper, with a block for even more custom html.
 	</ul>
 ```
 
-## Liquid
-
-TB Banners comes with its own custom [Liquid][liquid] tag. For now the liquid tag only supports rendering the standard html as generated by the `spud_banners_for_set`. Will provide support more advanced options in the future.
-
-Usage:
-
-```erb
-	<%= raw Liquid::Template.parse("{% spud_banner_set Promotions %}").render %>
-```
-
 ## Rich Text
 
-Banner Sets contain a configuration for rich text. Turning this feature on will enable a rich text editor on individual banners. The default setting for this option is off. 
+Banner Sets contain a configuration for rich text. Turning this feature on will enable a rich text editor on individual banners. The default setting for this option is off.
 
-Rich text is intended to be more of an edge case feature, and should be used only if your banner needs to include an editable HTML block. The built-in helpers described earlier will not automatically include your rich text; If you want to use this feature, you should supply a block to the helper and render the rich text yourself. 
+Rich text is intended to be more of an edge case feature, and should be used only if your banner needs to include an editable HTML block. The built-in helpers described earlier will not automatically include your rich text; If you want to use this feature, you should supply a block to the helper and render the rich text yourself.
 
 ```erb
 	<ul id="slides">
@@ -165,4 +156,3 @@ Below is an example of integration with [SlidesJs][slidesjs], a jQuery plugin.
 
 [tb]:https://bitbucket.org/westlakedesign/tb_core
 [slidesjs]:http://www.slidesjs.com
-[liquid]:https://github.com/Shopify/liquid

data/Rakefile

@@ -20,11 +20,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -36,5 +34,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
-task :default => :test
+task default: :test

data/app/assets/javascripts/admin/banners/banner_sets.js

@@ -1,102 +1,107 @@
 // Place all the behaviors and hooks related to the matching controller here.
 // All this logic will automatically be available in application.js.
 
-spud.admin.banner_sets = new function(){
+(function(){
 
-  var self = this;
-  var bannerSetEditId = false;
+var bannerSetEditId = false;
 
-  this.init = function(){
-    $('.spud_banner_sets_add_new').on('click', self.clickedAddNewBannerSet);
-    $('.spud_admin_banner_sets_list').on('click', '.spud_banner_sets_edit', self.clickedEditBannerSet);
-    $('.spud_admin_banner_sets_list').on('click', '.spud_banner_sets_delete', self.clickedDeleteBannerSet);
-    $('.modal-body').on('submit', '.spud_banner_set_form', self.submittedBannerSetForm);
-  };
+spud.admin.banner_sets = {
+  init: function(){
+    $('.spud_banner_sets_add_new').on('click', clickedAddNewBannerSet);
+    $('.admin-banner-sets-list').on('click', '.admin-banner-set-edit', clickedEditBannerSet);
+    $('.admin-banner-sets-list').on('click', '.admin-banner-set-delete', clickedDeleteBannerSet);
+    $('.modal-body').on('submit', '.admin-banner-set-form', submittedBannerSetForm);
+  }
+};
 
-  self.clickedAddNewBannerSet = function(e){
-    e.preventDefault();
-    bannerSetEditId = false;
-    $.ajax({
-      url: $(this).attr('href'),
-      dataType: 'html',
-      success: function(html, textStatus, jqXHR){
-        displayModalDialogWithOptions({
-          title: 'New Banner Set',
-          html: html
-        });
-      }
-    });
-  };
-
-  self.clickedEditBannerSet = function(e){
-    e.preventDefault();
-    bannerSetEditId = parseInt($(this).parents('li').attr('data-id'), 10);
-    $.ajax({
-      url: $(this).attr('href'),
-      dataType: 'html',
-      success: function(html, textStatus, jqXHR){
-        displayModalDialogWithOptions({
-          title: 'Edit Banner Set',
-          html: html
-        });
-      }
-    });
-  };
+var clickedAddNewBannerSet = function(e){
+  e.preventDefault();
+  bannerSetEditId = false;
+  $.ajax({
+    url: $(this).attr('href'),
+    dataType: 'html',
+    success: function(html, textStatus, jqXHR){
+      spud.admin.modal.displayWithOptions({
+        title: 'New Banner Set',
+        html: html
+      });
+    }
+  });
+};
 
-  self.clickedDeleteBannerSet = function(e){
-    e.preventDefault();
-    if(window.confirm('Are you sure?')){
-      var el = $(this);
-      $.ajax({
-        url: el.attr('href'),
-        type: 'post',
-        data: {'_method':'delete'},
-        complete: function(jqXHR, textStatus){
-          var parent = el.parents('li');
-          parent.fadeOut(200, function(){
-            parent.remove();
-          });
-          if(textStatus != 'success'){
-            console.warn('Something went wrong:', jqXHR);
-          }
-        }
+var clickedEditBannerSet = function(e){
+  e.preventDefault();
+  bannerSetEditId = parseInt($(this).parents('tr').attr('data-id'), 10);
+  $.ajax({
+    url: $(this).attr('href'),
+    dataType: 'html',
+    success: function(html, textStatus, jqXHR){
+      spud.admin.modal.displayWithOptions({
+        title: 'Edit Banner Set',
+        html: html
       });
     }
-  };
+  });
+};
 
-  self.submittedBannerSetForm = function(e){
-    e.preventDefault();
-    var form = $(this);
+var clickedDeleteBannerSet = function(e){
+  e.preventDefault();
+  $.ajaxSetup({
+    headers: { 'X-CSRF-TOKEN': Rails.csrfToken() }
+  });
+  if(window.confirm('Are you sure?')){
+    var el = $(this);
     $.ajax({
-      url: form.attr('action'),
-      data: form.serialize(),
+      url: el.attr('href'),
       type: 'post',
-      dataType: 'html',
-      success: self.savedBannerSetSuccess,
-      error: self.savedBannerSetError
+      data: {'_method':'delete'},
+      complete: function(jqXHR, textStatus){
+        var parent = el.parents('tr');
+        parent.fadeOut(200, function(){
+          parent.remove();
+        });
+        if(textStatus != 'success'){
+          console.warn('Something went wrong:', jqXHR);
+        }
+      }
     });
-  };
+  }
+};
 
-  self.savedBannerSetSuccess = function(html){
-    if(bannerSetEditId){
-      var item = $('.spud_admin_banner_sets_list_item[data-id="'+bannerSetEditId+'"]');
-      item.replaceWith(html);
-    }
-    else{
-      $('.spud_admin_banner_sets_list').append(html);
-    }
-    hideModalDialog();
-  };
+var submittedBannerSetForm = function(e){
+  e.preventDefault();
+  var form = $(this);
+  $.ajax({
+    url: form.attr('action'),
+    data: form.serialize(),
+    type: 'post',
+    dataType: 'html',
+    success: savedBannerSetSuccess,
+    error: savedBannerSetError
+  });
+};
 
-  self.savedBannerSetError = function(jqXHR, textStatus, errorThrown){
-    if(jqXHR.status == 422){
-      var html = jqXHR.responseText;
-      $('.spud_banner_set_form').replaceWith(html);
-    }
-    else{
-      if(window.console){
-        console.error('Oh Snap:', arguments);
-      }
+var savedBannerSetSuccess = function(html){
+  if(bannerSetEditId){
+    var item = $('.admin-banner-sets-list-item[data-id="'+bannerSetEditId+'"]');
+    item.replaceWith(html);
+  }
+  else{
+    $('.admin-banner-sets-list').append(html);
+  }
+  spud.admin.modal.hide();
+};
+
+var savedBannerSetError = function(jqXHR, textStatus, errorThrown){
+  if(jqXHR.status == 422){
+    var html = jqXHR.responseText;
+    $('.admin-banner-set-form').replaceWith(html);
+  }
+  else{
+    if(window.console){
+      console.error('Oh Snap:', arguments);
     }
-  };
-}();
+  }
+};
+
+})();

data/app/assets/javascripts/admin/banners/banners.js

@@ -1,78 +1,37 @@
 // Place all the behaviors and hooks related to the matching controller here.
 // All this logic will automatically be available in application.js.
 
-spud.admin.banners = new function(){
+(function(){
 
-  var self = this;
-  var html5upload = false;
-  var bannerEditId = false;
+var bannerEditId = false;
+
+spud.admin.banners = {
 
   // Index Page
   /////////////
-
-  this.init = function(){
-    if(typeof(FormData) != 'undefined'){
-      html5upload = true;
-    }
-    $('.admin-banner-set-item-add').on('click', self.clickedAddNewBanner);
-    $('.admin-banner-set-items-container').on('click', '.admin-banner-set-item-edit', self.clickedEditBanner);
-    $('.admin-banner-set-items-container').on('click', '.admin-banner-set-item-delete', self.clickedDeleteBanner);
-    $('.modal-body').on('submit', '.spud_banner_form', self.submittedBannerForm);
-
-    $('.admin-banner-set-items-container').sortable({
-      stop: self.sortedBanners,
-      helper: fixHelper
+  init: function(){
+    $('.admin-banner-set-item-add').on('click', clickedAddNewBanner);
+    $('.admin-banner-set-items-container').on('click', '.admin-banner-set-item-edit', clickedEditBanner);
+    $('.admin-banner-set-items-container').on('click', '.admin-banner-set-item-delete', clickedDeleteBanner);
+    $('.modal-body').on('submit', '.admin-banner-form', submittedBannerForm);
+    Sortable.create(document.querySelector('.admin-banner-set-items-container'), {
+      onUpdate: sortedBanners,
+      dragClass: 'banner-dragging',
+      handle: '.glyphicon-sort'
     });
+  }
+};
 
-    /*
-    * Workaround for bug when using Bootstrap 2 + Tinymce 4 that prevents the creation of hyperlinks while
-    * running in a modal dialog
-    *
-    * See: http://stackoverflow.com/questions/18111582/tinymce-4-links-plugin-modal-in-not-editable
-    *
-    * NOTE: REMOVE THIS CODE WHEN UPGRADING TO BOOTSTRAP 3
-    */
-    $(document).on('focusin', function(e) {
-      if($(e.target).closest(".mce-window").length){
-        e.stopImmediatePropagation();
-      }
-    });
-  };
-
-  // http://www.foliotek.com/devblog/make-table-rows-sortable-using-jquery-ui-sortable/
-  var fixHelper = function(e, ui) {
-    ui.children().each(function() {
-      $(this).width($(this).width());
-    });
-    return ui;
-  };
-
-  self.clickedAddNewBanner = function(e){
+var clickedAddNewBanner = function(e){
     e.preventDefault();
     bannerEditId = false;
-    $.ajax({
-      url: $(this).attr('href'),
-      dataType: 'html',
-      success: function(html, textStatus, jqXHR){
-        spud.admin.modal.displayWithOptions({
-          title: 'Upload Banner',
-          html: html
-        });
-        initForm();
-      }
-    });
-  };
-
-  self.clickedEditBanner = function(e){
-    e.preventDefault();
     spud.admin.editor.unload();
-    bannerEditId = parseInt($(this).parents('.admin-banner-set-item').attr('data-id'), 10);
     $.ajax({
       url: $(this).attr('href'),
       dataType: 'html',
       success: function(html, textStatus, jqXHR){
         spud.admin.modal.displayWithOptions({
-          title: 'Edit Banner',
+          title: 'Upload Banner',
           html: html
         });
         initForm();
@@ -80,138 +39,155 @@ spud.admin.banners = new function(){
     });
   };
 
-  self.clickedDeleteBanner = function(e){
-    e.preventDefault();
-    var el = $(this);
-    $.ajax({
-      url: el.attr('href'),
-      type: 'post',
-      data: {'_method':'delete'},
-      complete: function(jqXHR, textStatus){
-        var parent = el.parents('.admin-banner-set-item');
-        parent.fadeOut(200, function(){
-          parent.remove();
-        });
-        if(textStatus != 'success'){
-          console.warn('Something went wrong:', jqXHR);
-        }
-      }
-    });
-  };
-
-  self.submittedBannerForm = function(e){
-    if(html5upload){
-      e.preventDefault();
-
-      var form = $(this);
-      var fd = new FormData();
-      
-      $('input[type=text], input[type=hidden], select').each(function(index, element){
-        var input = $(element);
-        var name = input.attr('name');
-        var value = input.val();
-        fd.append(name, value);
+var clickedEditBanner = function(e){
+  e.preventDefault();
+  bannerEditId = parseInt($(this).parents('.admin-banner-set-item').attr('data-id'), 10);
+  spud.admin.editor.unload();
+  $.ajax({
+    url: $(this).attr('href'),
+    dataType: 'html',
+    success: function(html, textStatus, jqXHR){
+      spud.admin.modal.displayWithOptions({
+        title: 'Edit Banner',
+        html: html
       });
-
-      var richText = form.find('.spud_banner_rich_text');
-      if(richText.length > 0){
-        fd.append('spud_banner[rich_text]', richText.val());
-      }
-      else{
-        fd.append('spud_banner[rich_text]', '');
-      }
-
-      var file = form.find('#spud_banner_banner')[0].files[0];
-      if(file){
-        fd.append('spud_banner[banner]', file);
-        $('.spud_banner_upload_progress').show();
-      }
-
-      var xhr = new XMLHttpRequest();
-      xhr.upload.addEventListener('progress', self.onFileUploadProgress);
-      xhr.addEventListener('load', self.onFileUploadComplete);
-      xhr.addEventListener('error', self.onFileUploadError);
-      xhr.addEventListener('abort', self.onFileUploadAbort);
-      xhr.open('POST', form.attr('action'));
-      xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-      xhr.send(fd);
-      return false;
-    }
-  };
-
-  self.onFileUploadProgress = function(e){
-    var percent = Math.round(e.loaded * 100 / e.total);
-    var progress = $('.spud_banner_upload_progress');
-    progress.find('.bar').css({width: percent + '%'});
-    if(percent == 100){
-      progress.addClass('progress-success');
+      initForm();
     }
-  };
-
-  self.onFileUploadComplete = function(e){
-    switch(this.status){
-      case 200:
-        self.onLegacyUploadComplete(e.target.response);
-        break;
-      case 422:
-        self.onLegacyUploadError(e.target.response);
-        break;
-      default:
-        window.alert("Whoops! Something has gone wrong.");
-    }
-  };
-
-  self.onFileUploadError = function(e){
-
-  };
-
-  self.onFileUploadAbort = function(e){
-
-  };
-
-  // Non-html5 upload
-  self.onLegacyUploadComplete = function(html){
-    if(bannerEditId){
-      var item = $('.admin-banner-set-item[data-id="'+bannerEditId+'"]');
-      item.replaceWith(html);
+  });
+};
+
+var clickedDeleteBanner = function(e){
+  e.preventDefault();
+  $.ajaxSetup({
+    headers: { 'X-CSRF-TOKEN': Rails.csrfToken() }
+  });
+  var el = $(this);
+  $.ajax({
+    url: el.attr('href'),
+    type: 'post',
+    data: {'_method':'delete'},
+    complete: function(jqXHR, textStatus){
+      var parent = el.parents('.admin-banner-set-item');
+      parent.fadeOut(200, function(){
+        parent.remove();
+      });
+      if(textStatus != 'success'){
+        console.warn('Something went wrong:', jqXHR);
+      }
     }
-    else{
-      $('.admin-banner-set-items-container').append(html);
+  });
+};
+
+var submittedBannerForm = function(e){
+  e.preventDefault();
+
+  var form = $(this);
+  var fd = new FormData();
+
+  $('input[type=text], input[type=hidden], select').each(function(index, element){
+    var input = $(element);
+    var name = input.attr('name');
+    var value = input.val();
+    fd.append(name, value);
+  });
+
+  var richText = form.find('.admin-banner-rich-text');
+  if(richText.length > 0){
+    fd.append('spud_banner[rich_text]', richText.val());
+  }
+  else{
+    fd.append('spud_banner[rich_text]', '');
+  }
+
+  var file = form.find('#spud_banner_banner')[0].files[0];
+  if(file){
+    fd.append('spud_banner[banner]', file);
+    $('.admin-banner-upload-progress').show();
+  }
+
+  var xhr = new XMLHttpRequest();
+  xhr.upload.addEventListener('progress', onFileUploadProgress);
+  xhr.addEventListener('load', onFileUploadComplete);
+  xhr.addEventListener('error', onFileUploadError);
+  xhr.addEventListener('abort', onFileUploadAbort);
+  xhr.open('POST', form.attr('action'));
+  xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+  xhr.send(fd);
+  return false;
+};
+
+var onFileUploadProgress = function(e){
+  var percent = Math.round(e.loaded * 100 / e.total);
+  var progress = $('.admin-banner-upload-progress');
+  progress.find('.bar').css({width: percent + '%'});
+  if(percent == 100){
+    progress.addClass('progress-success');
+  }
+};
+
+var onFileUploadComplete = function(e){
+  switch(this.status){
+    case 200:
+      onUploadComplete(e.target.response);
+      break;
+    case 422:
+      onUploadError(e.target.response);
+      break;
+    default:
+      window.alert("Whoops! Something has gone wrong.");
+  }
+};
+
+var onFileUploadError = function(e){
+
+};
+
+var onFileUploadAbort = function(e){
+
+};
+
+var onUploadComplete = function(html){
+  if(bannerEditId){
+    var item = $('.admin-banner-set-item[data-id="'+bannerEditId+'"]');
+    item.replaceWith(html);
+  }
+  else{
+    $('.admin-banner-set-items-container').append(html);
+  }
+  spud.admin.modal.hide();
+};
+
+var onUploadError = function(html){
+  $('.admin-banner-form').replaceWith(html);
+  initForm();
+};
+
+var sortedBanners = function(e, ui){
+  var ids = [];
+  $('.admin-banner-set-item').each(function(){
+    ids.push($(this).attr('data-id'));
+  });
+  $.ajax({
+    headers: { 'X-CSRF-TOKEN': Rails.csrfToken() },
+    url: '/admin/banners/sort',
+    type: 'post',
+    data: { spud_banner_ids: ids, _method: 'put' }
+  });
+};
+
+var initForm = function(){
+  var richText = $('#admin-banner-rich-text');
+  if(richText){
+    if(typeof tinymce != "undefined"){
+      tinymce.EditorManager.execCommand('mceRemoveEditor', true, 'admin-banner-rich-text');
     }
-    spud.admin.modal.hide();
-  };
-
-  self.onLegacyUploadError = function(html){
-    $('.spud_banner_form').replaceWith(html);
-    initForm();
-  };
-
-  self.sortedBanners = function(e, ui){
-    var ids = [];
-    $('.admin-banner-set-item').each(function(){
-      ids.push($(this).attr('data-id'));
-    });
-    $.ajax({
-      url: '/admin/banners/sort',
-      type: 'post',
-      data: {spud_banner_ids:ids, _method:'put'}
+    spud.admin.editor.init({
+      selector: '#admin-banner-rich-text',
+      buttons: ['bold','italic','underline','formatselect','|','bullist','numlist','|','link','unlink','anchor', '|', 'code'],
+      height: 300,
+      width: 500
     });
-  };
-
-  // Form Page
-  ////////////
-
-  var initForm = function(){
-    var richText = $('#spud_banner_rich_text');
-    if(richText){
-      tinymce.EditorManager.execCommand('mceRemoveEditor', true, 'spud_banner_rich_text');
-      spud.admin.editor.init({
-        selector: '#spud_banner_rich_text',
-        buttons: ['bold','italic','underline','formatselect','|','bullist','numlist','|','link','unlink','anchor', '|', 'code'],
-        height: 300,
-        width: 500
-      });
-    }
-  };
+  }
+};
 
-}();
+})();