gluttonberg-core 2.6.3 → 2.6.4

data/app/assets/javascripts/gb_application.js

@@ -334,8 +334,15 @@ var AssetBrowser = {
 
     $(window).resize(function(e) {
       $("#assetsDialog").css({
-        position: "absolute",
-        top: (($(window).scrollTop())) + "px"
+        height: ($(window).height()*0.9) + "px",
+        width: ($(window).width()*0.7) + "px",
+        "margin-top": "-" + (($(window).height()*0.9)/2) + "px",
+        "margin-left": "-" + (($(window).width()*0.7)/2) + "px"
+      })
+
+      $(".modal-body").css({
+        "max-height": (($(window).height()*0.9) - 135) + "px",
+        "height": (($(window).height()*0.9) - 135) + "px"
       })
 
     })
@@ -500,7 +507,7 @@ var AssetBrowser = {
 
       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){
+        $.get("/admin/browser-collection/"+collectionID+".json?filter="+AssetBrowser.filter.val(), function(data){
           $(".gb_spinner").remove();
           accordionContentInner.prepend(data['markup']);
         });

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

@@ -60,7 +60,13 @@ module Gluttonberg
 
         def browser_collection
           @collection = AssetCollection.find(params[:id])
-          @assets = @collection.assets
+          @category_filter = ( params[:filter].blank? ? "all" : params[:filter] )
+          if @category_filter == "all"
+            @assets = @collection.assets
+          else
+            @category = AssetCategory.where({ :name => @category_filter }).first
+            @assets = @collection.assets.where({:asset_type_id => @category.asset_type_ids }) unless @category.blank? || @category.asset_type_ids.blank?
+          end
           render :layout => false
         end
 

data/lib/gluttonberg/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gluttonberg-core
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: authlogic