drg_cms 0.6.1.0 → 0.6.1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd59e26395442cc8bec436e5a05940e762f373bfd30a83d5ddca87b443627a4
-  data.tar.gz: be25c10a78a2fc6ed37f5e02484cfbff1d28b8cadb8546432f5b67665578006f
+  metadata.gz: a424c5a9f1d427b775dfb3a6a7bfa8ea0624c47fb2f4381c0fd19120a2c8c678
+  data.tar.gz: 6f0918c0365fbed1ff81e31bcd55be432ae8c02520f3811b18087941913957f5
 SHA512:
-  metadata.gz: 838507481e4d09277049b1468ddbc18b2e40cc32b5fdcac38224169ab1b761aee445ebd93c0747c409db4f87298e986c9472552bc60d69f7d73031bea58a9c31
-  data.tar.gz: 41965e0a604a632d975d3081d85d4e1d775ccb01a7e6dbbfad49be732e89f1223b20376024897b13df742bd6b38eab8c4a8f541d5270f127660dfd23e5edd27e
+  metadata.gz: 149a134733c8190f6b29003493f664e16fa2efad6608fb04a8bb607b9e00cd11a1752ec3b860d57af76789868667de12597b2023391879ad683ace066f71c1ec
+  data.tar.gz: 104ba8f48a7ad665da2f8ea99d833e04c94db4dc89a6d6ccecfe313ee5a082d7800691a31b805fb5cd35450e7350750ed68c073ef3e2bbafc971cfc8ff1180f2

data/app/assets/javascripts/drg_cms/drg_cms.js

@@ -832,9 +832,16 @@ $(document).ready( function() {
   * work on all field types.
   *******************************************************************/
   $('.record_filter_field_icon').on('click', function(e) {
-    var field = $('#_record__filter_field');
-    var url = $(this).parents('span').attr("data-url");
-    url = url + "&filter_value=" + field.val();
+    let field = $('#_record__filter_field');
+    let url = $(this).parents('span').attr("data-url");
+    let value = null;
+
+    if (field.is(':checkbox')) {
+      value = field.is(':checked'); }
+    else {
+      value = field.val();
+    }
+    url = url + "&filter_value=" + value;
     location.href = url;
   });
 

data/app/assets/stylesheets/drg_cms/drg_cms.css

@@ -188,7 +188,7 @@ a.dc-animate:hover { color: #000; background: transparent;}
 .dc-image-preview img { max-height: 2rem; padding-left: 0.5rem;}
 .dc-image-preview img:hover { cursor: zoom-in;}
 
-.text-with-select { width: 24px; }
+.text-with-select { width: 20px; }
 
 .no-borders {
   padding:  0;
@@ -795,6 +795,9 @@ border-top: 1px solid #ddd;
 display: flex;
 }
 .dc-head .dc-column {
+  white-space: nowrap;
+  overflow: hidden;
+  margin-right: 2px;
 }
 .dc-head .text {
   font-weight: normal;  
@@ -1217,6 +1220,16 @@ background-color: transparent;
   min-width: 50%;
 }
 
+#popup .dc-help .help-top {
+  position: absolute;
+  bottom: 1rem;
+  right: 1rem;
+  padding: 2px 4px;
+  border: 1px dotted #ccc;
+  border-radius: 4px;
+  background: rgba(76,154,255,0.2);
+}
+
 #popup .dc-help {
   background: #fff;
   padding: 8px;
@@ -1228,8 +1241,10 @@ background-color: transparent;
 #popup .dc-help h1 {
   background: darkred;
   color: #fff;
-  font-weight: 700;
-  padding: 4px
+  font-weight: 600;
+  padding: 4px;
+  font-size: 1.2em;
+  border-radius: 2px;
 }
 
 #popup .dc-help h2 {
@@ -1246,21 +1261,12 @@ background-color: transparent;
   padding: 4px
 }
 
-/*
-#popup .dc-help .help-tab {
-  display: table;
-  padding-top: 4px;
-  border-bottom: 3px solid #000;
-  margin: 8px 0;
-  font-weight: 600;
-}
-*/
 #popup .dc-help .help-tab {
   display: table;
   margin: 8px 0 0;
   padding: 3px 12px;
   color: #fff;
-  background: #444;
+  background: #555;
   border-radius: 5px 5px 0 0;
   font-weight: 600;
 }
@@ -1268,10 +1274,15 @@ background-color: transparent;
 #popup .dc-help .help-tab-help {
   font-weight: 600;
   color: #fff;
-  background: #666;
+  background: #777;
   padding: 3px 12px;
 }
 
+#popup .dc-help .help-fields {
+  margin-top: 1rem;
+  border-top: 1px solid #222;
+}
+
 #popup .dc-help .help-field {
   display: flex;
   background-color: #eee;
@@ -1291,11 +1302,14 @@ background-color: transparent;
 }
 
 #popup .dc-help .help-body {
-  margin-top: 8px;
   border-top: 1px solid #222;
   padding-top: 8px;
 }
 
+#popup .dc-help .help-buttons {
+  padding: 4px 0;
+}
+
 #popup .dc-help .dc-link {
   display: inline-flex;
 }

data/app/assets/stylesheets/drg_cms/select-multiple.css

@@ -28,7 +28,7 @@
   -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
   -o-transition: border linear 0.2s, box-shadow linear 0.2s;
   transition: border linear 0.2s, box-shadow linear 0.2s;
-  border: 1px solid #ddd;
+  border: 1px dashed #888;
   -webkit-border-radius: 1px;
   -moz-border-radius: 1px;
   border-radius: 1px;

data/app/controllers/dc_application_controller.rb

@@ -528,7 +528,7 @@ end
 #      
 ####################################################################
 def dc_check_model(document, crash=false)
-  DrgCms.check_model(document, crash=false)
+  DrgCms.model_check(document, crash)
 end
 
 ######################################################################

data/app/controls/dc_report.rb

@@ -153,8 +153,9 @@ def export_to_excel(report_id)
       excel[n, i] = value
     end
   end
-  workbook.write Rails.root.join("public/tmp/#{report_id}.xls")
-  dc_render_ajax(operation: :window, value: "/tmp/#{report_id}.xls")
+  file_name = "#{report_id}-#{Time.now.to_i}.xls"
+  workbook.write Rails.root.join('public', 'tmp', file_name)
+  dc_render_ajax(operation: :window, value: "/tmp/#{file_name}")
 end
 
 ############################################################################
@@ -200,15 +201,12 @@ end
 # @param [Object] txt : Text or object. Result of to_s method of the object is
 # @param [Hash] opts
 ###############################################################################
-def pdf_text(txt, opts={})
-  box_opts = {}
+def pdf_text(txt, opts = {})
+  box_opts = opts.dup
   ypos = @pdf.cursor
   xpos = opts.delete(:atx) || 0
-  box_opts.merge!(single_line: (opts.delete(:single_line) || true))
-  box_opts.merge!(at: (opts.delete(:at) || [xpos, ypos]))
-  box_opts.merge!(width: opts[:width]) if opts[:width]
-  box_opts.merge!(align: opts[:align]) if opts[:align]
-  box_opts.merge!(inline_format: opts[:inline_format]) if opts[:inline_format]
+  box_opts[:single_line] ||= true
+  box_opts[:at] ||= [xpos, ypos]
 
   @pdf.text_box(txt.to_s, box_opts)
 end

data/app/helpers/cms_common_helper.rb

@@ -356,13 +356,12 @@ end
 def dc_help_fields
   return '' if @form['form'].nil?
 
-  html = '<div class="dc-handle" data-div="#the1"></div><div id="the1">'
+  html = '<a id="fields"></a>'
   if @form['form']['tabs']
     @form['form']['tabs'].each { |tab| html << dc_help_for_tab(tab) }
   else
     html << dc_help_for_tab(@form['form']['fields'])
   end
-  html << '</div>'
   html.html_safe
 end
 

data/app/helpers/cms_edit_helper.rb

@@ -423,7 +423,7 @@ def dc_head_for_form
         @record.send(options['name'])
       end
     rescue Exception => e
-      dc_log_exception(e)
+      dc_log_exception(e, 'dc_head_for_form')
       field = '!!!Error'
     end
     #

data/app/helpers/cms_helper.rb

@@ -256,10 +256,10 @@ def dc_link_ajax_window_submit_action(yaml, record=nil, action_active=true)
 end
 
 ############################################################################
-#
+# Log exception to rails log. Usefull for debugging eval errors.
 ############################################################################
-def dc_log_exception(exception)
-  log = exception ? "\n!!!Error: #{exception.message}\n#{exception.backtrace.first.inspect}\n" : ''
+def dc_log_exception(exception, where = '')
+  log = exception ? "\n*** Error:#{where + ':'} #{exception.message}\n#{exception.backtrace.first.inspect}\n" : ''
   log << "DRG Form processing line: #{session[:form_processing]}\n"
   
   logger.error log

data/app/helpers/cms_index_helper.rb

@@ -291,7 +291,7 @@ def dc_actions_for_result(document)
       when yaml['type'] == 'delete' then
         parms['action'] = 'destroy'
         parms['id']     = document.id
-        parms['return_to'] = request.url
+        #parms['return_to'] = request.url
         dc_link_to( nil, 'remove lg', parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete )
       # undocumented so far
       when yaml['type'] == 'edit_embedded'
@@ -438,7 +438,7 @@ def dc_columns_for_result(document)
         "??? #{v['name']}"
       end
     rescue Exception => e
-      dc_log_exception(e)
+      dc_log_exception(e, 'dc_columns_for_result')
       value = '!!!Error'
     end
     html << '<div class="spacer"></div>'
@@ -540,15 +540,19 @@ def dc_style_or_class(selector, yaml, value, record)
   # alias record and value so both names can be used in eval
   field, document = value, record
   html = selector ? "#{selector}=\"" : ''
-  html << if yaml.class == String
-    yaml
-  # direct evaluate expression
-  elsif yaml['eval']
-    eval(yaml['eval']) rescue 'background-color:red;'
-  elsif yaml['method']
-    dc_process_eval(yaml['method'], record)
+  begin
+    html << if yaml.class == String
+              yaml
+              # direct evaluate expression
+            elsif yaml['eval']
+              eval(yaml['eval'])
+            elsif yaml['method']
+              dc_process_eval(yaml['method'], record)
+            end
+  rescue Exception => e
+    dc_log_exception(e, 'dc_style_or_class')
   end
-  html << '"' if selector 
+  html << '"' if selector
   html
 end 
 

data/app/helpers/dc_application_helper.rb

@@ -596,10 +596,11 @@ end
 # Returns: 
 # String. HTML code required for manipulation of currently processed document.
 ########################################################################
-def dc_page_edit_menu(opts=@opts)
+def dc_page_edit_menu(opts = @opts)
   opts[:edit_mode] ||= _origin.session[:edit_mode]
   return '' if opts[:edit_mode] < 2
-# save some data to cookie. This can not go to session.
+
+  # save some data to cookie. This can not go to session.
   page  = opts[:page] || @page
   table = _origin.site.page_class.underscore
   kukis = { "#{table}.dc_design_id" => page.dc_design_id,
@@ -616,11 +617,9 @@ def dc_page_edit_menu(opts=@opts)
     opts[:editparams].merge!( :id => page.id, :table => _origin.site.page_class.underscore, form_name: opts[:form_name], edit_only: 'body' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_content') )
     
-#    opts[:editparams][:edit_only] = nil
     opts[:editparams].merge!( edit_only: nil, 'icon' => 'pencil' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_advanced') )
     
-#    opts[:editparams][:action] = 'new'
     opts[:editparams].merge!( action: 'new', 'icon' => 'plus' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_new_page') )
 
@@ -642,8 +641,7 @@ end
 #      type: text_with_select
 #      eval: 'dc_page_class.all_pages_for_site(@parent.dc_get_site)'
 ########################################################################
-def dc_page_class()
-#  dc_get_site.page_class.classify.constantize  
+def dc_page_class
   dc_get_site.page_klass
 end
 
@@ -658,7 +656,7 @@ end
 #      type: tree_view
 #      eval: 'dc_menu_class.all_menus_for_site(@parent.dc_get_site)'
 ########################################################################
-def dc_menu_class()
+def dc_menu_class
   dc_get_site.menu_class.classify.constantize
 end
 
@@ -672,23 +670,20 @@ end
 # Returns:
 # DCSite. Site document.
 ####################################################################
-def dc_get_site()
+def dc_get_site
   return @site if @site # already cached
-#
+
   req = _origin.request.url # different when called from renderer
   uri  = URI.parse(req)
   @site = DcSite.find_by(name: uri.host)
-# Site can be aliased
-  if @site and !@site.alias_for.blank?
-    @site = DcSite.find_by(name: @site.alias_for)
-  end
-# Development environment. Check if site with name test exists and use 
-# alias_for field as pointer to real site name.
-  if @site.nil? and ENV["RAILS_ENV"] != 'production'
+  # Site can be aliased
+  @site = DcSite.find_by(name: @site.alias_for) if @site&.alias_for.present?
+  # Development. If site with name test exists use alias_for field as pointer to real site data
+  if @site.nil? && ENV["RAILS_ENV"] != 'production'
     @site = DcSite.find_by(name: 'test')
     @site = DcSite.find_by(name: @site.alias_for) if @site
   end 
-  @site = nil if @site and !@site.active # site is disabled
+  @site = nil if @site && !@site.active # site is disabled
   @site
 end
 
@@ -704,9 +699,9 @@ end
 #    html:
 #      include_blank: true      
 ############################################################################
-def dc_choices4_site_policies()
+def dc_choices4_site_policies
   site = dc_get_site()
-  site.dc_policies.all.inject([]) { |r, policy| r << [ policy.name, policy.id] if policy.active }
+  site.dc_policies.where(active: true).order_by(name: 1).map { |policy| [ policy.name, policy.id] }
 end
 
 ############################################################################
@@ -727,7 +722,7 @@ def dc_choices4_all_collections
   DrgCms.paths(:forms).reverse.each do |path|
     filename = "#{path}/cms_menu.yml"
     next unless File.exist?(filename)
-#
+
     menu = YAML.load_file(filename) rescue nil      # load menu
     next if menu.nil? or !menu['menu']              # not menu or error
     menu['menu'].each do |section|
@@ -754,8 +749,8 @@ def forms_merge(hash1, hash2) #:nodoc:
     end
     target[key] = hash2[key] == '/' ? nil :  hash2[key]
   end
-# delete keys with nil value  
-  target.delete_if{ |k,v| v.nil? }
+  # delete keys with nil value
+  target.delete_if{ |k, v| v.nil? }
 end
 
 ##########################################################################
@@ -770,7 +765,7 @@ def dc_choices4_cmsmenu()
     next if menu.nil? or !menu['menu']              # not menu or error
     menus = forms_merge(menu['menu'], menus)        # ignore top level part
  end
-#
+
   html = '<ul>'
   menus.to_a.sort.each do |index, menu|    # sort menus, result is array of sorted hashes
     next unless menu['caption']
@@ -835,9 +830,11 @@ def dc_choices4(model, name, id='_id', options = {})
     sites << nil if param == :with_nil 
     qry   = qry.in(dc_site_id: sites) if sites
   end
-  qry   = qry.and(active: true) if model.method_defined?(:active)
-  choices = qry.inject([]) {|result,e| result << [ e[name], e[id] ]}
-  choices.sort_alphabetical_by(&:first) # use UTF-8 sort
+  qry = qry.and(active: true) if model.method_defined?(:active)
+  qry = qry.order_by(name => 1).collation(locale: I18n.locale.to_s)
+  #choices = qry.inject([]) {|result,e| result << [ e[name], e[id] ]}
+  #choices.sort_alphabetical_by(&:first) # use UTF-8 sort
+  qry.map { |e| [e[name], e[id]] }
 end
 
 ############################################################################
@@ -898,35 +895,35 @@ end
 ############################################################################
 def dc_user_can_view(ctrl, policy_id)
   policy_id = policy_id.policy_id if policy_id and policy_id.respond_to?(:policy_id)
-# Eventualy object without policy_id will be checked. This is to prevent error
+  # Eventualy object without policy_id will be checked. This is to prevent error
   policy_id = nil unless policy_id.class == BSON::ObjectId
-#
+
   site = ctrl.site
   policies = if site.inherit_policy.blank? 
     site.dc_policies
   else
     Mongoid::QueryCache.cache { DcSite.find(site.inherit_policy) }.dc_policies
   end
-# permission defined by default policy
+  # permission defined by default policy
   default_policy = Mongoid::QueryCache.cache { policies.find_by(is_default: true) }
   return false, 'Default access policy not found for the site!' unless default_policy
-#  
+
   permissions = {}
   default_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
-# update permissions with defined policy 
+  # update permissions with defined policy
   part_policy = nil
   if policy_id
     part_policy = Mongoid::QueryCache.cache { policies.find(policy_id) }
     return false, 'Access policy not found for part!' unless part_policy
     part_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
   end
-# apply guest role if no roles defined
+  # apply guest role if no roles defined
   if ctrl.session[:user_roles].nil?
     role = Mongoid::QueryCache.cache { DcPolicyRole.find_by(system_name: 'guest', active: true) }
     return false, 'System guest role not defined!' unless role
     ctrl.session[:user_roles] = [role.id]
   end
-# Check if user has any role that allows him to view part
+  # Check if user has any role that allows him to view part
   can_view, msg = false,''
   ctrl.session[:user_roles].each do |role|
     next unless permissions[role]          # role not yet defined. Will die in next line.
@@ -962,10 +959,10 @@ def dc_user_has_role( role, user=nil, roles=nil )
   roles = _origin.session[:user_roles] if roles.nil?
   user  = _origin.session[:user_id] if user.nil?
   return false if user.nil? or roles.nil?
-#  
+
   role = DcPolicyRole.get_role(role)
   return false if role.nil?
-# role is included in roles array
+  # role is included in roles array
   roles.include?(role._id)
 end
 
@@ -1004,6 +1001,7 @@ end
 ############################################################################
 def dc_limit_string(string, size)
   return string if string.size < size
+
   string = string[0,size]
   string.chop! until (string[-1,1] == ' ' or string == '')
   string << '...'
@@ -1031,10 +1029,11 @@ def dc_big_table(key)
   bt = DcBigTable.find_by(key: key, site: dc_get_site._id, active: true)
   bt = DcBigTable.find_by(key: key, site: nil, active: true) if bt.nil?
   return ret if bt.nil? 
-# 
+
   locale = I18n.locale.to_s
   bt.dc_big_table_values.each do |v|   # iterate each value
     next unless v.active
+
     desc = ''
     v.dc_big_table_locales.each do |l| # iterate each locale
       if l.locale == locale

data/app/models/drgcms_form_fields/text_autocomplete.rb

@@ -131,11 +131,13 @@ $(document).ready(function() {
         }
       });
     },
+
     change: function (event, ui) { 
       #{not_id_code}
+      if (ui.item == null) return;
       $("##{record}_#{@yaml['name']}").val(ui.item.id);
-      
     },
+
     minLength: 2
   });
 });

data/app/renderers/dc_poll_renderer.rb

@@ -60,7 +60,7 @@ def do_one_item(poll, yaml)
   # label
   text = yaml['text'].match(/\./) ? t(yaml['text']) : yaml['text'] 
   if yaml['mandatory']
-    text << ( poll.display == 'in' ? ' *' : '<font color="red"> *</font>' )
+    text << ( poll.display == 'in' ? ' *' : '<span class="required"> *</span>' )
     yaml['html'] ||= {}
     yaml['html']['required'] = true
   else
@@ -108,11 +108,7 @@ def do_one_item(poll, yaml)
   if yaml['type'].match(/submit_tag|link_to/)
     # There can be more than one links on form. End the data at first link or submit.
     if !@end_of_data 
-      html << if poll.display == 'lr'
-        "</div><br>\n"
-      else
-        "</div>\n"
-      end
+      html << (poll.display == 'lr' ? "</div><br>\n" : "</div>\n")
       # captcha
       if poll.captcha_type.to_s.size > 1
         @opts.merge!(:captcha_type => poll.captcha_type)
@@ -166,18 +162,18 @@ def default
 
   poll = DcPoll.find(poll_id)
   poll = DcPoll.find_by(name: poll_id) if poll.nil? # name instead of id
-  return "<div class=\"dc-form-error\">Invalid Poll id #{poll_id}</div>" if poll.nil?
+  return %(<div class="dc-form-error">Invalid Poll id #{poll_id}</div>) if poll.nil?
   # If parent cant be seen. so cant be polls
   can_view, message = dc_user_can_view(@parent, @parent.page)
-  return "<div class=\"dc-form-error\">#{message}</div>" unless can_view
+  return %(<div class="dc-form-error">#{message}</div>) unless can_view
 
-  html = @opts[:div] ? "<div id='#{@opts[:div]}'>" : ''
+  html = @opts[:div] ? %(<div id="#{@opts[:div]}"'>) : ''
   html << '<a name="poll-top"></a>'
   unless poll.pre_display.blank?
     begin
       continue, message = eval_pre_display(poll.pre_display)
     rescue Exception => e
-      return "<div class=\"dc-form-error\">Error! Poll pre display. Error: #{e.message}</div>" 
+      return %(<div class="dc-form-error">Error! Poll pre display. Error: #{e.message}</div>)
     end
     return message unless continue
 
@@ -188,11 +184,11 @@ def default
     # If flash[:record] is present copy content to params record hash
     @parent.flash[:record].each {|k,v| @parent.params["p_#{k}"] = v } if @parent.flash[:record]  
     # Error during procesing request
-    html << "<div class=\"dc-form-error\">#{@parent.flash[:error]}</div>\n" if @parent.flash[:error].to_s.size > 0
-    html << "<div class=\"dc-form-info\">#{@parent.flash[:info]}</div>\n" if @parent.flash[:info]
+    html << %(<div class="dc-form-error">#{@parent.flash[:error]}</div>\n) if @parent.flash[:error].to_s.size > 0
+    html << %(<div class="dc-form-info">#{@parent.flash[:info]}</div>\n) if @parent.flash[:info]
   end
   # div and form tag
-  html <<  "<div class=\"poll-div\">\n"
+  html <<  %(<div class="poll-div">\n)
   # edit link
   if @opts[:edit_mode] > 1
     @opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', id: poll._id, table: 'dc_poll', form_name: 'dc_poll' )
@@ -208,13 +204,13 @@ def default
     @parent.form_tag( poll.parameters, method: :put)
   end
   # header, - on first position will not display title
-  html << "<div class='poll-title'>#{poll.title}</div>" unless poll.title[0] == '-'
-  html << poll.sub_text.to_s
+  html << %(<div class="poll-title">#{poll.title}</div>) unless poll.title[0] == '-'
+  html << %(<div class="poll-text">#{poll.sub_text}</div>)
   html << if poll.display == 'lr'
-    "\n" + '<div class="poll-data-table">'
-  else
-    '<div class="poll-data-div">' + "\n"
-  end
+            %(\n<div class="poll-data-table">)
+          else
+            %(<div class="poll-data-div">\n)
+          end
   # items. Convert each item to yaml
   @end_od_data = false
   if poll.form.to_s.size < 10
@@ -232,9 +228,9 @@ def default
       yaml['text'] = item.text
       yaml['mandatory'] = item.mandatory
       yaml['type'] = item.type
+
       html << do_one_item(poll, yaml)
     end
-  # FORM. Just call do_one_item for each form item
   else
     yaml = YAML.load(poll.form.gsub('&nbsp;',' ')) # very annoying. They come with copy&paste ;-)
     # if entered without numbering yaml is returned as Hash otherwise as Array

data/app/views/dc_common/_help.html.erb

@@ -1,8 +1,17 @@
-<%= javascript_include_tag "cms" %>
 
-<div class="dc-help">
+<div class="dc-help"><a id="help-top"></a>
   <h1><%= t('drgcms.dc_help.help') %>: <%= dc_form_title %></h1>
+  <div class="help-buttons">
+    <% if params[:type] == 'form' %>
+      <button onclick="location.href='#fields'; return false;"><%= t('drgcms.dc_help.fields_button') %></button>
+    <% end %>
+    <% if @commnets %>
+      <button onclick="location.href='#comments'; return false;"><%= t('drgcms.dc_help.comments_button') %></button>
+    <% end %>
+  </div>
 
-  <div class="help-fields"><%= dc_help_fields if params[:type] == 'form' %></div>
   <div class="help-body"><%= dc_help_body if @help %></div>
+  <div class="help-fields"><%= dc_help_fields if params[:type] == 'form' %></div>
+
+  <div class="help-top" onclick="location.href='#help-top'; return false;"><%= fa_icon('arrow-up') %></div>
 </div>

data/config/locales/drgcms_en.yml

@@ -120,6 +120,8 @@ en:
 
     dc_help:
       help: HELP
+      fields_button: Data description
+      comments_button: Comments
       title: Manage help documents
       project: Project
       lang: Locale

data/config/locales/drgcms_sl.yml

@@ -117,6 +117,8 @@ sl:
 
     dc_help:
       help: POMOČ
+      fields_button: Opis podatkov
+      comments_button: Opombe
       title: Urejanje dokumentov pomoči
       project: Projekt
       lang: Jezik

data/lib/drg_cms/version.rb

@@ -23,5 +23,5 @@
 
 # drg_cms gem version
 module DrgCms #:nodoc:
-  VERSION = '0.6.1.0'.freeze
+  VERSION = '0.6.1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.1.0
+  version: 0.6.1.1.1
 platform: ruby
 authors:
 - Damjan Rems
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-20 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails