lalala 4.1.0.dev.324 → 4.1.0.dev.332

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fd9c3d041be7883f1e339e76504fe7da24a6f5c
-  data.tar.gz: 77df2687bd1950d45d43e579b27b16371abcd917
+  metadata.gz: 914b10207996a20d92630b7a7da989afa80f161d
+  data.tar.gz: 8f256b33d037b0d4be445fa5ee757a8d953a0bde
 SHA512:
-  metadata.gz: 30745adbc31c0ef5bc0ba9a96994376866d3eebe827791ca6590f1553bcfdc6fa4bac0ebc97c3fd1ddf5ba86c4bc9e4a60bd762b64649642871c27549f298404
-  data.tar.gz: dcebce27e01f21076000b67f7be1175fa66c59558f2f9cf2c34ebfe305a95cd510c08384a38f433962e915406a762eceee27657e9b5cfce6da74c51d55717156
+  metadata.gz: 26e842d2024f2e7c3350ecd0bf8a8dddf6bdf977cc46a602039d2fa036440f16a4430233d5fc7e81e55438540820bfb8fca137ce6729187a01110de8505b5cef
+  data.tar.gz: 8fa8b9dc971ee0a45355d775ea9d878aedff6518b2dc49412fbdec8d6fb54560572c6641027a475a32ed80c1be2086b9f2087f2c444e76cfc6ba00c5ce3b1b78

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

@@ -60,6 +60,11 @@
     padding-top: 0;
   }
 
+  // TODO: gray button
+  &.gray {
+    background-color: gray(200);
+  }
+
   // green button
   &.green {
     background-color: $button_green;

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

@@ -108,7 +108,7 @@ select:focus {
 // groups
 .inputs,
 .actions {
-  @extend .inner;
+  // @extend .inner;
 
   ul, ol {
     list-style: none;

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

@@ -21,17 +21,49 @@
         float: left;
         margin: 0;
         padding: 20px 0;
+        position: relative;
         text-align: center;
 
-        .val {
-          font-size: 30px;
-          font-weight: bold;
-          margin: 0 0 5px 0;
+        // default shows the values
+        .default {
+
+          .val {
+            font-size: 30px;
+            font-weight: bold;
+            margin: 0 0 5px 0;
+          }
+          .title {
+            @include mono-font;
+            color: gray(200);
+          }
         }
-        .title {
-          @include mono-font;
-          color: gray(200);
+
+        // hover has the action to create a new instance
+        .hover {
+          position: absolute;
+          height: 100%;
+          top: 0;
+          left: 0;
+          width: 100%;
+
+          a.button {
+            @include transition(all 150ms);
+            @include icon('add', 'button');
+            background-position: -20px center;
+            display: block;
+            height: 100%;
+            text-indent: -9999px;
+          }
+        }
+
+        &:hover {
+          .hover {
+            a {
+              background-position: 30px center;
+            }
+          }
         }
+
       }
 
     }
@@ -51,7 +83,7 @@
     &.count_3 {
       ul {
         li {
-          width: 32.333333%;
+          width: 33%;
         }
       }
     }
@@ -65,14 +97,14 @@
     &.count_5 {
       ul {
         li {
-          width: 19.999999%;
+          width: 19.8%;
         }
       }
     }
     &.count_6 {
       ul {
         li {
-          width: 15.66666666%;
+          width: 16.5%;
         }
       }
     }
@@ -116,6 +148,15 @@ body.lalala_dashboard {
       .panel {
         @extend %pnl;
 
+        // overwrite default link behaviour on panel
+        a {
+          color: $blue !important;
+
+          &:hover {
+            color: $blue !important;
+          }
+        }
+
       }
 
     }

data/app/models/lalala/page.rb

@@ -251,6 +251,7 @@ private
         _locale = I18n.locale
 
         I18n.available_locales.each do |locale|
+          next if Rails.application.config.lalala.i18n.excluded_locales.try(:include?, locale)
           I18n.locale = locale
 
           translated_attrs.each do |attr|

data/lalala-assets.gemspec

@@ -31,9 +31,9 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'lalala',               Lalala::BUILD_VERSION
   gem.add_runtime_dependency 'coffee-rails',         '= 3.2.2'
   gem.add_runtime_dependency 'coffee-script-source', '= 1.4.0'
-  gem.add_runtime_dependency 'compass',              '= 0.13.alpha.0'
-  gem.add_runtime_dependency 'compass-rails',        '= 1.0.3'
-  gem.add_runtime_dependency 'sass',                 '= 3.2.14'
+  gem.add_runtime_dependency 'compass',              '= 1.0.0.alpha.19'
+  gem.add_runtime_dependency 'compass-rails',        '= 1.1.7'
+  gem.add_runtime_dependency 'sass',                 '= 3.3.4'
   gem.add_runtime_dependency 'sass-rails',           '= 3.2.6'
   gem.add_runtime_dependency 'sprockets-commonjs',   '= 0.0.5'
   gem.add_runtime_dependency 'uglifier',             '= 1.3.0'

data/lib/lalala/ext_active_record/i18n_translations_writer.rb

@@ -21,6 +21,7 @@ module Lalala::ExtActiveRecord::I18nTranslationsWriter
       _locale = I18n.locale
 
       I18n.available_locales.each do |locale|
+        next if Rails.application.config.lalala.i18n.excluded_locales.try(:include?, locale)
         I18n.locale = locale
         attrs = attributes[locale.to_s]
         if attrs

data/lib/lalala/ext_i18n/input_helper.rb

@@ -31,6 +31,7 @@ module Lalala::ExtI18n::InputHelper
       ].flatten.compact
 
       locales.each do |locale|
+        next if Rails.application.config.lalala.i18n.excluded_locales.try(:include?, locale)
         I18n.locale  = locale
         @object_name = "#{_object_name}[translations_writer][#{locale}]"
 

data/lib/lalala/markdown/html_renderer.rb

@@ -67,7 +67,7 @@ class Lalala::Markdown::HtmlRenderer < Redcarpet::Render::HTML
     end
 
     options = (@options[:link_attributes] || {}).merge(title: title)
-    helpers.link_to(content, link, options)
+    helpers.link_to(content.html_safe, link, options)
   end
 
   def enhanced_autolink(scheme, link, link_type)

data/lib/lalala/version.rb

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

data/test/dummy/app/views/admin/_stats.html.erb

@@ -6,20 +6,27 @@
   @user_total     = Lalala::AdminUser::all.count
 
   # fill array
-  @values << ["pages",@page_total]
-  @values << ["posts",@post_total]
-  @values << ["files",@assets_total]
-  @values << ["user(s)",@user_total]
+  @values << ["page",@page_total, nil]
+  @values << ["post",@post_total, "/lalala/articles/new"]
+  @values << ["file",@assets_total, nil]
+  @values << ["user",@user_total, "/lalala/admin_users/new"]
 
 %>
 <div class="mod-dashboard">
 
   <div class="stats count_<%= @values.length %>">
     <ul>
-      <% @values.each do |title,val| %>
+      <% @values.each do |title,val,link| %>
       <li>
-        <p class="val"><%= val %></p>
-        <p class="title"><%= title %></p>
+        <div class="default">
+          <p class="val"><%= val %></p>
+          <p class="title"><%= title.pluralize %></p>
+        </div>
+        <% unless link.nil? %>
+        <div class="hover">
+          <a href="<%= link %>" class="button">New <%= title %></a>
+        </div>
+        <% end %>
       </li>
       <% end %>
     </ul>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.1.0.dev.324
+  version: 4.1.0.dev.332
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -263,7 +263,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Haraway.md
 - LICENSE.txt
 - README.md
 - Rakefile

data/Haraway.md

@@ -1,14 +0,0 @@
-# Haraway
-
-## How to use
-
-1. Create initializer (config/initializers/haraway.rb)
-2. Add "haraway_metadata" column to the necessary tables (type = "text")
-3. In the model:  
-`has_many_assets :asset_association_name, :profile`
-`attr_accessible :asset_association_name`
-
-
-## To do
-
-- Include actual Haraway gem (not the local repo)