lalala 4.0.0.dev.161 → 4.0.0.dev.162

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6496dddb416bf30955bfda92c6b846b259141c15
-  data.tar.gz: a4e3ee6537a65917e5348c4f591b5cc26de16006
+  metadata.gz: 85ab922bcd762d6346607b0910afa1cbf3b44080
+  data.tar.gz: ecac7d2acab2bf0f4af49de9047483d9a08b57a0
 SHA512:
-  metadata.gz: f2e010c20df7eccad07a8e03ba9eeee5ba440ec66c5382b86cddd3512b64eb7699f00be11c2e39f0f674e5ebb59aa370c200d3b3dbf8b93095bf6db64b383b90
-  data.tar.gz: b920dd7d2f5a69c6d3829b2650ddc79e74eebfc83cd44029a1c3e0500696a4e2dcfe7507dcc09ecab41bb5aaf1559138613ae4bfc8091bbeafcf47a8133d95c6
+  metadata.gz: 3abf89d212e5fec3606f2df68c96af433a5c61ce61310fd64c126d509510eab129ea3d3b62af780263be6c0fa80b2f75f714d4a9488da04ee6d09d2231516973
+  data.tar.gz: 71a4da8d9ea4de8ccccf3d5fa157796335d5ee65563072de23f8dd57204abd5af24725c1f72dfd3421618161c2afda3add4a0cd59b9ad4f8136c6271fcd4b8f2

data/app/assets/javascripts/lalala/modules/calendar.module.js

@@ -73,17 +73,40 @@ Calendar = (function() {
       }
     });
 
+    cal.setDate(date);
+
     this.$el.data("calendar", cal);
   };
 
 
   Cal.prototype.get_date_from_hidden_fields = function() {
-    var values = [];
+    var fields = [], values = [], new_date;
 
     this.$fieldset.find('input[type="hidden"]').each(function() {
-      values.push( $(this).val() );
+      var name = $(this).attr("name");
+      fields.push(name);
     });
 
+    fields = fields.sort();
+    new_date = new Date();
+
+    for (var i=0,j=fields.length; i<j; ++i) {
+      var value = this.$fieldset.find('input[name="' + fields[i] + '"]').val();
+      var date_part_id = fields[i].match(/\(([^\)]+)\)/)[1];
+
+      if (!value) {
+        switch (date_part_id) {
+          case "1i": value = new_date.getFullYear(); break;
+          case "2i": value = new_date.getMonth() + 1; break;
+          case "3i": value = new_date.getDate(); break;
+          case "4i": value = "00"; break;
+          case "5i": value = "00"; break;
+        }
+      }
+
+      values.push(value);
+    }
+
     // return js date
     return new Date(values[0], values[1] - 1, values[2]);
   };

data/app/assets/javascripts/lalala/modules/grid.module.js

@@ -39,8 +39,11 @@ Grid = (function() {
       var grid_piece = document.createElement("li");
       grid_piece.className = "asset";
       grid_piece.innerHTML = this.innerHTML.replace("<a", "<a class=\"thumbnail\"");
+
       var overlay = document.createElement("div");
       overlay.className = "overlay";
+      $(overlay).attr("title", $(this).attr("title"));
+
       grid_piece.appendChild(overlay);
       fragment.appendChild(grid_piece);
     });

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

@@ -87,7 +87,7 @@
   }
 
   // label
-  .asset label {
+  .asset .filename {
     @include border-radius(2px);
     background: #fff;
     bottom: 6px;

data/lib/formtastic/inputs/grid_input.rb

@@ -4,77 +4,156 @@ class Formtastic::Inputs::GridInput
   def to_html
     object = builder.object
     assets = object.send(method)
+    asset_model_class = builder.object.class.reflect_on_association(method).class_name.constantize
 
-    asset_model_class = object.class.reflect_on_association(method).class_name.constantize
+    # build html
+    ul = template.content_tag :ul do
+      html = []
+      html << Formtastic::Inputs::GridInput.build_assets(assets, asset_model_class, builder, template, method)
+      html << Formtastic::Inputs::GridInput.build_errors(assets, asset_model_class, builder, template, method)
+      html << Formtastic::Inputs::GridInput.build_actions(assets, asset_model_class, builder, template, method)
+      template.raw html.join("")
+    end
+
+    input_wrapping { ul }
+  end
+
+private
+
+  #
+  #  Asset blocks (+ their attributes)
+  #
+  def self.build_assets(assets, asset_model_class, builder, template, method)
+    html = []
+
+    # collect attribute names
     asset_attributes = asset_model_class.accessible_attributes.to_a
     asset_attributes.select! { |x| x.size > 0 and !%w(asset translations_writer).include?(x) }
 
-    ul = template.content_tag :ul do
-      html = template.raw("")
-      asset_errors = []
-
-      assets.each_with_index do |asset, idx|
-        html += template.content_tag :li, class: "asset" do
-          builder.fields_for(method, asset) do |f|
-            asset_errors.concat(asset.errors.to_a)
-
-            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 = template.content_tag(:span, "", class: "file-icon")
-            end
-
-            asset_html = template.raw("")
-            asset_html << template.link_to(link_inner_html, f.object.asset.url)
-            asset_html << template.content_tag(:ol, { class: "attributes" }) do
-              inputs = asset_attributes.map do |ia|
-                if ia.include?("_id")
-                  collection_name = ia.chomp("_id").pluralize.to_sym
-                  if f.object.respond_to?(collection_name)
-                    f.input ia.to_sym, as: :select, collection: f.object.send(collection_name)
-                  else
-                    f.input ia.to_sym, placeholder: ia
-                  end
-                else
-                  f.input ia.to_sym, placeholder: ia
-                end
-              end
-
-              template.raw(inputs.join) + template.content_tag(
-                :a, template.raw("&#10005;"), class: "close-button"
-              )
-            end
-
-            asset_html
-          end
+    # build each
+    assets.each_with_index do |asset, idx|
+      li = template.content_tag :li, class: "asset", title: asset.asset.file.filename do
+        builder.fields_for(method, asset) do |f|
+          Formtastic::Inputs::GridInput.build_asset(asset, asset_attributes, f, template)
         end
       end
 
-      if asset_errors.present?
-        html += template.content_tag :li, class: "errors" do
-          template.content_tag :ul do
-            errors_html = template.raw("")
-            asset_errors.each do |error|
-              errors_html += template.content_tag(:li, error)
-            end
-            errors_html
-          end
-        end
+      html << li
+    end
+
+    template.raw(html.join(""))
+  end
+
+
+
+  def self.build_asset(asset, asset_attributes, f, template)
+    html = []
+
+    # html -> link
+    html << Formtastic::Inputs::GridInput.build_asset_link(f, template)
+
+    # html -> attributes
+    html << template.content_tag(:ol, { class: "attributes" }) do
+      inputs = asset_attributes.map do |attribute|
+        Formtastic::Inputs::GridInput.build_asset_attribute(attribute, f)
       end
 
-      html += template.content_tag :li, class: "actions" do
-        builder.fields_for(method, assets.build) do |f|
-          f.file_field :asset, multiple: true, accept: asset_model_class.extension_white_list
-        end
+      template.raw <<-EOS
+        #{inputs.join}
+        <a class="close-button">&#10005;</a>
+      EOS
+    end
+
+    # return
+    template.raw(html.join(""))
+  end
+
+
+
+  def self.build_asset_link(f, template)
+    inner_html = template.raw("")
+    filename = f.object.asset.file.filename
+
+    # get thumbnail
+    lalala_thumb = if f.object.asset.respond_to?(:lalala_thumb)
+      f.object.asset.lalala_thumb
+    end
+
+    # thumbnail or file-icon + filename
+    inner_html << if url = lalala_thumb.try(:url)
+      template.image_tag(url)
+    else
+      combo = template.raw("")
+      combo << template.content_tag(:span, "", class: "file-icon")
+      combo << template.content_tag(:span, filename, class: "filename")
+      combo
+    end
+
+    # return
+    template.link_to(inner_html, f.object.asset.url)
+  end
+
+
+
+  def self.build_asset_attribute(attribute, f)
+    args = [attribute.to_sym]
+    collection_name = attribute.chomp("_id").pluralize.to_sym
+
+    if attribute.include?("_id") && f.object.respond_to?(collection_name)
+      args << {
+        as: :select,
+        collection: f.object.send(collection_name)
+      }
+    else
+      args << {
+        placeholder: attribute
+      }
+    end
+
+    f.input(*args)
+  end
+
+
+
+  #
+  #  Errors
+  #
+  def self.build_errors(assets, asset_model_class, builder, template, method)
+    html = ""
+
+    asset_errors = assets.map do |asset|
+      asset.errors.to_a
+    end.flatten
+
+    if asset_errors.present?
+      html = <<-EOS
+        <li class="errors">
+          <ul>%{items}</ul>
+        </li>
+      EOS
+
+      errors_html = template.raw("")
+      asset_errors.each do |error|
+        errors_html << template.content_tag(:li, error)
       end
 
-      html
+      html.sub("%{items}", errors_html)
     end
 
-    input_wrapping { ul }
+    template.raw(html)
   end
+
+
+
+  #
+  #  Actions
+  #
+  def self.build_actions(assets, asset_model_class, builder, template, method)
+    template.content_tag :li, class: "actions" do
+      builder.fields_for(method, assets.build) do |f|
+        f.file_field :asset, multiple: true, accept: asset_model_class.extension_white_list
+      end
+    end
+  end
+
 end

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "161"
+  BUILD   = "162"
 
   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.161
+  version: 4.0.0.dev.162
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave