tb_banners 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjkyNTEzYmI1MjM5YWU1YjdiMTk1OThhMGYwOGU0ODkwMTM5YmVjMw==
+    YjQ3MjEyYWJkZjdiNjEyN2VjMjQ1NWJlMzVmMjYyNTcxYWNhOTY1Yg==
   data.tar.gz: !binary |-
-    MzA3ZTc3YThlMjMwYmJjMzNlNGI0NWQ1NDVlZGY2M2I2YTgxNWM1NA==
+    ZDE5OTMxYmEyYWUyOWVjNWMwZmFiMDQwMWY3MmU5YWQwZTk5OWQwOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGZlNjkwMjQzOGUyZmMzOGRjMWMxMDk3NGEzNzJkYmU2ODAwMDlhZjU2NzAw
-    OWM3OGEyZDNmYTU5YWJhZmI5M2ZlOTY5NDQ0MzYxMTc1YzMzM2U3NGE3OGM3
-    MWM4NDFhMzIyOGEzOWYyZTFmMzZlZTUxZDRmNDNmMTgzMjU0MTI=
+    ZTdjMmJiNzI0YTI1MzQ4MDY1ODFkZDM3ZGM3ZGM1N2U4OTYzZWQ2ZjZlZDI0
+    NTkwM2NlMGQyOWNlODg3MWNkZTk4NWFiNmY3MGU0NWM0NTY5YmU5ZGE3YjM3
+    ZDNhODJjYWZjZTc1MzkwOTlhYTE0M2EzYzAwZGQ0ZWM3MzE2NjA=
   data.tar.gz: !binary |-
-    OTFhN2ZlOTk4NzkzM2MzMjA2MDFlYWFhMDI2OGE2OWVhOWFkNDE0MzhhOWVl
-    N2FkNzc4MTBmOWQ3OTg4OTUwOGE3ODExYWU2MzQxMGUzZGYxNjUwNzUwNmZi
-    OGM0MGM2OTM3YTllMWQwOTRlZjE0OGUxMDFiZWE3YmJmYTM5M2Q=
+    ZGRjZTQ1NjNkMzFjNjcyODBiNGI0MGRlOTU1MjU0Yzk2YTMzN2UwY2Y3MTY1
+    ZTI2YmVkZTk0NTljMjczNzVjM2M1ZGYwZjRmZTljZmQ1NmRjMGQ4MTkwNDlh
+    NDhmYmU4YjI0YWVkNmJiYmVkOTk3YTM2OWNkMWUyNmVkYzdhOTk=

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

@@ -0,0 +1 @@
+//= require_directory

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

@@ -0,0 +1,4 @@
+/*
+*= require admin/banners/banners
+*= require admin/banners/banner_sets
+*/

data/app/controllers/{spud/admin → admin}/banner_sets_controller.rb

@@ -1,19 +1,19 @@
-class Spud::Admin::BannerSetsController < Spud::Admin::ApplicationController
+class Admin::BannerSetsController < Admin::ApplicationController
 
   cache_sweeper :spud_banner_sweeper, :only => [:create, :update, :destroy]
   before_filter :get_record, :only => [:show, :edit, :update, :destroy]
   respond_to :html
   belongs_to_spud_app :banner_sets
-  add_breadcrumb 'Banner Sets', :spud_admin_banner_sets_path
+  add_breadcrumb 'Banner Sets', :admin_banner_sets_path
   layout false
 
   def index
     @banner_sets = SpudBannerSet.all
-    respond_with @banner_sets, :layout => 'spud/admin/detail'
+    respond_with @banner_sets, :layout => 'admin/detail'
   end
 
   def show
-    respond_with @banner_set, :layout => 'spud/admin/detail'
+    respond_with @banner_set, :layout => 'admin/detail'
   end
 
   def new
@@ -60,7 +60,7 @@ private
       @banner_set = SpudBannerSet.find(params[:id])
     rescue ActiveRecord::RecordNotFound => e
       flash.now[:error] = "Could not find the requested BannerSet"
-      redirect_to spud_admin_banner_sets_path
+      redirect_to admin_banner_sets_path
       return false
     end
   end

data/app/controllers/{spud/admin → admin}/banners_controller.rb

@@ -1,4 +1,4 @@
-class Spud::Admin::BannersController < Spud::Admin::ApplicationController
+class Admin::BannersController < Admin::ApplicationController
 
   include RespondsToParent
 
@@ -96,7 +96,7 @@ private
       @banner = SpudBanner.find(params[:id])
     rescue ActiveRecord::RecordNotFound => e
       flash.now[:error] = "Could not find the requested SpudBanner"
-      redirect_to spud_admin_banner_sets_path
+      redirect_to admin_banner_sets_path
       return false
     end
   end

data/app/helpers/admin/banner_sets_helper.rb

@@ -0,0 +1,2 @@
+module Admin::BannerSetsHelper
+end

data/app/helpers/admin/banners_helper.rb

@@ -0,0 +1,2 @@
+module Admin::BannersHelper
+end

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

@@ -0,0 +1,8 @@
+<%= content_tag :li, :class => 'spud_admin_banner_sets_list_item', 'data-id' => banner_set.id  do %>
+  <%= banner_set.name %>
+  <span class="spud_admin_banner_sets_list_item_actions">
+    <%= link_to 'Manage Banners', admin_banner_set_path(banner_set), :class => 'btn btn-small' %>
+    <%= link_to 'Edit Configuration', edit_admin_banner_set_path(banner_set), :class => 'btn btn-small spud_banner_sets_edit' %>
+    <%= link_to 'Delete', admin_banner_set_path(banner_set), :class => 'btn btn-small btn-danger spud_banner_sets_delete' %>
+  </span>
+<% end %>

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

@@ -0,0 +1 @@
+<%= render :partial => 'form', :locals => {:path => admin_banner_set_path(@banner_set)} %>

data/app/views/{spud/admin → admin}/banner_sets/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for :data_controls do %>
-  <%= link_to "New Banner Set", new_spud_admin_banner_set_path, :class => "btn btn-primary spud_banner_sets_add_new", :title => "New Banner Set" %>
+  <%= link_to "New Banner Set", new_admin_banner_set_path, :class => "btn btn-primary spud_banner_sets_add_new", :title => "New Banner Set" %>
 <% end %>
 
 <% content_for :detail do %>

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

@@ -0,0 +1 @@
+<%= render :partial => 'form', :locals => {:path => admin_banner_sets_path} %>

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

@@ -0,0 +1,11 @@
+<% 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' %>
+<% end %>
+
+<div class="spud_banner_set_banners_container">
+  <%= render :partial => 'admin/banners/banner', :collection => @banner_set.banners %>
+</div>
+
+<script>
+  $(document).ready(spud.admin.banners.init);
+</script>

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

@@ -0,0 +1,7 @@
+<%= 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 %>

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

@@ -0,0 +1 @@
+<%= render :partial => 'form', :locals => {:path => admin_banner_path(@banner)} %>

data/app/views/{spud/admin → admin}/banners/legacy.js.erb

@@ -1,5 +1,5 @@
 <% if @banner.errors.any? %>
-  spud.admin.banners.onLegacyUploadError("<%= escape_javascript(render :partial => 'form', :locals => {:path => spud_admin_banner_set_banners_path(@banner_set)}) %>");
+  spud.admin.banners.onLegacyUploadError("<%= escape_javascript(render :partial => 'form', :locals => {:path => admin_banner_set_banners_path(@banner_set)}) %>");
 <% else %>
   spud.admin.banners.onLegacyUploadComplete("<%= escape_javascript(render :partial => 'banner', :locals => {:banner => @banner}) %>");
 <% end %>

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

@@ -0,0 +1 @@
+<%= render :partial => 'form', :locals => {:path => admin_banner_set_banners_path(@banner_set)} %>

data/config/routes.rb

@@ -1,14 +1,12 @@
 Rails.application.routes.draw do
 
-  namespace :spud, :path => '/' do
-    namespace :admin do
-      resources :banner_sets do
-        resources :banners, :only => [:new, :create]
-      end
-      resources :banners, :only => [:show, :edit, :update, :destroy] do
-        put :sort, :on => :collection
-      end
+  namespace :admin do
+    resources :banner_sets do
+      resources :banners, :only => [:new, :create]
+    end
+    resources :banners, :only => [:show, :edit, :update, :destroy] do
+      put :sort, :on => :collection
     end
   end
 
-end
+end

data/lib/spud_banners/engine.rb

@@ -6,12 +6,12 @@ module Spud
   module Banners
     class Engine < Rails::Engine
       engine_name :tb_banners
-      Spud::Core.append_admin_stylesheets('spud/admin/banners/application')
-      Spud::Core.append_admin_javascripts('spud/admin/banners/application')
+      Spud::Core.append_admin_stylesheets('admin/banners/application')
+      Spud::Core.append_admin_javascripts('admin/banners/application')
       initializer :admin do
         Spud::Core.config.admin_applications += [{
           :name => 'Banner Sets',
-          :thumbnail => 'spud/admin/banners/banners.png',
+          :thumbnail => 'admin/banners/banners.png',
           :retina => true,
           :url => '/admin/banner_sets',
           :order => 120  

data/lib/spud_banners/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Banners
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/spec/controllers/{spud/admin → admin}/banner_sets_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spud::Admin::BannerSetsController do
+describe Admin::BannerSetsController do
 
   before(:each) do
     activate_authlogic
@@ -31,7 +31,7 @@ describe Spud::Admin::BannerSetsController do
     it "should redirect if banner set is not found" do
       get :show, :id => -1
       assigns(:banner_set).should be_blank
-      response.should redirect_to spud_admin_banner_sets_path
+      response.should redirect_to admin_banner_sets_path
     end
   end
 

data/spec/dummy/db/migrate/20130920154442_create_spud_roles.tb_core.rb

@@ -0,0 +1,11 @@
+# This migration comes from tb_core (originally 20130620143010)
+class CreateSpudRoles < ActiveRecord::Migration
+  def change
+    create_table :spud_roles do |t|
+      t.string :name
+      t.timestamps
+    end
+    add_column :spud_users, :spud_role_id, :integer
+    add_index :spud_users, :spud_role_id
+  end
+end

data/spec/dummy/db/migrate/20130920154443_create_spud_permissions.tb_core.rb

@@ -0,0 +1,11 @@
+# This migration comes from tb_core (originally 20130620143941)
+class CreateSpudPermissions < ActiveRecord::Migration
+  def change
+    create_table :spud_permissions do |t|
+      t.string :name, :null => false
+      t.string :tag, :null => false
+      t.timestamps
+    end
+    add_index :spud_permissions, :tag, :unique => true
+  end
+end

data/spec/dummy/db/migrate/20130920154444_create_spud_role_permissions.tb_core.rb

@@ -0,0 +1,12 @@
+# This migration comes from tb_core (originally 20130620151132)
+class CreateSpudRolePermissions < ActiveRecord::Migration
+  def change
+    create_table :spud_role_permissions do |t|
+      t.integer :spud_role_id, :null => false
+      t.string :spud_permission_tag, :null => false
+      t.timestamps
+    end
+    add_index :spud_role_permissions, :spud_role_id
+    add_index :spud_role_permissions, :spud_permission_tag
+  end
+end

data/spec/dummy/db/migrate/20130920154445_drop_spud_admin_permissions.tb_core.rb

@@ -0,0 +1,16 @@
+# This migration comes from tb_core (originally 20130620163144)
+class DropSpudAdminPermissions < ActiveRecord::Migration
+  def up
+    drop_table :spud_admin_permissions
+  end
+
+  def down
+    create_table :spud_admin_permissions do |t|
+      t.integer :user_id
+      t.string :name
+      t.boolean :access
+      t.string :scope
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20130920154446_create_spud_banners.tb_banners.rb

@@ -0,0 +1,16 @@
+# This migration comes from tb_banners (originally 20121116195139)
+class CreateSpudBanners < ActiveRecord::Migration
+  def change
+    create_table :spud_banners do |t|
+      t.integer :spud_banner_set_id, :null => false
+      t.string :link_to
+      t.string :link_target, :default => '_self'
+      t.string :title
+      t.string :alt
+      t.integer :sort_order, :default => 0
+      t.attachment :banner
+      t.timestamps
+    end
+    add_index :spud_banners, :spud_banner_set_id, :unique => false
+  end
+end

data/spec/dummy/db/migrate/20130920154447_create_spud_banner_sets.tb_banners.rb

@@ -0,0 +1,13 @@
+# This migration comes from tb_banners (originally 20121116195312)
+class CreateSpudBannerSets < ActiveRecord::Migration
+  def change
+    create_table :spud_banner_sets do |t|
+      t.string :name, :null => false
+      t.integer :width, :null => false
+      t.integer :height, :null => false
+      t.boolean :cropped, :default => true
+      t.timestamps
+    end
+    add_index :spud_banner_sets, :name, :unique => true
+  end
+end

data/spec/dummy/db/migrate/20130920154448_add_rich_text_to_spud_banners.tb_banners.rb

@@ -0,0 +1,7 @@
+# This migration comes from tb_banners (originally 20130614132846)
+class AddRichTextToSpudBanners < ActiveRecord::Migration
+  def change
+    add_column :spud_banner_sets, :has_rich_text, :boolean, :default => false
+    add_column :spud_banners, :rich_text, :text
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,24 +11,16 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121127192250) do
-
-  create_table "spud_admin_permissions", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "name"
-    t.boolean  "access"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "scope"
-  end
+ActiveRecord::Schema.define(:version => 20130920154448) do
 
   create_table "spud_banner_sets", :force => true do |t|
-    t.string   "name",                         :null => false
-    t.integer  "width",                        :null => false
-    t.integer  "height",                       :null => false
-    t.boolean  "cropped",    :default => true
-    t.datetime "created_at",                   :null => false
-    t.datetime "updated_at",                   :null => false
+    t.string   "name",                             :null => false
+    t.integer  "width",                            :null => false
+    t.integer  "height",                           :null => false
+    t.boolean  "cropped",       :default => true
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.boolean  "has_rich_text", :default => false
   end
 
   add_index "spud_banner_sets", ["name"], :name => "index_spud_banner_sets_on_name", :unique => true
@@ -46,10 +38,36 @@ ActiveRecord::Schema.define(:version => 20121127192250) do
     t.datetime "banner_updated_at"
     t.datetime "created_at",                               :null => false
     t.datetime "updated_at",                               :null => false
+    t.text     "rich_text"
   end
 
   add_index "spud_banners", ["spud_banner_set_id"], :name => "index_spud_banners_on_spud_banner_set_id"
 
+  create_table "spud_permissions", :force => true do |t|
+    t.string   "name",       :null => false
+    t.string   "tag",        :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "spud_permissions", ["tag"], :name => "index_spud_permissions_on_tag", :unique => true
+
+  create_table "spud_role_permissions", :force => true do |t|
+    t.integer  "spud_role_id",        :null => false
+    t.string   "spud_permission_tag", :null => false
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+  end
+
+  add_index "spud_role_permissions", ["spud_permission_tag"], :name => "index_spud_role_permissions_on_spud_permission_tag"
+  add_index "spud_role_permissions", ["spud_role_id"], :name => "index_spud_role_permissions_on_spud_role_id"
+
+  create_table "spud_roles", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "spud_user_settings", :force => true do |t|
     t.integer  "spud_user_id"
     t.string   "key"
@@ -79,9 +97,11 @@ ActiveRecord::Schema.define(:version => 20121127192250) do
     t.datetime "created_at",                         :null => false
     t.datetime "updated_at",                         :null => false
     t.string   "time_zone"
+    t.integer  "spud_role_id"
   end
 
   add_index "spud_users", ["email"], :name => "index_spud_users_on_email"
   add_index "spud_users", ["login"], :name => "index_spud_users_on_login"
+  add_index "spud_users", ["spud_role_id"], :name => "index_spud_users_on_spud_role_id"
 
 end