lalala 4.0.0.dev.154 → 4.0.0.dev.155
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8f4cbfe91014d4fe64f61abe68328a8c2f012da7
|
4
|
+
data.tar.gz: 6dc0b55a2fa383aa355bdb76091025e0dcabdc57
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 234a578728e6e41997078875a9308993e1689ce093676b029097bf46dc9ebd7683ed333d41978299986eb51fedbce8d6312f2de7fc083a8d70ebec17cf520af4
|
7
|
+
data.tar.gz: c88e615d58106256a4e8ab12e8c1ed514cef8bfcdb038cf8d88bdb7ac3f626e9fc90b7a8cf075984c9446d704b8f6b604f6f6a324bff671587a446d676b92a10
|
@@ -50,7 +50,7 @@
|
|
50
50
|
.asset.will-destroy .overlay,
|
51
51
|
.asset.selected.will-destroy .overlay { background: rgba($red, .5); }
|
52
52
|
|
53
|
-
// thumbnail + overlay
|
53
|
+
// thumbnail + file-icon + overlay
|
54
54
|
.asset .thumbnail,
|
55
55
|
.asset .overlay {
|
56
56
|
left: 0;
|
@@ -62,6 +62,13 @@
|
|
62
62
|
z-index: 0;
|
63
63
|
}
|
64
64
|
|
65
|
+
.asset .file-icon {
|
66
|
+
background: #E4E4E4;
|
67
|
+
display: block;
|
68
|
+
height: 100%;
|
69
|
+
width: 100%;
|
70
|
+
}
|
71
|
+
|
65
72
|
.asset .overlay {
|
66
73
|
background: rgba(black, .5);
|
67
74
|
display: none;
|
@@ -13,7 +13,7 @@ class Lalala::AbstractAsset < ActiveRecord::Base
|
|
13
13
|
|
14
14
|
def self.extension_white_list
|
15
15
|
if self.uploaders and self.uploaders[:asset]
|
16
|
-
list = self.uploaders[:asset].new.try(:extension_white_list)
|
16
|
+
list = self.uploaders[:asset].new.try(:extension_white_list) || []
|
17
17
|
else
|
18
18
|
list = []
|
19
19
|
end
|
@@ -18,12 +18,14 @@ class Formtastic::Inputs::GridInput
|
|
18
18
|
builder.fields_for(method, asset) do |f|
|
19
19
|
asset_errors.concat(asset.errors.to_a)
|
20
20
|
|
21
|
-
lalala_thumb = f.object.asset.lalala_thumb
|
21
|
+
lalala_thumb = if f.object.asset.respond_to?(:lalala_thumb)
|
22
|
+
f.object.asset.lalala_thumb
|
23
|
+
end
|
22
24
|
|
23
25
|
if url = lalala_thumb.try(:url)
|
24
26
|
link_inner_html = template.image_tag(url)
|
25
27
|
else
|
26
|
-
link_inner_html = ""
|
28
|
+
link_inner_html = template.content_tag(:span, "", class: "file-icon")
|
27
29
|
end
|
28
30
|
|
29
31
|
asset_html = template.raw("")
|
data/lib/lalala/version.rb
CHANGED