drg_cms 0.5.52.16 → 0.6.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/drg_cms/drg_cms.js +446 -144
- data/app/assets/javascripts/drg_cms/jstree.min.js +6 -6
- data/app/assets/javascripts/drg_cms_application.js +1 -1
- data/app/assets/stylesheets/drg_cms/drg_cms.css +625 -243
- data/app/assets/stylesheets/drg_cms/jstree.css +6 -12
- data/app/assets/stylesheets/drg_cms/select-multiple.css +18 -12
- data/app/assets/stylesheets/drg_cms_cms.css +1 -1
- data/app/controllers/cmsedit_controller.rb +536 -331
- data/app/controllers/dc_application_controller.rb +380 -117
- data/app/controllers/dc_common_controller.rb +105 -14
- data/app/{controllers → controls}/browse_models_control.rb +0 -0
- data/app/controls/dc_help_control.rb +126 -0
- data/app/{controllers → controls}/dc_page_control.rb +24 -8
- data/app/controls/dc_poll_result_control.rb +88 -0
- data/app/controls/dc_report.rb +225 -0
- data/app/{controllers → controls}/design_element_settings_control.rb +0 -0
- data/app/forms/all_options.yml +50 -9
- data/app/forms/cms_menu.yml +28 -18
- data/app/forms/dc_ad.yml +11 -22
- data/app/forms/dc_big_table.yml +1 -0
- data/app/forms/dc_big_table_value.yml +1 -0
- data/app/forms/dc_category.yml +2 -1
- data/app/forms/dc_design.yml +20 -16
- data/app/forms/dc_filter.yml +3 -6
- data/app/forms/dc_help_1.yml +109 -0
- data/app/forms/dc_journal.yml +3 -1
- data/app/forms/dc_json_ld.yml +59 -0
- data/app/forms/dc_key_value.yml +32 -0
- data/app/forms/dc_link.yml +1 -1
- data/app/forms/dc_menu.yml +2 -0
- data/app/forms/dc_menu_item.yml +2 -0
- data/app/forms/dc_page.yml +3 -5
- data/app/forms/dc_part.yml +1 -0
- data/app/forms/dc_piece.yml +1 -0
- data/app/forms/dc_poll.yml +19 -9
- data/app/forms/dc_poll_item.yml +2 -1
- data/app/forms/dc_poll_result.yml +83 -0
- data/app/forms/dc_poll_result_export.yml +35 -0
- data/app/forms/dc_seo.yml +33 -0
- data/app/forms/dc_simple_menu.yml +2 -0
- data/app/forms/dc_site.yml +4 -12
- data/app/forms/dc_user.yml +27 -11
- data/app/forms/dc_user_role.yml +3 -0
- data/app/forms/json_ld_schema.yml +168 -0
- data/app/helpers/cms_common_helper.rb +376 -0
- data/app/helpers/cms_edit_helper.rb +506 -0
- data/app/helpers/cms_helper.rb +268 -0
- data/app/helpers/cms_index_helper.rb +576 -0
- data/app/helpers/dc_application_helper.rb +183 -271
- data/app/models/concerns/dc_page_concern.rb +40 -6
- data/app/models/concerns/dc_policy_rule_concern.rb +20 -8
- data/app/models/concerns/dc_seo_concern.rb +66 -0
- data/app/models/concerns/dc_site_concern.rb +67 -44
- data/app/models/concerns/dc_user_concern.rb +62 -21
- data/app/models/dc_design.rb +30 -18
- data/app/models/dc_filter.rb +22 -13
- data/app/models/dc_json_ld.rb +152 -0
- data/app/models/dc_key_value.rb +48 -0
- data/app/models/dc_key_value_store.rb +1 -0
- data/app/models/dc_memory.rb +8 -1
- data/app/models/dc_page.rb +0 -1
- data/app/models/dc_permission.rb +49 -9
- data/app/models/dc_policy.rb +25 -14
- data/app/models/dc_policy_role.rb +22 -11
- data/app/models/dc_poll.rb +39 -19
- data/app/models/{drgcms_form_fields/drgcms_form_fields.rb → dc_poll_result.rb} +23 -2
- data/app/models/dc_temp.rb +140 -0
- data/app/models/dc_user_role.rb +2 -2
- data/app/models/drgcms_form_fields.rb +14 -6
- data/app/models/drgcms_form_fields/action.rb +61 -0
- data/app/models/drgcms_form_fields/check_box.rb +3 -0
- data/app/models/drgcms_form_fields/comment.rb +8 -4
- data/app/models/drgcms_form_fields/date_picker.rb +11 -9
- data/app/models/drgcms_form_fields/date_select.rb +1 -1
- data/app/models/drgcms_form_fields/{date_time_picker.rb → datetime_picker.rb} +12 -10
- data/app/models/drgcms_form_fields/datetime_select.rb +1 -1
- data/app/models/drgcms_form_fields/drgcms_field.rb +55 -9
- data/app/models/drgcms_form_fields/embedded.rb +26 -16
- data/app/models/drgcms_form_fields/file_field.rb +52 -0
- data/app/models/drgcms_form_fields/file_select.rb +2 -2
- data/app/models/drgcms_form_fields/hash_field.rb +90 -0
- data/app/models/drgcms_form_fields/hidden_field.rb +1 -1
- data/app/models/drgcms_form_fields/html_field.rb +1 -1
- data/app/models/drgcms_form_fields/link_to.rb +2 -2
- data/app/models/drgcms_form_fields/method.rb +66 -0
- data/app/models/drgcms_form_fields/multitext_autocomplete.rb +23 -14
- data/app/models/drgcms_form_fields/number_field.rb +15 -6
- data/app/models/drgcms_form_fields/radio.rb +96 -0
- data/app/models/drgcms_form_fields/readonly.rb +2 -2
- data/app/models/drgcms_form_fields/select.rb +92 -29
- data/app/models/drgcms_form_fields/text_area.rb +1 -1
- data/app/models/drgcms_form_fields/text_autocomplete.rb +29 -17
- data/app/models/drgcms_form_fields/text_field.rb +1 -1
- data/app/models/drgcms_form_fields/text_with_select.rb +6 -3
- data/app/models/drgcms_form_fields/tree_select.rb +29 -10
- data/app/{helpers → renderers}/dc_ad_renderer.rb +0 -0
- data/app/{helpers → renderers}/dc_big_menu_renderer.rb +1 -0
- data/app/{helpers → renderers}/dc_captcha_renderer.rb +0 -0
- data/app/{helpers → renderers}/dc_common_renderer.rb +0 -0
- data/app/{helpers → renderers}/dc_gallery_renderer.rb +1 -0
- data/app/{helpers → renderers}/dc_menu_renderer.rb +11 -4
- data/app/{helpers → renderers}/dc_page_renderer.rb +1 -0
- data/app/{helpers → renderers}/dc_part_renderer.rb +5 -4
- data/app/{helpers → renderers}/dc_piece_renderer.rb +1 -1
- data/app/{helpers → renderers}/dc_poll_renderer.rb +84 -48
- data/app/{helpers → renderers}/dc_renderer.rb +1 -0
- data/app/{helpers → renderers}/dc_simple_menu_renderer.rb +1 -0
- data/app/views/cmsedit/{remove_edit_stuff.js.erb → __remove_edit_stuff.js.erb} +0 -0
- data/app/views/cmsedit/{show.html.erb → __show.html.erb} +0 -0
- data/app/views/cmsedit/_edit_stuff.html.erb +4 -25
- data/app/views/cmsedit/_form.html.erb +4 -3
- data/app/views/cmsedit/_result.html.erb +2 -3
- data/app/views/cmsedit/edit.html.erb +4 -1
- data/app/views/cmsedit/index.html.erb +7 -1
- data/app/views/cmsedit/new.html.erb +3 -1
- data/app/views/dc_common/_help.html.erb +8 -0
- data/app/views/layouts/models.html.erb +2 -1
- data/config/locales/drgcms_en.yml +26 -3
- data/config/locales/drgcms_sl.yml +31 -5
- data/config/locales/models_en.yml +66 -18
- data/config/locales/models_sl.yml +71 -20
- data/drg_cms.gemspec +3 -3
- data/lib/drg_cms.rb +63 -1
- data/lib/drg_cms/version.rb +2 -2
- data/lib/generators/new_drg_form/new_drg_form_generator.rb +9 -2
- data/lib/tasks/database.rake +6 -56
- metadata +81 -63
- data/app/assets/stylesheets/drg_cms/__jquery-ui.css +0 -339
- data/app/helpers/application_helper.rb +0 -2
- data/app/helpers/cmsedit_helper.rb +0 -885
- data/app/models/dc_dummy.rb +0 -102
- data/test/fixtures/drg_cms_test_data.rb +0 -87
data/app/forms/dc_menu.yml
CHANGED
data/app/forms/dc_menu_item.yml
CHANGED
@@ -41,6 +41,7 @@ form:
|
|
41
41
|
name: picture
|
42
42
|
type: file_select
|
43
43
|
size: 50
|
44
|
+
preview: false
|
44
45
|
30:
|
45
46
|
name: link
|
46
47
|
type: text_with_select
|
@@ -72,6 +73,7 @@ form:
|
|
72
73
|
10:
|
73
74
|
name: dc_menu_items
|
74
75
|
type: embedded
|
76
|
+
caption: false
|
75
77
|
form_name: dc_menu_item
|
76
78
|
html:
|
77
79
|
height: 1000
|
data/app/forms/dc_page.yml
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
## YAML Template for page
|
2
2
|
---
|
3
3
|
table: dc_page
|
4
|
+
include: dc_seo
|
4
5
|
|
5
6
|
index:
|
6
7
|
filter: subject, sub_subject as text_field, subject_link, alt_link, author_name, dc_site_id, body as text_field
|
@@ -40,10 +41,6 @@ form:
|
|
40
41
|
name: subject_link
|
41
42
|
type: text_field
|
42
43
|
size: 50
|
43
|
-
30:
|
44
|
-
name: title
|
45
|
-
type: text_field
|
46
|
-
size: 50
|
47
44
|
40:
|
48
45
|
name: alt_link
|
49
46
|
type: text_field
|
@@ -146,12 +143,14 @@ form:
|
|
146
143
|
3content:
|
147
144
|
10:
|
148
145
|
name: body
|
146
|
+
caption: false
|
149
147
|
type: html_field
|
150
148
|
options: 'height: 1000'
|
151
149
|
|
152
150
|
4parts:
|
153
151
|
10:
|
154
152
|
name: dc_parts
|
153
|
+
caption: false
|
155
154
|
type: embedded
|
156
155
|
form_name: dc_part
|
157
156
|
html:
|
@@ -189,4 +188,3 @@ form:
|
|
189
188
|
name: if_params
|
190
189
|
type: text_area
|
191
190
|
size: 80x10
|
192
|
-
|
data/app/forms/dc_part.yml
CHANGED
data/app/forms/dc_piece.yml
CHANGED
data/app/forms/dc_poll.yml
CHANGED
@@ -61,15 +61,15 @@ form:
|
|
61
61
|
type: select
|
62
62
|
|
63
63
|
50:
|
64
|
-
name: display
|
65
|
-
type: select
|
66
|
-
|
67
|
-
60:
|
68
64
|
name: parameters
|
69
65
|
type: text_field
|
70
66
|
html:
|
71
67
|
size: 50
|
72
68
|
|
69
|
+
60:
|
70
|
+
name: display
|
71
|
+
type: select
|
72
|
+
|
73
73
|
70:
|
74
74
|
name: captcha_type
|
75
75
|
type: text_field
|
@@ -78,13 +78,14 @@ form:
|
|
78
78
|
|
79
79
|
80:
|
80
80
|
name: valid_from
|
81
|
-
type:
|
81
|
+
type: datetime_picker
|
82
82
|
options:
|
83
83
|
include_blank: true
|
84
|
+
group: 2
|
84
85
|
|
85
86
|
90:
|
86
87
|
name: valid_to
|
87
|
-
type:
|
88
|
+
type: datetime_picker
|
88
89
|
options:
|
89
90
|
include_blank: true
|
90
91
|
|
@@ -99,16 +100,25 @@ form:
|
|
99
100
|
type: check_box
|
100
101
|
tab2:
|
101
102
|
10:
|
102
|
-
name:
|
103
|
+
name: js
|
103
104
|
type: text_area
|
105
|
+
caption: false
|
104
106
|
html:
|
105
107
|
size: 100x50
|
106
|
-
style: 'font-family:courier;'
|
107
|
-
|
108
|
+
style: 'font-family:courier;'
|
108
109
|
tab3:
|
109
110
|
20:
|
110
111
|
name: dc_poll_items
|
112
|
+
caption: false
|
111
113
|
type: embedded
|
112
114
|
form_name: dc_poll_item
|
113
115
|
html:
|
114
116
|
height: 800
|
117
|
+
tab4:
|
118
|
+
10:
|
119
|
+
name: form
|
120
|
+
caption: false
|
121
|
+
type: text_area
|
122
|
+
html:
|
123
|
+
size: 100x50
|
124
|
+
style: 'font-family:courier;'
|
data/app/forms/dc_poll_item.yml
CHANGED
@@ -0,0 +1,83 @@
|
|
1
|
+
## Form for retrieveng poll results
|
2
|
+
---
|
3
|
+
table: dc_poll_result
|
4
|
+
|
5
|
+
index:
|
6
|
+
filter: data as text_field
|
7
|
+
actions:
|
8
|
+
1: filter
|
9
|
+
10:
|
10
|
+
type: field
|
11
|
+
name: dc_poll_id
|
12
|
+
|
13
|
+
30:
|
14
|
+
type: field
|
15
|
+
name: start_date
|
16
|
+
field_type: date_picker
|
17
|
+
|
18
|
+
40:
|
19
|
+
type: field
|
20
|
+
name: end_date
|
21
|
+
field_type: date_picker
|
22
|
+
options:
|
23
|
+
openOnFocus: false
|
24
|
+
|
25
|
+
50:
|
26
|
+
type: ajax
|
27
|
+
caption: drgcms.filter_poll
|
28
|
+
title: drgcms.filter_poll_title
|
29
|
+
icon: filter
|
30
|
+
controller: cmsedit
|
31
|
+
action: run
|
32
|
+
control: dc_poll_result.do_filter
|
33
|
+
method: post
|
34
|
+
|
35
|
+
60:
|
36
|
+
type: ajax
|
37
|
+
caption: drgcms.export_poll
|
38
|
+
title: drgcms.export_poll_title
|
39
|
+
controller: cmsedit
|
40
|
+
icon: table
|
41
|
+
action: run
|
42
|
+
control: dc_poll_result.do_export
|
43
|
+
method: post
|
44
|
+
|
45
|
+
result_set:
|
46
|
+
actions: standard
|
47
|
+
filter: poll_filter
|
48
|
+
|
49
|
+
columns:
|
50
|
+
10:
|
51
|
+
name: dc_poll_id
|
52
|
+
eval: dc_name4_id,dc_poll,name
|
53
|
+
width: 25%
|
54
|
+
20:
|
55
|
+
name: created_at
|
56
|
+
format: '%d.%m.%Y %H:%M'
|
57
|
+
width: 10%
|
58
|
+
30:
|
59
|
+
name: confirmed
|
60
|
+
eval: dc_icon4_boolean
|
61
|
+
width: 5%
|
62
|
+
|
63
|
+
form:
|
64
|
+
actions:
|
65
|
+
1: back
|
66
|
+
2: save&back
|
67
|
+
|
68
|
+
fields:
|
69
|
+
10:
|
70
|
+
name: dc_poll_id
|
71
|
+
type: select
|
72
|
+
eval: "dc_choices4('dc_poll','name','_id')"
|
73
|
+
20:
|
74
|
+
name: data
|
75
|
+
type: text_area
|
76
|
+
size: 100x25
|
77
|
+
30:
|
78
|
+
name: confirmed
|
79
|
+
type: check_box
|
80
|
+
40:
|
81
|
+
name: created_at
|
82
|
+
type: readonly
|
83
|
+
format: '%d.%m.%Y %H:%M'
|
@@ -0,0 +1,35 @@
|
|
1
|
+
## Form for retrieveng poll results
|
2
|
+
---
|
3
|
+
table: dc_memory
|
4
|
+
|
5
|
+
form:
|
6
|
+
actions:
|
7
|
+
1:
|
8
|
+
type: script
|
9
|
+
caption: drgcms.back
|
10
|
+
js: 'history.back();'
|
11
|
+
icon: arrow-left
|
12
|
+
|
13
|
+
3:
|
14
|
+
type: ajax
|
15
|
+
caption: drgcms.export_poll
|
16
|
+
title: drgcms.export_poll_title
|
17
|
+
icon: cog
|
18
|
+
controller: cmsedit
|
19
|
+
action: run
|
20
|
+
method: post
|
21
|
+
control: poll.export
|
22
|
+
|
23
|
+
fields:
|
24
|
+
10:
|
25
|
+
name: dc_poll_id
|
26
|
+
type: select
|
27
|
+
eval: "dc_choices4('dc_poll','name','_id')"
|
28
|
+
20:
|
29
|
+
name: date_start
|
30
|
+
type: date_picker
|
31
|
+
size: 8
|
32
|
+
30:
|
33
|
+
name: date_end
|
34
|
+
type: date_picker
|
35
|
+
size: 8
|
@@ -0,0 +1,33 @@
|
|
1
|
+
form:
|
2
|
+
tabs:
|
3
|
+
seo:
|
4
|
+
caption: helpers.label.dc_seo.seo
|
5
|
+
10:
|
6
|
+
name: title
|
7
|
+
text: helpers.label.dc_seo.title
|
8
|
+
help: helpers.help.dc_seo.title
|
9
|
+
type: text_field
|
10
|
+
size: 70
|
11
|
+
|
12
|
+
20:
|
13
|
+
name: meta_description
|
14
|
+
text: helpers.label.dc_seo.meta_description
|
15
|
+
help: helpers.help.dc_seo.meta_description
|
16
|
+
type: text_area
|
17
|
+
size: 100x2
|
18
|
+
|
19
|
+
30:
|
20
|
+
name: canonical_link
|
21
|
+
text: helpers.label.dc_seo.canonical_link
|
22
|
+
help: helpers.help.dc_seo.canonical_link
|
23
|
+
type: text_field
|
24
|
+
size: 100
|
25
|
+
|
26
|
+
40:
|
27
|
+
name: dc_json_lds
|
28
|
+
text: helpers.label.dc_seo.dc_json_lds
|
29
|
+
help: helpers.help.dc_seo.dc_json_lds
|
30
|
+
type: embedded
|
31
|
+
table: dc_json_ld
|
32
|
+
html:
|
33
|
+
height: 600
|
@@ -61,6 +61,7 @@ form:
|
|
61
61
|
10:
|
62
62
|
name: dc_simple_menu_items
|
63
63
|
type: embedded
|
64
|
+
caption: false
|
64
65
|
form_name: dc_simple_menu_item
|
65
66
|
html:
|
66
67
|
height: 800
|
@@ -68,6 +69,7 @@ form:
|
|
68
69
|
tab3:
|
69
70
|
20:
|
70
71
|
name: css
|
72
|
+
caption: false
|
71
73
|
type: text_area
|
72
74
|
size: 100x50
|
73
75
|
|
data/app/forms/dc_site.yml
CHANGED
@@ -100,15 +100,11 @@ form:
|
|
100
100
|
name: menu_class
|
101
101
|
type: text_field
|
102
102
|
size: 20
|
103
|
-
# 60:
|
104
|
-
# name: menu_name
|
105
|
-
# type: text_with_select
|
106
|
-
# eval: dc_choices4(@record.menu_class,'description','name')
|
107
|
-
# size: 30
|
108
103
|
70:
|
109
104
|
name: menu_id
|
110
105
|
type: select
|
111
|
-
eval:
|
106
|
+
eval: DcSite.choices_for_menu
|
107
|
+
depend: menu_class
|
112
108
|
90:
|
113
109
|
name: settings
|
114
110
|
type: text_area
|
@@ -147,15 +143,11 @@ form:
|
|
147
143
|
20:
|
148
144
|
name: dc_policies
|
149
145
|
type: embedded
|
146
|
+
caption: false
|
150
147
|
form_name: dc_policy
|
151
|
-
html:
|
152
|
-
height: 800
|
153
148
|
6parts:
|
154
149
|
10:
|
155
150
|
name: dc_parts
|
151
|
+
caption: false
|
156
152
|
type: embedded
|
157
153
|
form_name: dc_part
|
158
|
-
html:
|
159
|
-
height: 1000
|
160
|
-
|
161
|
-
|
data/app/forms/dc_user.yml
CHANGED
@@ -22,8 +22,9 @@ result_set:
|
|
22
22
|
name: last_name
|
23
23
|
width: 20%
|
24
24
|
4:
|
25
|
-
name:
|
26
|
-
|
25
|
+
name: active
|
26
|
+
eval: dc_icon4_boolean
|
27
|
+
width: 5%
|
27
28
|
|
28
29
|
form:
|
29
30
|
title:
|
@@ -32,12 +33,18 @@ form:
|
|
32
33
|
actions: standard
|
33
34
|
|
34
35
|
tabs:
|
35
|
-
|
36
|
+
1base:
|
36
37
|
|
37
38
|
10:
|
38
39
|
name: username
|
39
40
|
type: text_field
|
40
41
|
size: 10
|
42
|
+
group: 2
|
43
|
+
html:
|
44
|
+
autocomplete: 'off'
|
45
|
+
15:
|
46
|
+
name: group
|
47
|
+
type: check_box
|
41
48
|
20:
|
42
49
|
name: title
|
43
50
|
type: text_field
|
@@ -45,7 +52,8 @@ form:
|
|
45
52
|
30:
|
46
53
|
name: first_name
|
47
54
|
type: text_field
|
48
|
-
size:
|
55
|
+
size: 30
|
56
|
+
group: 3
|
49
57
|
|
50
58
|
40:
|
51
59
|
name: middle_name
|
@@ -65,12 +73,13 @@ form:
|
|
65
73
|
70:
|
66
74
|
name: address
|
67
75
|
type: text_field
|
68
|
-
size:
|
76
|
+
size: 30
|
77
|
+
group: 2
|
69
78
|
|
70
79
|
80:
|
71
80
|
name: post
|
72
81
|
type: text_field
|
73
|
-
size:
|
82
|
+
size: 30
|
74
83
|
|
75
84
|
90:
|
76
85
|
name: country
|
@@ -81,11 +90,12 @@ form:
|
|
81
90
|
name: email
|
82
91
|
type: text_field
|
83
92
|
size: 30
|
93
|
+
group: 2
|
84
94
|
|
85
95
|
110:
|
86
96
|
name: phone
|
87
97
|
type: text_field
|
88
|
-
size:
|
98
|
+
size: 20
|
89
99
|
|
90
100
|
120:
|
91
101
|
name: birthdate
|
@@ -101,12 +111,16 @@ form:
|
|
101
111
|
140:
|
102
112
|
name: about
|
103
113
|
type: text_area
|
104
|
-
size:
|
114
|
+
size: 100x5
|
105
115
|
|
106
116
|
150:
|
107
117
|
name: password
|
108
118
|
type: password_field
|
109
119
|
size: 20
|
120
|
+
group: 2
|
121
|
+
line: top
|
122
|
+
html:
|
123
|
+
autocomplete: 'off'
|
110
124
|
|
111
125
|
160:
|
112
126
|
name: password_confirmation
|
@@ -120,6 +134,8 @@ form:
|
|
120
134
|
size: 20
|
121
135
|
|
122
136
|
180:
|
123
|
-
name:
|
124
|
-
type:
|
125
|
-
|
137
|
+
name: member
|
138
|
+
type: select
|
139
|
+
multiple: true
|
140
|
+
eval: DcUser.groups_for_select
|
141
|
+
size: 30
|