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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0fd9c3d041be7883f1e339e76504fe7da24a6f5c
4
- data.tar.gz: 77df2687bd1950d45d43e579b27b16371abcd917
3
+ metadata.gz: 914b10207996a20d92630b7a7da989afa80f161d
4
+ data.tar.gz: 8f256b33d037b0d4be445fa5ee757a8d953a0bde
5
5
  SHA512:
6
- metadata.gz: 30745adbc31c0ef5bc0ba9a96994376866d3eebe827791ca6590f1553bcfdc6fa4bac0ebc97c3fd1ddf5ba86c4bc9e4a60bd762b64649642871c27549f298404
7
- data.tar.gz: dcebce27e01f21076000b67f7be1175fa66c59558f2f9cf2c34ebfe305a95cd510c08384a38f433962e915406a762eceee27657e9b5cfce6da74c51d55717156
6
+ metadata.gz: 26e842d2024f2e7c3350ecd0bf8a8dddf6bdf977cc46a602039d2fa036440f16a4430233d5fc7e81e55438540820bfb8fca137ce6729187a01110de8505b5cef
7
+ data.tar.gz: 8fa8b9dc971ee0a45355d775ea9d878aedff6518b2dc49412fbdec8d6fb54560572c6641027a475a32ed80c1be2086b9f2087f2c444e76cfc6ba00c5ce3b1b78
@@ -60,6 +60,11 @@
60
60
  padding-top: 0;
61
61
  }
62
62
 
63
+ // TODO: gray button
64
+ &.gray {
65
+ background-color: gray(200);
66
+ }
67
+
63
68
  // green button
64
69
  &.green {
65
70
  background-color: $button_green;
@@ -108,7 +108,7 @@ select:focus {
108
108
  // groups
109
109
  .inputs,
110
110
  .actions {
111
- @extend .inner;
111
+ // @extend .inner;
112
112
 
113
113
  ul, ol {
114
114
  list-style: none;
@@ -21,17 +21,49 @@
21
21
  float: left;
22
22
  margin: 0;
23
23
  padding: 20px 0;
24
+ position: relative;
24
25
  text-align: center;
25
26
 
26
- .val {
27
- font-size: 30px;
28
- font-weight: bold;
29
- margin: 0 0 5px 0;
27
+ // default shows the values
28
+ .default {
29
+
30
+ .val {
31
+ font-size: 30px;
32
+ font-weight: bold;
33
+ margin: 0 0 5px 0;
34
+ }
35
+ .title {
36
+ @include mono-font;
37
+ color: gray(200);
38
+ }
30
39
  }
31
- .title {
32
- @include mono-font;
33
- color: gray(200);
40
+
41
+ // hover has the action to create a new instance
42
+ .hover {
43
+ position: absolute;
44
+ height: 100%;
45
+ top: 0;
46
+ left: 0;
47
+ width: 100%;
48
+
49
+ a.button {
50
+ @include transition(all 150ms);
51
+ @include icon('add', 'button');
52
+ background-position: -20px center;
53
+ display: block;
54
+ height: 100%;
55
+ text-indent: -9999px;
56
+ }
57
+ }
58
+
59
+ &:hover {
60
+ .hover {
61
+ a {
62
+ background-position: 30px center;
63
+ }
64
+ }
34
65
  }
66
+
35
67
  }
36
68
 
37
69
  }
@@ -51,7 +83,7 @@
51
83
  &.count_3 {
52
84
  ul {
53
85
  li {
54
- width: 32.333333%;
86
+ width: 33%;
55
87
  }
56
88
  }
57
89
  }
@@ -65,14 +97,14 @@
65
97
  &.count_5 {
66
98
  ul {
67
99
  li {
68
- width: 19.999999%;
100
+ width: 19.8%;
69
101
  }
70
102
  }
71
103
  }
72
104
  &.count_6 {
73
105
  ul {
74
106
  li {
75
- width: 15.66666666%;
107
+ width: 16.5%;
76
108
  }
77
109
  }
78
110
  }
@@ -116,6 +148,15 @@ body.lalala_dashboard {
116
148
  .panel {
117
149
  @extend %pnl;
118
150
 
151
+ // overwrite default link behaviour on panel
152
+ a {
153
+ color: $blue !important;
154
+
155
+ &:hover {
156
+ color: $blue !important;
157
+ }
158
+ }
159
+
119
160
  }
120
161
 
121
162
  }
@@ -251,6 +251,7 @@ private
251
251
  _locale = I18n.locale
252
252
 
253
253
  I18n.available_locales.each do |locale|
254
+ next if Rails.application.config.lalala.i18n.excluded_locales.try(:include?, locale)
254
255
  I18n.locale = locale
255
256
 
256
257
  translated_attrs.each do |attr|
@@ -31,9 +31,9 @@ Gem::Specification.new do |gem|
31
31
  gem.add_runtime_dependency 'lalala', Lalala::BUILD_VERSION
32
32
  gem.add_runtime_dependency 'coffee-rails', '= 3.2.2'
33
33
  gem.add_runtime_dependency 'coffee-script-source', '= 1.4.0'
34
- gem.add_runtime_dependency 'compass', '= 0.13.alpha.0'
35
- gem.add_runtime_dependency 'compass-rails', '= 1.0.3'
36
- gem.add_runtime_dependency 'sass', '= 3.2.14'
34
+ gem.add_runtime_dependency 'compass', '= 1.0.0.alpha.19'
35
+ gem.add_runtime_dependency 'compass-rails', '= 1.1.7'
36
+ gem.add_runtime_dependency 'sass', '= 3.3.4'
37
37
  gem.add_runtime_dependency 'sass-rails', '= 3.2.6'
38
38
  gem.add_runtime_dependency 'sprockets-commonjs', '= 0.0.5'
39
39
  gem.add_runtime_dependency 'uglifier', '= 1.3.0'
@@ -21,6 +21,7 @@ module Lalala::ExtActiveRecord::I18nTranslationsWriter
21
21
  _locale = I18n.locale
22
22
 
23
23
  I18n.available_locales.each do |locale|
24
+ next if Rails.application.config.lalala.i18n.excluded_locales.try(:include?, locale)
24
25
  I18n.locale = locale
25
26
  attrs = attributes[locale.to_s]
26
27
  if attrs
@@ -31,6 +31,7 @@ module Lalala::ExtI18n::InputHelper
31
31
  ].flatten.compact
32
32
 
33
33
  locales.each do |locale|
34
+ next if Rails.application.config.lalala.i18n.excluded_locales.try(:include?, locale)
34
35
  I18n.locale = locale
35
36
  @object_name = "#{_object_name}[translations_writer][#{locale}]"
36
37
 
@@ -67,7 +67,7 @@ class Lalala::Markdown::HtmlRenderer < Redcarpet::Render::HTML
67
67
  end
68
68
 
69
69
  options = (@options[:link_attributes] || {}).merge(title: title)
70
- helpers.link_to(content, link, options)
70
+ helpers.link_to(content.html_safe, link, options)
71
71
  end
72
72
 
73
73
  def enhanced_autolink(scheme, link, link_type)
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.1.0"
3
- BUILD = "324"
3
+ BUILD = "332"
4
4
 
5
5
  if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
6
6
  BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"
@@ -6,20 +6,27 @@
6
6
  @user_total = Lalala::AdminUser::all.count
7
7
 
8
8
  # fill array
9
- @values << ["pages",@page_total]
10
- @values << ["posts",@post_total]
11
- @values << ["files",@assets_total]
12
- @values << ["user(s)",@user_total]
9
+ @values << ["page",@page_total, nil]
10
+ @values << ["post",@post_total, "/lalala/articles/new"]
11
+ @values << ["file",@assets_total, nil]
12
+ @values << ["user",@user_total, "/lalala/admin_users/new"]
13
13
 
14
14
  %>
15
15
  <div class="mod-dashboard">
16
16
 
17
17
  <div class="stats count_<%= @values.length %>">
18
18
  <ul>
19
- <% @values.each do |title,val| %>
19
+ <% @values.each do |title,val,link| %>
20
20
  <li>
21
- <p class="val"><%= val %></p>
22
- <p class="title"><%= title %></p>
21
+ <div class="default">
22
+ <p class="val"><%= val %></p>
23
+ <p class="title"><%= title.pluralize %></p>
24
+ </div>
25
+ <% unless link.nil? %>
26
+ <div class="hover">
27
+ <a href="<%= link %>" class="button">New <%= title %></a>
28
+ </div>
29
+ <% end %>
23
30
  </li>
24
31
  <% end %>
25
32
  </ul>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lalala
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.0.dev.324
4
+ version: 4.1.0.dev.332
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Menke
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2014-03-07 00:00:00.000000000 Z
16
+ date: 2014-04-02 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: activeadmin
@@ -263,7 +263,6 @@ files:
263
263
  - ".gitignore"
264
264
  - ".travis.yml"
265
265
  - Gemfile
266
- - Haraway.md
267
266
  - LICENSE.txt
268
267
  - README.md
269
268
  - Rakefile
data/Haraway.md DELETED
@@ -1,14 +0,0 @@
1
- # Haraway
2
-
3
- ## How to use
4
-
5
- 1. Create initializer (config/initializers/haraway.rb)
6
- 2. Add "haraway_metadata" column to the necessary tables (type = "text")
7
- 3. In the model:
8
- `has_many_assets :asset_association_name, :profile`
9
- `attr_accessible :asset_association_name`
10
-
11
-
12
- ## To do
13
-
14
- - Include actual Haraway gem (not the local repo)