lalala 4.0.0.dev.90 → 4.0.0.dev.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2c265d0b510bf9f63a4490628305820b2e1eae4
-  data.tar.gz: c766e57c2bc3b3ec626f299f6dd49abb47a7301c
+  metadata.gz: 05c7393296cfd28f3a17f148eaa3826c349eba86
+  data.tar.gz: f99ba6009a6c4892a48d1386cdc7a24b7f5d184c
 SHA512:
-  metadata.gz: e7b90abba2b1f16a0e5023215d0b33b2ee1559bf8831141c4cd16b1fb92f0fa0e0a58c56a83c56972949765c86bff1dfb813cfb70791cd680a109d028a0aa60d
-  data.tar.gz: 7bd7c867cbe5d490f09696bdd38e9046bb4da6fb166a23103e910cf588cc8a4875405bad0020cb7cd3c83227b567656de9efafd53d8a42f3e7ec8379d51d6d5e
+  metadata.gz: 63343012a51c001837f3eac3f8e63105c1579332e2d145980ca1c17fd1ade68aef4d1983496365ab56d4df3bd2e053176f107e76a6180a4ce3484a8993e6ff60
+  data.tar.gz: 57f4ec701ab3ad66e5085845f2c56f9e755e912cd631a5a51a2fa57ca9aa51947f219695c9b65ac3d1b507fd5f04c0564c0cfb919fceda90abe5d54d97b355cc

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

@@ -1,7 +1,7 @@
 var markdown_settings;
 
 exports.init = function(){
-  $("textarea").each(setup);
+  $("textarea.markdown").each(setup);
 };
 
 function setup() {

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

@@ -64,6 +64,8 @@ select {
 
 // textarea, only vertically resizable
 textarea {
+  font-size: 12px;
+  line-height: 1.2em;
   resize: vertical;
 }
 

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

@@ -59,7 +59,7 @@
     &:hover {
 
       & > td > .member_link {
-        display: inline-block;
+        @include opacity(1);
       }
 
     }
@@ -86,7 +86,7 @@
     }
 
     &:last-child {
-      width: 75px;
+      //width: 75px;
     }
 
   }
@@ -96,7 +96,9 @@
     text-decoration: none;
 
     &.member_link {
-      display: none; // Will be shown on <tr:hover>
+      @include opacity(0);
+      @include transition(opacity 300ms);
+      display: inline-block; // Will be shown on <tr:hover>
       height: 16px;
       margin: 0 3px;
       text-indent: -9999px;
@@ -153,4 +155,24 @@
     margin: 0;
   }
 
+  &.index_table {
+
+    td {
+
+      &:last-child {
+        width: 75px;
+      }
+
+    }
+
+  }
+
+}
+
+#active_admin_content .attributes_table table {
+
+  th {
+    width: 25%;
+  }
+
 }

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

@@ -1,7 +1,7 @@
 .flashes {
   @include animation-name(flash-slide-up);
   @include animation-duration(500ms);
-  @include animation-delay(3s);
+  @include animation-delay(1.5s);
   @include animation-fill-mode(forwards);
   left: 0;
   height: $top_nav_height;

data/lib/lalala/engine.rb

@@ -53,6 +53,9 @@ module Lalala
     Lalala::ExtWithAdvisoryLock.patch!
   end
 
+  Formtastic::FormBuilder.send(
+    :include, Lalala::Markdown::InputHelper)
+
   Formtastic::FormBuilder.send(
     :include, Lalala::ExtI18n::InputHelper)
 

data/lib/lalala/markdown/input_helper.rb

@@ -0,0 +1,14 @@
+module Lalala::Markdown::InputHelper
+  extend ActiveSupport::Concern
+
+  def input(method, options = {})
+
+    if ( @object.respond_to?("#{method}_html") )
+      input_html = options[:input_html] || {}
+      input_html[:class] = [input_html[:class], 'markdown'].flatten.compact.join(" ")
+      options[:input_html] = input_html
+    end
+
+    super(method, options)
+  end
+end

data/lib/lalala/markdown/preview.rb

@@ -26,8 +26,32 @@ module Lalala::Markdown::Preview
         key = instance_params.keys.first
         val = instance_params[key]
 
+        if key.to_s == 'translations_writer'
+          instance_params = val
+
+          if instance_params.size > 1
+            raise "Expects exactly 1 param"
+          end
+
+          key = instance_params.keys.first
+          val = instance_params[key]
+
+          instance_params = val
+
+          if instance_params.size > 1
+            raise "Expects exactly 1 param"
+          end
+
+          key = instance_params.keys.first
+          val = instance_params[key]
+        end
+
         resource[key] = val
 
+        unless resource.respond_to?("#{key}_html")
+          raise "Column (#{key}) is not a markdown column"
+        end
+
         @content = resource.send("#{key}_html")
 
         render layout: 'lalala/markdown', template: 'lalala/markdown/preview'

data/lib/lalala/markdown.rb

@@ -4,6 +4,7 @@ class Lalala::Markdown
   require 'lalala/markdown/active_model'
   require 'lalala/markdown/html_renderer'
   require 'lalala/markdown/markdown_renderer'
+  require 'lalala/markdown/input_helper'
 
   module Handlers
     require 'lalala/markdown/handlers/base'

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "90"
+  BUILD   = "92"
 
   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.90
+  version: 4.0.0.dev.92
 platform: ruby
 authors:
 - Simon Menke
@@ -1486,6 +1486,7 @@ files:
 - lib/lalala/markdown/handlers/base.rb
 - lib/lalala/markdown/handlers/youtube.rb
 - lib/lalala/markdown/html_renderer.rb
+- lib/lalala/markdown/input_helper.rb
 - lib/lalala/markdown/markdown_renderer.rb
 - lib/lalala/markdown/preview.rb
 - lib/lalala/pages.rb