drg_cms 0.5.10.10 → 0.5.50.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +2 -1
- data/app/assets/javascripts/drg_cms/drg_cms.js +7 -0
- data/app/assets/javascripts/drg_cms_cms.js +5 -13
- data/app/assets/stylesheets/drg_cms/{jquery-ui.css → __jquery-ui.css} +0 -0
- data/app/assets/stylesheets/drg_cms/drg_cms.css +121 -119
- data/app/assets/stylesheets/drg_cms_cms.css +4 -6
- data/app/controllers/{drgcms_controls/browse_models_control.rb → browse_models_control.rb} +1 -1
- data/app/controllers/cmsedit_controller.rb +6 -1
- data/app/controllers/dc_application_controller.rb +9 -2
- data/app/controllers/{drgcms_controls/dc_page_control.rb → dc_page_control.rb} +1 -1
- data/app/forms/all_options.yml +4 -1
- data/app/forms/dc_category.yml +1 -0
- data/app/forms/dc_design.yml +15 -3
- data/app/forms/dc_journal.yml +1 -1
- data/app/forms/dc_page.yml +0 -0
- data/app/helpers/cmsedit_helper.rb +2 -2
- data/app/helpers/dc_application_helper.rb +27 -14
- data/app/helpers/dc_poll_renderer.rb +12 -5
- data/app/models/dc_big_table.rb +11 -10
- data/app/models/dc_category.rb +17 -0
- data/app/models/dc_design.rb +2 -0
- data/app/models/drgcms_form_fields.rb +5 -3
- data/app/views/cmsedit/_edit_stuff.html.erb +29 -16
- data/config/initializers/kaminari_patch.rb +25 -5
- data/config/locales/models_en.yml +5 -0
- data/config/locales/models_sl.yml +6 -0
- data/config/routes.rb +0 -0
- data/drg_cms.gemspec +7 -5
- data/lib/drg_cms.rb +26 -8
- data/lib/drg_cms/version.rb +1 -1
- metadata +19 -19
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5b0d0d0832114dcc62230d1d540b25cea65f5022
|
4
|
+
data.tar.gz: b1093a3341a080c91ce40c9dbc3fda29e29cddf4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fe6e2faa0ef667be8aeefbb2722556d4934d8c2277086ff87b17467d2b246f4f1112c4048458473e7bb525f7721750a0ba7a663c443a17a23b0b7f082228784f
|
7
|
+
data.tar.gz: c57c851dd45e6d825551100f22db6afcad6bb178637b4b47f16c440785c0db2dde28cc071c8bcc92be539931cdf99b3be115d90e3c8bc76193b69fa9431f3a18
|
data/README.md
CHANGED
@@ -16,7 +16,8 @@ Project Tracking
|
|
16
16
|
Compatibility
|
17
17
|
-------------
|
18
18
|
|
19
|
-
DRG CMS is tested against Ruby 2.
|
19
|
+
DRG CMS is tested against Ruby 2.2 and higher, Rails 5.0 and higher, Mongoid 6, MongoDB 3.0, 3.2
|
20
|
+
|
20
21
|
|
21
22
|
Documentation
|
22
23
|
-------------
|
@@ -568,6 +568,13 @@ element = $(this).find(':first').attr('id');
|
|
568
568
|
// $('#'+iframe).attr('src', loc);
|
569
569
|
// parent.document.getElementById(iframe).src = loc
|
570
570
|
});
|
571
|
+
|
572
|
+
/*******************************************************************
|
573
|
+
* Toggle one cmsedit menu level
|
574
|
+
*******************************************************************/
|
575
|
+
$('.cmsedit-top-level-menu').on('click', function(e) {
|
576
|
+
$(e.target).find('ul').toggle('fast');
|
577
|
+
});
|
571
578
|
|
572
579
|
});
|
573
580
|
|
@@ -9,23 +9,15 @@
|
|
9
9
|
//= require drg_cms/jquery-migrate.js
|
10
10
|
//= require jquery_ujs
|
11
11
|
|
12
|
-
//=
|
13
|
-
//= require jquery-ui/
|
14
|
-
//= require jquery-ui/
|
15
|
-
//= require jquery-ui/
|
16
|
-
//= require jquery-ui/
|
17
|
-
//= require jquery-ui/droppable
|
12
|
+
//= require jquery-ui/widgets/tooltip
|
13
|
+
//= require jquery-ui/widgets/autocomplete
|
14
|
+
//= require jquery-ui/widgets/draggable
|
15
|
+
//= require jquery-ui/widgets/droppable
|
16
|
+
//= require jquery-ui/widgets/selectable
|
18
17
|
|
19
18
|
//= require drg_cms/drg_cms
|
20
19
|
//= require drg_cms/jquery.datetimepicker
|
21
20
|
|
22
|
-
//= #require drg_cms/ckeditor/ckeditor.js
|
23
|
-
//= #require drg_cms/ckeditor/lang/sl.js
|
24
|
-
//= # require ckeditor_config
|
25
|
-
|
26
|
-
//= #require drg_cms/elfinder/js/elfinder.min.js
|
27
|
-
//= #require drg_cms/elfinder/js/proxy/elFinderSupportVer1.js
|
28
|
-
|
29
21
|
//= require drg_cms/jquery.bpopup.min.js
|
30
22
|
//= require drg_cms/select-multiple
|
31
23
|
|
File without changes
|
@@ -135,15 +135,24 @@ th a:hover { color: #000;}
|
|
135
135
|
|
136
136
|
img { vertical-align:bottom; }
|
137
137
|
|
138
|
-
a:link, a:active, a:visited
|
138
|
+
.dc-link a:link, .dc-link a:active, .dc-link a:visited,
|
139
|
+
.dc-animate a:link, .dc-animate a:active, .dc-animate a:visited,
|
140
|
+
.dc-result a:link, .dc-result a:active, .dc-result a:visited {
|
139
141
|
color: #888;
|
140
142
|
font-weight: bold;
|
141
143
|
text-decoration: none;
|
142
144
|
background: transparent;
|
143
145
|
}
|
144
146
|
|
145
|
-
a:hover
|
146
|
-
|
147
|
+
.dc-link a:hover, .dc-animate a:hover, .dc-result a:hover {
|
148
|
+
background: #f8f8f8;
|
149
|
+
transition: 0.3s;
|
150
|
+
color: #555;
|
151
|
+
}
|
152
|
+
|
153
|
+
a.dc-animate:hover { color: #555; background: transparent;}
|
154
|
+
|
155
|
+
.dc-link a img { border: none; }
|
147
156
|
|
148
157
|
|
149
158
|
.text-with-select {
|
@@ -194,20 +203,20 @@ padding: 0px;
|
|
194
203
|
.dc-link {
|
195
204
|
padding: 3px 8px;
|
196
205
|
text-align: center;
|
197
|
-
border-radius:
|
206
|
+
border-radius: 3px;
|
198
207
|
background-color: #eee;
|
199
208
|
background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
|
200
209
|
border: 1px solid #ddd;
|
201
210
|
}
|
202
211
|
|
203
212
|
.dc-link:hover {
|
204
|
-
background-color: #
|
205
|
-
border: 1px solid #
|
213
|
+
background-color: #f8f8f8;
|
214
|
+
border: 1px solid #ccc;
|
206
215
|
transition: 0.3s;
|
207
216
|
}
|
208
217
|
|
209
218
|
.dc-link:hover a {
|
210
|
-
color: #
|
219
|
+
color: #555;
|
211
220
|
transition: 0.3s;
|
212
221
|
}
|
213
222
|
|
@@ -296,17 +305,15 @@ border: 1px solid #ddd;
|
|
296
305
|
.skip-next a:hover { text-decoration: none; color: #c43; }
|
297
306
|
|
298
307
|
.dc-animate-button {
|
299
|
-
background
|
300
|
-
background: transparent linear-gradient(to bottom, #ddd 0%, #FFF 100%) repeat scroll 0% 0% !important;
|
301
|
-
/*border: 1px solid #ddd;*/
|
308
|
+
background: transparent linear-gradient(to bottom, #eee 0%, #eee 100%) repeat scroll 0% 0% !important;
|
302
309
|
}
|
303
310
|
|
304
311
|
.dc-link-submit {
|
305
312
|
text-align: left;
|
306
|
-
padding:
|
313
|
+
padding: 5px 6px;
|
307
314
|
margin-right: 4px;
|
308
315
|
|
309
|
-
border-radius:
|
316
|
+
border-radius: 3px;
|
310
317
|
background-color: #eee;
|
311
318
|
background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
|
312
319
|
border: 1px solid #ddd;
|
@@ -316,16 +323,16 @@ background: transparent linear-gradient(to bottom, #ddd 0%, #FFF 100%) repeat sc
|
|
316
323
|
color: #888;
|
317
324
|
}
|
318
325
|
.dc-link-submit:hover .fa {
|
319
|
-
color: #
|
326
|
+
color: #555;
|
320
327
|
transition: 0.3s;
|
321
328
|
}
|
322
329
|
.dc-link-submit:hover {
|
323
330
|
color: #000;
|
324
|
-
border: 1px solid #
|
331
|
+
border: 1px solid #ccc;
|
325
332
|
transition: 0.3s;
|
326
333
|
}
|
327
334
|
.dc-link-submit:hover .dc-submit {
|
328
|
-
color: #
|
335
|
+
color: #555;
|
329
336
|
transition: 0.3s;
|
330
337
|
}
|
331
338
|
.dc-submit {
|
@@ -346,21 +353,31 @@ background: transparent linear-gradient(to bottom, #ddd 0%, #FFF 100%) repeat sc
|
|
346
353
|
color: #fff;
|
347
354
|
background-color: #888;
|
348
355
|
}
|
356
|
+
|
349
357
|
/* Pagination */
|
350
|
-
.pagination span {
|
358
|
+
#result .pagination span {
|
351
359
|
border: 1px solid #ddd;
|
352
360
|
padding: 4px 4px 3px 6px;
|
353
361
|
margin-left: 1px;
|
354
362
|
background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
|
355
363
|
border-radius: 1px;
|
356
364
|
}
|
365
|
+
#result .pagination span a {
|
366
|
+
color: #888;
|
367
|
+
text-decoration: none;
|
368
|
+
}
|
369
|
+
|
370
|
+
#result .pagination span:hover > a {
|
371
|
+
color: #555;
|
372
|
+
}
|
357
373
|
|
358
|
-
.pagination .current {
|
374
|
+
#result .pagination .current {
|
359
375
|
background: #888;
|
360
376
|
color: #fff;
|
361
377
|
border: 1px solid #888;
|
362
378
|
}
|
363
379
|
|
380
|
+
|
364
381
|
.dc-title {
|
365
382
|
font-weight: bold;
|
366
383
|
color: #333;
|
@@ -388,9 +405,9 @@ background: transparent linear-gradient(to bottom, #ddd 0%, #FFF 100%) repeat sc
|
|
388
405
|
width: 100%;
|
389
406
|
padding: 0px;
|
390
407
|
padding-top: 4px;
|
391
|
-
border: 1px solid #
|
408
|
+
border: 1px solid #eee;
|
392
409
|
border-radius: 2px;
|
393
|
-
background-color: #
|
410
|
+
background-color: #fcfcfc;
|
394
411
|
}
|
395
412
|
|
396
413
|
.dc-form-info {
|
@@ -475,11 +492,11 @@ background: transparent linear-gradient(to bottom, #ddd 0%, #FFF 100%) repeat sc
|
|
475
492
|
}
|
476
493
|
|
477
494
|
.dc-color-odd {
|
478
|
-
background-color: #
|
495
|
+
background-color: #fcfcfc;
|
479
496
|
/* border-bottom: solid 1px #eee; */
|
480
497
|
}
|
481
498
|
.dc-color-even {
|
482
|
-
background-color: #
|
499
|
+
background-color: #fcfcfc;
|
483
500
|
/* border-bottom: solid 1px #eee; */
|
484
501
|
}
|
485
502
|
|
@@ -526,6 +543,11 @@ padding: 0px;
|
|
526
543
|
border-top: 2px solid #ccc;
|
527
544
|
}
|
528
545
|
|
546
|
+
#cmsedit-div {
|
547
|
+
font-family: helvetica;
|
548
|
+
font-size: 13px;
|
549
|
+
line-height: 13px;
|
550
|
+
}
|
529
551
|
#cmsedit-div a:link, #cmsedit-div a:active, #cmsedit-div a:visited {
|
530
552
|
color: #666;
|
531
553
|
font-weight: bold;
|
@@ -541,122 +563,96 @@ border-radius: 2px;
|
|
541
563
|
font-size: 1.2em;
|
542
564
|
}
|
543
565
|
|
544
|
-
|
545
|
-
.
|
546
|
-
|
547
|
-
|
548
|
-
|
549
|
-
background: transparent;
|
566
|
+
/******* TOP MENU *********/
|
567
|
+
.cmsedit-top {
|
568
|
+
width: 100%;
|
569
|
+
background-color: #fff;
|
570
|
+
border: 4px solid #fff;
|
550
571
|
}
|
551
572
|
|
552
|
-
.
|
553
|
-
|
554
|
-
|
555
|
-
|
573
|
+
.cmsedit-top #menu {
|
574
|
+
padding: 4px 4px 8px 4px;
|
575
|
+
color: #666;
|
576
|
+
background-color: #fff;
|
577
|
+
border-bottom: 3px solid #666;
|
556
578
|
}
|
557
|
-
|
558
|
-
|
559
|
-
width: 100%;
|
560
|
-
background-color: #fff;
|
561
|
-
border-collapse: collapse;
|
562
|
-
border: 4px solid #fff;
|
579
|
+
.cmsedit-top #menu a {
|
580
|
+
margin-right: 5px;
|
563
581
|
}
|
564
582
|
|
565
|
-
.cmsedit-
|
566
|
-
|
567
|
-
|
568
|
-
|
569
|
-
|
570
|
-
.cmsedit-menu {
|
571
|
-
background-color: #fff;
|
572
|
-
padding: 4px;
|
573
|
-
border-bottom: 3px solid #666;
|
574
|
-
margin-bottom: 10px;
|
575
|
-
}
|
576
|
-
.cmsedit-menu a {
|
577
|
-
margin-right: 5px;
|
583
|
+
.cmsedit-top #menu select#record_select {
|
584
|
+
padding: 0px;
|
585
|
+
max-width: 300px;
|
586
|
+
height: 26px;
|
578
587
|
}
|
588
|
+
.cmsedit-top #menu .fa {width: 20px;}
|
579
589
|
|
580
|
-
.cmsedit-
|
581
|
-
|
582
|
-
|
583
|
-
|
590
|
+
.cmsedit-container {
|
591
|
+
display: flex;
|
592
|
+
width: 100%;
|
593
|
+
background-color: #fff;
|
584
594
|
}
|
585
595
|
|
586
|
-
.cmsedit-menu
|
587
|
-
|
588
|
-
|
589
|
-
color: #
|
590
|
-
|
591
|
-
|
592
|
-
font-size: 14px;
|
596
|
+
.cmsedit-container #menu {
|
597
|
+
min-width: 20%;
|
598
|
+
height: 100%;
|
599
|
+
background-color: #fcfcfc;
|
600
|
+
border: 1px solid #eee;
|
601
|
+
border-radius: 1px;
|
593
602
|
}
|
594
|
-
.cmsedit-menu .fa {width: 20px;}
|
595
603
|
|
596
|
-
.cmsedit-
|
597
|
-
|
598
|
-
|
599
|
-
|
600
|
-
|
601
|
-
display: none;
|
602
|
-
position: absolute;
|
603
|
-
z-index: 1000;
|
604
|
+
.cmsedit-container #menu {
|
605
|
+
display: inline-block;
|
606
|
+
padding: 4px 0px;
|
607
|
+
margin: 4px;
|
608
|
+
font-size: 13px;
|
604
609
|
color: #222;
|
605
|
-
|
606
|
-
border: 1px solid #888;
|
607
|
-
box-shadow: 2px 2px 4px #ccc;
|
610
|
+
font-weight: bold;
|
608
611
|
}
|
609
612
|
|
610
|
-
.cmsedit-
|
611
|
-
|
613
|
+
.cmsedit-container .fa {
|
614
|
+
width: 20px;
|
612
615
|
}
|
613
|
-
|
614
|
-
|
616
|
+
|
617
|
+
.cmsedit-container #menu a {
|
615
618
|
font-weight: normal;
|
616
|
-
color: #
|
619
|
+
color: #666;
|
617
620
|
}
|
618
621
|
|
619
|
-
|
620
|
-
|
622
|
+
.cmsedit-container #menu ul {
|
623
|
+
margin: 0 5px;
|
624
|
+
line-height: 1.5rem;
|
621
625
|
}
|
622
626
|
|
623
|
-
.cmsedit-menu ul
|
624
|
-
|
625
|
-
}
|
626
|
-
.cmsedit-menu ul li ul li:hover {
|
627
|
-
background-color: #ddd;
|
628
|
-
color: #222;
|
627
|
+
.cmsedit-container #menu ul ul {
|
628
|
+
margin: 0 0 0 0.5rem;
|
629
629
|
}
|
630
630
|
|
631
|
-
.cmsedit-menu
|
632
|
-
|
633
|
-
|
634
|
-
|
635
|
-
|
636
|
-
display: none;
|
637
|
-
color: #fff;
|
638
|
-
background-color: #fff;
|
639
|
-
border: 1px solid #888;
|
640
|
-
box-shadow: 2px 2px 4px #ccc;
|
641
|
-
min-width:300px;
|
631
|
+
.cmsedit-container #menu li {
|
632
|
+
list-style-type: none;
|
633
|
+
padding: 2px;
|
634
|
+
width: 100%;
|
635
|
+
|
642
636
|
}
|
643
637
|
|
644
|
-
|
638
|
+
.cmsedit-container #menu a:hover {
|
639
|
+
font-weight: normal;
|
640
|
+
color: #000;
|
641
|
+
}
|
645
642
|
|
646
|
-
.cmsedit-menu
|
647
|
-
|
643
|
+
.cmsedit-container #menu .cmsedit-top-level-menu:hover {
|
644
|
+
cursor: pointer;
|
648
645
|
}
|
649
|
-
|
650
|
-
|
651
|
-
|
652
|
-
|
646
|
+
|
647
|
+
.cmsedit-container #menu li li:hover {
|
648
|
+
background-color: #eee;
|
649
|
+
padding: 2px 1px 2px 3px;
|
653
650
|
}
|
654
651
|
|
655
|
-
#
|
656
|
-
|
652
|
+
.cmsedit-container #menu ul li ul {
|
653
|
+
display: none;
|
657
654
|
}
|
658
655
|
|
659
|
-
/*********************/
|
660
656
|
.default-table {
|
661
657
|
width: 100%;
|
662
658
|
padding: 0px;
|
@@ -664,6 +660,7 @@ float:none;
|
|
664
660
|
text-align: left;
|
665
661
|
}
|
666
662
|
|
663
|
+
/****** jquery ui-autocomplete widget ***************/
|
667
664
|
.ui-autocomplete-input {
|
668
665
|
font-style: italic;
|
669
666
|
padding: 4px;
|
@@ -672,16 +669,22 @@ float:none;
|
|
672
669
|
/* background: linear-gradient(#8d8 0%, #ffe 15%, #fff 80%); */
|
673
670
|
}
|
674
671
|
|
675
|
-
.ui-autocomplete-
|
672
|
+
.ui-autocomplete.ui-menu{
|
673
|
+
font-size: 1.1em;
|
674
|
+
}
|
675
|
+
|
676
|
+
.ui-autocomplete .ui-menu-item div {
|
676
677
|
padding: 3px;
|
677
|
-
border: solid
|
678
|
-
|
679
|
-
|
680
|
-
|
681
|
-
|
682
|
-
background:
|
683
|
-
|
678
|
+
border: 1px solid #fff;
|
679
|
+
}
|
680
|
+
|
681
|
+
.ui-autocomplete .ui-menu-item .ui-state-active {
|
682
|
+
padding: 3px;
|
683
|
+
background-color: #eee;
|
684
|
+
border: 1px solid #ddd;
|
685
|
+
color: #000;
|
684
686
|
}
|
687
|
+
|
685
688
|
.dc-red { color: red;}
|
686
689
|
.dc-green { color: #396;}
|
687
690
|
|
@@ -801,7 +804,7 @@ list-style:none;
|
|
801
804
|
padding: 5px 8px;
|
802
805
|
margin-right: 4px;
|
803
806
|
background: #eee;
|
804
|
-
border-radius:
|
807
|
+
border-radius:3px;
|
805
808
|
z-index: 1;
|
806
809
|
|
807
810
|
background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
|
@@ -810,13 +813,12 @@ border: 1px solid #ddd;
|
|
810
813
|
|
811
814
|
|
812
815
|
.dc-action-menu li:hover {
|
813
|
-
border: 1px solid #
|
814
|
-
color: #
|
816
|
+
border: 1px solid #ccc;
|
817
|
+
color: #555;
|
815
818
|
transition: 0.3s;
|
816
819
|
}
|
817
820
|
|
818
821
|
.dc-action-menu li:hover a {
|
819
|
-
color: #222;
|
820
822
|
}
|
821
823
|
|
822
824
|
.dc-action-menu ul {
|