lalala 4.0.0.dev.114 → 4.0.0.dev.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a1fad3d77c965bd1802434f7178f03407ddcaa0
-  data.tar.gz: ea76065b4866879a8fd9dc794eca8ae489f7d73b
+  metadata.gz: 320e3ccbb7e876b90dfdedde5009021a5e19c93d
+  data.tar.gz: 83aa07124ba072c6f9013447d6a265adf2547ae0
 SHA512:
-  metadata.gz: cb9105e8848057d62e27b1d8cb99970d7f7ca511ccf1dc932c3500e15ffd1064d57b5637ea78edbf3a85182d1b8be401d475b7f46d258b41cbdcd9baa1a6c16d
-  data.tar.gz: 40bdd34d506aff22ad8376d75fccd7f63e27d08e62a0b9e1b69874bd8c5664dd40f3702a4d54c9e85ddc379ee47a75e008d12429d652baf0f894a7c05c2bee51
+  metadata.gz: e9adf760f8062960f9c26b970656843f1b5342efe518ebb46c0f8690843128f32d85969b073c0c237cc6756ee737f60110850fef88b52c1fddafc5c731872c80
+  data.tar.gz: a0b1f393209726a0cf501390dc9f920a9bd62513c8b312b54d3ab645e4153677a087e7c652e3e9a556fb567b9fdb26ff53867d06782620449a75a73e2e58c0d4

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

@@ -39,8 +39,9 @@ Grid = (function() {
     fragment = document.createDocumentFragment();
 
     // transform images html
-    $grid.find("li").not(":last-child").each(function() {
+    $grid.find("li.asset").not(":last-child").each(function() {
       var grid_piece = document.createElement("li");
+      grid_piece.className = "asset";
       grid_piece.innerHTML = this.innerHTML.replace("<a", "<a class=\"image\"");
       var overlay = document.createElement("div");
       overlay.className = "overlay";
@@ -177,7 +178,7 @@ Grid = (function() {
     var grid = this;
 
     this.$el.selectable({
-      filter: "li",
+      filter: "li.asset",
       cancel: ".actions,.button,input,textarea,button",
       selecting: function(e, ui) {
         $row = $(ui.selecting);

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

@@ -21,7 +21,7 @@
   }
 
   // [row]
-  li {
+  .asset {
     float: left;
     margin: 0 11px 11px 0;
     position: relative;
@@ -34,36 +34,42 @@
     &.move,
     &.properties,
     &.selected,
-    &.will-destroy { .overlay { display: block; }}
+    &.will-destroy {
+      .overlay { display: block; }
+    }
+
+    &.edit-block .attributes {
+      display: block;
+    }
   }
 
   // [row]:types
-  li.move label { cursor: move; }
-  li.properties { cursor: pointer; }
-  li.selected .overlay { background: rgba($yellow, .5); }
-  li.will-destroy .overlay,
-  li.selected.will-destroy .overlay { background: rgba($red, .5); }
+  .asset.move label { cursor: move; }
+  .asset.properties { cursor: pointer; }
+  .asset.selected .overlay { background: rgba($yellow, .5); }
+  .asset.will-destroy .overlay,
+  .asset.selected.will-destroy .overlay { background: rgba($red, .5); }
 
   // image + overlay
-  li .image,
-  li .overlay {
+  .asset .image,
+  .asset .overlay {
     left: 0;
     position: absolute;
     top: 0;
   }
 
-  li .image {
+  .asset .image {
     z-index: 0;
   }
 
-  li .overlay {
+  .asset .overlay {
     background: rgba(black, .5);
     display: none;
     z-index: 1;
   }
 
   // [row].edit-block
-  li.edit-block {
+  .asset.edit-block {
     clear: both;
     height: auto;
     min-height: 100px;
@@ -71,7 +77,7 @@
   }
 
   // label
-  li label {
+  .asset label {
     @include border-radius(2px);
     background: #fff;
     bottom: 6px;
@@ -90,22 +96,29 @@
   }
 
   // attributes
-  li .attributes { display: none; position: relative }
-  li.edit-block .attributes { display: block }
+  .asset .attributes { display: none; position: relative }
 
-  li .attributes input,
-  li .attributes textarea {
+  .asset .attributes input,
+  .asset .attributes textarea {
     margin-bottom: 6px;
     margin-left: 115px;
     resize: none;
     width: 300px;
   }
 
-  li .attributes textarea {
+  .asset .attributes textarea {
     height: 100px !important;
   }
 
-  li .attributes .close-button {
+  .asset .attributes li {
+    margin: 0;
+  }
+
+  .asset .attributes label {
+    display: none;
+  }
+
+  .asset .attributes .close-button {
     color: #c5c5c5;
     cursor: pointer;
     display: inline-block;

data/app/models/lalala/abstract_asset.rb

@@ -2,6 +2,8 @@ class Lalala::AbstractAsset < ActiveRecord::Base
   self.abstract_class = true
   self.table_name = "assets"
 
+  include Lalala::ExtActiveRecord::I18nTranslationsWriter
+
   attr_accessible :asset, :title, :caption
   translates :title, :caption
   Lalala::AbstractAsset::Translation.table_name = 'asset_translations'

data/lib/formtastic/inputs/grid_input.rb

@@ -7,30 +7,20 @@ class Formtastic::Inputs::GridInput
 
     image_model_class = object.class.reflect_on_association(method).class_name.constantize
     image_attributes = image_model_class.accessible_attributes.to_a
-    image_attributes.select! { |x| x.size > 0 and x != "asset" }
+    image_attributes.select! { |x| x.size > 0 and !%w(asset translations_writer).include?(x) }
 
     ul = template.content_tag :ul do
       html = template.raw("")
 
       assets.each_with_index do |asset, idx|
-        html += template.content_tag :li do
+        html += template.content_tag :li, class: "asset" do
           builder.fields_for(method, asset) do |f|
             thumbnail_html = template.image_tag f.object.asset.lalala_thumb.url
             asset_html = template.raw("")
             asset_html << template.link_to(thumbnail_html, f.object.asset.url)
-            asset_html << template.content_tag(:div, { class: "attributes" }) do
+            asset_html << template.content_tag(:ol, { class: "attributes" }) do
               inputs = image_attributes.map do |ia|
-                if image_model_class.columns_hash[ia]
-                  column_type = image_model_class.columns_hash[ia].type
-                elsif image_model_class.translation_class.columns_hash[ia]
-                  column_type = image_model_class.translation_class.columns_hash[ia].type
-                end
-
-                case column_type
-                when :string then f.text_field(ia.to_sym, placeholder: ia)
-                when :text then f.text_area(ia.to_sym, placeholder: ia)
-                when :boolean then f.check_box(ia.to_sym)
-                end
+                f.input ia.to_sym, placeholder: ia
               end
 
               template.raw(inputs.join) + template.content_tag(

data/lib/lalala/ext_i18n/input_helper.rb

@@ -34,7 +34,6 @@ module Lalala::ExtI18n::InputHelper
         I18n.locale  = locale
         @object_name = "#{_object_name}[translations_writer][#{locale}]"
 
-
         opts[:wrapper_html][:'data-locale'] = locale.to_s
 
         h << super(method, opts)

data/lib/lalala/version.rb

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