gluttonberg-core 2.6.2 → 2.6.3

data/app/assets/javascripts/gb_application.js

@@ -493,6 +493,21 @@ var AssetBrowser = {
       if (target.attr("href") != '') {
         $.getJSON(target.attr("href"), null, AssetBrowser.handleJSON);
       }
+    } else if(target.is(".accordion-toggle")){
+      var accordionContent = $(target.attr('href'));
+      var accordionContentInner = accordionContent.find(".accordion-inner");
+      var collectionID = accordionContentInner.attr('data-id');
+
+      if(accordionContentInner.attr("content-loaded") == "false"){
+        accordionContentInner.prepend("<img src='/assets/gb_spinner.gif' class='gb_spinner'/>");
+        $.get("/admin/browser-collection/"+collectionID+".json", function(data){
+          $(".gb_spinner").remove();
+          accordionContentInner.prepend(data['markup']);
+        });
+        accordionContentInner.attr("content-loaded",true);
+      }
+
+      return true;
     } else if(target.is(".no-ajax")){
       return true;
     }
@@ -901,3 +916,22 @@ function stopAudio(){
     basicMP3Player.stopSound(basicMP3Player.lastSound);
   }
 }
+
+function initCollectionAccordion(){
+  $(".collapse").collapse({parent: "#accordion_for_collections"})
+  $(".accordion-heading a").click(function(e){
+    var target = $(this);
+    var accordionContent = $(target.attr('href'));
+      var accordionContentInner = accordionContent.find(".accordion-inner");
+      var collectionID = accordionContentInner.attr('data-id');
+
+      if(accordionContentInner.attr("content-loaded") == "false"){
+        accordionContentInner.prepend("<img src='/assets/gb_spinner.gif' class='gb_spinner'/>");
+        $.get("/admin/browser-collection/"+collectionID+".json", function(data){
+          $(".gb_spinner").remove();
+          accordionContentInner.prepend(data['markup']);
+        });
+        accordionContentInner.attr("content-loaded",true);
+      }
+    });
+}

data/app/assets/stylesheets/gb_bootstrap.css

@@ -3562,6 +3562,10 @@ a.thumbnail:hover {
 .thumbnail .caption {
   padding: 9px;
 }
+.thumbnail .caption h5 {
+  height: 18px;
+  overflow: hidden;
+}
 .label {
   padding: 1px 4px 2px;
   font-size: 10.998px;

data/app/controllers/gluttonberg/admin/asset_library/assets_controller.rb

@@ -42,7 +42,7 @@ module Gluttonberg
         # if filter param is provided then it will only show filtered type
         def browser
           # Get the latest assets
-          @assets = Asset.order("created_at DESC").includes(:asset_type)
+          @assets = Asset.order("created_at DESC").includes(:asset_type).limit(20)
 
           @category_filter = ( params[:filter].blank? ? "all" : params[:filter] )
           if @category_filter == "all"
@@ -58,6 +58,12 @@ module Gluttonberg
           end
         end
 
+        def browser_collection
+          @collection = AssetCollection.find(params[:id])
+          @assets = @collection.assets
+          render :layout => false
+        end
+
         # list assets page by page if user drill down into a category from category tab of home page
         def category
           params[:category] = params[:category].downcase.singularize unless params[:category].blank?
@@ -364,4 +370,4 @@ class MyFile < File
     end
   end
 
-end
+end

data/app/views/gluttonberg/admin/asset_library/assets/_browser_root.html.haml

@@ -39,22 +39,19 @@
   #collections.tab-pane
     - unless @collections.empty?
       .accordion#accordion_for_collections
-        - first_open = false
         - for collection in @collections
           - unless @category.blank? || @category.asset_type_ids.blank?
             - assets = collection.assets.where({:asset_type_id => @category.asset_type_ids })
           - else
             - assets = collection.assets
-          - if assets.length > 0
+          - if assets.count > 0
             .accordion-group
               .accordion-heading
                 %a{ :class=>"accordion-toggle no-ajax" , "data-toggle" => "collapse" , "data-parent" => "#accordion_for_collections" , "data-target" => "#collection-#{collection.id}", "href" => "#collection-#{collection.id}"}
-                  = "#{collection.name} ( #{pluralize(assets.length,'asset')} )"
-              .accordion-body{:id => "collection-#{collection.id}" , :class => "collapse #{first_open ? '' : 'in' } " }
-                .accordion-inner
-                  = render :partial => "gluttonberg/admin/shared/asset_panel.html" , :locals => {:assets => assets}
+                  = "#{collection.name} ( #{pluralize(assets.count,'asset')} )"
+              .accordion-body{:id => "collection-#{collection.id}" , :class => "collapse " }
+                .accordion-inner{"content-loaded" => "false" , "data-id" => collection.id}
                   .clear
-              - first_open = true
 
   #upload.tab-pane
     - @asset  = Gluttonberg::Asset.new

data/app/views/gluttonberg/admin/asset_library/assets/browser_collection.json.haml

@@ -0,0 +1 @@
+= { :name => "Assets for collection '#{@collection.name}'" , :backURL  => admin_asset_browser_url+"?no_frame=false", :markup   => asset_panel(@assets , params[:category] , "search" ) }.to_json.html_safe

data/app/views/gluttonberg/admin/asset_library/collections/index.html.haml

@@ -22,17 +22,15 @@
                 - assets = collection.assets.where({:asset_type_id => @category.asset_type_ids })
               - else
                 - assets = collection.assets
-              - if assets.length > 0
+              - if assets.count > 0
                 .accordion-group
                   .accordion-heading
                     %a{ :class=>"accordion-toggle no-ajax" , "data-toggle" => "collapse" , "data-parent" => "#accordion_for_collections" , "data-target" => "#collection-#{collection.id}", "href" => "#collection-#{collection.id}"}
-                      = "#{collection.name} ( #{pluralize(assets.length,'asset')} )"
+                      = "#{collection.name} ( #{pluralize(assets.count,'asset')} )"
                   .accordion-body{:id => "collection-#{collection.id}" , :class => "collapse  in"}
-                    .accordion-inner
-                      = render :partial => "gluttonberg/admin/shared/asset_panel.html" , :locals => {:assets => assets}
-                      /%li= link_to("Edit", edit_admin_collection_url(collection)  )
-                      /%li= link_to("Delete", delete_admin_collection_url(collection) )
+                    .accordion-inner{"content-loaded" => "false" , "data-id" => collection.id}
+
 
 
 :javascript
-  $(".collapse").collapse({parent: "#accordion_for_collections"})
+  initCollectionAccordion();

data/app/views/gluttonberg/admin/settings/generic_settings/index.html.haml

@@ -1,6 +1,7 @@
 - @window_title = "Settings"
 - @page_title = "Configuration"
 
+- has_deletable_settings = Gluttonberg::Setting.has_deletable_settings?
 .row-fluid
   = render :partial => "/gluttonberg/admin/settings/main/sidebar"
   .span9
@@ -18,7 +19,7 @@
           %tr
             %th Name
             %th Value (Click to edit)
-            - if Gluttonberg::Setting.has_deletable_settings?
+            - if has_deletable_settings
               %th.controls Controls
         %tbody
           - i = 1
@@ -49,7 +50,7 @@
                   = gb_editable_field setting, :value , :update_url => admin_generic_setting_path( setting)
 
                 = image_tag("/assets/gb_spinner.gif" , :id => "progress_#{setting.id}" , :style => "display:none")
-              - if Gluttonberg::Setting.has_deletable_settings?
+              - if has_deletable_settings
                 %td.controls
                   - if setting.delete_able
                     = link_to 'Delete', delete_admin_generic_setting_path(setting)

data/config/routes.rb

@@ -106,6 +106,7 @@ Rails.application.routes.draw do
           match "create_assets_in_bulk"  => "assets#create_assets_in_bulk" , :as => :create_assets_in_bulk
           match "destroy_assets_in_bulk"  => "assets#destroy_assets_in_bulk" , :as => :destroy_assets_in_bulk
           match "browser"  => "assets#browser" , :as => :asset_browser
+          match "browser-collection/:id"  => "assets#browser_collection" , :as => :asset_browser_collection
           match "browse/:category/page/:page"  => "assets#category" , :as => :asset_category
           match "collections/:id/page/:page"  => "collections#show" , :as => :asset_collection
           resources :collections  do

data/lib/generators/gluttonberg/blog/templates/blog_migration.rb

@@ -1,4 +1,4 @@
-class BlogMigration < ActiveRecord::Migration 
+class BlogMigration < ActiveRecord::Migration
   def self.up
     create_table :gb_blogs do |t|
       t.string :name, :null => false
@@ -15,19 +15,19 @@ class BlogMigration < ActiveRecord::Migration
       t.datetime :published_at
       t.timestamps
     end
-    
+
     create_table :gb_articles do |t|
       t.string :slug, :null => false
       t.integer :blog_id, :null => false
       t.integer :user_id, :null => false
-      t.integer :author_id, :null => false      
+      t.integer :author_id, :null => false
       t.column :state , :string #use for publishing
-      t.column :disable_comments , :boolean , :default => false 
-      t.datetime :published_at 
+      t.column :disable_comments , :boolean , :default => false
+      t.datetime :published_at
       t.string :previous_slug
       t.timestamps
     end
-    
+
     create_table :gb_comments do |t|
       t.text :body
       t.string :author_name
@@ -38,9 +38,11 @@ class BlogMigration < ActiveRecord::Migration
       t.boolean :moderation_required, :default => true
       t.boolean :approved, :default => false
       t.datetime :notification_sent_at
+      t.boolean :spam , :default =>  false
+      t.float   :spam_score
       t.timestamps
     end
-    
+
     create_table :gb_comment_subscriptions do |t|
       t.integer :article_id
       t.string :author_name
@@ -48,7 +50,7 @@ class BlogMigration < ActiveRecord::Migration
       t.string :reference_hash
       t.timestamps
     end
-    
+
     create_table :gb_article_localizations do |t|
       t.string :title, :null => false
       t.text :excerpt
@@ -63,19 +65,19 @@ class BlogMigration < ActiveRecord::Migration
       t.integer :fb_icon_id
       t.timestamps
     end
-    
+
     begin
       Gluttonberg::Blog.create_versioned_table
     rescue => e
       puts e
     end
-    
+
     begin
       Gluttonberg::ArticleLocalization.create_versioned_table
     rescue => e
       puts e
     end
-    
+
   end
 
   def self.down

data/lib/gluttonberg/version.rb

@@ -1,3 +1,3 @@
 module Gluttonberg
-  VERSION = "2.6.2"
+  VERSION = "2.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gluttonberg-core
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: authlogic
@@ -579,6 +579,7 @@ files:
 - app/views/gluttonberg/admin/asset_library/assets/_search_form.html.haml
 - app/views/gluttonberg/admin/asset_library/assets/add_assets_in_bulk.html.haml
 - app/views/gluttonberg/admin/asset_library/assets/browser.html.haml
+- app/views/gluttonberg/admin/asset_library/assets/browser_collection.json.haml
 - app/views/gluttonberg/admin/asset_library/assets/category.html.haml
 - app/views/gluttonberg/admin/asset_library/assets/category.json.haml
 - app/views/gluttonberg/admin/asset_library/assets/create_assets_in_bulk.html.haml
@@ -728,7 +729,6 @@ files:
 - config/locales/en_gb.yml
 - config/routes.rb
 - db/migrate/20121106025800_add_artist_and_link_to_assets.rb
-- db/migrate/20130201025800_spam_flag_for_comments.rb
 - lib/acts_as_versioned.rb
 - lib/audio_job.rb
 - lib/engine.rb

data/db/migrate/20130201025800_spam_flag_for_comments.rb

@@ -1,6 +0,0 @@
-class SpamFlagForComments < ActiveRecord::Migration
-  def change
-    add_column :gb_comments , :spam , :boolean , :default =>  false
-    add_column :gb_comments , :spam_score , :float
-  end
-end