gluttonberg-core 2.5 → 2.5.1
Sign up to get free protection for your applications and to get access to all the features.
- data/app/assets/stylesheets/admin-override.sass +116 -109
- data/app/helpers/gluttonberg/asset_library.rb +3 -3
- data/app/models/gluttonberg/asset.rb +9 -1
- data/app/models/gluttonberg/member.rb +6 -1
- data/app/views/gluttonberg/admin/asset_library/assets/_form.html.haml +18 -5
- data/app/views/gluttonberg/admin/content/articles/_form.html.haml +29 -16
- data/app/views/gluttonberg/admin/content/articles/edit.html.haml +1 -7
- data/app/views/gluttonberg/admin/content/articles/index.html.haml +8 -1
- data/app/views/gluttonberg/admin/content/page_localizations/_form.html.haml +17 -9
- data/app/views/gluttonberg/admin/content/page_localizations/edit.html.haml +1 -1
- data/app/views/gluttonberg/admin/content/pages/_row.html.haml +9 -7
- data/app/views/layouts/gluttonberg.html.haml +4 -4
- data/db/migrate/20121106025800_add_artist_and_link_to_assets.rb +6 -0
- data/lib/engine.rb +3 -1
- data/lib/gluttonberg/components.rb +18 -17
- data/lib/gluttonberg/content/localization.rb +4 -7
- data/lib/gluttonberg/library/attachment_mixin.rb +4 -4
- data/lib/gluttonberg/version.rb +1 -1
- metadata +5 -11
- data/db/migrate/migrations +0 -1
- data/db/migrate/old_migrations/1_untitled.rb +0 -147
- data/db/migrate/old_migrations/20101110051141_version_tables.rb +0 -12
- data/db/migrate/old_migrations/20101110061505_add_state_column.rb +0 -9
- data/db/migrate/old_migrations/20101111002552_create_users.rb +0 -18
- data/db/migrate/old_migrations/2_asset_library.rb +0 -87
- data/lib/version.rb +0 -3
@@ -1,10 +1,10 @@
|
|
1
1
|
//
|
2
2
|
gb_skin
|
3
3
|
|
4
|
-
.container-fluid .row-fluid
|
4
|
+
.container-fluid .row-fluid
|
5
5
|
min-size: 960px !important
|
6
6
|
|
7
|
-
a.brand-img
|
7
|
+
a.brand-img
|
8
8
|
background: url(/assets/gb_logo_top.png) no-repeat 15px 6px
|
9
9
|
text-indent: -9999px
|
10
10
|
float: left
|
@@ -17,8 +17,8 @@ a.brand-img
|
|
17
17
|
margin-left: -20px
|
18
18
|
width: 115px
|
19
19
|
padding: 0
|
20
|
-
|
21
|
-
.navbar .brand
|
20
|
+
|
21
|
+
.navbar .brand
|
22
22
|
float: left
|
23
23
|
display: block
|
24
24
|
margin-left: 10px
|
@@ -27,16 +27,16 @@ a.brand-img
|
|
27
27
|
line-height: 40px
|
28
28
|
color: #fff
|
29
29
|
padding: 0
|
30
|
-
|
31
|
-
|
30
|
+
|
31
|
+
|
32
32
|
body
|
33
33
|
:padding
|
34
34
|
:top 160px !important
|
35
35
|
background: url(/assets/bg.png) repeat
|
36
|
-
|
37
|
-
.navbar-fixed-top
|
36
|
+
|
37
|
+
.navbar-fixed-top
|
38
38
|
z-index: 1035
|
39
|
-
|
39
|
+
|
40
40
|
.navbar-inner
|
41
41
|
background-color: #333
|
42
42
|
background-image: -moz-linear-gradient(top, #555, #333)
|
@@ -54,7 +54,7 @@ body
|
|
54
54
|
float: left
|
55
55
|
margin: 5px 0 0 0
|
56
56
|
border-radius: 2px
|
57
|
-
|
57
|
+
|
58
58
|
.navbar-main
|
59
59
|
top: 40px
|
60
60
|
position: fixed
|
@@ -70,12 +70,12 @@ body
|
|
70
70
|
margin: 0px
|
71
71
|
padding: 0px
|
72
72
|
height: 80px
|
73
|
-
|
73
|
+
|
74
74
|
li
|
75
75
|
float: left
|
76
76
|
width: 130px
|
77
77
|
height: 80px
|
78
|
-
|
78
|
+
|
79
79
|
a
|
80
80
|
display:block
|
81
81
|
color: #fff
|
@@ -86,120 +86,120 @@ body
|
|
86
86
|
line-height: 1em
|
87
87
|
background-position: 50% 100%
|
88
88
|
background-repeat: no-repeat
|
89
|
-
|
89
|
+
|
90
90
|
a:hover, a.active
|
91
91
|
background-color: #d35152
|
92
92
|
background-position: 50% 0
|
93
93
|
background-repeat: no-repeat
|
94
|
-
|
94
|
+
|
95
95
|
a#dashboard_nav
|
96
96
|
background-image: url('/assets/icon_dashboard.png')
|
97
|
-
|
97
|
+
|
98
98
|
a#content_nav
|
99
99
|
background-image: url('/assets/icon_content.png')
|
100
|
-
|
100
|
+
|
101
101
|
a#library_nav
|
102
102
|
background-image: url('/assets/icon_library.png')
|
103
|
-
|
103
|
+
|
104
104
|
a#membership_nav
|
105
105
|
background-image: url('/assets/icon_members.png')
|
106
|
-
|
106
|
+
|
107
107
|
a#settings_nav
|
108
108
|
background-image: url('/assets/icon_settings.png')
|
109
|
-
|
109
|
+
|
110
110
|
.dash-left
|
111
111
|
background: #fff
|
112
112
|
height: 100%
|
113
113
|
margin: 0
|
114
|
-
|
115
|
-
|
114
|
+
|
115
|
+
|
116
116
|
.page-header
|
117
117
|
margin: 0 0 18px 0
|
118
|
-
|
119
|
-
.well.sidebar-nav
|
118
|
+
|
119
|
+
.well.sidebar-nav
|
120
120
|
background: white
|
121
121
|
border: 1px solid #DDD
|
122
122
|
box-shadow: none
|
123
|
-
|
124
|
-
.nav-list > .active > a, .nav-list > .active > a:hover
|
123
|
+
|
124
|
+
.nav-list > .active > a, .nav-list > .active > a:hover
|
125
125
|
color: white
|
126
126
|
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2)
|
127
127
|
background-color: #83A2B2
|
128
128
|
padding: 3px 10px 3px 35px
|
129
129
|
background-position: 15px -32px !important
|
130
|
-
|
130
|
+
|
131
131
|
.nav-list > li > a
|
132
132
|
padding: 3px 10px 3px 35px
|
133
|
-
background-image: url(/assets/icon_default.png)
|
134
|
-
background-position: 15px 5px
|
133
|
+
background-image: url(/assets/icon_default.png)
|
134
|
+
background-position: 15px 5px
|
135
135
|
background-repeat: no-repeat
|
136
136
|
|
137
137
|
.nav-list a.blog
|
138
|
-
background-image: url(/assets/icon_blog.png)
|
139
|
-
background-position: 15px 5px
|
138
|
+
background-image: url(/assets/icon_blog.png)
|
139
|
+
background-position: 15px 5px
|
140
140
|
background-repeat: no-repeat
|
141
141
|
|
142
142
|
.nav-list a.pages
|
143
|
-
background-image: url(/assets/icon_pages.png)
|
144
|
-
background-position: 15px 5px
|
143
|
+
background-image: url(/assets/icon_pages.png)
|
144
|
+
background-position: 15px 5px
|
145
145
|
background-repeat: no-repeat
|
146
|
-
|
146
|
+
|
147
147
|
.nav-list a#groupsNav
|
148
|
-
background-image: url(/assets/icon_member.png)
|
149
|
-
background-position: 15px 5px
|
148
|
+
background-image: url(/assets/icon_member.png)
|
149
|
+
background-position: 15px 5px
|
150
150
|
background-repeat: no-repeat
|
151
|
-
|
151
|
+
|
152
152
|
.nav-list a#membersNav
|
153
|
-
background-image: url(/assets/icon_member.png)
|
154
|
-
background-position: 15px 5px
|
153
|
+
background-image: url(/assets/icon_member.png)
|
154
|
+
background-position: 15px 5px
|
155
155
|
background-repeat: no-repeat
|
156
|
-
|
156
|
+
|
157
157
|
.nav-list a.upload
|
158
|
-
background-image: url(/assets/icon_upload.png)
|
159
|
-
background-position: 15px 5px
|
158
|
+
background-image: url(/assets/icon_upload.png)
|
159
|
+
background-position: 15px 5px
|
160
160
|
background-repeat: no-repeat
|
161
|
-
|
161
|
+
|
162
162
|
.nav-list a.collections
|
163
|
-
background-image: url(/assets/icon_collection.png)
|
164
|
-
background-position: 15px 5px
|
163
|
+
background-image: url(/assets/icon_collection.png)
|
164
|
+
background-position: 15px 5px
|
165
165
|
background-repeat: no-repeat
|
166
|
-
|
166
|
+
|
167
167
|
.nav-list a.assets
|
168
|
-
background-image: url(/assets/icon_asset.png)
|
169
|
-
background-position: 15px 5px
|
168
|
+
background-image: url(/assets/icon_asset.png)
|
169
|
+
background-position: 15px 5px
|
170
170
|
background-repeat: no-repeat
|
171
|
-
|
171
|
+
|
172
172
|
.nav-list a.active
|
173
|
-
background-position: 15px -32px
|
173
|
+
background-position: 15px -32px
|
174
174
|
background-repeat:no-repeat
|
175
175
|
|
176
176
|
.dashboard.well
|
177
177
|
background-color: #fff
|
178
178
|
|
179
|
-
.dashboard .nav-list
|
179
|
+
.dashboard .nav-list
|
180
180
|
margin: 0
|
181
181
|
padding: 0
|
182
182
|
|
183
183
|
.dashboard a
|
184
184
|
display: block
|
185
185
|
margin: 0 0 3px 0
|
186
|
-
|
186
|
+
|
187
187
|
.dashboard a.edit
|
188
|
-
background-image: url(/assets/icon_blog.png)
|
188
|
+
background-image: url(/assets/icon_blog.png)
|
189
189
|
|
190
190
|
.dashboard a.add
|
191
|
-
background-image: url(/assets/icon_add.png)
|
192
|
-
|
191
|
+
background-image: url(/assets/icon_add.png)
|
192
|
+
|
193
193
|
|
194
194
|
|
195
195
|
a
|
196
196
|
color: #83A2B2
|
197
|
-
|
197
|
+
|
198
198
|
a:hover
|
199
199
|
color: #728d9b
|
200
|
-
|
201
200
|
|
202
|
-
|
201
|
+
|
202
|
+
h1
|
203
203
|
color: #333
|
204
204
|
|
205
205
|
h1 a
|
@@ -207,13 +207,13 @@ h1 a
|
|
207
207
|
|
208
208
|
h1 a:hover
|
209
209
|
text-decoration: none
|
210
|
-
|
210
|
+
|
211
211
|
input, textarea
|
212
212
|
display: block
|
213
|
-
|
213
|
+
|
214
214
|
label
|
215
215
|
display: inline-block
|
216
|
-
|
216
|
+
|
217
217
|
input[type="radio"], input[type="checkbox"]
|
218
218
|
display: inline-block
|
219
219
|
float: left
|
@@ -221,10 +221,10 @@ input[type="radio"], input[type="checkbox"]
|
|
221
221
|
|
222
222
|
select
|
223
223
|
display: block
|
224
|
-
|
224
|
+
|
225
225
|
legend
|
226
|
-
margin-bottom: 15px
|
227
|
-
|
226
|
+
margin-bottom: 15px
|
227
|
+
|
228
228
|
input:focus, textarea:focus, select:focus
|
229
229
|
border-color: rgba(0, 0, 0, 0.3)
|
230
230
|
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(0, 0, 0, 0.2)
|
@@ -232,7 +232,7 @@ input:focus, textarea:focus, select:focus
|
|
232
232
|
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(0, 0, 0, 0.2)
|
233
233
|
outline: 0
|
234
234
|
|
235
|
-
.btn-success, .btn-primary
|
235
|
+
.btn-success, .btn-primary
|
236
236
|
background-color: #96bacc
|
237
237
|
background-image: -moz-linear-gradient(top, #83a2b2, #627985)
|
238
238
|
background-image: -ms-linear-gradient(top, #83a2b2, #627985)
|
@@ -242,7 +242,7 @@ input:focus, textarea:focus, select:focus
|
|
242
242
|
background-image: linear-gradient(top, #83a2b2, #627985)
|
243
243
|
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#83a2b2', endColorstr='#627985', GradientType=0)
|
244
244
|
border-color: #83a2b2 #83a2b2 #556a74
|
245
|
-
|
245
|
+
|
246
246
|
.btn-success:hover, .btn-success:active, .btn-primary:hover, .btn-primary:active, .btn-success.active, .btn-success.disabled, .btn-success[disabled]
|
247
247
|
background-color: #627985
|
248
248
|
|
@@ -258,17 +258,17 @@ input:focus, textarea:focus, select:focus
|
|
258
258
|
|
259
259
|
.comment hr
|
260
260
|
margin: 5px 0
|
261
|
-
|
261
|
+
|
262
262
|
.comment .controls
|
263
263
|
text-align: right
|
264
|
-
|
264
|
+
|
265
265
|
span.date
|
266
266
|
color: #999
|
267
267
|
|
268
268
|
#asset_search_form, #list_search_form
|
269
269
|
input
|
270
270
|
display: inline-block
|
271
|
-
input.button
|
271
|
+
input.button
|
272
272
|
background: #83A2B2
|
273
273
|
color: white
|
274
274
|
border: none
|
@@ -279,7 +279,7 @@ span.date
|
|
279
279
|
|
280
280
|
.table-bordered
|
281
281
|
background: #fff
|
282
|
-
|
282
|
+
|
283
283
|
.meta_body
|
284
284
|
dl
|
285
285
|
:width 100%
|
@@ -294,38 +294,38 @@ span.date
|
|
294
294
|
dt:first-child, dd:nth-child(2)
|
295
295
|
:border-top none
|
296
296
|
:padding-top 0
|
297
|
-
|
298
|
-
|
299
|
-
|
297
|
+
|
298
|
+
|
299
|
+
|
300
300
|
#login
|
301
301
|
img
|
302
302
|
:float left
|
303
303
|
:margin -5px 10px 0 0
|
304
|
-
|
304
|
+
|
305
305
|
#form.well
|
306
306
|
:margin 10px 0
|
307
|
-
|
307
|
+
|
308
308
|
.alert
|
309
309
|
.error-title
|
310
310
|
:font
|
311
311
|
:size 14px
|
312
312
|
:margin
|
313
313
|
:bottom 10px
|
314
|
-
|
314
|
+
|
315
315
|
form
|
316
316
|
:margin 0
|
317
|
-
|
317
|
+
|
318
318
|
input.span4
|
319
319
|
:width 420px
|
320
|
-
|
320
|
+
|
321
321
|
form
|
322
322
|
.span5
|
323
323
|
:margin 0 !important
|
324
324
|
:width 520px
|
325
|
-
|
325
|
+
|
326
326
|
input[type="text"]
|
327
327
|
:width 510px
|
328
|
-
|
328
|
+
|
329
329
|
textarea
|
330
330
|
:width 510px
|
331
331
|
:height 200px
|
@@ -333,11 +333,11 @@ td
|
|
333
333
|
a.thumbnail
|
334
334
|
:background #ffffff
|
335
335
|
:width 160px
|
336
|
-
|
336
|
+
|
337
337
|
ul.thumbnails
|
338
|
-
p
|
338
|
+
p
|
339
339
|
:margin 9px 0 0 !important
|
340
|
-
|
340
|
+
|
341
341
|
.modal
|
342
342
|
:position fixed !important
|
343
343
|
:top 50%
|
@@ -351,8 +351,8 @@ ul.thumbnails
|
|
351
351
|
:margin
|
352
352
|
:top -100px
|
353
353
|
:left -100px
|
354
|
-
|
355
|
-
|
354
|
+
|
355
|
+
|
356
356
|
.ui-draggable
|
357
357
|
background: url('/assets/drag_handle.png') no-repeat
|
358
358
|
width: 11px
|
@@ -381,7 +381,7 @@ ul.thumbnails
|
|
381
381
|
|
382
382
|
.ui-resizable .ui-resizable-handle
|
383
383
|
display: block
|
384
|
-
|
384
|
+
|
385
385
|
tr
|
386
386
|
&.insert_after td
|
387
387
|
border: none
|
@@ -403,13 +403,13 @@ tr
|
|
403
403
|
z-index: 1
|
404
404
|
|
405
405
|
|
406
|
-
.help-block
|
406
|
+
.help-block
|
407
407
|
.span2
|
408
408
|
:margin-left 0px
|
409
409
|
:color #BFBFBF
|
410
410
|
:margin-top -5px
|
411
411
|
:font-size 12px
|
412
|
-
|
412
|
+
|
413
413
|
label.error
|
414
414
|
:color #b94a48
|
415
415
|
|
@@ -419,17 +419,17 @@ form .span5
|
|
419
419
|
|
420
420
|
.clear
|
421
421
|
:clear both
|
422
|
-
|
422
|
+
|
423
423
|
|
424
424
|
.model-error
|
425
|
-
:width 469px
|
426
|
-
|
427
|
-
|
425
|
+
:width 469px
|
426
|
+
|
427
|
+
|
428
428
|
legend.expandable
|
429
429
|
background: url('/assets/arrow.png') top right no-repeat
|
430
430
|
cursor: pointer
|
431
431
|
|
432
|
-
legend.collapsed
|
432
|
+
legend.collapsed
|
433
433
|
background: url('/assets/arrow.png') bottom right no-repeat
|
434
434
|
|
435
435
|
//
|
@@ -476,7 +476,7 @@ legend.collapsed
|
|
476
476
|
color: white
|
477
477
|
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2)
|
478
478
|
background-color: #08C
|
479
|
-
|
479
|
+
|
480
480
|
.pagination
|
481
481
|
span.disabled, em
|
482
482
|
float: left
|
@@ -490,7 +490,7 @@ legend.collapsed
|
|
490
490
|
-webkit-border-radius: 3px 0 0 3px
|
491
491
|
-moz-border-radius: 3px 0 0 3px
|
492
492
|
border-radius: 3px 0 0 3px
|
493
|
-
|
493
|
+
|
494
494
|
|
495
495
|
table
|
496
496
|
thead
|
@@ -503,7 +503,7 @@ table
|
|
503
503
|
&:hover, &.asc:hover, &.current.desc
|
504
504
|
:padding-right 25px
|
505
505
|
background: url("/assets/library/sort_by_desc.png") right no-repeat
|
506
|
-
|
506
|
+
|
507
507
|
#page_slug_holder
|
508
508
|
.domain
|
509
509
|
:float left
|
@@ -511,14 +511,14 @@ table
|
|
511
511
|
#page_slug
|
512
512
|
span
|
513
513
|
:background none
|
514
|
-
|
514
|
+
|
515
515
|
#page_hidden_slug
|
516
516
|
:display none
|
517
|
-
|
517
|
+
|
518
518
|
.nav-tabs
|
519
519
|
margin: 0
|
520
|
-
|
521
|
-
.tab-content
|
520
|
+
|
521
|
+
.tab-content
|
522
522
|
display: table
|
523
523
|
width: 100%
|
524
524
|
border: 1px solid #DDD
|
@@ -527,12 +527,12 @@ table
|
|
527
527
|
|
528
528
|
.tab-content .pad
|
529
529
|
padding: 15px 10px
|
530
|
-
|
531
|
-
|
530
|
+
|
531
|
+
|
532
532
|
.span5 .pad input[type="text"], .span5 .pad textarea
|
533
533
|
width: 480px
|
534
|
-
|
535
|
-
|
534
|
+
|
535
|
+
|
536
536
|
.nav-tabs > li > a
|
537
537
|
font-size: 19.5px
|
538
538
|
color: #333
|
@@ -543,21 +543,28 @@ table
|
|
543
543
|
.versions
|
544
544
|
position: absolute
|
545
545
|
right: 0
|
546
|
-
|
546
|
+
|
547
547
|
|
548
548
|
.table-bordered th
|
549
549
|
border-left: none
|
550
550
|
background: #eee
|
551
|
-
|
552
|
-
|
551
|
+
|
552
|
+
|
553
553
|
.table-bordered th:first-child
|
554
554
|
border-left: 1px solid #DDD
|
555
|
-
|
555
|
+
|
556
556
|
.nav > li > a:hover
|
557
557
|
background-color: #f5f5f5
|
558
558
|
|
559
559
|
.dropdown-menu li > a:hover
|
560
|
-
background-color: #83A2B2
|
560
|
+
background-color: #83A2B2
|
561
561
|
|
562
562
|
.dropdown-menu li.danger > a:hover
|
563
|
-
background-color: #DA4F49
|
563
|
+
background-color: #DA4F49
|
564
|
+
|
565
|
+
.versions.page_content_form
|
566
|
+
.btn-group
|
567
|
+
:float left
|
568
|
+
:margin-right 10px
|
569
|
+
.historycontrols
|
570
|
+
:float left
|