lalala 4.0.0.dev.344 → 4.0.0.dev.349

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eff2ff2adf549dd218bc1ed27fa4fb8a0113a08a
-  data.tar.gz: d8431b3a2e7657a00658ff58ebad819246863d4f
+  metadata.gz: 4d5eccfb6ba59a7e2b37202787566bf88aa2a0cf
+  data.tar.gz: ba7d8acaf3a176fe432c1c29dc9bac3afad3470d
 SHA512:
-  metadata.gz: f4df78cf5886fb2b488137e4d89871f8df1addd0664edc98887723f5fdbc3de7823d13858ed8698eed6bd6ae139bd0ec709201875c546023ede3fc6b7fc9033f
-  data.tar.gz: b3dd01fc8222e320a8ef91a075ce7ad41e9fafe4cc54df5b2ea6eadded7e21015a6c8a4dc31241278f05281973aeda07320735f92c5c0ddf4968fc55346385e2
+  metadata.gz: 34eab6e8d3bcb3a9cde5753e243de6313c37f2d27f6c12e32a93adfea9783db64485ea470d72f9281f22fdd6a5181c35809dd1b018ae1a5195ef61e80c8a274d
+  data.tar.gz: 2cba029a02b40fe253206aff313de504e63df3c30b98fdfbc3cd7da12f63b230e247ae257d5ae5c9f5fdeb0cfb13a5655c57b9559208b3bfd3955632562af062

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

@@ -6,7 +6,8 @@ var console = require('browser/console'),
     sorted_pages_tree = require("lalala/modules/sorted_pages_tree"),
     login = require("lalala/modules/login"),
     dashboard = require("lalala/modules/dashboard"),
-    collapsible_pages_tree = require("lalala/modules/collapsible_pages_tree");
+    collapsible_pages_tree = require("lalala/modules/collapsible_pages_tree"),
+    input_group = require("lalala/modules/input_group");
 
 $(function() {
   login.init();
@@ -17,6 +18,7 @@ $(function() {
   sorted_pages_tree.init();
   dashboard.init();
   collapsible_pages_tree.init();
+  input_group.init();
 
   $('select').not(".bypass-chosen").chosen();
 });

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

@@ -0,0 +1,36 @@
+'use strict';
+
+/**
+ * Append or prepend placeholders to certain inputs
+ */
+
+exports.init = function () {
+  $('.js-prepend-placeholder[placeholder], .js-append-placeholder[placeholder]').each(function () {
+    var $this = $(this);
+    replace_input_with_group($this, $this.attr('placeholder'), $this.hasClass('js-append-placeholder'));
+  });
+}
+
+/**
+ * Replace an <input> element with an appended/prepended placeholder
+ * @param  {jQuery}          $input
+ * @param  {string}          placeholder
+ * @param  {optional} {bool} reverse - false: prepend, true: append (default false)
+ * @return {jQuery}          The new input group
+ */
+function replace_input_with_group ($input, placeholder, reverse) {
+    var placeholder  = placeholder || '',
+        reverse      = (typeof reverse === 'undefined') ? false : reverse,
+        span_class   = !!reverse ? 'input-append' : 'input-prepend',
+        $clone       = $input.clone(),
+        $input_group = $('<div class="input-group"></div>'),
+        $prepend     = $('<span class="' + span_class + '">' + placeholder + '</span>');
+
+    $prepend.prependTo($input_group);
+    $clone.attr('placeholder', '')
+          .appendTo($input_group);
+    $input.replaceWith($input_group);
+    $clone.css(!!reverse ? 'padding-right' : 'padding-left', (parseInt($clone.css('padding-right'), 10) + parseInt($prepend.outerWidth(), 10)) + 'px');
+
+    return $input_group;
+}

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

@@ -276,3 +276,37 @@ select:focus {
 .chosen-container {
   margin-top: 4px;
 }
+
+.input-group {
+  display: inline-block;
+  position: relative;
+  width: $input_width;
+
+  input {
+    width: 100%;
+  }
+
+  .input-prepend,
+  .input-append {
+    background-color: rgb(220, 220, 220);
+    color: rgb(110, 110, 110);
+    bottom: 0;
+    line-height: 2.875;
+    padding: 0 15px;
+    position: absolute;
+    text-shadow: 0 1px 0 rgb(240, 240, 240);
+    top: 0;
+  }
+
+  .input-prepend {
+    border-top-left-radius: 5px;
+    border-bottom-left-radius: 5px;
+    left: 0;
+  }
+
+  .input-append {
+    border-top-right-radius: 5px;
+    border-bottom-right-radius: 5px;
+    right: 0;
+  }
+}

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "344"
+  BUILD   = "349"
 
   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.344
+  version: 4.0.0.dev.349
 platform: ruby
 authors:
 - Simon Menke
@@ -1319,6 +1319,7 @@ files:
 - app/assets/javascripts/lalala/modules/grid.module.js
 - app/assets/javascripts/lalala/modules/helpers.module.js
 - app/assets/javascripts/lalala/modules/init.module.js
+- app/assets/javascripts/lalala/modules/input_group.module.js
 - app/assets/javascripts/lalala/modules/locale_chooser.module.js
 - app/assets/javascripts/lalala/modules/login.module.js
 - app/assets/javascripts/lalala/modules/sorted_pages_tree.module.js