lalala 4.0.0.dev.246 → 4.0.0.dev.249

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf1af9f05211fe2c365b13f1fb96f37524361105
-  data.tar.gz: e6d0bfa79ae75e71dc936e8fdc0a26271e7076c8
+  metadata.gz: 9f33b33445dd34eda8de019fb0883039caf3c02a
+  data.tar.gz: 0d326d92d2a724c85b833d45990e3feb05966c57
 SHA512:
-  metadata.gz: 3ab8a8effde66dc7c915c3d5caa1c9385ebda0f50ff3a4d06b4071ad47cbb1f004c714f9e2941c7d5dc8406853c866ec071ed7be62e139d0d7ea6b01364151f9
-  data.tar.gz: 41ae0805aaacd22642f1777dcb6bdbbbceea619fa8c9f4d96c63d899bad7b8ff0d74624edfbe9141f7662e7232aef6bd9bc8952d2f7979e70974e4bbbb226a83
+  metadata.gz: 9649460231bd56a8df902547f1e45abd7d02e95336c79f468ae1606d3bac8d1ead38720fc2ff16aba880119d64d8bae78a14aa386f1419c822a604e9d3b873bf
+  data.tar.gz: 649ec533e839fea5d970fa013715db7c97767aae75f739ec678bb14def9a6d3b43581b2e6afa75ee7ab0011eec2c6139ceffc6b8ceaf46b2465804abc6d36f0f

data/app/assets/stylesheets/lalala/modules/_sidebar-section.css.scss

@@ -7,11 +7,131 @@
   h3 {
     background-color: gray(220);
     color: $white;
+    font-size: 14px !important;
     font-weight: bold;
     padding: 10px;
+    margin: 0 !important;
   }
 
   .panel_contents {
     padding: 10px;
+
+    // LALALA specific styling
+    //
+    .lalala {
+      font-size: 13px;
+      line-height: 18px;
+
+      &.sidebar {
+
+        // intro message
+        &.message {
+          color: gray(180);
+          padding: 0 20px 10px 0;
+
+          strong {
+            font-weight: bold;
+          }
+        }
+
+        // person id-card
+        &.person {
+          text-align: center;
+
+          // optional img
+          .avatar {
+            @include border-radius(100px);
+          }
+
+          // name
+          h4 {
+            font-size: 16px;
+            font-weight: bold;
+            margin: 10px 0 0 0;
+          }
+
+          // detailed information
+          .details {
+            color: gray(180);
+            font-family: "Monaco";
+            font-size: 12px;
+            margin: 10px;
+          }
+
+        }
+
+        // listing, lists various elements (uls, divs, table, ...)
+        &.listing {
+          margin: 10px 0 0 0;
+
+          // plain div's
+          &.div {
+
+            .item {
+              border-bottom: 1px solid gray(220);
+              padding: 0 0 5px 0;
+              margin: 0 0 10px 0;
+            }
+
+            // last item has no border or margin
+            > :last-child {
+              border-bottom: none;
+              margin: 0;
+            }
+
+          }
+
+          // ul
+          &.ul {
+
+            .item {
+              border-bottom: 1px solid gray(220);
+              padding: 0 0 5px 0;
+              margin: 0 0 10px 0;
+            }
+
+            // last item has no border or margin
+            > :last-child {
+              border-bottom: none;
+              margin: 0;
+            }
+
+          }
+
+          // table
+          &.table {
+
+            table {
+              thead {
+                display: none;
+              }
+              tbody tr td {
+                padding: 7px 5px 6px 5px !important;
+              }
+            }
+
+          }
+
+        }
+
+        // element has a closing line
+        &.with-closing-line {
+          border-bottom: 1px solid gray(220);
+        }
+
+        .timeago {
+          color: $gray_lighter;
+        }
+
+      }
+
+    // default link style inside .panel_contents .lalala
+    a {
+      color: $blue;
+      text-decoration: none;
+    }
+
+    }
+
   }
 }

data/lalala-assets.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   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.12'
+  gem.add_runtime_dependency 'sass',                 '= 3.2.13'
   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/version.rb

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

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

@@ -16,4 +16,81 @@ ActiveAdmin.register Article do
     f.actions
   end
 
+
+  sidebar "Related tags", :only => [:show] do
+
+    div :class => "lalala sidebar message", :id => "lalala_sidebar_message" do
+      "This is an intro block.... It is yours. It is the best <strong>intro block</strong> in the world. Click the link for a tag detail.".html_safe
+    end
+
+    div :class => "lalala sidebar message with-closing-line" do
+      "This is an intro block with a closing line.... It is yours. It is the best <strong>intro block</strong> in the world. Click the <a href='#'>link</a> for a tag detail.".html_safe
+    end
+
+    div :class => "lalala sidebar listing div" do
+
+      div :class => "item" do
+        span link_to("tag.title", "#")
+        div "2 days ago", { :class => "timeago", :title => "2 days ago" }
+      end
+
+      div :class => "item" do
+        div link_to("hoe laat zou het zijn", "#")
+        div "2 days ago", { :class => "timeago", :title => "2 days ago" }
+      end
+
+      div :class => "item" do
+        div link_to("maakt da nu eens mee seg, een te lange titel", "#")
+        div "2 days ago", { :class => "timeago", :title => "2 days ago" }
+      end
+
+    end
+
+  end
+
+  sidebar "User Information", :only => [:show] do
+    div :class => "lalala sidebar person" do
+
+      fallback_url = "#{root_url}assets/lalala/users/fallback.jpg"
+      gravatar_id = Digest::MD5.hexdigest("hanefaeffes@mrhenry.be")
+      default_url = "http://gravatar.com/avatar/#{gravatar_id}.png?s=100&d=" + CGI.escape(fallback_url)
+
+      img(:src => default_url, :class => "avatar")
+
+      h4 :class => "title" do
+        "Hans Spooren"
+      end
+
+      div :class => "details" do
+        "sex: m<br />e-mail: hans@mrhenry.be<br />address: kronenburgstraat 14, 2000 Antwerp".html_safe
+      end
+
+      div :class => "cta" do
+        link_to("view detailed info", "#")
+      end
+
+    end
+  end
+
+  sidebar "Help", :only => [:show] do
+    div :class => "lalala sidebar message", :id => "lalala_sidebar_message" do
+      "Test".html_safe
+    end
+
+    ul :class => "lalala sidebar listing ul" do
+
+      li :class => "item" do
+        span link_to("tag.title", "#")
+        div "2 days ago", { :class => "timeago", :title => "2 days ago" }
+      end
+
+      li :class => "item" do
+        span link_to("tag.title", "#")
+        div "2 days ago", { :class => "timeago", :title => "2 days ago" }
+      end
+
+    end
+
+  end
+
 end

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

@@ -17,4 +17,8 @@ class Article < ActiveRecord::Base
   # Bindings
   has_and_belongs_to_many :tags
 
+  def get_tags
+    self.tags
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.246
+  version: 4.0.0.dev.249
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -1296,6 +1296,7 @@ files:
 - app/assets/images/lalala/icons/zoom_out.png
 - app/assets/images/lalala/overlay-logo.png
 - app/assets/images/lalala/users/default.jpg
+- app/assets/images/lalala/users/fallback.jpg
 - app/assets/javascripts/browser/console.module.js
 - app/assets/javascripts/browser/document.module.js
 - app/assets/javascripts/browser/history.module.js