lalala 4.1.0.dev.342 → 4.1.0.dev.355

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8b462820df556d01fbe874cfc55149e096501f7
-  data.tar.gz: 168c6afcb8db54630d9ca285cf8941347547c4d6
+  metadata.gz: 13a743bef666720edcb001f00581985995ea7d3e
+  data.tar.gz: d7954e8b380b8fb860ad9be7594d305f6752ee84
 SHA512:
-  metadata.gz: 2390c328dcd5f44b0a12f0272603608e892132960be0cf99d0fc1aeeb56952338d6a9ac47d833ab8710f0852729320991ee1c3f6df8029c68a5a9cb9e278c158
-  data.tar.gz: 1ac0f4a12f05e09419f00b1c8bebc38a9ed17d7b1dbf7b1501c68336f3a8b9c7de9ee7497897ab24de8ef545f7cb90e0f778a870d72397c497b41f56a368d928
+  metadata.gz: 8d2580ecb6c7c71e8b2ab312985d373dcd22b05efd1ad7d64518845d822cf2153c2e494b5c39bcc548d6108f294b9a56b6385d8e7d06a7dd83d2f7c5dbf329f5
+  data.tar.gz: 0c1087b6925649a282010692d47db2bdaa8bafd07b55ec485bef8c5e07d24c225644b0a7baba2cabb7cb13ffbd04fd81820f123c8c3393ce872e856b45454e25

data/app/assets/javascripts/lalala/base.js

@@ -13,7 +13,7 @@ $(function() {
   var modules = [
     "calendar", "editor", "locale_chooser",
     "sorted_pages_tree", "login", "dashboard",
-    "collapsible_pages_tree"
+    "collapsible_pages_tree", "input_group"
   ];
 
   for (var i=0, j=initializers.length; i<j; ++i) {

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

@@ -260,3 +260,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/app/assets/stylesheets/lalala/modules/_title-bar.css.scss

@@ -92,3 +92,20 @@
   }
 
 }
+
+
+//
+// Hide new button from header on edit views
+//
+.active_admin.edit {
+
+  #title_bar {
+
+    #titlebar_right {
+
+      .action_item a[href$=new] {
+        display: none;
+      }
+    }
+  }
+}

data/lib/lalala/admin/pages.rb

@@ -1,11 +1,14 @@
 if defined?(ActiveAdmin) and defined?(ApplicationPage)
   ActiveAdmin.register ApplicationPage, :as => 'Page' do
-
     menu priority: 20, html_options: { class: 'icon-page' }
 
     config.filters  = false
     config.paginate = false
+    config.clear_action_items!
 
+    #
+    # Index
+    #
     index as: :tree_table, paginator: false, download_links: false do
       selectable_column
 
@@ -44,6 +47,10 @@ if defined?(ActiveAdmin) and defined?(ApplicationPage)
 
     end
 
+
+    #
+    # Form
+    #
     form do |f|
       h = "".html_safe
       if f.object.new_record?
@@ -54,6 +61,10 @@ if defined?(ActiveAdmin) and defined?(ApplicationPage)
       h
     end
 
+
+    #
+    # Order action
+    #
     collection_action :order, :method => :put do
       unless Array === params[:ordered_ids]
         render status: 422
@@ -68,6 +79,10 @@ if defined?(ActiveAdmin) and defined?(ApplicationPage)
       render json: { status: "OK" }, status: 200
     end
 
+
+    #
+    # Controller
+    #
     controller do
 
       def new

data/lib/lalala/version.rb

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

data/test/dummy/app/admin/articles.rb

@@ -13,6 +13,8 @@ ActiveAdmin.register Article do
       f.input :body
       f.input :tags
       f.input :category, as: :select, collection: %w(A B C)
+	  f.input :url, input_html: { placeholder: 'http://', class: 'js-prepend-placeholder' }
+      f.input :price, input_html: { placeholder: '€', class: 'js-append-placeholder' }
       f.input :poster_image, as: :single_file
 
       f.input :images, as: :multiple_files do |h|

data/test/dummy/app/models/article.rb

@@ -1,5 +1,5 @@
 class Article < ActiveRecord::Base
-  attr_accessible :body, :title, :category, :tag_ids
+  attr_accessible :body, :title, :category, :tag_ids, :url, :price
 
   # Translations
   translates :title, :body

data/test/dummy/db/migrate/20140926152646_add_pre_and_postpend_test_columns_to_articles.rb

@@ -0,0 +1,6 @@
+class AddPreAndPostpendTestColumnsToArticles < ActiveRecord::Migration
+  def change
+    add_column :articles, :url, :string
+    add_column :articles, :price, :string
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140228141749) do
+ActiveRecord::Schema.define(:version => 20140926152646) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -60,10 +60,12 @@ ActiveRecord::Schema.define(:version => 20140228141749) do
   add_index "article_translations", ["locale"], :name => "index_article_translations_on_locale"
 
   create_table "articles", :force => true do |t|
-    t.text     "haraway_metadata"
     t.datetime "created_at",       :null => false
     t.datetime "updated_at",       :null => false
     t.string   "category"
+    t.text     "haraway_metadata"
+    t.string   "url"
+    t.string   "price"
   end
 
   create_table "articles_tags", :id => false, :force => true do |t|
@@ -73,6 +75,25 @@ ActiveRecord::Schema.define(:version => 20140228141749) do
 
   add_index "articles_tags", ["article_id", "tag_id"], :name => "index_articles_tags_on_article_id_and_tag_id", :unique => true
 
+  create_table "asset_translations", :force => true do |t|
+    t.string  "locale"
+    t.integer "asset_id"
+    t.string  "title"
+    t.text    "caption"
+  end
+
+  create_table "assets", :force => true do |t|
+    t.string   "asset"
+    t.string   "type"
+    t.integer  "asset_owner_id"
+    t.string   "asset_owner_type"
+    t.string   "asset_owner_section"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+  end
+
+  add_index "assets", ["asset_owner_id", "asset_owner_type", "asset_owner_section"], :name => "asset_owner_idx"
+
   create_table "page_hierarchies", :id => false, :force => true do |t|
     t.integer "ancestor_id",   :null => false
     t.integer "descendant_id", :null => false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.1.0.dev.342
+  version: 4.1.0.dev.355
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -1307,6 +1307,7 @@ files:
 - app/assets/javascripts/lalala/modules/editor.module.js
 - app/assets/javascripts/lalala/modules/file-metadata.module.js
 - app/assets/javascripts/lalala/modules/helpers.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/media_selector.module.js
@@ -1535,6 +1536,7 @@ files:
 - test/dummy/db/migrate/20131122165715_create_tags.rb
 - test/dummy/db/migrate/20131122170308_add_articles_tags_binding.rb
 - test/dummy/db/migrate/20140228141749_create_media_page.rb
+- test/dummy/db/migrate/20140926152646_add_pre_and_postpend_test_columns_to_articles.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep
@@ -1639,6 +1641,7 @@ test_files:
 - test/dummy/db/migrate/20131122165715_create_tags.rb
 - test/dummy/db/migrate/20131122170308_add_articles_tags_binding.rb
 - test/dummy/db/migrate/20140228141749_create_media_page.rb
+- test/dummy/db/migrate/20140926152646_add_pre_and_postpend_test_columns_to_articles.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep