lalala 4.0.0.dev.50 → 4.0.0.dev.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34fc1e87c660f9e8552d085eaef0011998c25b22
-  data.tar.gz: 88bcc61a4969106b60ee5b825d756309a8820777
+  metadata.gz: f367f7a3bcd2371400cc57d75b9337e898f265a5
+  data.tar.gz: e97f450415b1b69cb47ee903bb77440ba7c05886
 SHA512:
-  metadata.gz: 49434b8e34b7f5b06a1cfe36eeab5de4b4dc53551ba5325a389b2b1147ac5a847850afddc998285676629618f6e2477a7808953d08f0166209d41ba11f0c23d5
-  data.tar.gz: a88615c311c5ba20c575311595b19ad335a65c0b74e0e4703c68478de2e8260727aaf545520762f8e4372f1d22fd70e57b4197ac090f17543efc071ecd935163
+  metadata.gz: f6a812f89f955058a5d50db7fd2a535519e277c670fe32d5f460c8b32b4b05650fc19fb691e702754bfc339524acb811dba7538b4032079610fa30f9c7b15664
+  data.tar.gz: f16f2434a2d803444150b7f609cb210ca1309e89ea28b8d3798dcb5ff341d1593b66cf44fed7891e3495995fbd260caddb77ac94fbc371d369cd6409e42b84f3

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

@@ -0,0 +1,137 @@
+var Grid;
+
+
+exports.init = function() {
+  var instances = [];
+  this.$el = $(".grid");
+  this.$el.each(function() { instances.push(new Grid(this)); });
+};
+
+
+Grid = (function() {
+  var __bind = function(fn, me) {
+    return function() { return fn.apply(me, arguments); };
+  };
+
+
+  function G(grid_element) {
+    this.transform_html(grid_element);
+    this.bind_mouse_events();
+  }
+
+
+  G.prototype.transform_html = function(grid_element) {
+    var fragment, el, el_images, el_input, $grid;
+
+    // document fragment for the images
+    fragment = document.createDocumentFragment();
+
+    // transform images html
+    $grid = $(grid_element);
+    $grid.find("li").not(":last-child").each(function() {
+      var grid_piece = document.createElement("li");
+      grid_piece.innerHTML = this.innerHTML.replace("<a", "<a class=\"image\"");
+      var overlay = document.createElement("div");
+      overlay.className = "overlay";
+      grid_piece.appendChild(overlay);
+      fragment.appendChild(grid_piece);
+    });
+
+    // create new container elements
+    el = document.createElement("div");
+    el.className = "mod-grid";
+    el_images = document.createElement("ul");
+    el_images.className = "images";
+    el_images.appendChild(fragment);
+    el_input = document.createElement("div");
+    el_input.className = "input-fields";
+    el_input.innerHTML = $grid.find("li:last-child").html();
+
+    // merge
+    el.appendChild(el_images);
+    el.appendChild(el_input);
+
+    // replace original with new
+    $grid.children("ul:first-child").replaceWith(el);
+
+    // bind to instance
+    this.$el = $(el);
+  };
+
+
+  //
+  //  Events
+  //
+  G.prototype.bind_mouse_events = function() {
+    this.$el.children(".images")
+      .on("mouseleave", "li", this.row_mouseleave)
+      .on("mouseleave", "li label", this.row_label_mouseleave)
+      .on("mouseenter", "li label", this.row_label_mouseenter)
+      .on("mouseenter", "li .image", this.row_image_mouseenter)
+      .on("click", "li .overlay", __bind(this.row_overlay_click, this));
+  };
+
+  G.prototype.row_mouseleave = function(e) {
+    $(this).removeClass("properties");
+  };
+
+  G.prototype.row_label_mouseenter = function(e) {
+    $(this).parent().addClass("move");
+  };
+
+  G.prototype.row_label_mouseleave = function(e) {
+    $(this).parent().addClass("properties").removeClass("move");
+  };
+
+  G.prototype.row_image_mouseenter = function(e) {
+    $(this).parent().addClass("properties");
+  };
+
+  G.prototype.row_overlay_click = function(e) {
+    // $(this).parent().toggleClass("selected");
+    this.toggle_destroy( $(e.currentTarget).parent()[0] );
+  };
+
+
+
+  //
+  //  Destroy
+  //
+  G.prototype.toggle_destroy = function(row) {
+    if ($(row).find('input[name$="[_destroy]"]').length) {
+      this.set_to_not_destroy(row);
+    } else {
+      this.set_to_destroy(row);
+    }
+  };
+
+
+  G.prototype.set_to_destroy = function(row) {
+    var $row = $(row);
+    var input_id_name = $row.find('input[name$="[id]"]')[0].name;
+    var input_destroy = document.createElement("input");
+
+    $(input_destroy).attr({
+      name: input_id_name.replace("[id]", "[_destroy]"),
+      type: "hidden",
+      value: "1"
+    });
+
+    $row.append(input_destroy);
+    $row.addClass("will-destroy");
+  };
+
+
+  G.prototype.set_to_not_destroy = function(row) {
+    $(row).find('input[name$="[_destroy]"]').remove();
+    $(row).removeClass("will-destroy");
+  };
+
+
+
+  //
+  //  The end
+  //
+  return G;
+
+})();

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

@@ -1,12 +1,14 @@
 var console = require('browser/console'),
     calendar = require('lalala/modules/calendar'),
     editor = require('lalala/modules/editor'),
+    grid = require('lalala/modules/grid'),
     locale_chooser = require("lalala/modules/locale_chooser");
 
 $(function(){
   locale_chooser.init();
   editor.init();
   calendar.init();
+  grid.init();
 
   $('select').chosen();
 });

data/app/assets/stylesheets/lalala/_base.css.scss

@@ -27,6 +27,7 @@
 @import "lalala/modules/index-as-tree-table";
 @import "lalala/modules/editor";
 @import "lalala/modules/editor-cheatsheet";
+@import "lalala/modules/grids";
 
 @import "lalala/lib/jquery-ui";
 @import "lalala/lib/chosen";

data/app/assets/stylesheets/lalala/base/_variables.css.scss

@@ -1,14 +1,14 @@
 // colors
-$white:         rgba(255,255,255, 1);
-$black:         rgba(35,31,32, 1);
-$gray_lighter:  rgba(211,211,211, 1);
-$yellow:        rgba(255,204,100, 1);
-$blue:          rgba(31,115,255, 1);
-$red:           rgba(225,70,62, 1);
+$white:         rgb(255,255,255);
+$black:         rgb(35,31,32);
+$gray_lighter:  rgb(211,211,211);
+$yellow:        rgb(255,204,100);
+$blue:          rgb(31,115,255);
+$red:           rgb(225,70,62);
 
-$button_green:  rgba(162,218,137, 1);
-$button_blue:   rgba(159,220,248, 1);
-$button_red:    rgba(245,92,92, 1);
+$button_green:  rgb(162,218,137);
+$button_blue:   rgb(159,220,248);
+$button_red:    rgb(245,92,92);
 
 
 // fonts

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

@@ -1,12 +1,15 @@
 /*
 
-  IMAGE GRIDS
-  --------------
+  GRIDS
+  --------
 
 */
-.grid.images {
-  list-style: none;
-  overflow: hidden;
+
+.mod-grid {
+  .images,
+  .input-fields {
+    overflow: hidden;
+  }
 
   // [row]
   li {
@@ -21,13 +24,16 @@
 
     &.move,
     &.properties,
-    &.selected { .overlay { display: block; }}
+    &.selected,
+    &.will-destroy { .overlay { 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); }
 
   // image + overlay
   li .image,

data/lib/formtastic/inputs/grid_input.rb

@@ -0,0 +1,31 @@
+class Formtastic::Inputs::GridInput
+  include Formtastic::Inputs::Base
+
+  def to_html
+    object = builder.object
+    assets = object.send(method)
+
+    ul = template.content_tag :ul do
+      html = template.raw("")
+
+      assets.each do |asset|
+        html += template.content_tag :li do
+          builder.fields_for(method, asset) do |f|
+            thumbnail_html = template.image_tag f.object.asset.thumb.url
+            template.link_to thumbnail_html, f.object.asset.url
+          end
+        end
+      end
+
+      html += template.content_tag :li do
+        builder.fields_for(method, assets.build) do |f|
+          f.file_field :asset
+        end
+      end
+
+      html
+    end
+
+    input_wrapping { ul }
+  end
+end

data/lib/lalala/uploaders/image.rb

@@ -0,0 +1,17 @@
+class Lalala::Uploaders::Image < CarrierWave::Uploader::Base
+
+  include CarrierWave::MiniMagick
+  include Sprockets::Helpers::RailsHelper
+  include Sprockets::Helpers::IsolatedHelper
+
+  storage :file
+
+  def store_dir
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  def extension_white_list
+    %w(jpg jpeg gif png)
+  end
+
+end

data/lib/lalala/uploaders.rb

@@ -0,0 +1,5 @@
+module Lalala::Uploaders
+  extend ActiveSupport::Autoload
+
+  autoload :Image
+end

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "50"
+  BUILD   = "56"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

data/lib/lalala.rb

@@ -45,6 +45,7 @@ module Lalala
 
   autoload :Markdown
   autoload :Pages
+  autoload :Uploaders
 
   module Core
     require 'lalala/core/class_inheritable_setting'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.50
+  version: 4.0.0.dev.56
 platform: ruby
 authors:
 - Simon Menke
@@ -1368,6 +1368,7 @@ files:
 - app/assets/javascripts/lalala/lib/pikaday.js
 - app/assets/javascripts/lalala/modules/calendar.module.js
 - app/assets/javascripts/lalala/modules/editor.module.js
+- app/assets/javascripts/lalala/modules/grid.module.js
 - app/assets/javascripts/lalala/modules/init.module.js
 - app/assets/javascripts/lalala/modules/locale_chooser.module.js
 - app/assets/javascripts/lalala/modules/storage.module.js
@@ -1421,6 +1422,7 @@ files:
 - lalala-development.gemspec
 - lalala-test.gemspec
 - lalala.gemspec
+- lib/formtastic/inputs/grid_input.rb
 - lib/generators/lalala/assets/assets_generator.rb
 - lib/generators/lalala/assets/templates/active_admin.css.scss
 - lib/generators/lalala/assets/templates/active_admin.js
@@ -1474,6 +1476,8 @@ files:
 - lib/lalala/pages/path_handler.rb
 - lib/lalala/pages/route_mapper.rb
 - lib/lalala/test.rb
+- lib/lalala/uploaders.rb
+- lib/lalala/uploaders/image.rb
 - lib/lalala/utils/intall_template.rb
 - lib/lalala/vendor.rb
 - lib/lalala/version.rb