lalala 4.0.0.dev.336 → 4.0.0.dev.339

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b188a038a28a5653c94779b7779ccca29ecd21a
-  data.tar.gz: 74972285a2e94e5d6fc94daf70354014e628a926
+  metadata.gz: e91d1a69370ce03241a151589b88e0a541d7d907
+  data.tar.gz: 6f3ea642e9e3a9ec6e63468fbff5c4771c1284f9
 SHA512:
-  metadata.gz: 01685ff57831824b64cca38ff07f54da67cdfa56810c2bfa9f2bd87d69e5823fec5c2e37994273948ebc414a19c1e407539f0c3438636559874360a776065260
-  data.tar.gz: 720317a16f55ad7fc36aff1535dbef6263e541a32de5c130671dc2cc3bfbec59474b603c8c322ae51fb0e741231582f7dbf8ab1becf443f9e78339758ab68226
+  metadata.gz: 8096e0ef884dd1a46cb94f3c84f9b5df96d96fd26df0448e7585592a9cdc5d1b7017328f55b76ec24525c654b87d7d787c01b31822cbb01a4f5070672ae09921
+  data.tar.gz: 139132ec45b821f9301bc3115a4916f14c21da293972bd02bfd84584b66f3fbf469673ab8dd786bf2bdb45ecca76cef60f4b73f157288aaa1edc584fc3a013d1

data/app/assets/stylesheets/lalala/components/_forms.css.scss

@@ -230,26 +230,42 @@ select:focus {
 }
 
 // single file
-.input.single_file .file-description {
-  font-size: 12px;
-  margin-left: $label_width;
-  margin-top: 7px;
-  width: $input_width;
-
-  img {
-    display: inline-block;
+.input.single_file  {
+  .delete-button {
+    position: absolute;
+    right: 10px;
+    top: 0;
+    width: 60px;
+
+    input {
+      width: auto;
+      padding: 0;
+      margin: 0 0 0 5px;
+    }
   }
 
-  span {
-    display: inline-block;
-    font-size: 13px;
-    margin-left: 8px;
-    vertical-align: top;
+  .file-description {
+    font-size: 12px;
+    margin-left: $label_width;
+    margin-top: 7px;
+    width: $input_width;
+
+    img {
+      display: inline-block;
+    }
+
+    span {
+      display: inline-block;
+      font-size: 13px;
+      margin-left: 8px;
+      vertical-align: top;
+    }
   }
 }
 
 
 
+
 /*
 
   FORMS / CHOSEN

data/lib/formtastic/inputs/single_file_input.rb

@@ -8,8 +8,18 @@ class Formtastic::Inputs::SingleFileInput
 
     html = template.raw("")
     html << label_html
-    html << builder.fields_for(method, model_class.new) do |f|
-      f.file_field :asset, accept: model_class.extension_white_list, id: input_html_options[:id]
+    html << builder.fields_for(method, model_instance || model_class.new) do |f|
+      f_html = template.raw("")
+      f_html << f.file_field(:asset, accept: model_class.extension_white_list, id: input_html_options[:id])
+      if model_instance
+        f_html << template.content_tag(:div, class: "delete-button") do
+          b_html = template.raw("")
+          b_html << f.label(:_destroy, "delete")
+          b_html << f.check_box(:_destroy)
+          b_html
+        end
+      end
+      f_html
     end
 
     if model_instance

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "336"
+  BUILD   = "339"
 
   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.336
+  version: 4.0.0.dev.339
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin