active_scaffold 3.1.17 → 3.1.18

Sign up to get free protection for your applications and to get access to all the features.
Files changed (30) hide show
  1. data/app/assets/images/{add.gif → active_scaffold/add.gif} +0 -0
  2. data/app/assets/images/{arrow_down.gif → active_scaffold/arrow_down.gif} +0 -0
  3. data/app/assets/images/{arrow_up.gif → active_scaffold/arrow_up.gif} +0 -0
  4. data/app/assets/images/{close.gif → active_scaffold/close.gif} +0 -0
  5. data/app/assets/images/{close_touch.png → active_scaffold/close_touch.png} +0 -0
  6. data/app/assets/images/{config.png → active_scaffold/config.png} +0 -0
  7. data/app/assets/images/{cross.png → active_scaffold/cross.png} +0 -0
  8. data/app/assets/images/{gears.png → active_scaffold/gears.png} +0 -0
  9. data/app/assets/images/{indicator-small.gif → active_scaffold/indicator-small.gif} +0 -0
  10. data/app/assets/images/{indicator.gif → active_scaffold/indicator.gif} +0 -0
  11. data/app/assets/images/{magnifier.png → active_scaffold/magnifier.png} +0 -0
  12. data/app/assets/javascripts/jquery/active_scaffold.js +125 -125
  13. data/app/assets/javascripts/jquery/date_picker_bridge.js.erb +5 -5
  14. data/app/assets/javascripts/jquery/draggable_lists.js +9 -9
  15. data/app/assets/javascripts/jquery/tiny_mce_bridge.js +2 -2
  16. data/app/assets/stylesheets/active_scaffold.css.erb +166 -147
  17. data/app/assets/stylesheets/active_scaffold.css.erb~ +182 -147
  18. data/app/assets/stylesheets/blue-theme.css +74 -0
  19. data/app/assets/stylesheets/blue-theme.css~ +1150 -0
  20. data/frontends/default/views/_search.html.erb +3 -3
  21. data/lib/active_scaffold/actions/nested.rb +2 -2
  22. data/lib/active_scaffold/actions/nested.rb~ +3 -3
  23. data/lib/active_scaffold/data_structures/nested_info.rb +6 -2
  24. data/lib/active_scaffold/data_structures/nested_info.rb~ +7 -3
  25. data/lib/active_scaffold/helpers/search_column_helpers.rb +3 -1
  26. data/lib/active_scaffold/helpers/view_helpers.rb +1 -1
  27. data/lib/active_scaffold/version.rb +1 -1
  28. data/lib/active_scaffold.rb +2 -1
  29. data/lib/active_scaffold.rb~ +14 -4
  30. metadata +21 -19
@@ -7,6 +7,82 @@
7
7
  For details, see the ActiveScaffold web site: http://www.activescaffold.com/
8
8
 
9
9
  */
10
+ <%
11
+ @disabled_color ||= '#999'
12
+ @actions_disabled_color ||= '#666'
13
+ @link_color ||= '#06c'
14
+ @hover_bg ||= '#ff8'
15
+ @header_color ||= '#555'
16
+
17
+ @column_header_bg ||= @header_color
18
+ @column_header_link_color ||= '#fff'
19
+ @column_header_link_hover_bg ||= '#000'
20
+ @column_header_link_hover_color ||= '#ff8'
21
+ @column_header_color ||= '#eee'
22
+ @column_header_sorted_bg ||= '#333'
23
+
24
+ @column_bg ||= '#E6F2FF'
25
+ @column_even_bg ||= '#fff'
26
+ @column_color ||= '#333'
27
+ @column_empty_color ||= '#999'
28
+ @column_border_color ||= '#C5DBF7'
29
+ @column_even_border_color ||= '#ddd'
30
+ @column_actions_border_color ||= '#ccc'
31
+
32
+ @column_sorted_bg ||= '#B9DCFF'
33
+ @column_sorted_border_color ||= '#AFD0F5'
34
+ @column_even_sorted_bg ||= '#E6F2FF'
35
+ @column_even_sorted_border_color ||= '#AFD0F5'
36
+
37
+ @calculations_bg ||= '#eee'
38
+ @calculations_border_color ||= '#005CB8'
39
+
40
+ @action_group_color ||= '#0066CC'
41
+ @action_group_hover_bg ||= '#ff8'
42
+ @action_group_border_color ||= '#005CB8'
43
+ @action_group_items_bg ||= '#EEE'
44
+ @action_group_items_border_color ||= '#222'
45
+ @action_group_link_color ||= @column_color
46
+
47
+ @nested_bg ||= '#DAFFCD'
48
+ @nested_border_color ||= '#7FCF00'
49
+ @nested_footer_color ||= '#444'
50
+ @nested_column_bg ||= '#ECFFE7'
51
+ @nested_column_border_color ||= @column_border_color
52
+
53
+ @second_nested_bg ||= '#FFFFBB'
54
+ @second_nested_border_color ||= '#DDDF37'
55
+
56
+ @third_nested_bg ||= @nested_bg
57
+ @third_nested_border_color ||= @nested_border_color
58
+
59
+ @pagination_border_color ||= '#ccc'
60
+ @msg_color ||= '#333'
61
+ @msg_error_bg ||= '#fbb'
62
+ @msg_error_border_color ||= '#f66'
63
+ @msg_warning_bg ||= '#ffb'
64
+ @msg_warning_border_color ||= '#ff6'
65
+ @msg_info_bg ||= '#bbf'
66
+ @msg_info_border_color ||= '#66f'
67
+ @msg_filtered_bg ||= '#e8e8e8'
68
+ @msg_filtered_color ||= '#666'
69
+
70
+ @form_title_color ||= '#1F7F00'
71
+ @label_color ||= @header_color
72
+ @description_color ||= '#999'
73
+ @placeholder_color ||= '#aaa'
74
+ @input_border_color ||= @form_title_color
75
+ @input_error_border_color ||= '#f00'
76
+ @input_focus_bg ||= '#ffc'
77
+
78
+ @draggable_list_bg ||= '#FFFF88'
79
+ @draggable_list_selected_bg ||= '#7FCF00'
80
+ @checkbox_list_bg ||= '#fff'
81
+
82
+ @subform_color ||= '#999'
83
+ @subform_header_color ||= @header_color
84
+ @subform_footer_color ||= @subform_color
85
+ %>
10
86
 
11
87
  .active-scaffold form,
12
88
  .active-scaffold table,
@@ -28,16 +104,16 @@ border-collapse: separate;
28
104
 
29
105
  .active-scaffold a,
30
106
  .active-scaffold a:visited {
31
- color: #06c;
107
+ color: <%= @link_color %>;
32
108
  text-decoration: none;
33
109
  }
34
110
 
35
111
  .active-scaffold a.disabled {
36
- color: #999;
112
+ color: <%= @disabled_color %>;
37
113
  }
38
114
 
39
115
  .active-scaffold a:hover, .active-scaffold div.hover, .active-scaffold td span.hover {
40
- background-color: #ff8;
116
+ background-color: <%= @hover_bg %>;
41
117
  }
42
118
 
43
119
  .active-scaffold div.actions a img,
@@ -56,12 +132,12 @@ clear: both;
56
132
  }
57
133
 
58
134
  noscript.active-scaffold {
59
- border-left: solid 5px #f66;
60
- background-color: #fbb;
135
+ border-left: solid 5px <%= @msg_error_border_color %>;
136
+ background-color: <%= @msg_error_bg %>;
61
137
  font-size: 11px;
62
138
  font-weight: bold;
63
139
  padding: 5px 20px 5px 5px;
64
- color: #333;
140
+ color: <%= @column_color %>;
65
141
  }
66
142
 
67
143
  .active-scaffold .mark_record_column {
@@ -75,22 +151,13 @@ color: #333;
75
151
  position: relative;
76
152
  }
77
153
 
78
- .blue-theme .active-scaffold-header {
79
- background-color: #005CB8;
80
- }
81
-
82
154
  .active-scaffold-header h2 {
83
155
  padding: 2px 0px;
84
156
  margin: 0;
85
- color: #555;
157
+ color: <%= @header_color %>;
86
158
  font: bold 160% arial, sans-serif;
87
159
  }
88
160
 
89
- .blue-theme .active-scaffold-header h2 {
90
- color: #fff;
91
- padding: 2px 5px 4px 5px;
92
- }
93
-
94
161
  .active-scaffold-header div.actions a,
95
162
  .active-scaffold-header div.actions {
96
163
  float: right;
@@ -139,17 +206,8 @@ top: 14px;
139
206
  float: left;
140
207
  }
141
208
 
142
- .blue-theme .active-scaffold-header div.actions a {
143
- color: #fff;
144
- }
145
-
146
209
  .active-scaffold-header div.actions a.disabled {
147
- color: #666;
148
- opacity: 0.5;
149
- }
150
-
151
- .blue-theme .active-scaffold-header div.actions a.disabled {
152
- color: #fff;
210
+ color: <%= @actions_disabled_color %>;
153
211
  opacity: 0.5;
154
212
  }
155
213
 
@@ -176,25 +234,21 @@ background-repeat: no-repeat;
176
234
  }
177
235
 
178
236
  .active-scaffold-header div.actions div.action_group div {
179
- background-image: url(<%= asset_path 'gears.png' %>); /* default icon for actions or override with css */
237
+ background-image: url(<%= asset_path 'active_scaffold/gears.png' %>); /* default icon for actions or override with css */
180
238
  }
181
239
 
182
240
  .active-scaffold-header div.actions a.show_config_list {
183
- background-image: url(<%= asset_path 'config.png' %>);
241
+ background-image: url(<%= asset_path 'active_scaffold/config.png' %>);
184
242
  }
185
243
 
186
244
  .active-scaffold-header div.actions a.new,
187
245
  .active-scaffold-header div.actions a.new_existing {
188
- background-image: url(<%= asset_path 'add.gif' %>);
246
+ background-image: url(<%= asset_path 'active_scaffold/add.gif' %>);
189
247
  }
190
248
 
191
249
  .active-scaffold-header div.actions a.show_search {
192
250
 
193
- background-image: url(<%= asset_path 'magnifier.png' %>);
194
- }
195
-
196
- .blue-theme .active-scaffold-header div.actions a:hover {
197
- background-color: #378CDF;
251
+ background-image: url(<%= asset_path 'active_scaffold/magnifier.png' %>);
198
252
  }
199
253
 
200
254
  .active-scaffold-header div.actions a.disabled:hover {
@@ -213,7 +267,7 @@ text-align: right;
213
267
  ============================= */
214
268
 
215
269
  .active-scaffold th {
216
- background-color: #555;
270
+ background-color: <%= @column_header_bg %>;
217
271
  text-align: left;
218
272
  }
219
273
 
@@ -221,26 +275,26 @@ text-align: left;
221
275
  .active-scaffold th p {
222
276
  font: bold 11px arial, sans-serif;
223
277
  display: block;
224
- background-color: #555;
278
+ background-color: <%= @column_header_bg %>;
225
279
  }
226
280
 
227
281
  .active-scaffold th a, .active-scaffold th a:visited {
228
- color: #fff;
282
+ color: <%= @column_header_link_color %>;
229
283
  padding: 2px 2px 2px 5px;
230
284
  }
231
285
 
232
286
  .active-scaffold th p {
233
- color: #eee;
287
+ color: <%= @column_header_color %>;
234
288
  padding: 2px 5px;
235
289
  }
236
290
 
237
291
  .active-scaffold th a:hover {
238
- background-color: #000;
239
- color: #ff8;
292
+ background-color: <%= @column_header_link_hover_bg %>;
293
+ color: <%= @column_header_link_hover_color %>;
240
294
  }
241
295
 
242
296
  .active-scaffold th.sorted {
243
- background-color: #333;
297
+ background-color: <%= @column_header_sorted_bg %>;
244
298
  }
245
299
 
246
300
  .active-scaffold th.sorted a {
@@ -249,17 +303,29 @@ padding-right: 18px;
249
303
 
250
304
  .active-scaffold th.asc a,
251
305
  .active-scaffold th.asc a:hover {
252
- background: #333 url(<%= asset_path 'arrow_up.gif' %>) right 50% no-repeat;
306
+ <<<<<<< Updated upstream
307
+ background: #333 url(<%= asset_path 'active_scaffold/arrow_up.gif' %>) right 50% no-repeat;
308
+ =======
309
+ background: <%= @column_header_sorted_bg %> url(<%= asset_path 'arrow_up.gif' %>) right 50% no-repeat;
310
+ >>>>>>> Stashed changes
253
311
  }
254
312
 
255
313
  .active-scaffold th.desc a,
256
314
  .active-scaffold th.desc a:hover {
257
- background: #333 url(<%= asset_path 'arrow_down.gif' %>) right 50% no-repeat;
315
+ <<<<<<< Updated upstream
316
+ background: #333 url(<%= asset_path 'active_scaffold/arrow_down.gif' %>) right 50% no-repeat;
317
+ =======
318
+ background: <%= @column_header_sorted_bg %> url(<%= asset_path 'arrow_down.gif' %>) right 50% no-repeat;
319
+ >>>>>>> Stashed changes
258
320
  }
259
321
 
260
322
  .active-scaffold th.loading a,
261
323
  .active-scaffold th.loading a:hover {
262
- background: #333 url(<%= asset_path 'indicator-small.gif' %>) right 50% no-repeat;
324
+ <<<<<<< Updated upstream
325
+ background: #333 url(<%= asset_path 'active_scaffold/indicator-small.gif' %>) right 50% no-repeat;
326
+ =======
327
+ background: <%= @column_header_sorted_bg %> url(<%= asset_path 'indicator-small.gif' %>) right 50% no-repeat;
328
+ >>>>>>> Stashed changes
263
329
  }
264
330
 
265
331
  .active-scaffold th .mark_heading {
@@ -274,15 +340,15 @@ display: none;
274
340
  ============================= */
275
341
 
276
342
  .active-scaffold tr.record {
277
- background-color: #E6F2FF;
343
+ background-color: <%= @column_bg %>;
278
344
  }
279
345
  .active-scaffold tr.record td {
280
346
  padding: 5px 4px;
281
- color: #333;
347
+ color: <%= @column_color %>;
282
348
  font-family: Verdana, sans-serif;
283
349
  font-size: 11px;
284
- border-bottom: solid 1px #C5DBF7;
285
- border-left: solid 1px #C5DBF7;
350
+ border: solid 1px <%= @column_border_color %>;
351
+ border-width: 0 0 1px 1px;
286
352
  }
287
353
 
288
354
  .active-scaffold tr.record td.messages-container {
@@ -290,24 +356,24 @@ padding: 0px;
290
356
  }
291
357
 
292
358
  .active-scaffold tr.even-record {
293
- background-color: #fff;
359
+ background-color: <%= @column_even_bg %>;
294
360
  }
295
361
  .active-scaffold tr.even-record td {
296
- border-left-color: #ddd;
362
+ border-left-color: <%= @column_even_border_color %>;
297
363
  }
298
364
 
299
365
  .active-scaffold tr.record td.sorted {
300
- background-color: #B9DCFF;
301
- border-bottom-color: #AFD0F5;
366
+ background-color: <%= @column_sorted_bg %>;
367
+ border-bottom-color: <%= @column_sorted_border_color %>;
302
368
  }
303
369
 
304
370
  .active-scaffold tr.even-record td.sorted {
305
- background-color: #E6F2FF;
306
- border-bottom-color: #AFD0F5;
371
+ background-color: <%= @column_even_sorted_bg %>;
372
+ border-bottom-color: <%= @column_even_sorted_border_color %>;
307
373
  }
308
374
 
309
375
  .active-scaffold tbody.records td.empty {
310
- color: #999;
376
+ color: <%= @column_empty_color %>;
311
377
  text-align: center;
312
378
  }
313
379
 
@@ -319,7 +385,7 @@ text-align: right;
319
385
  /* Table :: Actions (Edit, Delete)
320
386
  ============================= */
321
387
  .active-scaffold tr.record td.actions {
322
- border-right: solid 1px #ccc;
388
+ border-right: solid 1px <%= @column_actions_border_color %>;
323
389
  padding: 0;
324
390
  min-width: 1%;
325
391
  }
@@ -347,22 +413,22 @@ white-space: nowrap;
347
413
  }
348
414
 
349
415
  .active-scaffold tr.record td.actions a.disabled {
350
- color: #666;
416
+ color: <%= @actions_disabled_color %>;
351
417
  opacity: 0.5;
352
418
  }
353
419
 
354
420
  .active-scaffold .actions .action_group div:hover {
355
- background-color: #ff8;
421
+ background-color: <%= @action_group_hover_bg %>;
356
422
  }
357
423
 
358
424
  .active-scaffold .actions .action_group {
359
425
  position: relative;
360
426
  text-align: left;
361
- color: #0066CC;
427
+ color: <%= @action_group_color %>;
362
428
  }
363
429
 
364
430
  .active-scaffold .actions .action_group ul {
365
- border: 2px solid #005CB8;
431
+ border: 2px solid <%= @action_group_border_color %>;
366
432
  list-style-type: none;
367
433
  margin: 0;
368
434
  padding: 0;
@@ -381,8 +447,8 @@ right: 150px;
381
447
  }
382
448
 
383
449
  .active-scaffold .actions .action_group ul li {
384
- background: none repeat scroll 0 0 #EEE;
385
- border-top: 1px dashed #222;
450
+ background: none repeat scroll 0 0 <%= @action_group_items_bg %>;
451
+ border-top: 1px dashed <%= @action_group_items_border_color %>;
386
452
  display: block;
387
453
  position: relative;
388
454
  width: auto;
@@ -398,7 +464,7 @@ z-index: 2;
398
464
 
399
465
  .active-scaffold .actions .action_group ul li a {
400
466
  display: block;
401
- color: #333;
467
+ color: <%= @action_group_link_color %>;
402
468
  margin: 0;
403
469
  padding: 5px 5px 5px 25px;
404
470
  background-position: 5px 50%;
@@ -406,7 +472,7 @@ z-index: 2;
406
472
  }
407
473
 
408
474
  .active-scaffold .actions .action_group ul li.top {
409
- border-top: 0px solid #005CB8;
475
+ border-top-width: 0px;
410
476
  }
411
477
 
412
478
  .active-scaffold .actions .action_group:hover ul ul,
@@ -424,9 +490,9 @@ display: block;
424
490
  ============================= */
425
491
 
426
492
  .active-scaffold .view {
427
- background-color: #DAFFCD;
493
+ background-color: <%= @nested_bg %>;
428
494
  padding: 4px;
429
- border: solid 1px #7FcF00;
495
+ border: solid 1px <%= @nested_border_color %>;
430
496
  }
431
497
 
432
498
  .active-scaffold tbody.records td.inline-adapter-cell .view {
@@ -442,19 +508,12 @@ float: right;
442
508
  text-indent: -4000px;
443
509
  width: 16px;
444
510
  height: 17px;
445
- background: url(<%= asset_path 'close.gif' %>) 0 0 no-repeat;
511
+ background: url(<%= asset_path 'active_scaffold/close.gif' %>) 0 0 no-repeat;
446
512
  }
447
513
 
448
514
  /* Nested
449
515
  ======================== */
450
516
 
451
- .blue-theme .active-scaffold .active-scaffold-header,
452
- .blue-theme .active-scaffold .active-scaffold-footer {
453
- background-color: #1F7F00;
454
-
455
- background: transparent;
456
- }
457
-
458
517
  .active-scaffold .active-scaffold .active-scaffold-header {
459
518
  margin-right: 25px;
460
519
  }
@@ -464,9 +523,8 @@ font-size: 12px;
464
523
  font-weight: bold;
465
524
  }
466
525
 
467
- .blue-theme .active-scaffold .active-scaffold-header h2,
468
526
  .active-scaffold .active-scaffold .active-scaffold-footer {
469
- color: #444;
527
+ color: <%= @nested_footer_color %>;
470
528
  }
471
529
 
472
530
  .active-scaffold .active-scaffold .active-scaffold-header div.actions {
@@ -479,15 +537,6 @@ right: 0px;
479
537
  font: bold 11px verdana, sans-serif;
480
538
  }
481
539
 
482
- .blue-theme .active-scaffold .active-scaffold-header div.actions a,
483
- .blue-theme .active-scaffold .active-scaffold-header div.actions a:visited {
484
- color: #06c;
485
- }
486
-
487
- .blue-theme .active-scaffold .active-scaffold-header div.actions a:hover {
488
- background-color: #ff8;
489
- }
490
-
491
540
  .active-scaffold .active-scaffold .view {
492
541
  background-color: transparent;
493
542
  padding: 0px;
@@ -495,22 +544,22 @@ border: none;
495
544
  }
496
545
 
497
546
  .active-scaffold .active-scaffold td {
498
- background-color: #ECFFE7;
499
- border-bottom: solid 1px #CDF7C5;
500
- border-left: solid 1px #CDF7C5;
547
+ background-color: <%= @nested_column_bg %>;
548
+ border-bottom: solid 1px <%= @nested_column_border_color %>;
549
+ border-left: solid 1px <%= @nested_column_border_color %>;
501
550
  }
502
551
 
503
552
  .active-scaffold .active-scaffold td.inline-adapter-cell {
504
- background-color: #FFFFBB;
553
+ background-color: <%= @second_nested_bg %>;
505
554
  padding: 4px;
506
- border: solid 1px #DDDF37;
555
+ border: solid 1px <%= @second_nested_border_color %>;
507
556
  border-top: none;
508
557
  }
509
558
 
510
559
  .active-scaffold .active-scaffold .active-scaffold td.inline-adapter-cell {
511
- background-color: #DAFFCD;
560
+ background-color: <%= @third_nested_bg %>;
512
561
  padding: 4px;
513
- border: solid 1px #7FcF00;
562
+ border: solid 1px <%= @third_nested_border_color %>;
514
563
  border-top: none;
515
564
  }
516
565
 
@@ -522,8 +571,8 @@ font-size: 11px;
522
571
  ========================== */
523
572
 
524
573
  .active-scaffold-calculations td {
525
- background-color: #eee;
526
- border-top: 2px solid #005CB8;
574
+ background-color: <%= @calculations_bg %>;
575
+ border-top: 2px solid <%= @calculations_border_color %>;
527
576
  font: bold 12px arial, sans-serif;
528
577
  }
529
578
 
@@ -533,21 +582,12 @@ border-bottom: none;
533
582
  font: bold 12px arial, sans-serif;
534
583
  }
535
584
 
536
- .blue-theme .active-scaffold-footer {
537
- background-color: #005CB8;
538
- color: #ccc;
539
- }
540
-
541
585
  .active-scaffold-footer .active-scaffold-pagination {
542
586
  float: right;
543
587
  white-space: nowrap;
544
588
  margin-right: 5px;
545
589
  }
546
590
 
547
- .blue-theme .active-scaffold-footer .active-scaffold-records {
548
- margin-left: 5px;
549
- }
550
-
551
591
  .active-scaffold-footer a {
552
592
  text-decoration: none;
553
593
  letter-spacing: 0;
@@ -556,25 +596,16 @@ margin: 0 -2px;
556
596
  font: bold 12px arial, sans-serif;
557
597
  }
558
598
 
559
- .blue-theme .active-scaffold-footer a,
560
- .blue-theme .active-scaffold-footer a:visited {
561
- color: #fff;
562
- }
563
-
564
- .blue-theme .active-scaffold-footer a:hover {
565
- background-color: #378CDF;
566
- }
567
-
568
599
  .active-scaffold-footer .next {
569
600
  margin-left: 0;
570
601
  padding-left: 5px;
571
- border-left: solid 1px #ccc;
602
+ border-left: solid 1px <%= @pagination_border_color %>;
572
603
  }
573
604
 
574
605
  .active-scaffold-footer .previous {
575
606
  margin-right: 0;
576
607
  padding-right: 5px;
577
- border-right: solid 1px #ccc;
608
+ border-right: solid 1px <%= @pagination_border_color %>;
578
609
  }
579
610
 
580
611
  /* Messages
@@ -588,17 +619,17 @@ border: none;
588
619
  }
589
620
 
590
621
  .active-scaffold .empty-message, .active-scaffold .filtered-message {
591
- background-color: #e8e8e8;
622
+ background-color: <%= @msg_filtered_bg %>;
592
623
  padding: 4px;
593
624
  text-align: center;
594
- color: #666;
625
+ color: <%= @msg_filtered_color %>;
595
626
  }
596
627
 
597
628
  .active-scaffold .message {
598
629
  font-size: 11px;
599
630
  font-weight: bold;
600
631
  padding: 5px 20px 5px 5px;
601
- color: #333;
632
+ color: <%= @msg_color %>;
602
633
  position: relative;
603
634
  margin: 2px 7px;
604
635
  line-height: 12px;
@@ -618,27 +649,27 @@ margin: 0;
618
649
  }
619
650
 
620
651
  .active-scaffold .error-message {
621
- border-left: solid 5px #f66;
622
- background-color: #fbb;
652
+ border-left: solid 5px <%= @msg_error_border_color %>;
653
+ background-color: <%= @msg_error_bg %>;
623
654
  }
624
655
 
625
656
  .active-scaffold .warning-message {
626
- border-left: solid 5px #ff6;
627
- background-color: #ffb;
657
+ border-left: solid 5px <%= @msg_warning_border_color %>;
658
+ background-color: <%= @msg_warning_bg %>;
628
659
  }
629
660
 
630
661
  .active-scaffold .info-message {
631
- border-left: solid 5px #66f;
632
- background-color: #bbf;
662
+ border-left: solid 5px <%= @msg_info_border_color %>;
663
+ background-color: <%= @msg_info_bg %>;
633
664
  }
634
665
 
635
666
  /* Error Styling
636
667
  ========================== */
637
668
 
638
669
  .active-scaffold .errorExplanation {
639
- background-color: #fcc;
670
+ background-color: <%= @msg_error_bg %>;
640
671
  margin: 2px 0;
641
- border: solid 1px #f66;
672
+ border: solid 1px <%= @msg_error_border_color %>;
642
673
  }
643
674
 
644
675
  .active-scaffold fieldset {
@@ -647,12 +678,12 @@ clear: both;
647
678
 
648
679
  .active-scaffold .errorExplanation h2 {
649
680
  padding: 2px 5px;
650
- color: #333;
681
+ color: <%= @msg_color %>;
651
682
  font-size: 11px;
652
683
  margin: 0;
653
684
  letter-spacing: 0;
654
685
  font-family: Verdana;
655
- background-color: #f66;
686
+ background-color: <%= @msg_error_border_color %>;
656
687
  }
657
688
 
658
689
  .active-scaffold .errorExplanation ul {
@@ -704,7 +735,7 @@ width: 12em;
704
735
  float: left;
705
736
  clear: left;
706
737
  font: normal 11px verdana, sans-serif;
707
- color: #555;
738
+ color: <%= @label_color %>;
708
739
  line-height: 16px;
709
740
  }
710
741
 
@@ -744,7 +775,7 @@ border: none;
744
775
  padding: 2px;
745
776
  margin: 0;
746
777
  text-transform: none;
747
- color: #1F7F00;
778
+ color: <%= @form_title_color %>;
748
779
  letter-spacing: -1px;
749
780
  font: bold 16px arial;
750
781
  }
@@ -783,7 +814,7 @@ clear: both;
783
814
 
784
815
  .active-scaffold label {
785
816
  font: normal 11px verdana, sans-serif;
786
- color: #555;
817
+ color: <%= @label_color %>;
787
818
  }
788
819
 
789
820
  .active-scaffold li.form-element dt {
@@ -808,7 +839,7 @@ margin: 0;
808
839
 
809
840
  .active-scaffold .description {
810
841
  display: inline-block;
811
- color: #999;
842
+ color: <%= @description_color %>;
812
843
  font-size: 10px;
813
844
  margin-left: 5px;
814
845
  }
@@ -820,14 +851,14 @@ font-weight: bold;
820
851
  .active-scaffold label.example {
821
852
  font-size: 11px;
822
853
  font-family: arial;
823
- color: #888;
854
+ color: <%= @placeholder_color %>;
824
855
  }
825
856
 
826
857
  .active-scaffold input.text-input,
827
858
  .active-scaffold select {
828
859
  font: bold 16px arial;
829
860
  letter-spacing: -1px;
830
- border: solid 1px #1F7F00;
861
+ border: solid 1px <%= @input_border_color %>;
831
862
  }
832
863
 
833
864
  .active-scaffold input.text-input {
@@ -840,7 +871,7 @@ padding: 2px;
840
871
  .active-scaffold .field_with_errors textarea,
841
872
  .active-scaffold .fieldWithErrors select,
842
873
  .active-scaffold .field_with_errors select {
843
- border: solid 1px #f00;
874
+ border: solid 1px <%= @input_error_border_color %>;
844
875
  }
845
876
 
846
877
  .active-scaffold select {
@@ -848,19 +879,19 @@ padding: 1px;
848
879
  }
849
880
 
850
881
  .active-scaffold input.example {
851
- color: #aaa;
882
+ color: <%= @placeholder_color %>;
852
883
  }
853
884
 
854
885
  .active-scaffold select:focus,
855
886
  .active-scaffold input.text-input:focus {
856
- background-color: #ffc;
887
+ background-color: <%= @input_focus_bg %>;
857
888
  }
858
889
 
859
890
  .active-scaffold textarea {
860
891
  font-family: Arial, sans-serif;
861
892
  font-size: 12px;
862
893
  padding: 1px;
863
- border: solid 1px #1F7F00;
894
+ border: solid 1px <%= @input_border_color %>;
864
895
  }
865
896
 
866
897
  .active-scaffold .checkbox-list {
@@ -883,7 +914,7 @@ margin-right: 15px;
883
914
  min-height: 30px;
884
915
  max-height: 100px;
885
916
  overflow: auto;
886
- background-color: #FFFF88;
917
+ background-color: <%= @draggable_list_bg %>;
887
918
  }
888
919
 
889
920
  .active-scaffold .draggable-list.hover {
@@ -891,13 +922,17 @@ opacity: 0.5;
891
922
  }
892
923
 
893
924
  .active-scaffold .draggable-list.selected {
894
- background-color: #7FCF00;
925
+ background-color: <%= @draggable_list_selected_bg %>;
895
926
  }
896
927
 
897
928
  .active-scaffold .draggable-list li {
898
929
  display: block;
899
930
  }
900
931
 
932
+ li.draggable-item {
933
+ list-style: none;
934
+ }
935
+ li.draggable-item input,
901
936
  .active-scaffold .draggable-list input {
902
937
  display: none;
903
938
  }
@@ -932,7 +967,7 @@ background: none;
932
967
 
933
968
  .active-scaffold .sub-form table th {
934
969
  font: normal 10px verdana, sans-serif;
935
- color: #555;
970
+ color: <%= @subform_header_color %>;
936
971
  padding: 0 5px 0 1px;
937
972
  background: none;
938
973
  }
@@ -943,8 +978,8 @@ display: none;
943
978
 
944
979
  .active-scaffold .sub-form .checkbox-list {
945
980
  padding: 0 2px 2px 2px;
946
- background-color: #fff;
947
- border: solid 1px #1F7F00;
981
+ background-color: <%= @checkbox_list_bg %>;
982
+ border: solid 1px <%= @input_border_color %>;
948
983
  }
949
984
 
950
985
  .active-scaffold .sub-form .checkbox-list label {
@@ -956,7 +991,7 @@ border: none;
956
991
  background-color: transparent;
957
992
  padding: 1px;
958
993
  vertical-align: top;
959
- color: #999;
994
+ color: <%= @subform_color %>;
960
995
  }
961
996
 
962
997
  .active-scaffold .sub-form .actions {
@@ -972,7 +1007,7 @@ height: 16px;
972
1007
  padding: 0;
973
1008
  width: 16px;
974
1009
  text-indent: -4000px;
975
- background: url(<%= asset_path 'cross.png' %>) 0 0 no-repeat;
1010
+ background: url(<%= asset_path 'active_scaffold/cross.png' %>) 0 0 no-repeat;
976
1011
  }
977
1012
 
978
1013
  .active-scaffold .sub-form .locked a.destroy {
@@ -995,7 +1030,7 @@ margin-right: 10px;
995
1030
  }
996
1031
 
997
1032
  .active-scaffold .sub-form .footer {
998
- color: #999;
1033
+ color: <%= @subform_footer_color %>;
999
1034
  padding: 3px 5px;
1000
1035
  }
1001
1036
 
@@ -1017,7 +1052,7 @@ font-size: 100%;
1017
1052
  .as_touch a.inline-adapter-close {
1018
1053
  width: 25px;
1019
1054
  height: 27px;
1020
- background: url(<%= asset_path 'close_touch.png' %>) 0 0 no-repeat;
1055
+ background: url(<%= asset_path 'active_scaffold/close_touch.png' %>) 0 0 no-repeat;
1021
1056
  }
1022
1057
 
1023
1058
  .as_touch .as_paginate {
@@ -1085,7 +1120,7 @@ line-height: 130%;
1085
1120
  }
1086
1121
 
1087
1122
  .as_touch th a, .as_touch th a:visited {
1088
- color: #fff;
1123
+ color: <%= @column_header_link_color %>;
1089
1124
  padding: 5px 2px 5px 5px;
1090
1125
  }
1091
1126