drg_cms 0.7.0.2 → 0.7.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (75) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/drg_cms/drg_cms.js +110 -35
  3. data/app/assets/javascripts/drg_cms/jquery.bpopup.js +372 -0
  4. data/app/assets/javascripts/drg_cms_application.js +1 -1
  5. data/app/assets/javascripts/drg_cms_cms.js +1 -1
  6. data/app/assets/stylesheets/drg_cms/drg_cms.css +126 -36
  7. data/app/assets/stylesheets/drg_cms/select-multiple.css +6 -7
  8. data/app/controllers/cmsedit_controller.rb +78 -47
  9. data/app/controllers/dc_application_controller.rb +22 -25
  10. data/app/controllers/dc_common_controller.rb +9 -6
  11. data/app/controllers/dc_main_controller.rb +0 -1
  12. data/app/controls/{dc_category_control.rb → dc_gallery_control.rb} +15 -30
  13. data/app/controls/dc_image_control.rb +180 -0
  14. data/app/controls/dc_page_control.rb +3 -3
  15. data/app/controls/dc_poll_result_control.rb +38 -39
  16. data/app/controls/dc_report.rb +9 -4
  17. data/app/controls/dc_setup_control.rb +53 -0
  18. data/app/controls/design_element_settings_control.rb +88 -37
  19. data/app/forms/all_options.yml +20 -9
  20. data/app/forms/cms_menu.yml +14 -2
  21. data/app/forms/dc_gallery.yml +1 -1
  22. data/app/forms/dc_image.yml +122 -0
  23. data/app/forms/dc_image_search.yml +72 -0
  24. data/app/forms/dc_page.yml +11 -8
  25. data/app/forms/dc_poll.yml +2 -1
  26. data/app/forms/dc_poll_result.yml +10 -7
  27. data/app/forms/dc_setup.yml +45 -0
  28. data/app/forms/dc_steps_template.yml +6 -2
  29. data/app/helpers/cms_common_helper.rb +36 -24
  30. data/app/helpers/cms_edit_helper.rb +26 -33
  31. data/app/helpers/cms_helper.rb +29 -12
  32. data/app/helpers/cms_index_helper.rb +109 -80
  33. data/app/helpers/dc_application_helper.rb +108 -86
  34. data/app/helpers/dc_image_helper.rb +127 -0
  35. data/app/models/concerns/dc_policy_rule_concern.rb +1 -1
  36. data/app/models/concerns/dc_user_concern.rb +13 -5
  37. data/app/models/dc_big_table.rb +1 -1
  38. data/app/models/dc_category.rb +12 -0
  39. data/app/models/dc_design.rb +5 -4
  40. data/app/models/dc_filter.rb +24 -27
  41. data/app/models/dc_image.rb +237 -0
  42. data/app/models/dc_internals.rb +5 -9
  43. data/app/models/dc_memory.rb +2 -2
  44. data/app/models/dc_policy_role.rb +8 -8
  45. data/app/models/dc_setup.rb +111 -0
  46. data/app/models/drgcms_form_fields/datetime_picker.rb +1 -1
  47. data/app/models/drgcms_form_fields/drgcms_field.rb +9 -26
  48. data/app/models/drgcms_form_fields/embedded.rb +28 -17
  49. data/app/models/drgcms_form_fields/journal_diff.rb +2 -2
  50. data/app/models/drgcms_form_fields/multitext_autocomplete.rb +88 -76
  51. data/app/models/drgcms_form_fields/select.rb +41 -19
  52. data/app/models/drgcms_form_fields/text_with_select.rb +5 -9
  53. data/app/renderers/dc_big_menu_renderer.rb +18 -20
  54. data/app/renderers/dc_gallery_renderer.rb +10 -4
  55. data/app/renderers/dc_menu_renderer.rb +21 -58
  56. data/app/renderers/dc_page_renderer.rb +7 -7
  57. data/app/renderers/dc_poll_renderer.rb +13 -12
  58. data/app/renderers/dc_simple_menu_renderer.rb +1 -1
  59. data/app/views/cmsedit/_edit_stuff.html.erb +4 -1
  60. data/app/views/cmsedit/edit.html.erb +1 -1
  61. data/app/views/cmsedit/index.html.erb +1 -1
  62. data/app/views/cmsedit/new.html.erb +1 -0
  63. data/config/locales/drgcms_en.yml +22 -2
  64. data/config/locales/drgcms_sl.yml +25 -6
  65. data/config/locales/models_en.yml +50 -1
  66. data/config/locales/models_sl.yml +60 -1
  67. data/drg_cms.gemspec +1 -1
  68. data/lib/drg_cms/version.rb +1 -1
  69. data/lib/drg_cms.rb +40 -27
  70. data/lib/generators/convert_to_ar/USAGE +8 -0
  71. data/lib/generators/convert_to_ar/convert_to_ar_generator.rb +158 -0
  72. data/lib/generators/new_drg_form/new_drg_form_generator.rb +32 -14
  73. metadata +19 -10
  74. data/app/assets/javascripts/drg_cms/jquery.bpopup.min.js +0 -7
  75. data/app/views/layouts/__cmsedit.html.erb +0 -16
@@ -55,7 +55,7 @@ def find_selected
55
55
  top_menu_id = @parent.page.menu_id.split(';')[1] if @parent.page.menu_id.match(';')
56
56
  ret = @menu.dc_menu_items.find(top_menu_id)
57
57
  end
58
- # return first if not found (something is wrong)
58
+ # return first if not found (something is wrong)
59
59
  ret ||= @menu.dc_menu_items[0]
60
60
  end
61
61
 
@@ -64,50 +64,11 @@ end
64
64
  ########################################################################
65
65
  def link_4edit(opts) #:nodoc:
66
66
  html = ''
67
- # return html unless @opts[:edit_mode] > 1
68
-
69
67
  opts.merge!( { controller: 'cmsedit', action: 'edit' } )
70
68
  title = "#{t('drgcms.edit')}: "
71
69
  opts[:title] = "#{title} #{opts[:title]}"
72
70
 
73
- html << '<li>'+dc_link_for_edit(opts)+'</li>'
74
- end
75
-
76
- ########################################################################
77
- # Returns html code required to create single link in a menu. Subroutine of do_menu_level.
78
- ########################################################################
79
- def link_4menu(item)
80
- # prepand to link
81
- link = if !item.link_prepend.blank?
82
- item.link_prepend
83
- elsif !@menu.link_prepend.blank?
84
- @menu.link_prepend
85
- else
86
- ''
87
- end
88
-
89
- if item.link.match('http')
90
- link = item.link
91
- else
92
- link += (item.link[0] == '/' ? '' : '/') + item.link
93
- link = '/' + link unless link[0] == '/' # link should start with '/'
94
- end
95
-
96
- target = item.target.blank? ? nil : item.target
97
- # - in first place won't write caption text
98
- caption = item.caption[0] == '-' ? '' : item.caption.to_s
99
- img_title = item.caption.to_s.sub('-','')
100
- # add picture if picture is not blank
101
- html = ''
102
- if !item.picture.blank?
103
- if item.picture[0,3] == 'fa-'
104
- caption << @parent.fa_icon(item.picture[3,20])
105
- else
106
- html = @parent.link_to( @parent.image_tag(item.picture), link, {title: img_title, target: target} ) rescue ''
107
- end
108
- end
109
- html << @parent.link_to(caption.html_safe, link, {target: target}) unless caption.blank?
110
- html
71
+ html << "<li>#{dc_link_for_edit(opts)}</li>"
111
72
  end
112
73
 
113
74
  ########################################################################
@@ -117,9 +78,9 @@ end
117
78
  # [item] MenuItem.
118
79
  ########################################################################
119
80
  def link_4menu(item)
120
- # just horizontal line
81
+ # just horizontal line
121
82
  return item.caption if item.caption == '<hr>'
122
- # prepand to link
83
+ # prepand to link
123
84
  link = if !item.link_prepend.blank?
124
85
  item.link_prepend
125
86
  elsif !@menu.link_prepend.blank?
@@ -160,27 +121,29 @@ end
160
121
  ########################################################################
161
122
  # Creates HTML code required for submenu on single level. Subroutine of default.
162
123
  ########################################################################
163
- def do_menu_level(menu, options={})
124
+ def do_menu_level(menu, options = {})
164
125
  html = "<ul>"
165
126
  if @opts[:edit_mode] > 1
166
127
  options[:title] = menu.respond_to?('name') ? menu.name : menu.caption # 1. level or submenus
167
- options[:id] = menu._id
128
+ options[:id] = menu._id
168
129
  html << link_4edit(options)
169
130
  end
170
- # sort items acording to :order
131
+ # sort items according to :order
171
132
  menu.dc_menu_items.order_by(order: 1).each do |item|
172
133
  next unless item.active
173
- # menu can be hidden from user
134
+ # menu can be hidden from user
174
135
  can_view, msg = dc_user_can_view(@parent, item)
175
136
  next unless can_view
176
-
177
- html << if item.id == @selected.id
178
- "<li class=\"menu-selected\">#{ link_4menu(item) }"
179
- else
180
- "<li>#{ link_4menu(item) }"
181
- end
182
- # do submenu
183
- if (sub = item.dc_menu_items).size > 0
137
+
138
+ html << if @opts[:path]&.include?(item.link)
139
+ %(<li class="menu-selected">#{ link_4menu(item) })
140
+ elsif item.id == @selected.id
141
+ %(<li class="menu-selected">#{ link_4menu(item) })
142
+ else
143
+ "<li>#{ link_4menu(item) }"
144
+ end
145
+ # do submenu
146
+ if item.dc_menu_items.size > 0
184
147
  if @opts[:edit_mode] > 1
185
148
  opts = options.clone
186
149
  opts['ids'] = (opts['ids'] ? "#{opts['ids']};" : '') + menu._id.to_s
@@ -199,12 +162,12 @@ end
199
162
  ########################################################################
200
163
  def default
201
164
  return "(#{@opts[:name]}) menu not found!" if @menu.nil?
202
- #
165
+
203
166
  @selected = find_selected
204
167
  html = ''
205
- html << "<div id='#{@menu.div_name}'>" unless @menu.div_name.blank?
168
+ html << "<div id='#{@menu.div_name}'>" if @menu.div_name.present?
206
169
  html << do_menu_level(@menu, table: 'dc_menu')
207
- html << "</div>" unless @menu.div_name.blank?
170
+ html << "</div>" if @menu.div_name.present?
208
171
  html
209
172
  end
210
173
 
@@ -41,7 +41,7 @@ include CmsCommonHelper
41
41
  ########################################################################
42
42
  # Object initialization.
43
43
  ########################################################################
44
- def initialize( parent, opts={} ) #:nodoc:
44
+ def initialize( parent, opts = {} ) #:nodoc:
45
45
  @parent = parent
46
46
  @opts = opts
47
47
  @page = @parent.page
@@ -74,11 +74,11 @@ def iframe
74
74
  return '' if @page.if_url.blank?
75
75
 
76
76
  html = "\n<iframe"
77
- html << " id=\"#{@page.if_id}\"" unless @page.if_id.blank?
78
- html << " class=\"#{@page.if_class}\"" unless @page.if_class.blank?
77
+ html << " id=\"#{@page.if_id}\"" if @page.if_id.present?
78
+ html << " class=\"#{@page.if_class}\"" if @page.if_class.present?
79
79
  html << " border=\"#{@page.if_border}\""
80
- html << " height=\"#{@page.if_height}\"" unless @page.if_height.blank?
81
- html << " width=\"#{@page.if_width}\"" unless @page.if_width.blank?
80
+ html << " height=\"#{@page.if_height}\"" if @page.if_height.present?
81
+ html << " width=\"#{@page.if_width}\"" if @page.if_width.blank?
82
82
  html << " scrolling=\"#{@page.if_scroll}\""
83
83
  # Parameters
84
84
  parameters = @page.if_url.match(/\?/) ? '' : '?'
@@ -88,7 +88,7 @@ def iframe
88
88
  val = @parent.dc_internal_var(value['object'], value['method'])
89
89
  parameters << "&#{key}=#{val}" if val # only when not nil
90
90
  end
91
- url = @page.if_url + (parameters.size > 1 ? parameters : '')
91
+ url = @page.if_url + (parameters.blank? ? '' : parameters)
92
92
  html << "src=\"#{url}\" ></iframe>\n"
93
93
  html
94
94
  end
@@ -106,7 +106,7 @@ def default
106
106
  html << @page.body
107
107
  # render poll if defined
108
108
  if @page.dc_poll_id
109
- @opts.merge!(:poll_id => @page.dc_poll_id, :return_to => @parent.request.url, method: nil)
109
+ @opts.merge!(poll_id: @page.dc_poll_id, return_to: @parent.request.url, method: nil)
110
110
  comment = DcPollRenderer.new(@parent, @opts)
111
111
  html << "<div class='wrap row'>#{comment.render_html}</div>"
112
112
  @css << "\n#{comment.render_css}"
@@ -110,7 +110,7 @@ def do_one_item(poll, yaml)
110
110
  if !@end_of_data
111
111
  html << (poll.display == 'lr' ? "</div><br>\n" : "</div>\n")
112
112
  # captcha
113
- if poll.captcha_type.to_s.size > 1
113
+ if poll.captcha_type.present?
114
114
  @opts.merge!(:captcha_type => poll.captcha_type)
115
115
  captcha = DcCaptchaRenderer.new(@parent, @opts)
116
116
  html << captcha.render_html
@@ -157,7 +157,7 @@ end
157
157
  ########################################################################
158
158
  def default
159
159
  # poll_id may be defined in params or opts
160
- poll_id = @opts[:poll_id] || @parent.params[:poll_id]
160
+ poll_id = @opts[:id] || @opts[:poll_id] || @parent.params[:poll_id]
161
161
  return '<br>Poll id is not defined?<br>' if poll_id.nil?
162
162
 
163
163
  poll = DcPoll.find(poll_id)
@@ -191,18 +191,19 @@ def default
191
191
  html << %(<div class="poll-div">\n)
192
192
  # edit link
193
193
  if @opts[:edit_mode] > 1
194
- @opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', id: poll._id, table: 'dc_poll', form_name: 'dc_poll' )
194
+ @opts[:editparams].merge!( controller: :cmsedit, action: :edit, id: poll._id, table: :dc_poll, form_name: :dc_poll )
195
195
  @opts[:editparams].merge!(title: "#{t('drgcms.edit')}: #{poll.name}")
196
196
  @opts[:editparams].delete(:ids) # this is from page, but it gets in a way
197
197
  html << dc_link_for_edit( @opts[:editparams] )
198
198
  end
199
199
 
200
200
  html << case
201
- when poll.operation == 'poll_submit' then
202
- @parent.form_tag(action: poll.operation, method: :put)
203
- when poll.operation == 'link' then
204
- @parent.form_tag( poll.parameters, method: :put)
205
- end
201
+ when poll.operation == 'poll_submit'
202
+ @parent.form_tag(action: poll.operation, method: :put, return_to: params[:return_to])
203
+ when poll.operation == 'link'
204
+ poll.parameters << "?return_to=#{params[:return_to]}" if params[:return_to]
205
+ @parent.form_tag( poll.parameters, method: :put)
206
+ end
206
207
  # header, - on first position will not display title
207
208
  html << %(<div class="poll-title">#{poll.title}</div>) unless poll.title[0] == '-'
208
209
  html << %(<div class="poll-text">#{poll.sub_text}</div>)
@@ -212,10 +213,10 @@ def default
212
213
  %(<div class="poll-data-div">\n)
213
214
  end
214
215
  # items. Convert each item to yaml
215
- @end_od_data = false
216
+ @end_of_data = false
216
217
  if poll.form.to_s.size < 10
217
218
  items = poll.dc_poll_items
218
- items.sort! { |a,b| a.order <=> b.order }
219
+ items.sort! { |a, b| a.order <=> b.order }
219
220
  items.each do |item|
220
221
  next unless item.active # disabled items
221
222
  # convert options to yaml
@@ -232,12 +233,12 @@ def default
232
233
  html << do_one_item(poll, yaml)
233
234
  end
234
235
  else
235
- yaml = YAML.load(poll.form.gsub('&nbsp;',' ')) # very annoying. They come with copy&paste ;-)
236
+ yaml = YAML.load(poll.form.gsub('&nbsp;', ' ')) # very annoying. They come with copy&paste ;-)
236
237
  # if entered without numbering yaml is returned as Hash otherwise as Array
237
238
  yaml.each { |i| html << do_one_item(poll, (i.class == Hash ? i : i.last)) } #
238
239
  end
239
240
  # hide some fields usefull as parameters
240
- html << @parent.hidden_field_tag('return_to', @opts[:return_to] || @parent.params[:return_to] || @parent.request.url)
241
+ html << @parent.hidden_field_tag('return_to', @opts[:return_to] || @parent.params[:return_to])
241
242
  html << @parent.hidden_field_tag('return_to_error', @parent.request.url )
242
243
  html << @parent.hidden_field_tag('poll_id', poll_id )
243
244
  html << @parent.hidden_field_tag('page_id', @parent.page.id )
@@ -162,8 +162,8 @@ def as_responsive
162
162
  items.each do |item|
163
163
  # menu can be hidden from user
164
164
  can_view, msg = dc_user_can_view(@parent, item)
165
- p msg unless can_view
166
165
  next unless can_view
166
+
167
167
  html << "<li class=\"#{klas}#{(item.id == @selected.id) ? 'selected' : 'item'}\">#{ link_4menu(item) }</li>" #
168
168
  end
169
169
  html
@@ -35,6 +35,9 @@
35
35
  {controller: 'dc_common', action: 'paste_clipboard'}, target: 'iframe_cms') %>
36
36
 
37
37
  <%= DrgcmsFormFields::Elfinder.file_manager_url(self) %>
38
+ <span>|</span>
39
+
40
+ <%= link_to(session[:user_name], '/cms/logout', { title: t('drgcms.logout') }) %>
38
41
 
39
42
  </div>
40
43
  </div>
@@ -43,7 +46,7 @@
43
46
 
44
47
  <div class="cmsedit-container">
45
48
  <div id="cms-menu">
46
- <%= dc_choices4_cmsmenu.html_safe %>
49
+ <%= dc_cms_menu %>
47
50
  </div>
48
51
 
49
52
  <div class="cmsedit-iframe" style="width: 99%;">
@@ -1,6 +1,6 @@
1
1
  <% dc_form_update %>
2
2
 
3
- <div <%= dc_form_id %>>
3
+ <div <%= dc_form_id %> <%= dc_form_class %> >
4
4
  <%= dc_head_for_form %>
5
5
  <%= dc_table_title dc_edit_title() %>
6
6
 
@@ -1,6 +1,6 @@
1
1
  <% dc_form_update %>
2
2
 
3
- <div <%= dc_form_id %> class="dc-form-frame">
3
+ <div <%= dc_form_id %> <%= dc_form_class('dc-form-frame') %> >
4
4
  <%= dc_title_for_index @records %>
5
5
 
6
6
  <%= dc_actions_for_index %>
@@ -1,6 +1,7 @@
1
1
  <% dc_form_update %>
2
2
 
3
3
  <div <%= dc_form_id %>>
4
+ <%= dc_head_for_form %>
4
5
  <%= dc_table_title dc_new_title %>
5
6
 
6
7
  <%= form_tag(@form_params, method: :post, id: CmsHelper.form_param(params) || CmsHelper.table_param(params),
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2012-2013 Damjan Rems
2
+ # Copyright (c) 2012+ Damjan Rems
3
3
  #
4
4
  # Permission is hereby granted, free of charge, to any person obtaining
5
5
  # a copy of this software and associated documentation files (the
@@ -40,6 +40,7 @@ en:
40
40
  doc_paste_update: Update existing document if document._id exists
41
41
  doc_no_delete: Document can not be deleted!
42
42
  doc_no_update: Document can not be updated!
43
+ doc_no_edit: Document can not be edited!
43
44
  edit_content: Edit content
44
45
  edit_advanced: Advanced edit
45
46
  edit_new_page: Create new page
@@ -53,11 +54,13 @@ en:
53
54
  menu_plus: Show alternative menu
54
55
  not_email: is not valid e-mail address!
55
56
  updated_by_other: Document was updated by other user. Please reenter your data.
57
+ dfs: Double submit error! Returning back in history is prohibited.
56
58
  not_id: Value entered is not ID!
57
59
  cms_main: CMS main tables
58
60
  cms_advanced: CMS advanced
59
61
  search_placeholder: Start typing to search
60
62
  login: Login into CMS
63
+ logout: Logout
61
64
  username: User name
62
65
  password: Password
63
66
  form_error: Error loading form %{form_name}
@@ -65,7 +68,8 @@ en:
65
68
  no_class: Class [%{class}] not defined!
66
69
  no_method: Method (helper) [%{method}] not defined!
67
70
  img_alt_not_present: All images in body must have alternative text entered
68
-
71
+ not_valid: Value is not valid!
72
+
69
73
  toggle_cms: Toggle CMS edit/view mode
70
74
  edit: Edit
71
75
  show: Show
@@ -87,6 +91,7 @@ en:
87
91
  save: Save
88
92
  save&back: Save & back
89
93
  save&close: Save & close
94
+ search: Search
90
95
  filter_on: Filter ON
91
96
  filter_off: Filter OFF
92
97
  filter_set: Set filter
@@ -97,6 +102,9 @@ en:
97
102
  errors_no: 'No. of errors:'
98
103
  runtime_error: Runtime error!
99
104
  two_chars: type in at least two chars
105
+ print: Print
106
+ export: Export
107
+ result: Result
100
108
 
101
109
  created_by: Created by
102
110
  updated_by: Updated by
@@ -116,6 +124,8 @@ en:
116
124
  category_has_subs: Category can't be deleted, because it contains sub-elements.
117
125
  category_as_tree: Edit in treeview
118
126
 
127
+ iframe_save_to_view: Data must be saved in order to view content
128
+
119
129
  dc_journal:
120
130
  zero_selected: No data selected!
121
131
  restored: Data has been restored.
@@ -141,3 +151,13 @@ en:
141
151
  1basic: Basic
142
152
  2index: Index
143
153
  3form: Form
154
+
155
+ dc_image:
156
+ wrong_type: Image type not allowed! Types allowed are (jpg jpeg png gif svg webp).
157
+ no_file: Original image file not present. Try to upload image file again.
158
+ invoke: Invoke images manager.
159
+ search: Search and select image
160
+ select: Click to select
161
+ preview: Click to view image
162
+ available: Available image sizes
163
+ offset_error: Enter either X or Y offset.
@@ -32,17 +32,18 @@ sl:
32
32
  not_authorized: Uporabnik nima pravic za to operacijo!
33
33
  doc_disabled: Dokument onemogočen!
34
34
  doc_enabled: Dokument omogočen!
35
- doc_saved: Dokument zapisan!
36
- doc_info: Info
37
- doc_copy_clipboard: Kopija vsebine dokumenta v novem oknu.
38
- doc_paste_clipboard: Obdelaj podatke
35
+ doc_paste_clipboard: Obdelaj podatke
39
36
  doc_paste_title: Ustvari (spremeni) dokumente iz JSON zapisa
40
37
  doc_paste_update: Spremeni obstoječ dokument, če dokument._id obstaja
41
38
  doc_no_delete: Dokumenta ni možno izbrisati!
42
39
  doc_no_update: Dokumenta ni možno spremeniti!
40
+ doc_no_edit: Dokumenta ni možno urejati!
43
41
  edit_content: Urejanje vsebine
44
42
  edit_advanced: Napredno urejanje
45
43
  edit_new_page: Ustvarite novo stran
44
+ doc_saved: Dokument zapisan!
45
+ doc_info: Info
46
+ doc_copy_clipboard: Kopija vsebine dokumenta v novem oknu.
46
47
  edit_new_part: Ustvarite nov element na strani
47
48
  edit_design: 'Uredi: Dizajn'
48
49
  edit_site: 'Uredi: Spletišče'
@@ -53,18 +54,21 @@ sl:
53
54
  menu_plus: Malo drugačen menu
54
55
  not_email: ni veljaven e-naslov!
55
56
  updated_by_other: Dokument je spremenil drug uporabnik. Prosimo ponovite vpis podatkov.
57
+ dfs: Dvojno shranjevanje. Vračanje v zgodovino brskalnika ni dovoljeno.
56
58
  not_id: Vsebina polja ni ključ ID!
57
59
  cms_main: CMS tabele
58
60
  cms_advanced: CMS napredne opcije
59
61
  search_placeholder: Vpišite pojem za iskanje
60
62
  login: Prijava v CMS
63
+ logout: Odjava
61
64
  username: Uporabnik
62
65
  password: Geslo
63
66
  form_error: Napaka pri branju forme %{form_name}
64
67
  img_large: Klik za večjo sliko
65
68
  no_class: Razred (class) [%{class}] ni definiran!
66
69
  no_method: Metoda (helper) [%{method}] ne obstaja!
67
- img_alt_not_present: Vse slike v vsebini morajo imeti vpisano nadomestno besedilo
70
+ img_alt_not_present: Vse slike v vsebini morajo imeti vpisano nadomestno besedilo
71
+ not_valid: Nedovoljena vrednost!
68
72
 
69
73
  toggle_cms: Preklopi med CMS urejanjem in prikazom
70
74
  edit: Urejanje
@@ -87,6 +91,7 @@ sl:
87
91
  save: Shrani
88
92
  save&back: Shrani in nazaj
89
93
  save&close: Shrani in zapri
94
+ search: Išči
90
95
  filter_on: Vklopi filter
91
96
  filter_off: Izklopi filter
92
97
  filter_set: Nastavi filter
@@ -97,6 +102,9 @@ sl:
97
102
  errors_no: 'Število napak:'
98
103
  runtime_error: Napaka med izvajanjem programa!
99
104
  two_chars: vpišite vsaj dva znaka
105
+ print: Tiskanje
106
+ export: Izvoz
107
+ result: Rezultat
100
108
 
101
109
  created_by: Ustvaril
102
110
  updated_by: Spremenil
@@ -116,6 +124,8 @@ sl:
116
124
  category_has_subs: Kategorije ni mogoče izbrisati, ker vsebuje podrejene elemente.
117
125
  category_as_tree: Uredi v drevesnem pogledu
118
126
 
127
+ iframe_save_to_view: Za prikaz vsebine je potrebno predhodno shraniti podatke.
128
+
119
129
  dc_journal:
120
130
  zero_selected: Ni izbranih podatkov!
121
131
  restored: Podatki so restavrirani.
@@ -139,4 +149,13 @@ sl:
139
149
  2index: Index
140
150
  3form: Forma
141
151
 
142
-
152
+ dc_image:
153
+ wrong_type: Nedovoljena vrsta slike. Dovoljene so vrste (jpg jpeg png gif svg webp).
154
+ no_file: Nisem našel originalne slike. Predlagam, da sliko ponovno naložite.
155
+ invoke: Zagon iskalnika slik.
156
+ search: Poiščite in izberite sliko
157
+ select: Kliknite za izbiro
158
+ preview: Kliknite za ogled slike
159
+ image: Slika
160
+ available: Velikosti na voljo
161
+ offset_error: Vpišite samo X ali Y zamik.
@@ -570,7 +570,37 @@ en:
570
570
  dc_json_lds: Schema sub element
571
571
  active: Active
572
572
 
573
- # help for forms #####################################################
573
+ dc_image:
574
+ tabletitle: Images manager
575
+
576
+ upload_file: Upload
577
+ name: File name
578
+ short: Short description
579
+ text: Description text
580
+ keep_original: Keep original
581
+ size_o: Original dimension
582
+ size_l: Large dimension
583
+ size_m: Medium dimension
584
+ size_s: Small dimension
585
+ size_ls: Large dimension
586
+ size_ms: Medium dimension
587
+ size_ss: Small dimension
588
+ categories: Categories
589
+ cats_input: Categories
590
+ categories_line: Categories
591
+ created_by: Uploaded by
592
+
593
+ dc_setup:
594
+ tabletitle: Applications settings
595
+ tab0: Options
596
+ tab00: Form
597
+
598
+ name: Setup name
599
+ form: Form
600
+ data: Data
601
+ editors: Editors
602
+
603
+ # help for forms ##############################################################################################
574
604
 
575
605
  help:
576
606
  dc_site:
@@ -973,3 +1003,22 @@ en:
973
1003
  active: Document is active
974
1004
  add_schema: Add new schema
975
1005
  add_error: Schema element %{schema} already exists!
1006
+
1007
+ dc_image:
1008
+ upload_file: Select file to upload
1009
+ name: Original file name
1010
+ short: Short image description
1011
+ text: Longer image description text
1012
+ keep_original: Keep original image
1013
+ size_o: Dimension of original image
1014
+ size_l: Dimension for large image
1015
+ size_m: Dimension form medium size image
1016
+ size_s: Dimension for small size image
1017
+ categories: Categories for later searching of image
1018
+ created_by: Image was uploaded by
1019
+
1020
+ dc_setup:
1021
+ name: Setup name (typically application or module name)
1022
+ form: Form definition for entering settings. Edit fields must be defined on tabs
1023
+ data: Actual data saved
1024
+ editors: List of users, which can edit this setup beside administrators
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2012-2013 Damjan Rems
2
+ # Copyright (c) 2012+ Damjan Rems
3
3
  #
4
4
  # Permission is hereby granted, free of charge, to any person obtaining
5
5
  # a copy of this software and associated documentation files (the
@@ -574,6 +574,46 @@ sl:
574
574
  active: Aktiven
575
575
  dc_json_lds: Podelement strukture
576
576
 
577
+ dc_image:
578
+ tabletitle: Organizator slik
579
+
580
+ upload_file: Naloži datoteko
581
+ name: Originalno ime
582
+ short: Kratek opis
583
+ text: Daljši opis
584
+ keep_original: Ohrani original
585
+ size_o: Prvotna dimenzija
586
+ size_l: Velika dimenzija
587
+ size_m: Srednja dimenzija
588
+ size_s: Mala dimenzija
589
+ size_ls: Velika dimenzija
590
+ size_ms: Srednja dimenzija
591
+ size_ss: Mala dimenzija
592
+ offset_lx: Zamik X
593
+ offset_ly: Zamik Y
594
+ offset_mx: Zamik X
595
+ offset_my: Zamik Y
596
+ offset_sx: Zamik X
597
+ offset_sy: Zamik Y
598
+ preview_s: Slika
599
+ preview_m: Slika
600
+ preview_l: Slika
601
+
602
+ categories: Kategorije
603
+ cats_input: Kategorije
604
+ categories_line: Kategorije
605
+ created_by: Naložil
606
+
607
+ dc_setup:
608
+ tabletitle: Tabela nastavitev aplikacij
609
+ tab0: Nastavitve
610
+ tab00: Form
611
+
612
+ name: Naziv nastavitev
613
+ form: Obrazec za zajem
614
+ data: Vsebina
615
+ editors: Urejevalci
616
+
577
617
  # help pomoč na obrazcih ####################################################
578
618
 
579
619
  help:
@@ -985,3 +1025,22 @@ sl:
985
1025
  add_schema: Dodaj strukturo
986
1026
  add_error: Element %{schema} že obstaja!
987
1027
 
1028
+ dc_image:
1029
+ upload_file: Naloži datotekov obdelavo
1030
+ name: Originalno ime datoteke
1031
+ short: Kratek opis slike
1032
+ text: Daljši opis slike
1033
+ keep_original: Ohrani originalno sliko
1034
+ size_o: Dimenzije originalne slike
1035
+ size_l: Dimenzije velike slike
1036
+ size_m: Dimenzije srednje velike slike
1037
+ size_s: Dimenzije male slike
1038
+ categories: Kategorije za poznejše lažje iskanje slike
1039
+ created_by: Uporabnik, ki je naložil sliko
1040
+ offset: Offset image before resizing. Offset origin is the top left corner.
1041
+
1042
+ dc_setup:
1043
+ name: Naziv nastavitev (tipično ime aplikacije, modula)
1044
+ form: Definicija posamezne nastavitve in obrazec za zajem
1045
+ data: Vsebina nastavitev (kot je shranjena v bazi podatkov)
1046
+ editors: Seznam zaposlenih, ki lahko poleg administratorjev urejajo zapis
data/drg_cms.gemspec CHANGED
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
23
23
  s.add_dependency 'rails'#, '~> 6.1'
24
24
  s.add_dependency 'jquery-rails'
25
25
  s.add_dependency 'jquery-ui-rails'
26
- s.add_dependency 'non-stupid-digest-assets'
26
+ s.add_dependency 'non-digest-assets'
27
27
 
28
28
  s.add_dependency 'bcrypt' #, '~> 3.0.0'
29
29
  s.add_dependency 'mongoid'#, '~> 7'
@@ -23,5 +23,5 @@
23
23
 
24
24
  # drg_cms gem version
25
25
  module DrgCms #:nodoc:
26
- VERSION = '0.7.0.2'.freeze
26
+ VERSION = '0.7.1.1'.freeze
27
27
  end