lalala 4.0.0.dev.224 → 4.0.0.dev.227

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7314e8f7a9befcc525c6329eeba49e2b2086ac9
-  data.tar.gz: 8e22778b81fc3a18e08931add4f53da8a11aa6d2
+  metadata.gz: 94648eedf5496e82cbc5b2162f1d736b48f73bc7
+  data.tar.gz: 8781740443196720d4f4492d871e21227b985105
 SHA512:
-  metadata.gz: 511a431c0045a716b6cd1a1814e36045dfb00262246c32dcc09c4d9fb8d003f915198322f56b3a9299f57a8a24a12a56de43d045aa96f4ea872e3480c8d9c297
-  data.tar.gz: 408a133d383a8c593b37e12389237d7318f8a18c5fd3afa6ae359e34009978dec815e9ff1f055e42a72aa9cdc78ec576da3b3696812e10591cf84f3ce7758030
+  metadata.gz: 38ba27b9a21af7e08ba2bf636df44a7d09fff9e22a5ecb58618f6d83e88dedd68136a287f79e30406faf5b074da82973c2435c7234b19379e3e9c6cdcb6a0313
+  data.tar.gz: 6fc2e359ab825ff6ace2f2c34aa76f56d51e5df9277a15cb5acf2184c59e66b83e2696308a9dd512f398b793f80af666a9f2bf1c72e87368b1b6cec14ef42517

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

@@ -6,10 +6,15 @@
 @import "lalala/base/base";
 @import "lalala/base/layout";
 
+@import "lalala/lib/jquery-ui";
+@import "lalala/lib/chosen";
+@import "lalala/lib/pikaday";
+
 @import "lalala/components/icons";
 @import "lalala/components/forms";
 @import "lalala/components/buttons";
 @import "lalala/components/tables";
+@import "lalala/components/chosen-lalala";
 
 @import "lalala/modules/flashes";
 @import "lalala/modules/login";
@@ -28,7 +33,3 @@
 @import "lalala/modules/editor";
 @import "lalala/modules/editor-cheatsheet";
 @import "lalala/modules/grid";
-
-@import "lalala/lib/jquery-ui";
-@import "lalala/lib/chosen";
-@import "lalala/lib/pikaday";

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

@@ -2,7 +2,8 @@
 $white:         rgb(255,255,255);
 $black:         rgb(35,31,32);
 $gray_lighter:  rgb(211,211,211);
-$yellow:        rgb(255,204,100);
+$yellow:        rgb(255,202,19);
+$orange:        rgb(255,168,0);
 $blue:          rgb(31,115,255);
 $red:           rgb(225,70,62);
 

data/app/assets/stylesheets/lalala/components/_chosen-lalala.css.scss

@@ -0,0 +1,289 @@
+/* @group Base */
+.chosen-container {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+  font-size: 13px;
+  zoom: 1;
+  *display: inline;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
+.chosen-container .chosen-drop {
+  position: absolute;
+  top: 100%;
+  left: -9999px;
+  z-index: 1010;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  width: 100%;
+  border: 1px solid $yellow;
+  border-top: 0;
+  background: #fff;
+  @include box-shadow(transparentize($yellow, .2) 0 0 5px);
+}
+.chosen-container.chosen-with-drop .chosen-drop {
+  left: 0;
+}
+.chosen-container a {
+  cursor: pointer;
+}
+
+/* @end */
+/* @group Single Chosen */
+.chosen-container-single .chosen-single {
+  position: relative;
+  display: block;
+  overflow: hidden;
+  padding: 5px 6px 5px 8px;
+  border: 1px solid gray(200);
+  border-radius: 5px;
+  background-color: #fff;
+  background: none;
+  background-clip: padding-box;
+  box-shadow: none;
+  color: #444;
+  text-decoration: none;
+  white-space: nowrap;
+  line-height: 24px;
+}
+.chosen-container-single .chosen-default {
+  color: #999;
+}
+.chosen-container-single .chosen-single span {
+  display: block;
+  overflow: hidden;
+  margin-right: 26px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.chosen-container-single .chosen-single-with-deselect span {
+  margin-right: 38px;
+}
+.chosen-container-single .chosen-single abbr {
+  position: absolute;
+  top: 8px;
+  right: 26px;
+  display: block;
+  width: 12px;
+  height: 12px;
+  background: image-url('lalala/chosen/chosen-sprite.png') -42px 1px no-repeat;
+  font-size: 1px;
+}
+.chosen-container-single .chosen-single abbr:hover {
+  background-position: -42px -10px;
+}
+.chosen-container-single.chosen-disabled .chosen-single abbr:hover {
+  background-position: -42px -10px;
+}
+.chosen-container-single .chosen-single div {
+  position: absolute;
+  top: 6px;
+  right: 0;
+  display: block;
+  width: 18px;
+  height: 100%;
+}
+.chosen-container-single .chosen-single div b {
+  display: block;
+  width: 100%;
+  height: 100%;
+  background: image-url('lalala/chosen/chosen-sprite.png') no-repeat 0px 1px;
+}
+.chosen-container-single .chosen-search {
+  position: relative;
+  z-index: 1010;
+  margin: 0;
+  padding: 3px 4px;
+  white-space: nowrap;
+}
+.chosen-container-single .chosen-search input[type="text"] {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  margin: 1px 0;
+  padding: 4px 20px 4px 5px;
+  width: 100%;
+  height: auto;
+  outline: 0;
+  border: 1px solid gray(200);
+  background: white image-url('lalala/chosen/chosen-sprite.png') no-repeat 100% -20px;
+  box-shadow: none;
+  background: none;
+  font-size: 1em;
+  font-family: sans-serif;
+  line-height: normal;
+  border-radius: 0;
+}
+.chosen-container-single .chosen-drop {
+  margin-top: -1px;
+  border-radius: 0 0 4px 4px;
+  background-clip: padding-box;
+}
+.chosen-container-single.chosen-container-single-nosearch .chosen-search {
+  position: absolute;
+  left: -9999px;
+}
+
+/* @end */
+/* @group Results */
+.chosen-container .chosen-results {
+  position: relative;
+  overflow-x: hidden;
+  overflow-y: auto;
+  margin: 0 4px 4px 0;
+  padding: 0 0 0 4px;
+  max-height: 240px;
+  -webkit-overflow-scrolling: touch;
+}
+.chosen-container .chosen-results li {
+  display: none;
+  margin: 0;
+  padding: 5px 6px;
+  list-style: none;
+  line-height: 15px;
+}
+.chosen-container .chosen-results li.active-result {
+  display: list-item;
+  cursor: pointer;
+}
+.chosen-container .chosen-results li.disabled-result {
+  display: list-item;
+  color: #ccc;
+  cursor: default;
+}
+.chosen-container .chosen-results li.highlighted {
+  background-color: $blue;
+  background-image: none;
+  color: #fff;
+}
+.chosen-container .chosen-results li.no-results {
+  display: list-item;
+  background: #f4f4f4;
+}
+.chosen-container .chosen-results li.group-result {
+  display: list-item;
+  font-weight: bold;
+  cursor: default;
+}
+.chosen-container .chosen-results li.group-option {
+  padding-left: 15px;
+}
+.chosen-container .chosen-results li em {
+  font-style: normal;
+  text-decoration: underline;
+}
+
+/* @end */
+/* @group Multi Chosen */
+.chosen-container-multi .chosen-choices {
+  @include border-radius(5px);
+  border: 1px solid gray(200);
+
+  background-color: white;
+  background-image: none !important;
+}
+.chosen-container-multi .chosen-choices li {
+  float: left;
+  list-style: none;
+}
+.chosen-container-multi .chosen-choices li.search-field {
+  margin: 0;
+  padding: 0;
+  white-space: nowrap;
+}
+.chosen-container-multi .chosen-choices li.search-field input[type="text"] {
+  margin: 1px 0;
+  padding: 5px;
+  height: 15px;
+  outline: 0;
+  border: 0 !important;
+  background: transparent !important;
+  box-shadow: none;
+  color: #666;
+  font-size: 100%;
+  font-family: sans-serif;
+  line-height: normal;
+  border-radius: 0;
+}
+.chosen-container-multi .chosen-choices li.search-field .default {
+  color: #999;
+}
+.chosen-container-multi .chosen-choices li.search-choice {
+  @include text-shadow(rgba($orange, 1) 1px 1px 0);
+  background-image: none;
+  background-color: $yellow;
+  border: 1px solid $orange;
+  box-shadow: none;
+  color: white;
+  font-size: 14px;
+  font-weight: bold;
+  padding: 7px 20px 7px 6px;
+}
+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close {
+  position: absolute;
+  top: 4px;
+  right: 3px;
+  display: block;
+  width: 12px;
+  height: 15px;
+  background: image-url('lalala/chosen/chosen-sprite.png') -43px 5px no-repeat;
+  font-size: 1px;
+}
+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover {
+  background-position: -43px 6px;
+}
+.chosen-container-multi .chosen-choices li.search-choice-disabled {
+  background-color: #e4e4e4;
+  background-image: none;
+  color: #666;
+}
+.chosen-container-multi .chosen-choices li.search-choice-focus {
+  background: #d4d4d4;
+}
+.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close {
+  background-position: -42px -10px;
+}
+.chosen-container-multi .chosen-results {
+  margin: 0;
+  padding: 0;
+}
+.chosen-container-multi .chosen-drop .result-selected {
+  display: list-item;
+  color: #ccc;
+  cursor: default;
+}
+
+/* @end */
+/* @group Active  */
+.chosen-container-active .chosen-single {
+  border: 1px solid $yellow;
+  @include box-shadow(transparentize($yellow, .2) 0 0 5px);
+}
+.chosen-container-active.chosen-with-drop .chosen-single {
+  border: 1px solid $yellow;
+  -moz-border-radius-bottomright: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 0;
+  border-bottom-left-radius: 0;
+  background-image: none;
+  @include box-shadow(transparentize($yellow, .2) 0 0 5px);
+}
+.chosen-container-active.chosen-with-drop .chosen-single div {
+  border-left: none;
+  background: transparent;
+}
+.chosen-container-active.chosen-with-drop .chosen-single div b {
+  background-position: -18px 2px;
+}
+.chosen-container-active .chosen-choices {
+  @include box-shadow(transparentize($yellow, .2) 0 0 5px);
+  border: 1px solid $yellow;
+}
+.chosen-container-active .chosen-choices li.search-field input[type="text"] {
+  color: #111 !important;
+}
+
+/* @end */

data/lib/lalala/version.rb

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

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

@@ -4,6 +4,7 @@ ActiveAdmin.register Article do
     f.inputs do
       f.input :title
       f.input :body
+      f.input :tags
       f.input :category, as: :select, collection: %w(A B C)
       f.input :image, as: :single_file
     end

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

@@ -0,0 +1,14 @@
+ActiveAdmin.register Tag do
+
+  #menu priority: 50, html_options: { class: 'icon-tag-purple' }
+
+
+  form do |f|
+    f.inputs do
+      f.input :title
+    end
+
+    f.actions
+  end
+
+end

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

@@ -1,5 +1,5 @@
 class Article < ActiveRecord::Base
-  attr_accessible :body, :title, :category
+  attr_accessible :body, :title, :category, :tag_ids
 
   has_one_asset :image
 
@@ -9,4 +9,7 @@ class Article < ActiveRecord::Base
   # Validations
   validates :title, presence: true
 
+  # Bindings
+  has_and_belongs_to_many :tags
+
 end

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

@@ -0,0 +1,13 @@
+class Tag < ActiveRecord::Base
+
+  attr_accessible :title, :article_ids
+
+  translates :title
+
+  validates :title,
+    presence: true
+
+  # Bindings
+  has_and_belongs_to_many :articles
+
+end

data/test/dummy/db/migrate/20131122165715_create_tags.rb

@@ -0,0 +1,17 @@
+class CreateTags < ActiveRecord::Migration
+
+  def up
+    create_table :tags do |t|
+      t.timestamps
+    end
+    Tag.create_translation_table!(
+      title:       :string
+    )
+  end
+
+  def down
+    drop_table :tags
+    Tag.drop_translation_table!
+  end
+
+end

data/test/dummy/db/migrate/20131122170308_add_articles_tags_binding.rb

@@ -0,0 +1,9 @@
+class AddArticlesTagsBinding < ActiveRecord::Migration
+  def up
+    create_join_table :tags, :articles
+  end
+
+  def down
+    drop_table :articles_tags
+  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 => 20131121092946) do
+ActiveRecord::Schema.define(:version => 20131122170308) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -65,6 +65,13 @@ ActiveRecord::Schema.define(:version => 20131121092946) do
     t.string   "category"
   end
 
+  create_table "articles_tags", :id => false, :force => true do |t|
+    t.integer "article_id"
+    t.integer "tag_id"
+  end
+
+  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"
@@ -114,4 +121,20 @@ ActiveRecord::Schema.define(:version => 20131121092946) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "tag_translations", :force => true do |t|
+    t.integer  "tag_id"
+    t.string   "locale"
+    t.string   "title"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "tag_translations", ["locale"], :name => "index_tag_translations_on_locale"
+  add_index "tag_translations", ["tag_id"], :name => "index_tag_translations_on_tag_id"
+
+  create_table "tags", :force => true do |t|
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
 end

data/test/dummy/test/fixtures/tags.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+# This model initially had no columns defined.  If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+#  column: value

data/test/dummy/test/unit/tag_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TagTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.224
+  version: 4.0.0.dev.227
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -1324,6 +1324,7 @@ files:
 - app/assets/stylesheets/lalala/base/_mixins.css.scss
 - app/assets/stylesheets/lalala/base/_variables.css.scss
 - app/assets/stylesheets/lalala/components/_buttons.css.scss
+- app/assets/stylesheets/lalala/components/_chosen-lalala.css.scss
 - app/assets/stylesheets/lalala/components/_forms.css.scss
 - app/assets/stylesheets/lalala/components/_icons.css.scss
 - app/assets/stylesheets/lalala/components/_tables.css.scss
@@ -1470,6 +1471,7 @@ files:
 - test/dummy/app/admin/admin_users.rb
 - test/dummy/app/admin/articles.rb
 - test/dummy/app/admin/dashboard.rb
+- test/dummy/app/admin/tags.rb
 - test/dummy/app/assets/javascripts/active_admin.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/active_admin.css.scss
@@ -1484,6 +1486,7 @@ files:
 - test/dummy/app/models/article.rb
 - test/dummy/app/models/file_asset.rb
 - test/dummy/app/models/image_asset.rb
+- test/dummy/app/models/tag.rb
 - test/dummy/app/pages/application_page.rb
 - test/dummy/app/pages/basic_page.rb
 - test/dummy/app/pages/home_page.rb
@@ -1514,6 +1517,8 @@ files:
 - test/dummy/db/migrate/20130729125648_create_home_page.rb
 - test/dummy/db/migrate/20131113134503_add_category_to_articles.rb
 - test/dummy/db/migrate/20131121092946_make_articles_translatable.rb
+- test/dummy/db/migrate/20131122165715_create_tags.rb
+- test/dummy/db/migrate/20131122170308_add_articles_tags_binding.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep
@@ -1523,7 +1528,9 @@ files:
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
 - test/dummy/test/fixtures/admin_users.yml
+- test/dummy/test/fixtures/tags.yml
 - test/dummy/test/unit/admin_user_test.rb
+- test/dummy/test/unit/tag_test.rb
 - test/dummy/tmp/cache/.gitkeep
 - test/fixtures/files/image.png
 - test/i18n/router_test.rb
@@ -1563,6 +1570,7 @@ test_files:
 - test/dummy/app/admin/admin_users.rb
 - test/dummy/app/admin/articles.rb
 - test/dummy/app/admin/dashboard.rb
+- test/dummy/app/admin/tags.rb
 - test/dummy/app/assets/javascripts/active_admin.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/active_admin.css.scss
@@ -1577,6 +1585,7 @@ test_files:
 - test/dummy/app/models/article.rb
 - test/dummy/app/models/file_asset.rb
 - test/dummy/app/models/image_asset.rb
+- test/dummy/app/models/tag.rb
 - test/dummy/app/pages/application_page.rb
 - test/dummy/app/pages/basic_page.rb
 - test/dummy/app/pages/home_page.rb
@@ -1607,6 +1616,8 @@ test_files:
 - test/dummy/db/migrate/20130729125648_create_home_page.rb
 - test/dummy/db/migrate/20131113134503_add_category_to_articles.rb
 - test/dummy/db/migrate/20131121092946_make_articles_translatable.rb
+- test/dummy/db/migrate/20131122165715_create_tags.rb
+- test/dummy/db/migrate/20131122170308_add_articles_tags_binding.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep
@@ -1616,7 +1627,9 @@ test_files:
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
 - test/dummy/test/fixtures/admin_users.yml
+- test/dummy/test/fixtures/tags.yml
 - test/dummy/test/unit/admin_user_test.rb
+- test/dummy/test/unit/tag_test.rb
 - test/dummy/tmp/cache/.gitkeep
 - test/fixtures/files/image.png
 - test/i18n/router_test.rb