drg_cms 0.6.1.9 → 0.6.1.11

data/app/helpers/cms_helper.rb

@@ -35,8 +35,16 @@ module CmsHelper
 ############################################################################
 def dc_script_action(yaml)
   icon = dc_icon_for_link yaml['icon']
-  data = %(data-request="script" data-script="#{yaml['js'] || yaml['script']}" data-url="script")
-  %(<li><div class="dc-link-ajax" #{data}>#{icon} #{ t(yaml['caption'],yaml['caption']) }</div></li>)
+  yaml['html'] ||= {}
+  yaml['html']['data-url'] = 'script'
+  yaml['html']['data-request'] = 'script'
+  yaml['html']['data-script'] = "#{yaml['js'] || yaml['script']}"
+  yaml['html']['class'] ||= 'dc-link-ajax'
+  attributes = yaml['html'].inject('') { |r, e| r << "#{e.first}=\"#{e.last}\"" }
+
+  #  data = %(data-request="script" data-script="#{yaml['js'] || yaml['script']}" data-url="script")
+  #%(<li><div class="dc-link-ajax" #{data}>#{icon} #{ t(yaml['caption'], yaml['caption']) }</div></li>)
+  %(<li><div #{attributes}>#{icon} #{ t(yaml['caption'], yaml['caption']) }</div></li>)
 end
 
 ############################################################################
@@ -105,11 +113,13 @@ def dc_label_help(options)
   return [nil, nil] if %w(comment action).include?(options['type'])
 
   label = options['caption'] || options['text'] || options['label']
-  label = if label.blank?
-            t_name(options['name'], options['name'].capitalize.gsub('_',' ') )
-          elsif options['name']
-            t(label, label)
-          end
+  if options['name']
+    label = if label.blank?
+              t_label_for_field(options['name'], options['name'].capitalize.gsub('_',' ') )
+            elsif options['name']
+              t(label, label)
+            end
+  end
   # help text can be defined in form or in translations starting with helpers. or as helpers.help.collection.field
   help = options['help']
   help ||= "helpers.help.#{@form['table']}.#{options['name']}" if options['name']
@@ -128,11 +138,11 @@ end
 #   help : String : Help text
 ############################################################################
 def dc_tab_label_help(tab_name)
-  label = @form['form']['tabs'][tab_name]['caption'] || tab_name
-  label = t(label, t_name(label, label))
+  label = @form.dig('form', 'tabs', tab_name, 'caption') || tab_name
+  label = t(label, t_label_for_field(label, label))
 
-  help = @form['form']['tabs'][tab_name]['help'] || "helpers.help.#{@form['table']}.#{tab_name}"
-  help = t(help, t_name(help, help))
+  help = @form.dig('form', 'tabs', tab_name, 'help') || "helpers.help.#{@form['table']}.#{tab_name}"
+  help = t(help, t_label_for_field(help, help))
   help = nil if help.match('helpers.') # help not found in translation
 
   [label, help]
@@ -197,12 +207,14 @@ def dc_link_ajax_window_submit_action(yaml, record = nil, action_active = true)
   unless dc_is_action_active?(yaml)
     return %(<li><div class="dc-link-no">#{icon} #{caption}</div></li>)
   end
-  # set data-confirm when confirm 
+  # set data-confirm when confirm shortcut present
   yaml['html'] ||= {}
-  confirm = yaml['html']['data-confirm'] || yaml['confirm']
-  yaml['html']['data-confirm'] = t(confirm) if confirm.present?
-  yaml['html']['title'] ||= yaml['title']
-  yaml['html']['title'] = t(yaml['title']) if yaml['title'].present?
+  text = yaml['html']['data-confirm'] || yaml['confirm']
+  yaml['html']['data-confirm'] = t(text) if text.present?
+
+  text = yaml['html']['title'] || yaml['title']
+  yaml['html']['title'] = t(text) if text.present?
+
   yaml['html']['target'] ||= yaml['target']
   # direct url
   if yaml['url']
@@ -282,11 +294,18 @@ end
 ############################################################################
 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"
+  log << "DRG Form: #{CmsHelper.form_param(params)}, line: #{session[:form_processing]}\n"
   
   logger.error log
 end
 
+############################################################################
+# Will return form id, to be used on each form for simpler css selecting.
+############################################################################
+def dc_form_id
+  %( id=#{CmsHelper.form_param(params) || CmsHelper.table_param(params)} )
+end
+
 ############################################################################
 # Will return form_name from parameter regardless if set as form_name or just f.
 ############################################################################
@@ -301,4 +320,42 @@ def self.table_param(params)
   params[:table] || params[:t]
 end
 
+########################################################################
+# Searches forms path for file_name and returns full file name or nil if not found.
+#
+# @param [String] Form file name. File name can be passed as gem_name.filename. This can
+# be useful when you are extending form but want to retain same name as original form
+# For example. You are extending dc_user form from drg_cms gem and want to
+# retain same dc_user name. This can be done by setting drg_cms.dc_user as extend option.
+#
+# @return [String] Form file name including path or nil if not found.
+########################################################################
+def self.form_file_find(form_file)
+  form_path = nil
+  form_path, form_file = form_file.split(/\.|\//) if form_file.match(/\.|\//)
+
+  DrgCms.paths(:forms).reverse.each do |path|
+    f = "#{path}/#{form_file}.yml"
+    return f if File.exist?(f) && (form_path.nil? || path.to_s.match(/\/#{form_path}(-|\/)/i))
+  end
+  raise "Exception: Form file '#{form_file}' not found!"
+end
+
+########################################################################
+# Merges two forms when current form extends other form. Subroutine of dc_form_read.
+# With a little help of https://www.ruby-forum.com/topic/142809
+########################################################################
+def self.forms_merge(hash1, hash2)
+  target = hash1.dup
+  hash2.keys.each do |key|
+    if hash2[key].is_a?(Hash) && hash1[key].is_a?(Hash)
+      target[key] = CmsHelper.forms_merge(hash1[key], hash2[key])
+      next
+    end
+    target[key] = hash2[key] == '/' ? nil :  hash2[key]
+  end
+  # delete keys with nil value
+  target.delete_if { |k, v| v.nil? }
+end
+
 end

data/app/helpers/cms_index_helper.rb

@@ -59,7 +59,7 @@ def dc_actions_for_index
     session[:form_processing] = "index:actions: #{key}=#{options}"
     next if options.nil? # must be
 
-    url = @parms.clone
+    url = @form_params.clone
     yaml = options.class == String ? {'type' => options} : options # if single definition simulate type parameter
     action = yaml['type'].to_s.downcase 
     if action == 'url'
@@ -90,8 +90,10 @@ def dc_actions_for_index
         end
       end
       data = t('drgcms.sort') + select('sort', 'sort', choices, { include_blank: true }, { class: 'dc-sort-select',
-                                 'data-table' => @form['table'], 'data-form' => CmsHelper.form_param(params)} )
-      html_right << %(<li><div class="dc-sort">#{data}</li>)
+                                                                                           'data-table' => @form['table'], 'data-form' => CmsHelper.form_param(params)} )
+      data = mi_icon('sort') + select('sort', 'sort', choices, { include_blank: true }, { class: 'dc-sort-select',
+                                                                                           'data-table' => @form['table'], 'data-form' => CmsHelper.form_param(params)} )
+      html_right << %(<li title="#{t('drgcms.sort')}"><div class="dc-sort">#{data}</li>)
 
     # filter
     when action == 'filter'
@@ -102,7 +104,7 @@ def dc_actions_for_index
       html_right << %(
 <li>
   <div class="dc-filter" title="#{DcFilter.title4_filter_off(table)}" data-url="#{url.html_safe}">
-    #{mi_icon(url.blank? ? 'search' : 'search_off') }#{DcFilter.menu_filter(self).html_safe}
+    #{mi_icon(url.blank? ? 'search' : 'filter_alt_off') }#{DcFilter.menu_filter(self).html_safe}
   </div>
 </li>#{DcFilter.get_filter_field(self)}).html_safe
 
@@ -132,7 +134,7 @@ def dc_actions_for_index
 # reorder      
     when action == 'reorder' then  
       caption = t('drgcms.reorder')
-      parms = @parms.clone
+      parms = @form_params.clone
       parms['operation'] = v
       parms['id']       = params[:ids]
       parms['table']     = @form['table']
@@ -257,13 +259,13 @@ def dc_actions_column
   actions = { 'standard' => true } if actions.class == String && actions == 'standard'
   std_actions = { 2 => 'edit', 5 => 'delete' }
   if actions['standard']
-    actions.merge!(std_actions) 
+    actions.merge!(std_actions)
     actions.delete('standard')
   end
   # check must be first action
-  has_check = actions.first[1] == 'check'
+  has_check = actions[0] && actions[0]['type'] == 'check'
   width = actions.size == 1 ? 22 : 44
-  width = 22 if actions.size > 2 and !has_check
+  width = 22 if actions.size > 2 && !has_check
   [actions, width, has_check]
 end
 
@@ -290,7 +292,7 @@ def dc_actions_for_result(document)
   main_menu, sub_menu = '', ''
   actions.sort_by(&:first).each do |num, action|
     session[:form_processing] = "result_set:actions: #{num}=#{action}"
-    parms = @parms.clone
+    parms = @form_params.clone
     # if single definition simulate type parameter
     yaml = action.class == String ? { 'type' => action } : action
 
@@ -362,7 +364,7 @@ def dc_header_for_result
   html = '<div class="dc-result-header">'
   if @form['result_set']['actions'] && !@form['readonly']
     ignore, width, has_check = dc_actions_column()
-    check_all = fa_icon('check-square-o', class: 'dc-check-all') if has_check
+    check_all = fa_icon('check-box-o', class: 'dc-check-all') if has_check
     html << %(<div class="dc-result-actions" style="width:#{width}px;">#{check_all}</div>)
   end
   # preparation for sort icon  
@@ -372,22 +374,20 @@ def dc_header_for_result
   end
 
   if (columns = @form['result_set']['columns'])
-    columns.sort.each do |k, v|
-      session[:form_processing] = "result_set:columns: #{k}=#{v}"
-      next if v['width'].to_s.match(/hidden|none/i)
-
-      th = %(<div class="th" style="width:#{v['width'] || '15%'};text-align:#{v['align'] || 'left'};" data-name="#{v['name']}")
-      label = v['caption'] || v['label']
-      label = (v['name'] ? "helpers.label.#{@form['table']}.#{v['name']}" : '') if label.nil?
-      label = t(label) if label.match(/\./)
+    columns.sort.each do |key, options|
+      session[:form_processing] = "result_set:columns: #{key}=#{options}"
+      next if options['width'].to_s.match(/hidden|none/i)
+
+      th = %(<div class="th" style="width:#{options['width'] || '15%'};text-align:#{options['align'] || 'left'};" data-name="#{options['name']}")
+      label = t_label_for_column(options)
       # no sorting when embedded documents or custom filter is active
       sort_ok = !dc_dont?(@form['result_set']['sort'], false)
       sort_ok = sort_ok || (@form['index'] && @form['index']['sort'])
-      sort_ok = sort_ok && !dc_dont?(v['sort'], false)
+      sort_ok = sort_ok && !dc_dont?(options['sort'], false)
       if @tables.size == 1 && sort_ok
         icon = 'sort_unset md-18'
-        filter_class = form_has_input_field?(v['name']) ? nil : 'no-filter'
-        if v['name'] == sort_field
+        filter_class = form_has_input_field?(options['name']) ? nil : 'no-filter'
+        if options['name'] == sort_field
           icon = sort_direction == '1' ? 'sort_down md-18' : 'sort_up md-18'
         else
           # no icon if filter can not be set
@@ -395,7 +395,7 @@ def dc_header_for_result
         end
         # sort and filter icon
         icon = mi_icon(icon, class: filter_class) if icon
-        url = url_for(controller: 'cmsedit', action: 'run', control: 'cmsedit.sort', sort: v['name'],
+        url = url_for(controller: 'cmsedit', action: 'run', control: 'cmsedit.sort', sort: options['name'],
                       t: CmsHelper.table_param(params), f: CmsHelper.form_param(params))
         th << %(><span data-url="#{url}">#{label}</span>#{icon}</div>)
       else
@@ -472,27 +472,29 @@ end
 def dc_columns_for_result(document)
   return '' unless @form['result_set']['columns']
 
-  html = ''  
-  @form['result_set']['columns'].sort.each do |k,v|
+  html, index = '', 0
+  @form['result_set']['columns'].sort.each do |k, v|
     session[:form_processing] = "result_set:columns: #{k}=#{v}"
     next if v['width'].to_s.match(/hidden|none/i)
 
     # convert shortcut to hash 
     v = {'name' => v} if v.class == String    
     begin
-      # eval
-      value = if v['eval']
-        dc_process_column_eval(v, document)
-      # as field        
-      elsif document.respond_to?(v['name'])
-        dc_format_value(document.send( v['name'] ), v['format']) 
-      # as hash (dc_memory)
-      elsif document.class == Hash 
-        dc_format_value(document[ v['name'] ], v['format'])
-      # error
-      else
-        "??? #{v['name']}"
-      end
+              # as Array (footer)
+      value = if document.class == Array
+                dc_format_value(document[index], v['format']) if document[index]
+              # as Hash (dc_memory)
+              elsif document.class == Hash
+                dc_format_value(document[ v['name'] ], v['format'])
+              # eval
+              elsif v['eval']
+                dc_process_column_eval(v, document)
+              # as field
+              elsif document.respond_to?(v['name'])
+                dc_format_value(document.send( v['name'] ), v['format'])
+              else
+                "??? #{v['name']}"
+              end
     rescue Exception => e
       dc_log_exception(e, 'dc_columns_for_result')
       value = '!!!Error'
@@ -507,6 +509,7 @@ def dc_columns_for_result(document)
     style = "style=\"#{width_align}#{style}\" "
 
     html << "<div class=\"td #{clas}\" #{style}>#{value}</div>"
+    index += 1
   end
   html.html_safe
 end

data/app/helpers/dc_application_helper.rb

@@ -242,7 +242,7 @@ end
 # and renderers during page rendering.
 ########################################################################
 def dc_page_bottom
-  %(<style type="text/css">#{@css}</style>#{javascript_tag @js}).html_safe
+  %(<style>#{@css}</style>#{javascript_tag @js}).html_safe
 end
 
 ############################################################################
@@ -258,13 +258,9 @@ end
 ############################################################################
 def dc_table_title(text, result_set = nil)
   c = %(<div class="dc-title">#{text})
-  # help button
-  type = result_set.nil? ? 'form' : 'index'
-  form_name = CmsHelper.form_param(params) || CmsHelper.table_param(params)
-  url = url_for(controller: :dc_common, action: :help, type: type, f: form_name)
-  c << %(<div class="dc-help-icon dc-link-ajax" data-url=#{url}>#{fa_icon('question-circle')}</div>)
+  c << dc_help_button(result_set)
 
-  if result_set and result_set.respond_to?(:current_page)
+  if result_set && result_set.respond_to?(:current_page)
     c << %(<div class="dc-paginate">#{paginate(result_set, :params => {action: 'index', clear: 'no', filter: nil})}</div>)
   end
   c << '<div style="clear: both;"></div></div>'
@@ -302,11 +298,11 @@ end
 # Returns:
 # String. HTML code for title.
 ############################################################################
-def dc_new_title()
+def dc_new_title
   session[:form_processing] = "form:title:"
   title = @form['form']['title']
   # defined as form:title:new
-  if title and title['new']
+  if title && title['new']
     t( title['new'], title['new'] )
   else
     # in memory structures
@@ -745,23 +741,6 @@ def dc_choices4_all_collections
   choices.invert.to_a.sort # hash has to be inverted for values to be returned right
 end
 
-########################################################################
-# Merges two forms when current form extends other form. Subroutine of dc_choices4_cmsmenu.
-# With a little help of https://www.ruby-forum.com/topic/142809 
-########################################################################
-def forms_merge(hash1, hash2) #:nodoc:
-  target = hash1.dup
-  hash2.keys.each do |key|
-    if hash2[key].is_a? Hash and hash1[key].is_a? Hash
-      target[key] = forms_merge(hash1[key], hash2[key])
-      next
-    end
-    target[key] = hash2[key] == '/' ? nil :  hash2[key]
-  end
-  # delete keys with nil value
-  target.delete_if{ |k, v| v.nil? }
-end
-
 ##########################################################################
 # Returns choices for creating collection edit select field on CMS top menu.
 ##########################################################################
@@ -772,7 +751,7 @@ def dc_choices4_cmsmenu
     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
-    menus = forms_merge(menu['menu'], menus)        # ignore top level part
+    menus = CmsHelper.forms_merge(menu['menu'], menus) # ignore top level part
  end
 
   html = '<ul>'

data/app/models/dc_journal.rb

@@ -55,6 +55,6 @@ class DcJournal
   field :time,        type: DateTime
   field :diff,        type: String
   
-  index( { user_id: 1, time: -1 } )  
-  index( { time: 1 } )  
+  index user_id: 1
+  index doc_id: 1
 end

data/app/models/dc_json_ld.rb

@@ -37,21 +37,21 @@
 # 
 ########################################################################
 class DcJsonLd 
-  include Mongoid::Document
-  include Mongoid::Timestamps
+include Mongoid::Document
+include Mongoid::Timestamps
 
-  field :name,        type: String
-  field :type,        type: String
-  field :data,        type: String
-  field :active,      type: Boolean,      default: true
+field :name,        type: String
+field :type,        type: String
+field :data,        type: String
+field :active,      type: Boolean,      default: true
 
-  embeds_many :dc_json_lds, :cyclic => true
+embeds_many :dc_json_lds, :cyclic => true
 
-  field :created_by,  type: BSON::ObjectId
-  field :updated_by,  type: BSON::ObjectId
-  
-  validates :name, presence: true
-  validates :type, presence: true
+field :created_by,  type: BSON::ObjectId
+field :updated_by,  type: BSON::ObjectId
+
+validates :name, presence: true
+validates :type, presence: true
   
 ##########################################################################
 # Returns JSON LD data as YAML
@@ -71,29 +71,6 @@ def get_json_ld(parent_data)
   yaml
 end
 
-########################################################################
-# Searches forms path for file_name and returns full file name or nil if not found.
-# 
-# @param [String] Form file name. File name can be passed as gem_name.filename. This can
-# be useful when you are extending form but want to retain same name as original form
-# For example. You are extending dc_user form from drg_cms gem and want to
-# retain same dc_user name. This can be done by setting drg_cms.dc_user to extend option. 
-# 
-# @return [String] Form file name including path or nil if not found.
-########################################################################
-def self.dc_find_form_file(form_file)
-  form_path=nil
-  if form_file.match(/\.|\//)
-    form_path,form_file=form_file.split(/\.|\//)
-  end
-  DrgCms.paths(:forms).reverse.each do |path|
-    f = "#{path}/#{form_file}.yml"
-    return f if File.exist?(f) and (form_path.nil? or path.to_s.match(/\/#{form_path}\//i))
-  end
-  p "Form file #{form_file} not found!"
-  nil
-end
-
 ########################################################################
 # Find document by ids when document are embedded into main d even if embedded
 # 
@@ -105,9 +82,9 @@ end
 def self.find_document_by_ids(tables, ids)
   collection = tables.split(';').first.classify.constantize
   ar_ids = ids.split(';')
-# Find top document  
+  # Find top document
   document = collection.find(ar_ids.shift)
-# Search for embedded document
+  # Search for embedded document
   ar_ids.each {|id| document = document.dc_json_lds.find(id) }
   document
 end
@@ -116,7 +93,7 @@ end
 # Returns possible options for type select field on form.
 #########################################################################
 def self.choices4_type()
-  yaml = YAML.load_file( dc_find_form_file('json_ld_schema') )
+  yaml = YAML.load_file( CmsHelper.form_file_find('json_ld_schema') )
   
   yaml.inject([]) {|result, schema_name| result << schema_name.first }
 end
@@ -125,7 +102,7 @@ end
 # Create menu to add schema element. Called from DRGCMS Form action.
 #########################################################################
 def self.add_schema_menu(parent)
-  yaml = YAML.load_file( dc_find_form_file('json_ld_schema') )
+  yaml = YAML.load_file( CmsHelper.form_file_find('json_ld_schema') )
   if (level = parent.params['ids'].split(';').size) == 1
     # select only top level elements
     yaml.delete_if { |schema_name, schema_data| schema_data['level'].nil? }
@@ -139,7 +116,7 @@ def self.add_schema_menu(parent)
     end
     yaml = _yaml
   end
-# create menu code
+  # create menu code
   html = '<ul>'
   yaml.each do |schema_name, schema_data|
     next if level == 1 and schema_data['level'].nil?
@@ -149,4 +126,4 @@ def self.add_schema_menu(parent)
   html << '</ul>' 
 end
   
-end
+end

data/app/models/drgcms_form_fields/readonly.rb

@@ -56,7 +56,7 @@ def render
   @record[@yaml['name']] = @yaml['html']['value'] if @yaml['html']['value']
 
   @html << @parent.hidden_field('record', @yaml['name']) # retain field as hidden field
-  @html << '<div class="dc-readonly">'
+  @html << %(<div class="dc-readonly" id="record_#{@yaml['name']}_">)
 
   @html << if @yaml['eval']
              if @yaml['eval'].match(/dc_name4_id|dc_name_for_id/)

data/app/models/drgcms_form_fields/select.rb

@@ -146,8 +146,8 @@ def add_view_code
 
   table, form_name = @yaml['view'].split(/\ |\,/).delete_if { |e| e.blank? }
   url  = @parent.url_for(controller: 'cmsedit', id: data, action: :edit, table: table, form_name: form_name, readonly: true, window_close: 1 )
-  icon = @parent.fa_icon('eye')
-  %(<span class="dc-window-open" data-url="#{url}">#{icon}</span>)
+  icon = @parent.mi_icon('eye-o md-18')
+  %(<span class="dc-window-open" data-url="#{url}"> #{icon}</span>)
 end
 
 ###########################################################################

data/app/models/drgcms_form_fields/text_autocomplete.rb

@@ -114,7 +114,7 @@ def render
              style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )
   end
   # with edit icon
-  if @yaml['with_edit'] && @record[@yaml['name']].present?
+  if @yaml['with_edit'] && @record && @record[@yaml['name']].present?
     @html << ' ' + @parent.fa_icon('edit-o', class: 'in-edit-add', title: t('drgcms.edit'),
              style: "vertical-align: top;", 'data-table' => @yaml['with_edit'], 'data-id' => @record[@yaml['name']] )
   end
@@ -148,7 +148,7 @@ $(document).ready(function() {
     change: function (event, ui) { 
       #{not_id_code}
       if (ui.item == null) return;
-      $("##{record}_#{@yaml['name']}").val(ui.item.id);
+      $("##{record}_#{@yaml['name']}").val(ui.item.id).trigger('change');
     },
 
     minLength: 2

data/app/models/drgcms_form_fields/text_with_select.rb

@@ -83,6 +83,7 @@ $(document).ready(function() {
  $('##{@yaml['name']}_').change( function() {
   if ($(this).val().toString().length > 0) {
     $('##{record}_#{@yaml['name']}').val( $(this).val() );
+    $('##{record}_#{@yaml['name']}').trigger("change");
   }
   $('##{record}_#{@yaml['name']}').focus();
  });

data/app/renderers/dc_common_renderer.rb

@@ -68,9 +68,10 @@ end
 #    dc_render(:dc_common_renderer, method: 'google_analytics', code: 'UA-12345678-9')
 ########################################################################
 def google_analytics
+  html = ''
   ga_acc = @opts[:code] || @opts[:ga_acc]
-  return '' if ga_acc.nil? or ga_acc == '/'
-  html =<<EOT 
+  if ga_acc && ga_acc != '/'
+    html << %(
   <!-- Google analytics. -->
 <script type="text/javascript">
   (function(i,s,o,g,r,a,m){
@@ -86,7 +87,23 @@ def google_analytics
     ga('send', 'pageview')
   }
 </script>
-EOT
+)
+  end
+
+  ga4_acc = @opts[:code4] || @opts[:ga4_acc]
+  if ga4_acc && ga4_acc != '/'
+    html << %(
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=#{ga4_acc}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '#{ga4_acc}');
+</script>)
+  end
+
   html.html_safe
 end
 

data/app/views/cmsedit/_form.html.erb

@@ -1,17 +1,24 @@
+<div id="dc-form-container">
+  <div id="dc-form-left">
+    <%= dc_form_left %>
+  </div>
 
-<%= dc_flash_messages %>
-<%= dc_error_messages_for @record %>
-<%= dc_warning_messages_for @record %>
+  <div id="dc-form-right">
+    <%= dc_flash_messages %>
+    <%= dc_error_messages_for @record %>
+    <%= dc_warning_messages_for @record %>
 
-<div class="dc-form-frame">
+    <div class="dc-form-frame">
+    <% fields = dc_fields_for_form %>
+    <%= dc_actions_for_form 'top' %>
 
-  <%= dc_actions_for_form 'top' %>
-  
-  <%= dc_fields_for_form %>
-  <%= dc_document_statistics %>
+    <%= fields %>
+    <%= dc_document_statistics %>
 
-  <%= dc_actions_for_form 'bottom' %>
-</div>
+    <%= dc_actions_for_form 'bottom' %>
+    </div>
 
-<%= javascript_tag(@js)  unless @js.blank? %>
-<% unless @css.blank? %><style type="text/css"><%= @css %></style><% end %>
+    <%= javascript_tag(@js)  unless @js.blank? %>
+    <% unless @css.blank? %><style><%= @css %></style><% end %>
+  </div>
+</div>

data/app/views/cmsedit/edit.html.erb

@@ -1,9 +1,13 @@
-<%= dc_head_for_form %>
-<%= dc_table_title dc_edit_title() %>
+<% dc_form_update %>
 
-<%= form_tag( @parms, method: :put, id: params['form_name'] || params['table'],
-              class: 'cmsform', multipart: @form['form']['multipart'] ) do %>
-  <%= render partial: 'form' %>
-<% end %>
+<div <%= dc_form_id %>>
+  <%= dc_head_for_form %>
+  <%= dc_table_title dc_edit_title() %>
+
+  <%= form_tag( @form_params, method: :put, id: CmsHelper.form_param(params) || CmsHelper.table_param(params),
+                class: 'cmsform', multipart: @form['form']['multipart'], window_close: params[:window_close] ) do %>
+    <%= render partial: 'form' %>
+  <% end %>
+</div>
 
 <div id="popup" style="display: none;"></div>