lalala 4.0.0.dev.154 → 4.0.0.dev.155

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 425d7e8c567094ce9135f2c46126d448b9a74db0
-  data.tar.gz: 6096cbe267d51d033972447e09235dcbec617d1c
+  metadata.gz: 8f4cbfe91014d4fe64f61abe68328a8c2f012da7
+  data.tar.gz: 6dc0b55a2fa383aa355bdb76091025e0dcabdc57
 SHA512:
-  metadata.gz: 4248271fe38157d447cc8fb7f3c0ef33d40199e55c49552342b6e563281d5d5e18aa13811f90dfe990a58d1994e3c7363d0f1fa602a6e3996d385ba66b5c45f4
-  data.tar.gz: e90574f96d008bf7cdb90ec5ec8299a993ac4777c7a5f25ee51c15ab328c5a27e1986362058d031ea7b10c7aa4e945b05759b26f252bd181d87ac7124beea41a
+  metadata.gz: 234a578728e6e41997078875a9308993e1689ce093676b029097bf46dc9ebd7683ed333d41978299986eb51fedbce8d6312f2de7fc083a8d70ebec17cf520af4
+  data.tar.gz: c88e615d58106256a4e8ab12e8c1ed514cef8bfcdb038cf8d88bdb7ac3f626e9fc90b7a8cf075984c9446d704b8f6b604f6f6a324bff671587a446d676b92a10

data/app/assets/stylesheets/lalala/modules/_grid.css.scss

@@ -50,7 +50,7 @@
   .asset.will-destroy .overlay,
   .asset.selected.will-destroy .overlay { background: rgba($red, .5); }
 
-  // thumbnail + overlay
+  // thumbnail + file-icon + overlay
   .asset .thumbnail,
   .asset .overlay {
     left: 0;
@@ -62,6 +62,13 @@
     z-index: 0;
   }
 
+  .asset .file-icon {
+    background: #E4E4E4;
+    display: block;
+    height: 100%;
+    width: 100%;
+  }
+
   .asset .overlay {
     background: rgba(black, .5);
     display: none;

data/app/models/lalala/abstract_asset.rb

@@ -13,7 +13,7 @@ class Lalala::AbstractAsset < ActiveRecord::Base
 
   def self.extension_white_list
     if self.uploaders and self.uploaders[:asset]
-      list = self.uploaders[:asset].new.try(:extension_white_list)
+      list = self.uploaders[:asset].new.try(:extension_white_list) || []
     else
       list = []
     end

data/lib/formtastic/inputs/grid_input.rb

@@ -18,12 +18,14 @@ class Formtastic::Inputs::GridInput
           builder.fields_for(method, asset) do |f|
             asset_errors.concat(asset.errors.to_a)
 
-            lalala_thumb = f.object.asset.lalala_thumb
+            lalala_thumb = if f.object.asset.respond_to?(:lalala_thumb)
+              f.object.asset.lalala_thumb
+            end
 
             if url = lalala_thumb.try(:url)
               link_inner_html = template.image_tag(url)
             else
-              link_inner_html = ""
+              link_inner_html = template.content_tag(:span, "", class: "file-icon")
             end
 
             asset_html = template.raw("")

data/lib/generators/lalala/install/templates/admin_pages.rb

@@ -3,6 +3,9 @@ ActiveAdmin.register ApplicationPage, :as => 'Page' do
 
   menu :priority => 2
 
+  # Disable pagination
+  config.paginate = false
+
   # Enable the filter
   # config.filters = false
 

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "154"
+  BUILD   = "155"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.154
+  version: 4.0.0.dev.155
 platform: ruby
 authors:
 - Simon Menke