lalala 4.0.0.dev.279 → 4.0.0.dev.283

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ccc606f086137e14a5e08168385c0c38e5f7e4e5
4
- data.tar.gz: 485447d2da4248fe3b99bd08bda7732ca1e364d9
3
+ metadata.gz: e83d3f8b88728d4baa64cc7d9c70d68a3a0867b3
4
+ data.tar.gz: 3fcf1e8d11995075bf9f38aefb9eef18210077ef
5
5
  SHA512:
6
- metadata.gz: 9f9b6294bda402b07640de4b20604b37cd71ff03ad681463207de46fa4e2f277b6e261f490581513c5c1107d771f622394e7b41d98de5c91ecc4602ef9b7959f
7
- data.tar.gz: d973cdb51d14480f5e606f851c79efd58abe377288ec88cfb997f80de9b0f2a2f8373d84732e487ef1b3bcc7576fd026b067ca4a0433cfcbd669bf939d0dc67d
6
+ metadata.gz: f82cde937f2c63cc8cad79747b5e24e6d0d7a5a409bdadf3a14a9a4e4544118c445f0ce4fd41d0563d23d6fa357e9d28a99341ace1b937bb30ac130311715184
7
+ data.tar.gz: b61f9004a170e2d7c2601da010d2b2f4808b7940c2b7e35883da5507c40959f6b1d6c7503fae1be8e271242337cdf7fe5037c07b3ecb2dc66f59eb9315857590
@@ -5,6 +5,7 @@
5
5
  @import "lalala/base/variables";
6
6
  @import "lalala/base/base";
7
7
  @import "lalala/base/layout";
8
+ @import "lalala/base/fonts";
8
9
 
9
10
  @import "lalala/lib/jquery-ui";
10
11
  @import "lalala/lib/chosen";
@@ -13,6 +14,7 @@
13
14
  @import "lalala/components/icons";
14
15
  @import "lalala/components/forms";
15
16
  @import "lalala/components/buttons";
17
+ @import "lalala/components/panels";
16
18
  @import "lalala/components/tables";
17
19
  @import "lalala/components/chosen-lalala";
18
20
 
@@ -6,6 +6,7 @@ body {
6
6
  }
7
7
 
8
8
  a {
9
+ @include transition(color 150ms);
9
10
  color: $blue;
10
11
  }
11
12
 
@@ -0,0 +1,6 @@
1
+ @mixin mono-font {
2
+ font-family: 'Monaco';
3
+ font-size: 12px;
4
+ font-style: normal !important;
5
+ font-weight: normal;
6
+ }
@@ -0,0 +1,207 @@
1
+ //
2
+ // Default panel styles
3
+ //
4
+ %pnl {
5
+ @include border-radius(5px);
6
+ border: 1px solid gray(220);
7
+ overflow: hidden;
8
+
9
+ // title creates the 'header'
10
+ h3 {
11
+ background-color: gray(245);
12
+ border-bottom: 1px solid gray(220);
13
+ color: gray(70);
14
+ font-size: 14px !important;
15
+ font-weight: bold;
16
+ padding: 15px 20px;
17
+ margin: 0 !important;
18
+ }
19
+
20
+ // define default panel contents
21
+ .panel_contents {
22
+
23
+ // default font-size
24
+ font-size: 13px;
25
+
26
+ // paragraph styles
27
+ p {
28
+ padding: 10px;
29
+ }
30
+
31
+ // list styles
32
+ ul {
33
+ li {
34
+ border-top: 1px solid $gray_lighter;
35
+ a {
36
+ color: $black;
37
+ display: block;
38
+ padding: 10px 5px 10px 20px;
39
+ text-decoration: none;
40
+
41
+ &:hover {
42
+ color: $blue;
43
+ }
44
+ }
45
+ }
46
+ // first item doesn't have a border
47
+ > :first-child {
48
+ border-top: none;
49
+ }
50
+ }
51
+
52
+ // table styles
53
+ table {
54
+ thead {
55
+ display: none;
56
+ }
57
+ tbody {
58
+ // cell padding
59
+ td {
60
+ padding: 13px 20px 12px 20px !important;
61
+ }
62
+ // date format
63
+ .timeago {
64
+ @include mono-font;
65
+ display: block;
66
+ color: $gray_lighter;
67
+ text-align: right;
68
+ }
69
+ // default link
70
+ a {
71
+ color: $black;
72
+
73
+ &:hover {
74
+ color: $blue !important;
75
+ }
76
+ }
77
+ }
78
+ }
79
+
80
+ // LALALA specific styling
81
+ //
82
+ .lalala {
83
+ font-size: 13px;
84
+ line-height: 18px;
85
+
86
+ &.sidebar {
87
+
88
+ // intro message
89
+ &.message {
90
+ color: gray(180);
91
+ padding: 0 20px 10px 0;
92
+
93
+ strong {
94
+ font-weight: bold;
95
+ }
96
+ }
97
+
98
+ // person id-card
99
+ &.person {
100
+ text-align: center;
101
+
102
+ // optional img
103
+ .avatar {
104
+ @include border-radius(100px);
105
+ }
106
+
107
+ // name
108
+ h4 {
109
+ font-size: 16px;
110
+ font-weight: bold;
111
+ margin: 10px 0 0 0;
112
+ }
113
+
114
+ // detailed information
115
+ .details {
116
+ color: gray(180);
117
+ font-family: "Monaco";
118
+ font-size: 12px;
119
+ margin: 10px;
120
+ }
121
+
122
+ }
123
+
124
+ // listing, lists various elements (uls, divs, table, ...)
125
+ &.listing {
126
+ margin: 10px 0 0 0;
127
+
128
+ // plain div's
129
+ &.div {
130
+
131
+ .item {
132
+ border-bottom: 1px solid gray(220);
133
+ padding: 0 0 5px 0;
134
+ margin: 0 0 10px 0;
135
+ }
136
+
137
+ // last item has no border or margin
138
+ > :last-child {
139
+ border-bottom: none;
140
+ margin: 0;
141
+ }
142
+
143
+ }
144
+
145
+ // ul
146
+ &.ul {
147
+
148
+ .item {
149
+ border-bottom: 1px solid gray(220);
150
+ border-top: none;
151
+ padding: 0 0 5px 0 !important;
152
+ margin: 0 0 10px 0;
153
+
154
+ a {
155
+ padding: 0;
156
+ }
157
+ }
158
+
159
+ // last item has no border or margin
160
+ > :last-child {
161
+ border-bottom: none;
162
+ border-top: none;
163
+ padding: 0 0 5px 0 !important;
164
+ margin: 0;
165
+ }
166
+
167
+ }
168
+
169
+ // table
170
+ &.table {
171
+
172
+ table {
173
+ thead {
174
+ display: none;
175
+ }
176
+ tbody tr td {
177
+ padding: 7px 5px 6px 5px !important;
178
+ }
179
+ }
180
+
181
+ }
182
+
183
+ }
184
+
185
+ // element has a closing line
186
+ &.with-closing-line {
187
+ border-bottom: 1px solid gray(220);
188
+ }
189
+
190
+ .timeago {
191
+ color: $gray_lighter;
192
+ }
193
+
194
+ }
195
+
196
+ // default link style inside .panel_contents .lalala
197
+ a {
198
+ color: $blue;
199
+ text-decoration: none;
200
+ }
201
+
202
+ }
203
+ // end lalala
204
+
205
+ }
206
+
207
+ }
@@ -1,3 +1,87 @@
1
+ //
2
+ // own partials and containers
3
+ //
4
+ .mod-dashboard {
5
+
6
+ .stats {
7
+ @include border-radius(3px);
8
+ border: 1px solid gray(220);
9
+
10
+ // list items are stats
11
+ // divide percentage with number of stats
12
+ // count_x <- x is set by rails
13
+ ul {
14
+ @include pie-clearfix;
15
+ list-style: none;
16
+ margin: 0;
17
+ padding: 0;
18
+
19
+ li {
20
+ border-left: 1px solid gray(220);
21
+ float: left;
22
+ margin: 0;
23
+ padding: 20px 0;
24
+ text-align: center;
25
+
26
+ .val {
27
+ font-size: 30px;
28
+ font-weight: bold;
29
+ margin: 0 0 5px 0;
30
+ }
31
+ .title {
32
+ @include mono-font;
33
+ color: gray(200);
34
+ }
35
+ }
36
+
37
+ }
38
+
39
+ li:first-child {
40
+ border-left: none;
41
+ }
42
+
43
+ // count settings
44
+ &.count_2 {
45
+ ul {
46
+ li {
47
+ width: 49.999999%;
48
+ }
49
+ }
50
+ }
51
+ &.count_3 {
52
+ ul {
53
+ li {
54
+ width: 32.333333%;
55
+ }
56
+ }
57
+ }
58
+ &.count_4 {
59
+ ul {
60
+ li {
61
+ width: 24.8%;
62
+ }
63
+ }
64
+ }
65
+ &.count_5 {
66
+ ul {
67
+ li {
68
+ width: 19.999999%;
69
+ }
70
+ }
71
+ }
72
+ &.count_6 {
73
+ ul {
74
+ li {
75
+ width: 15.66666666%;
76
+ }
77
+ }
78
+ }
79
+
80
+ }
81
+
82
+ }
83
+
84
+
1
85
  //
2
86
  // Trying to make lemonade with the dashboard lemons given by FormTastic
3
87
  //
@@ -9,9 +93,17 @@ body.lalala_dashboard {
9
93
  }
10
94
 
11
95
  #dashboard_default_message {
12
- @include border-radius(3px);
13
- border: 1px solid $gray_lighter;
14
- margin: 0 0 40px 0;
96
+ @include mono-font;
97
+ background-color: #fffbcb;
98
+ background-image: url('/assets/lalala/img-notes-pattern.jpg');
99
+ background-position-y: 2px;
100
+ line-height: 27px;
101
+ margin: 0 0 20px 0;
102
+ width: auto;
103
+
104
+ .blank_slate {
105
+ font-style: normal;
106
+ }
15
107
  }
16
108
 
17
109
  .columns {
@@ -22,68 +114,7 @@ body.lalala_dashboard {
22
114
  margin-bottom: 20px;
23
115
 
24
116
  .panel {
25
- @include border-radius(10px);
26
- border: 1px solid $gray_lighter;
27
- overflow: hidden;
28
-
29
- // title
30
- h3 {
31
- color: white;
32
- background-color: $gray_lighter;
33
- font-size: 14px;
34
- font-weight: bold;
35
- padding: 10px;
36
- }
37
-
38
- .panel_contents {
39
-
40
- // paragraph styles
41
- p {
42
- padding: 10px;
43
- }
44
- // list styles
45
- ul {
46
- li {
47
- border-top: 1px solid $gray_lighter;
48
- a {
49
- color: $black;
50
- display: block;
51
- padding: 10px 5px 10px 10px;
52
- text-decoration: none;
53
-
54
- &:hover {
55
- color: $blue;
56
- }
57
- }
58
- }
59
- }
60
- // table styles
61
- table {
62
- thead {
63
- display: none;
64
- }
65
- tbody {
66
- // cell padding
67
- td {
68
- padding: 13px 10px 12px 10px !important;
69
- }
70
- // date format
71
- .timeago {
72
- display: block;
73
- color: $gray_lighter;
74
- text-align: right;
75
- }
76
- // default link
77
- a {
78
- color: $black;
79
-
80
- &:hover {
81
- color: $blue !important;
82
- }
83
- }
84
- }
85
- }
86
- }
117
+ @extend %pnl;
87
118
 
88
119
  }
89
120
 
@@ -8,7 +8,7 @@
8
8
  font-size: 16px;
9
9
  font-weight: 600;
10
10
  line-height: 1.2em;
11
- margin: 10px 20px 100px 10px;
11
+ margin: -37px 20px 140px 10px;
12
12
  text-align: right;
13
13
  }
14
14
 
@@ -1,138 +1,9 @@
1
1
  .sidebar_section {
2
- @include border-radius(5px);
3
- border: 1px solid gray(220);
2
+ @extend %pnl;
4
3
  margin: 0 30px 20px 0;
5
- overflow: hidden;
6
-
7
- h3 {
8
- background-color: gray(245);
9
- border-bottom: 1px solid gray(220);
10
- color: gray(70);
11
- font-size: 14px !important;
12
- font-weight: bold;
13
- padding: 15px 20px;
14
- margin: 0 !important;
15
- }
16
4
 
17
5
  .panel_contents {
18
6
  padding: 15px 20px 10px 20px;
19
-
20
- // LALALA specific styling
21
- //
22
- .lalala {
23
- font-size: 13px;
24
- line-height: 18px;
25
-
26
- &.sidebar {
27
-
28
- // intro message
29
- &.message {
30
- color: gray(180);
31
- padding: 0 20px 10px 0;
32
-
33
- strong {
34
- font-weight: bold;
35
- }
36
- }
37
-
38
- // person id-card
39
- &.person {
40
- text-align: center;
41
-
42
- // optional img
43
- .avatar {
44
- @include border-radius(100px);
45
- }
46
-
47
- // name
48
- h4 {
49
- font-size: 16px;
50
- font-weight: bold;
51
- margin: 10px 0 0 0;
52
- }
53
-
54
- // detailed information
55
- .details {
56
- color: gray(180);
57
- font-family: "Monaco";
58
- font-size: 12px;
59
- margin: 10px;
60
- }
61
-
62
- }
63
-
64
- // listing, lists various elements (uls, divs, table, ...)
65
- &.listing {
66
- margin: 10px 0 0 0;
67
-
68
- // plain div's
69
- &.div {
70
-
71
- .item {
72
- border-bottom: 1px solid gray(220);
73
- padding: 0 0 5px 0;
74
- margin: 0 0 10px 0;
75
- }
76
-
77
- // last item has no border or margin
78
- > :last-child {
79
- border-bottom: none;
80
- margin: 0;
81
- }
82
-
83
- }
84
-
85
- // ul
86
- &.ul {
87
-
88
- .item {
89
- border-bottom: 1px solid gray(220);
90
- padding: 0 0 5px 0;
91
- margin: 0 0 10px 0;
92
- }
93
-
94
- // last item has no border or margin
95
- > :last-child {
96
- border-bottom: none;
97
- margin: 0;
98
- }
99
-
100
- }
101
-
102
- // table
103
- &.table {
104
-
105
- table {
106
- thead {
107
- display: none;
108
- }
109
- tbody tr td {
110
- padding: 7px 5px 6px 5px !important;
111
- }
112
- }
113
-
114
- }
115
-
116
- }
117
-
118
- // element has a closing line
119
- &.with-closing-line {
120
- border-bottom: 1px solid gray(220);
121
- }
122
-
123
- .timeago {
124
- color: $gray_lighter;
125
- }
126
-
127
- }
128
-
129
- // default link style inside .panel_contents .lalala
130
- a {
131
- color: $blue;
132
- text-decoration: none;
133
- }
134
-
135
- }
136
-
137
7
  }
8
+
138
9
  }
@@ -1,15 +1,15 @@
1
1
  #utility_nav {
2
2
  position: absolute;
3
- top: 125px;
3
+ top: 75px;
4
4
  left: 25px;
5
5
 
6
6
  a {
7
- @include text-shadow(1px 1px 2px #AAAAAA);
7
+ @include text-shadow(1px 1px 1px rgba(0,0,0,.2));
8
8
  color: $white;
9
9
  display: inline-block;
10
10
  font-size: 15px;
11
11
  font-weight: bold;
12
- padding: 20px 0 0 10px;
12
+ padding: 20px 0 0 38px;
13
13
  text-decoration: none;
14
14
  }
15
15
 
@@ -17,7 +17,7 @@
17
17
  @include border-radius(50%);
18
18
  background-image: image-url('lalala/users/default.jpg');
19
19
  background-size: cover;
20
- border: 1px solid $yellow;
20
+ border: 3px solid $yellow;
21
21
  display: block;
22
22
  float: left;
23
23
  height: 60px;
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.0.0"
3
- BUILD = "279"
3
+ BUILD = "283"
4
4
 
5
5
  if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
6
6
  BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"
@@ -66,6 +66,27 @@ ActiveAdmin.register Article do
66
66
 
67
67
  end
68
68
 
69
+ sidebar "Help", :only => [:show] do
70
+ div :class => "lalala sidebar message", :id => "lalala_sidebar_message" do
71
+ "Test".html_safe
72
+ end
73
+
74
+ ul :class => "lalala sidebar listing ul" do
75
+
76
+ li :class => "item" do
77
+ span link_to("tag.title", "#")
78
+ div "2 days ago", { :class => "timeago", :title => "2 days ago" }
79
+ end
80
+
81
+ li :class => "item" do
82
+ span link_to("tag.title", "#")
83
+ div "2 days ago", { :class => "timeago", :title => "2 days ago" }
84
+ end
85
+
86
+ end
87
+
88
+ end
89
+
69
90
  sidebar "User Information", :only => [:show] do
70
91
  div :class => "lalala sidebar person" do
71
92
 
@@ -89,25 +110,5 @@ ActiveAdmin.register Article do
89
110
  end
90
111
  end
91
112
 
92
- sidebar "Help", :only => [:show] do
93
- div :class => "lalala sidebar message", :id => "lalala_sidebar_message" do
94
- "Test".html_safe
95
- end
96
-
97
- ul :class => "lalala sidebar listing ul" do
98
-
99
- li :class => "item" do
100
- span link_to("tag.title", "#")
101
- div "2 days ago", { :class => "timeago", :title => "2 days ago" }
102
- end
103
-
104
- li :class => "item" do
105
- span link_to("tag.title", "#")
106
- div "2 days ago", { :class => "timeago", :title => "2 days ago" }
107
- end
108
-
109
- end
110
-
111
- end
112
113
 
113
114
  end
@@ -5,14 +5,24 @@ ActiveAdmin.register_page "Dashboard" do
5
5
  content :title => proc{ I18n.t("active_admin.dashboard") } do
6
6
  div :class => "blank_slate_container", :id => "dashboard_default_message" do
7
7
  span :class => "blank_slate" do
8
- span I18n.t("active_admin.dashboard_welcome.welcome")
9
- small I18n.t("active_admin.dashboard_welcome.call_to_action")
8
+ span "Howdy, partner! You’ve reached your own personal LALALA dashboard, full of stats, data and extravaganza!"
10
9
  end
11
10
  end
12
11
 
13
12
  # Here is an example of a simple dashboard with columns and panels.
14
13
  #
15
14
  columns do
15
+
16
+ column do
17
+
18
+ render partial: "/admin/stats", :locals => { :matches => "test" }
19
+
20
+ end
21
+
22
+ end
23
+
24
+ columns do
25
+
16
26
  column :span => 2 do
17
27
  panel "Recent Posts List" do
18
28
  ul do
@@ -36,12 +46,6 @@ ActiveAdmin.register_page "Dashboard" do
36
46
  end
37
47
  end
38
48
 
39
- column do
40
- panel "Info" do
41
- para "Welcome to LALALA."
42
- end
43
- end
44
-
45
49
  end
46
50
 
47
51
 
@@ -0,0 +1,28 @@
1
+ <%
2
+ @values = []
3
+ @page_total = Lalala::Page::all.count
4
+ @post_total = Article::all.count rescue Post::all.count
5
+ @assets_total = "n/a"
6
+ @user_total = Lalala::AdminUser::all.count
7
+
8
+ # fill array
9
+ @values << ["pages",@page_total]
10
+ @values << ["posts",@post_total]
11
+ @values << ["files",@assets_total]
12
+ @values << ["user(s)",@user_total]
13
+
14
+ %>
15
+ <div class="mod-dashboard">
16
+
17
+ <div class="stats count_<%= @values.length %>">
18
+ <ul>
19
+ <% @values.each do |title,val| %>
20
+ <li>
21
+ <p class="val"><%= val %></p>
22
+ <p class="title"><%= title %></p>
23
+ </li>
24
+ <% end %>
25
+ </ul>
26
+ </div>
27
+
28
+ </div>
@@ -5,12 +5,12 @@ ActiveAdmin.setup do |config|
5
5
  # Set the title that is displayed on the main layout
6
6
  # for each of the active admin pages.
7
7
  #
8
- # config.site_title = "Dummy"
8
+ config.site_title = "Dummy Siteje"
9
9
 
10
10
  # Set the link url for the title. For example, to take
11
11
  # users to your main site. Defaults to no link.
12
12
  #
13
- # config.site_title_link = "/"
13
+ #config.site_title_link = "/"
14
14
 
15
15
  # Set an optional image to be displayed for the header
16
16
  # instead of a string (overrides :site_title)
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.0.0.dev.279
4
+ version: 4.0.0.dev.283
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Menke
@@ -1294,6 +1294,7 @@ files:
1294
1294
  - app/assets/images/lalala/icons/zoom.png
1295
1295
  - app/assets/images/lalala/icons/zoom_in.png
1296
1296
  - app/assets/images/lalala/icons/zoom_out.png
1297
+ - app/assets/images/lalala/img-notes-pattern.jpg
1297
1298
  - app/assets/images/lalala/overlay-logo.png
1298
1299
  - app/assets/images/lalala/users/default.jpg
1299
1300
  - app/assets/images/lalala/users/fallback.jpg
@@ -1324,6 +1325,7 @@ files:
1324
1325
  - app/assets/javascripts/lalala/modules/storage.module.js
1325
1326
  - app/assets/stylesheets/lalala/_base.css.scss
1326
1327
  - app/assets/stylesheets/lalala/base/_base.css.scss
1328
+ - app/assets/stylesheets/lalala/base/_fonts.css.scss
1327
1329
  - app/assets/stylesheets/lalala/base/_layout.css.scss
1328
1330
  - app/assets/stylesheets/lalala/base/_mixins.css.scss
1329
1331
  - app/assets/stylesheets/lalala/base/_variables.css.scss
@@ -1331,6 +1333,7 @@ files:
1331
1333
  - app/assets/stylesheets/lalala/components/_chosen-lalala.css.scss
1332
1334
  - app/assets/stylesheets/lalala/components/_forms.css.scss
1333
1335
  - app/assets/stylesheets/lalala/components/_icons.css.scss
1336
+ - app/assets/stylesheets/lalala/components/_panels.css.scss
1334
1337
  - app/assets/stylesheets/lalala/components/_tables.css.scss
1335
1338
  - app/assets/stylesheets/lalala/editor-preview.css.scss
1336
1339
  - app/assets/stylesheets/lalala/lib/_chosen.css.scss
@@ -1514,6 +1517,7 @@ files:
1514
1517
  - test/dummy/app/pages/home_page.rb
1515
1518
  - test/dummy/app/uploaders/file_uploader.rb
1516
1519
  - test/dummy/app/uploaders/image_uploader.rb
1520
+ - test/dummy/app/views/admin/_stats.html.erb
1517
1521
  - test/dummy/app/views/layouts/application.html.erb
1518
1522
  - test/dummy/config.ru
1519
1523
  - test/dummy/config/application.rb
@@ -1613,6 +1617,7 @@ test_files:
1613
1617
  - test/dummy/app/pages/home_page.rb
1614
1618
  - test/dummy/app/uploaders/file_uploader.rb
1615
1619
  - test/dummy/app/uploaders/image_uploader.rb
1620
+ - test/dummy/app/views/admin/_stats.html.erb
1616
1621
  - test/dummy/app/views/layouts/application.html.erb
1617
1622
  - test/dummy/config.ru
1618
1623
  - test/dummy/config/application.rb