tb_banners 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4c7779a7c8f87620ecddca6c2da15e4c561066f
-  data.tar.gz: 430847fd679a36969272e2c00fb794ddc1c2856e
+  metadata.gz: ad452499d29ec9a3057ccd4cb8a36c033d63092d
+  data.tar.gz: e036c409580661b5e0de416b6742749fdbae9ba8
 SHA512:
-  metadata.gz: 864e79857a1ee584d217fdf61a5ce2e85983dd8ab75be57482ddce596ad73e3c54ac3c52402da0a65a096b52893a36f52bb3e7e32e95d7f3b8103f2879a312b9
-  data.tar.gz: 02894fdec03b82a9d3afe800225c49372f45af427d63f8be0cfb0ad15d956847af4a6ad48dfd28c08840cb56d8f2f2d3e000c2d6048c7cb42c42f79ed5ce5aea
+  metadata.gz: 1b7ba0b3b26f430ef451a377302ae412b7a9cbbf2cb3e2896b5fbdac9b9848359852a2805c18b6175c7a90fc766b33f8fc06935d94b6914c06ab8bb37bc3692d
+  data.tar.gz: 4af7f96c8d9b8724636bfea43af11c2bc1fe520ab03d0e0615b7d28c5d679b7bd937c25db52bc52568147a2149c2942bef5436de29dd88bde09d1f7af5fb1115

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

@@ -14,16 +14,25 @@ spud.admin.banners = new function(){
     if(typeof(FormData) != 'undefined'){
       html5upload = true;
     }
-    $('.spud_banner_add_new').on('click', self.clickedAddNewBanner);
-    $('.spud_banner_set_banners_container').on('click', '.spud_banner_set_banner_item_edit', self.clickedEditBanner);
-    $('.spud_banner_set_banners_container').on('click', '.spud_banner_set_banner_item_delete', self.clickedDeleteBanner);
+    $('.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);
 
-    $('.spud_banner_set_banners_container').sortable({
-      stop: self.sortedBanners
+    $('.admin-banner-set-items-container').sortable({
+      stop: self.sortedBanners,
+      helper: fixHelper
     });
   };
 
+  // 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){
     e.preventDefault();
     bannerEditId = false;
@@ -41,7 +50,7 @@ spud.admin.banners = new function(){
 
   self.clickedEditBanner = function(e){
     e.preventDefault();
-    bannerEditId = parseInt($(this).parents('.spud_banner_set_banner_item').attr('data-id'), 10);
+    bannerEditId = parseInt($(this).parents('.admin-banner-set-item').attr('data-id'), 10);
     $.ajax({
       url: $(this).attr('href'),
       dataType: 'html',
@@ -62,7 +71,7 @@ spud.admin.banners = new function(){
       type: 'post',
       data: {'_method':'delete'},
       complete: function(jqXHR, textStatus){
-        var parent = el.parents('.spud_banner_set_banner_item');
+        var parent = el.parents('.admin-banner-set-item');
         parent.fadeOut(200, function(){
           parent.remove();
         });
@@ -79,12 +88,13 @@ spud.admin.banners = new function(){
 
       var form = $(this);
       var fd = new FormData();
-      fd.append('_method', form.find('[name=_method]').val());
-      fd.append('authenticity_token', form.find('[name=authenticity_token]').val());
-      fd.append('spud_banner[link_to]', form.find('#spud_banner_link_to').val());
-      fd.append('spud_banner[link_target]', form.find('#spud_banner_link_target').val());
-      fd.append('spud_banner[title]', form.find('#spud_banner_title').val());
-      fd.append('spud_banner[alt]', form.find('#spud_banner_alt').val());
+      
+      $('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('.spud_banner_rich_text');
       if(richText){
@@ -142,11 +152,11 @@ spud.admin.banners = new function(){
   // Non-html5 upload
   self.onLegacyUploadComplete = function(html){
     if(bannerEditId){
-      var item = $('.spud_admin_banner_item[data-id="'+bannerEditId+'"]');
+      var item = $('.admin-banner-set-item[data-id="'+bannerEditId+'"]');
       item.replaceWith(html);
     }
     else{
-      $('.spud_banner_set_banners_container').append(html);
+      $('.admin-banner-set-items-container').append(html);
     }
     hideModalDialog();
   };
@@ -157,7 +167,7 @@ spud.admin.banners = new function(){
 
   self.sortedBanners = function(e, ui){
     var ids = [];
-    $('.spud_banner_set_banner_item').each(function(){
+    $('.admin-banner-set-item').each(function(){
       ids.push($(this).attr('data-id'));
     });
     $.ajax({

data/app/assets/stylesheets/admin/banners/banners.css.scss

@@ -0,0 +1,27 @@
+// Banner Management
+.admin-banner-set-items-container{
+
+}
+.admin-banner-set-item{
+  cursor: move;
+}
+.admin-banner-set-item.ui-sortable-helper{
+  width: 940px;
+  display: block;
+}
+.admin-banner-set-item img{
+  display: block;
+}
+.admin-banner-set-item-nowrap{
+  white-space: nowrap;
+}
+
+// Banner Form
+.spud_banner_upload_progress{
+  display: none;
+}
+.controls-banner-date-selects{
+  select{
+    width: 100px;
+  }
+}

data/app/controllers/admin/banners_controller.rb

@@ -8,7 +8,7 @@ class Admin::BannersController < Admin::ApplicationController
   layout false
 
   def new
-    @banner = @banner_set.banners.new
+    @banner = @banner_set.banners.new(:start_date => Date.today)
     respond_with @banner
   end
 
@@ -102,7 +102,7 @@ private
   end
 
   def banner_params
-    params.require(:spud_banner).permit(:banner, :link_to, :link_target, :title, :alt, :sort_order, :rich_text)
+    params.require(:spud_banner).permit(:banner, :link_to, :link_target, :title, :alt, :sort_order, :rich_text, :start_date, :end_date)
   end
 
 end

data/app/helpers/spud_banners_helper.rb

@@ -1,5 +1,13 @@
 module SpudBannersHelper
 
+  # Returns banner html for a given identifier
+  # Generated HTML will be cached if your application uses fragment caching
+  #
+  # * set_or_identifier: A reference to a SpudBannerSet, or the name of a known banner set passed as a symbol (ie, :home)
+  # * options:
+  #   - limit: Max number of banners to return
+  #   - background_image: Pass true to return the banners as CSS background-image properties rather than <img/> tags
+  #
   def spud_banners_for_set(set_or_identifier, options = {})
     if set_or_identifier.is_a?(SpudBannerSet)
       banner_set = set_or_identifier
@@ -12,22 +20,42 @@ module SpudBannersHelper
     end
   end
 
+  # Returns banner html for a given banner_set
+  #
+  # * banner_set: A reference to a SpudBannerSet
+  # * options:
+  #   - limit: Max number of banners to return
+  #   - background_image: Pass true to return the banners as CSS background-image properties rather than <img/> tags
+  #
   def spud_banners_set_tag(banner_set, options = {})
-    limit = options[:limit] || false
+    background_image = options.delete(:background_image)
+    limit = options.delete(:limit) || false
+    banners_query = banner_set.banners.active.limit(limit)
     if block_given?
-      banner_set.banners.limit(limit).each do |banner|
+      banners_query.each do |banner|
         yield(banner)
       end
     else
-      content_tag(:div, :class => 'spud_banner_set', 'data-id' => banner_set.id) do
-        banner_set.banners.limit(limit).map do |banner|
-          concat(content_tag(:div, :class => 'spud_banner_set_banner', 'data-id' => banner.id){ spud_banner_tag(banner) })
+      content_tag(:div, :class => "spud-banner-set #{options[:wrapper_class]}", 'data-id' => banner_set.id) do
+        banners_query.map do |banner|
+          if background_image
+            concat(content_tag(:div, :class => "spud-banner #{options[:banner_class]}", 'data-id' => banner.id, :style => "background:url('#{banner.banner.url(:banner)}') center center / 100% auto no-repeat;"){
+              if banner.rich_text
+                content_tag :div, raw(banner.rich_text), :class => 'spud-banner-rich-text'
+              end
+            })
+          else
+            concat(content_tag(:div, :class => "spud-banner #{options[:banner_class]}", 'data-id' => banner.id){ spud_banner_tag(banner, options) })
+          end
         end
       end
     end
   end
 
-  def spud_banner_tag(banner)
+  # Returns an HTML tag for a single banner
+  # May return either an <img/> or an <a/> depending on the banner
+  #
+  def spud_banner_tag(banner, options={})
     if banner.link_to.blank?
       spud_banner_image_tag(banner)
     else
@@ -37,6 +65,8 @@ module SpudBannersHelper
     end
   end
 
+  # Returns an HTML <img/> tag for a single banner
+  #
   def spud_banner_image_tag(banner)
     image_tag(banner.banner.url(:banner), :alt => banner.alt, :title => banner.title)
   end

data/app/models/spud_banner.rb

@@ -1,10 +1,14 @@
 class SpudBanner < ActiveRecord::Base
   belongs_to :owner, :class_name => 'SpudBannerSet', :foreign_key => 'spud_banner_set_id', :inverse_of => :banners, :touch => true
 
+  scope :active, ->{
+    where('(start_date IS NULL OR start_date <= ?) AND (end_date IS NULL OR end_date >= ?)', Date.today, Date.today)
+  }
+
   has_attached_file :banner, 
     :styles => lambda { |attachment| attachment.instance.dynamic_styles },
     :convert_options => {
-      :admin_small => '-strip -density 72x72',
+      :tiny => '-strip -density 72x72',
       :banner => '-strip -density 72x72'
     },
     :storage => Spud::Banners.paperclip_storage,
@@ -18,7 +22,7 @@ class SpudBanner < ActiveRecord::Base
 
   def dynamic_styles
     styles = {
-      :spud_admin_small => '300x150'
+      :tiny => '150x150'
     }
     owner_style = nil
     if self.owner
@@ -33,4 +37,8 @@ class SpudBanner < ActiveRecord::Base
     return owner.name
   end
 
+  def is_expired?
+    return end_date.present? && end_date < Date.today
+  end
+
 end

data/app/views/admin/banner_sets/show.html.erb

@@ -1,10 +1,21 @@
 <% content_for :data_controls do %>
-  <%= link_to 'Upload Banner', new_admin_banner_set_banner_path(@banner_set), :class => 'btn btn-primary spud_banner_add_new' %>
+  <%= link_to 'Upload Banner', new_admin_banner_set_banner_path(@banner_set), :class => 'btn btn-primary admin-banner-set-item-add' %>
 <% end %>
 
-<div class="spud_banner_set_banners_container">
-  <%= render :partial => 'admin/banners/banner', :collection => @banner_set.banners %>
-</div>
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th>Banner</th>
+      <th>Start Date</th>
+      <th>End Date</th>
+      <% if !@banner_set.has_rich_text %>
+        <th>Links to</th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody class="admin-banner-set-items-container">
+    <%= render :partial => 'admin/banners/banner', :collection => @banner_set.banners %>
+  </tbody>
 
 <script>
   $(document).ready(spud.admin.banners.init);

data/app/views/admin/banners/_banner.html.erb

@@ -1,7 +1,27 @@
-<%= content_tag :div, 'data-id' => banner.id, :class => 'spud_banner_set_banner_item' do %>
-  <%= image_tag banner.banner.url(:spud_admin_small) %>
-  <div class="spud_banner_set_banner_item_actions">
-    <%= link_to 'Edit', edit_admin_banner_path(banner), :class => 'spud_banner_set_banner_item_edit' %>
-    <%= link_to 'Delete', admin_banner_path(banner), :class => 'spud_banner_set_banner_item_delete' %>
-  </div>
-<% end %>
+<%= content_tag :tr, 'data-id' => banner.id, :class => 'admin-banner-set-item' do %>
+  <td width="200">
+    <%= link_to banner.banner.url(:banner), :target => :blank do %>
+      <%= image_tag banner.banner.url(:tiny) %>
+    <% end %>
+  </td>
+  <td><%= banner.start_date.try(:strftime, '%m/%d/%Y') %></td>
+  <td class="admin-banner-set-item-nowrap">
+    <%= banner.end_date.try(:strftime, '%m/%d/%Y') %>
+    <% if banner.is_expired? %>
+      <span class="label">Expired</span>
+    <% end %>
+  </td>
+  <% if !banner.owner.has_rich_text %>
+    <td>
+      <% if banner.link_to.present? %>
+        <%= link_to banner.link_to, banner.link_to, :target => :blank %>
+      <% else %>
+        n/a
+      <% end %>
+    </td>
+  <% end %>
+  <td class="admin-banner-set-item-nowrap">
+    <%= link_to 'Edit', edit_admin_banner_path(banner), :class => 'admin-banner-set-item-edit btn btn-mini' %>
+    <%= link_to 'Delete', admin_banner_path(banner), :class => 'admin-banner-set-item-delete btn btn-mini btn-danger' %>
+  </td>
+<% end %>

data/app/views/admin/banners/_form.html.erb

@@ -3,33 +3,6 @@
   <%= error_messages_for(f.object) %>
 
   <fieldset>
-    <div class="control-group">
-      <%= f.label :link_to, 'Link to', :class => 'control-label' %>
-      <div class="controls">
-        <%= f.text_field :link_to %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :link_target, 'Open Link in', :class => 'control-label' %>
-      <div class="controls">
-        <%= f.select :link_target, options_for_select([
-          ['Same Window', '_self'],
-          ['New Window', '_blank']
-        ], @banner.link_target) %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :title, 'Image Title', :class => 'control-label' %>
-      <div class="controls">
-        <%= f.text_field :title %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :alt, 'Alt Text', :class => 'control-label' %>
-      <div class="controls">
-        <%= f.text_field :alt %>
-      </div>
-    </div>
     <div class="control-group">
       <%= f.label :banner, 'Banner', :class => 'control-label' %>
       <div class="controls">
@@ -43,7 +16,48 @@
           <%= f.text_area :rich_text, :class => 'spud_banner_rich_text' %>
         </div>
       </div>
+    <% else %>
+      <div class="control-group">
+        <%= f.label :link_to, 'Link to', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :link_to %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :link_target, 'Open Link in', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.select :link_target, options_for_select([
+            ['Same Window', '_self'],
+            ['New Window', '_blank']
+          ], @banner.link_target) %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :title, 'Image Title', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :title %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :alt, 'Alt Text', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :alt %>
+        </div>
+      </div>
     <% end %>
+    <div class="control-group">
+      <%= f.label :start_date, 'Start Date', :class => 'control-label' %>
+      <div class="controls controls-banner-date-selects">
+        <%= f.date_select :start_date, :start_year => Date.today.year %>
+      </div>
+    </div>
+    <div class="control-group">
+      <%= f.label :end_date, 'End Date', :class => 'control-label' %>
+      <div class="controls controls-banner-date-selects">
+        <%= f.date_select :end_date, :include_blank => true, :start_year => Date.today.year %>
+        <span class="help-block">Leave blank to never expire</span>
+      </div>
+    </div>
   </fieldset>
 
   <div class="progress progress-striped active spud_banner_upload_progress">

data/db/migrate/20140721142719_add_start_and_end_dates_to_spud_banners.rb

@@ -0,0 +1,6 @@
+class AddStartAndEndDatesToSpudBanners < ActiveRecord::Migration
+  def change
+    add_column :spud_banners, :start_date, :date
+    add_column :spud_banners, :end_date, :date
+  end
+end

data/lib/spud_banners/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Banners
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_banners
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Westlake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -189,13 +189,12 @@ files:
 - README.markdown
 - Rakefile
 - app/assets/images/admin/banners/banners.png
-- app/assets/images/admin/banners/banners@2x.png
 - app/assets/javascripts/admin/banners/application.js
 - app/assets/javascripts/admin/banners/banner_sets.js
 - app/assets/javascripts/admin/banners/banners.js
 - app/assets/stylesheets/admin/banners/application.css
 - app/assets/stylesheets/admin/banners/banner_sets.css
-- app/assets/stylesheets/admin/banners/banners.css
+- app/assets/stylesheets/admin/banners/banners.css.scss
 - app/controllers/admin/banner_sets_controller.rb
 - app/controllers/admin/banners_controller.rb
 - app/helpers/admin/banner_sets_helper.rb
@@ -220,6 +219,7 @@ files:
 - db/migrate/20121116195139_create_spud_banners.rb
 - db/migrate/20121116195312_create_spud_banner_sets.rb
 - db/migrate/20130614132846_add_rich_text_to_spud_banners.rb
+- db/migrate/20140721142719_add_start_and_end_dates_to_spud_banners.rb
 - lib/spud_banners/configuration.rb
 - lib/spud_banners/engine.rb
 - lib/spud_banners/liquid_tags.rb

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

@@ -1,36 +0,0 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/
-
-/* Banner Management
--------------------- */
-.spud_banner_set_banners_container{
-
-}
-.spud_banner_set_banner_item{
-  padding: 0 10px 10px 0;
-  position: relative;
-  display: inline-block;
-  cursor: move;
-  float: left;
-}
-.spud_banner_set_banner_item img{
-  display: inline-block;
-}
-.spud_banner_set_banner_item_actions{
-  position: absolute;
-  bottom: 10px;
-  right: 10px;
-  padding: 5px 10px;
-  background: rgba(0, 0, 0, 0.5);
-}
-.spud_banner_set_banner_item_actions a{
-  color: white;
-}
-
-/* Banner Form
---------------- */
-.spud_banner_upload_progress{
-  display: none;
-}