lalala 4.0.0.dev.155 → 4.0.0.dev.156

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f4cbfe91014d4fe64f61abe68328a8c2f012da7
-  data.tar.gz: 6dc0b55a2fa383aa355bdb76091025e0dcabdc57
+  metadata.gz: aa6c7eb72f5278074e2bbb18931f5e7f53f6c70d
+  data.tar.gz: af5b20136b6554acb756a89fafb8d2848d401e30
 SHA512:
-  metadata.gz: 234a578728e6e41997078875a9308993e1689ce093676b029097bf46dc9ebd7683ed333d41978299986eb51fedbce8d6312f2de7fc083a8d70ebec17cf520af4
-  data.tar.gz: c88e615d58106256a4e8ab12e8c1ed514cef8bfcdb038cf8d88bdb7ac3f626e9fc90b7a8cf075984c9446d704b8f6b604f6f6a324bff671587a446d676b92a10
+  metadata.gz: 91a9b7efbaff2a6e5b80539d549c853c9b8f2f0cfdd9a97d940dd487d028ce1fda184f190b3e86976d1e5a8b9fabdd8ca3f2b72937eef285a74ccd8e00ecccb5
+  data.tar.gz: 196b3dfde73286ecb479e7e87fe0353408b8f47ec84ffdb84d9c6ef68bce2dc40fa74f14db0a6e11b56aab2907c2fef38f34cbb372a033260d9598836d9c1faf

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

@@ -24,7 +24,8 @@ Grid = (function() {
 
 
   G.prototype.transform_html = function(grid_element) {
-    var fragment, el, el_assets, el_actions, el_errors, $grid, $original_list;
+    var fragment, clear_element, el, el_assets, el_actions, el_errors,
+        $grid, $original_list;
 
     // elements
     $grid = $(grid_element);
@@ -48,9 +49,13 @@ Grid = (function() {
     el = document.createElement("div");
     el.className = "mod-grid";
 
+    clear_element = document.createElement("div");
+    clear_element.className = "clear";
+
     el_assets = document.createElement("ul");
     el_assets.className = "assets";
     el_assets.appendChild(fragment);
+    el_assets.appendChild(clear_element);
 
     el_actions = document.createElement("div");
     el_actions.className = "actions";

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

@@ -11,11 +11,14 @@
 
   @include border-radius(5px);
 
-  .assets,
   .actions {
     overflow: hidden;
   }
 
+  .clear {
+    clear: both;
+  }
+
   .assets {
     padding-top: 10px - 3px;
   }
@@ -103,12 +106,16 @@
   }
 
   // attributes
-  .asset .attributes { display: none; position: relative }
+  .asset .attributes {
+    display: none;
+    margin-left: 115px;
+    position: relative;
+  }
 
   .asset .attributes input,
-  .asset .attributes textarea {
+  .asset .attributes textarea,
+  .asset .attributes select {
     margin-bottom: 6px;
-    margin-left: 115px;
     resize: none;
     width: 300px;
   }

data/lib/formtastic/inputs/grid_input.rb

@@ -32,7 +32,13 @@ class Formtastic::Inputs::GridInput
             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|
-                f.input ia.to_sym, placeholder: ia
+                if ia.include?("_id")
+                  collection_name = ia.chomp("_id").pluralize
+                  collection = f.object.send(collection_name.to_sym)
+                  f.input ia.to_sym, as: :select, collection: collection
+                else
+                  f.input ia.to_sym, placeholder: ia
+                end
               end
 
               template.raw(inputs.join) + template.content_tag(

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "155"
+  BUILD   = "156"
 
   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.155
+  version: 4.0.0.dev.156
 platform: ruby
 authors:
 - Simon Menke