drg_cms 0.4.58 → 0.4.61

data/app/assets/stylesheets/drg_cms_application.css

@@ -9,4 +9,5 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require drg_cms/drg_cms
+ *= require font-awesome
 */

data/app/assets/stylesheets/drg_cms_cms.css

@@ -15,6 +15,7 @@
  *= require jquery-ui/autocomplete
  *= #require ../javascripts/drg_cms/elfinder/css/elfinder.min.css
  *= #require ../javascripts/drg_cms/elfinder/css/theme.css
+ *= require font-awesome
 */
 
 

data/app/controllers/cmsedit_controller.rb

@@ -76,7 +76,9 @@
 # If filter method returns false user will be presented with flash error.
 ########################################################################
 class CmseditController < DcApplicationController
-before_action :check_authorization, :except => [:show, :login]
+before_action :check_authorization, :except => [:login]
+before_filter :reload_patches if Rails.env.development?
+  
 layout 'cms'
 
 ########################################################################
@@ -101,6 +103,39 @@ def check_sort_options() #:nodoc:
   params['sort'] = nil # otherwise there is problem with other links
 end
 
+########################################################################
+# Set aditional filter options when filter is defined by filter method in control object.
+########################################################################
+def user_filter_options(model) #:nodoc:
+# no filter is active or set off
+  if params[:filter] == 'off' or (params[:filter].nil? and session[:tmp_filter].nil?)
+    session[:tmp_filter] = nil
+    return model
+  end
+# 
+  table, field, oper, value = if params[:filter] == 'on' 
+    [model.to_s, params[:filter_field], params[:filter_oper], params[:record][params[:filter_field]] ]
+  else
+    session[:tmp_filter].split("\t")
+  end
+# filter set previously on other collection
+  if table != model.to_s
+    session[:tmp_filter] = nil
+    return model 
+  end
+#
+  field = '_id' if field == 'id' # must be
+  value = /#{value}/ if oper == 'like' # do regex if operation is like
+# when field type is ObjectId transform value    
+  if model.fields[field].type == BSON::ObjectId
+    value = BSON::ObjectId.from_string(value) rescue nil
+    flash[:error] = t('drgcms.not_id') if value.nil?
+  end
+# save filter to session  
+  session[:tmp_filter] = [ table, field, oper, value ].join("\t")
+  model.where(field => value)
+end
+
 ########################################################################
 # Will check and set current filter options for result set. Subroutine of index method.
 ########################################################################
@@ -120,25 +155,31 @@ def check_filter_options() #:nodoc:
     session[table_name][:page] = 1
     params[:filter] = nil # must be. Otherwise kaminari includes parameter on paging and everything goes wrong
   end
-# if data model has field dc_site_id ensure that only records which belong to the site
-# are selected.
-  t = @tables.first[0]
+# if data model has field dc_site_id ensure that only documents which belong 
+# to the site are selected.
+  model = @tables.first[0]
   site_id = dc_get_site._id if dc_get_site
 # dont't filter site if no dc_site_id field or user is ADMIN
-  site_id = nil if !t.method_defined?('dc_site_id') or dc_user_can(DcPermission::CAN_ADMIN)
+  site_id = nil if !model.method_defined?('dc_site_id') or dc_user_can(DcPermission::CAN_ADMIN)
   if session[table_name][:filter]
     field, oper, value = session[table_name][:filter].split( "\t")
-    value = /#{value}/ if oper == 'like' # change to regex if like
+    field = '_id' if field == 'id' # must be
+    value = /#{value}/ if oper == 'like' # do regex if operation is like
+# when field type is ObjectId transform value    
+    if model.fields[field].type == BSON::ObjectId
+      value = BSON::ObjectId.from_string(value) rescue nil
+      flash[:error] = t('drgcms.not_id') if value.nil?
+    end
     @records =  if site_id
-      t.where(dc_site_id: site_id, field => value)
+      model.where(dc_site_id: site_id, field => value)
     else
-      t.where(field => value)
+      model.where(field => value)
     end
   else
     @records = if site_id
-      t.where(dc_site_id: site_id)
+      model.where(dc_site_id: site_id)
     else
-      t
+      model
     end
   end
 # pagination if required
@@ -202,11 +243,15 @@ end
 # and logout actions can be directly performed by calling http://site.com/cmsedit/login
 ########################################################################
 def show
+=begin  
   case
   when params[:id].in?(%w(login logout)) then # show login menu
     session[:edit_mode] = 0 
-    render action: 'show', layout: 'cms'
+    render action: 'show'#, layout: 'cms'
   end
+=end
+  find_record
+  render action: 'edit', layout: 'cms'
 end
 
 ########################################################################
@@ -215,6 +260,7 @@ end
 def login #:nodoc:
 #  session[:edit_mode] = 0 if params[:id].in? %w(login logout) # show login menu
 #  dc_collect_menu_forms
+  session[:edit_mode] = 0 
   render action: 'show', layout: 'cms'
 end
 
@@ -498,10 +544,12 @@ def read_drg_cms_form
     @form = forms_merge(form, @form)
   end
 # add readonly key to form if readonly parameter is passed in url
-  @form['readonly'] = 1 if params['readonly'] and %w(1 yes true).include?(params['readonly'].to_s.downcase.strip)
+  @form['readonly'] = 1 if params['readonly'] #and %w(1 yes true).include?(params['readonly'].to_s.downcase.strip)
 # !!!!!! Always use strings for key names since @parms['table'] != @parms[:table]
-  @parms = { 'table' => table_name, 'ids' => ids, 'formname' => formname,
-             'return_to' => params['return_to'], 'edit_only' => params['edit_only'] }
+  @parms = { 'table' => table_name, 'ids' => params[:ids], 'formname' => formname,
+             'return_to' => params['return_to'], 'edit_only' => params['edit_only'],
+             'readonly' => params['readonly'] 
+           }
 end
 
 ############################################################################
@@ -511,7 +559,8 @@ end
 def check_authorization
   params[:table] ||= params[:formname]
 # Just show menu
-  return show if params[:action] == 'show'
+#  return show if params[:action] == 'show'
+  return login if params[:id].in?(%w(login logout))
 # request shouldn't pass
   if session[:user_roles].nil? or params[:table].to_s.strip.downcase.size < 3 or 
      !dc_user_can(DcPermission::CAN_VIEW)
@@ -687,7 +736,7 @@ def save_data
     next if params[:edit_only] and params[:edit_only] != v['name'] # otherwise other fields would be wiped
     next unless @record.respond_to?(v['name']) # there can be temporary fields on the form
 # return value from form field definition
-    value = DrgcmsFormField.const_get(v['type'].camelize).get_data(params, v['name'])
+    value = DrgcmsFormFields.const_get(v['type'].camelize).get_data(params, v['name'])
     @record.send("#{v['name']}=", value)
   end
 # 
@@ -712,19 +761,14 @@ def save_data
   end
   saved
 end
-
-=begin
+  
 ########################################################################
-# Returns true if model has field defined. This might be defined by mongoid,
-# but I didn't found method.
-#
-# @param [model] Model object
-# @param [field_name] Field name to be checked
+# Reload patches in development.
 ########################################################################
-def model_has_field?(model, field_name)
-  model.fields.each {|f| return true if f.first == field_name.to_s}
-  false
+def reload_patches
+  DrgCms.paths(:patches).each do |patches| 
+    Dir["#{patches}/**/*.rb"].each { |path| require_dependency path }
+  end
 end
-=end
 
 end

data/app/forms/dc_design.yml

@@ -52,7 +52,7 @@ form:
         name: body
         type: text_area
         html:
-          size: 140x30
+          size: 120x30
 
       50:
         name: css

data/app/helpers/cmsedit_helper.rb

@@ -35,7 +35,7 @@ module CmseditHelper
 # Creates action div for cmsedit index action. 
 ############################################################################
 def dc_actions_for_index()
-  return '' if @form['index'].nil?
+  return '' if @form['index'].nil? or @form['readonly']
   actions = @form['index']['actions']
   return '' if actions.nil? or actions.size == 0
 # Simulate standard actions  
@@ -48,9 +48,11 @@ def dc_actions_for_index()
 # start div with hidden spinner image 
   html = <<EOT
 <div id="dc-action-menu">
-  <span id="dc-spinner" class="div-hidden">#{image_tag('drg_cms/spinner.gif')}"</span>
+  <span id="dc-spinner" class="div-hidden">#{fa_icon('spinner lg spin')}"</span>
   <ul class="dc-action-menu">
 EOT
+#    #{fa_icon('spinner lg spin', id: 'dc-spinner', class: 'div-hidden')}
+
 #
    actions.each do |k,v|
     session[:form_processing] = "index:actions: #{k}=#{v}"
@@ -84,22 +86,27 @@ EOT
           choices << [ t("helpers.label.#{@form['table']}.#{s}"), s ]
         end
       end
-      t('drgcms.sort')+ ' ' + select('sort', 'sort', choices, { include_blank: true }, { class: 'drgcms_sort', 'data-table' => @form['table']} )
+      fa_icon('sort-alpha-asc') + ' ' + t('drgcms.sort') + ' ' + 
+              select('sort', 'sort', choices, { include_blank: true }, 
+              { class: 'drgcms_sort', 'data-table' => @form['table']} )
 
     when action == 'filter' then # filter
       caption = t('drgcms.filter')
       s = session[@form['table']]
 # add checked image to filter, so user will know that data is filtered      
-      caption << '&nbsp;'+image_tag('drg_cms/checkbox-checked.png') if s and s[:filter]
+#      caption << '&nbsp;'+image_tag('drg_cms/checkbox-checked.png') if s and s[:filter]
       yhtml['onclick'] = "$('#drgcms_filter').toggle(300);"
-      link_to(caption.html_safe, '#', yhtml )
+#      link_to(caption.html_safe, '#', yhtml )
+      dc_link_to('drgcms.filter','filter', '#', yhtml )
+    when action == 'new' then # new
+      dc_link_to(t('drgcms.new'),'plus', url, yhtml )
     when action == 'menu' then  # menu
       caption = t(v['caption'], v['caption'])
       caption + eval(v['eval'])      
     else 
       caption = yaml['caption'] || yaml['text']
-      caption = caption ? t(caption, caption) : t('drgcms.' + action)
-      link_to(caption, url, yhtml)
+      icon    = yaml['icon'] ? yaml['icon'] : action
+      dc_link_to(caption, icon, url, yhtml)
     end
     html << '</li>'
   end
@@ -128,11 +135,9 @@ def _get_field_div(name) #:nodoc:
 # field not defined on form. Must be defined: name as form_field_type  
   filter = nil
   if session[@form['table']] and session[@form['table']][:filter]
-    filter = session[@form['table']][:filter].split("\t")
+    filter, operation, value = session[@form['table']][:filter].split("\t")
   end
-  
-#params[:filter_field], params[:filter_oper], params[:record][params[:filter_field]]
-
+#
   if name.match(' as ')
     name, dummy, type = name.split(' ')
     field = {"name" => name, "type" => type, "html"=>{"size"=>20}}
@@ -141,18 +146,21 @@ def _get_field_div(name) #:nodoc:
     field = {"name" => name, "type" => 'text_field', "html"=>{"size"=>20}} if field.nil?
   end
 #
+  div_hidden = 'div-hidden'
   if filter
+    div_hidden = '' if name == filter
     if field['html'] 
-      field['html']['value'] = filter[2]
+      field['html']['value'] = value
     else
-      field['html'] = {"value"=>filter[2]}
+      field['html'] = { "value" => value }
     end
   end
   klas_string = field['type'].camelize
-  klas = DrgcmsFormField::const_get(klas_string) || nil
+  klas = DrgcmsFormFields::const_get(klas_string) || nil
   return 'error' if klas.nil?
+#
   o = klas.new(self, @record, field).render
-  "<span id=\"filter_#{field['name']}\" class=\"div-hidden\">" << o.html << (o.js.size > 2 ? javascript_tag(o.js) : '') << '</span>'
+  "<span id=\"filter_#{field['name']}\" class=\"#{div_hidden}\">" << o.html << (o.js.size > 2 ? javascript_tag(o.js) : '') << '</span>'
 end
   
 ############################################################################
@@ -160,9 +168,8 @@ end
 ############################################################################
 def dc_div_filter()
   choices, inputs = [], ''
-# searching by id is added by default
   filter = (@form['index'] and @form['index']['filter']) ? @form['index']['filter'] + ',' : ''
-  filter << 'id as text_field'
+  filter << 'id as text_field' # filter id is added by default
   filter.split(',').each do |f| 
     f.strip!
     name = f.match(' as ') ? f.split(' ').first : f
@@ -173,21 +180,28 @@ def dc_div_filter()
   choices4_operators = t('drgcms.choices4_filter_operators').chomp.split(',').inject([]) {|r,v| r << (v.match(':') ? v.split(':') : v )}
   s = session[@form['table']]
   is_hidden = (s and s[:filter]) ? '' : ' class="div-hidden" '
+#
+  if session[@form['table']] and session[@form['table']][:filter]
+    field_name, operators_value, dummy = session[@form['table']][:filter].split("\t")
+  else
+    field_name, operators_value = nil, nil
+  end
   html =<<EOT
   <div id="drgcms_filter" #{is_hidden}>
     <table class="dc-menu"><td>
   #{ form_tag :table => @form['table'], filter: :on, action: :index, method: :post }
-    #{ select(nil, 'filter_field', choices, { include_blank: true}) }
-    #{ select(nil, 'filter_oper', choices4_operators) }
+    #{ select(nil, 'filter_field', options_for_select(choices, field_name), { include_blank: true }) }
+    #{ select(nil, 'filter_oper', options_for_select(choices4_operators, operators_value)) }
     #{ inputs }
       </td>
-      <td class="dc-link-submit dc-animate">#{submit_tag(t('drgcms.filter_on'), :class => 'dc-submit')}</td>
-      <td class="dc-link dc-animate">#{link_to t('drgcms.filter_off'), action: 'index', filter: 'off', :table => @form['table']}</td>
+      <td class="dc-link-submit dc-animate">#{fa_icon('check-square-o')} #{submit_tag(t('drgcms.filter_on'), :class => 'dc-submit')}</td>
+      <td class="dc-link dc-animate">#{dc_link_to('drgcms.filter_off','close', {action: 'index', filter: 'off', :table => @form['table']}) }</td>
     </table>
   </form>
 </div>
   
 EOT
+#      <td class="dc-link dc-animate">#{link_to t('drgcms.filter_off'), action: 'index', filter: 'off', :table => @form['table']}</td>
   html.html_safe
 end
 
@@ -204,14 +218,56 @@ def dc_table_title_for_result(result=nil)
   dc_table_title(title, result)
 end
 
+############################################################################
+# Similar to rails submit_tag, but also takes care of link icon, translation, ...
+############################################################################
+def dc_submit_tag(caption, icon, parms, rest={})
+  parms['class'] ||= 'dc-submit'
+  if icon
+    icon_image = if icon.match(/\./)
+      image_tag(icon, class: 'dc-animate')
+    else
+      fa_icon(icon)
+    end
+  end
+  html = icon_image || ''
+  html << submit_tag(t(caption, caption), parms)
+end
+############################################################################
+# Similar to rails link_to, but also takes care of link icon, translation, ...
+############################################################################
+def dc_link_to(caption, icon, parms, rest={})
+  rest['class'] =  rest['class'].to_s + ' dc-animate'
+  if icon
+    icon_image = if icon.match(/\./)
+      image_tag(icon, class: 'dc-link-img dc-animate')
+    else
+      fa_icon(icon)
+    end
+  end
+#  
+  if caption
+    caption = t(caption, caption)
+    icon_image << ' ' if icon_image
+  end
+  link_to("#{icon_image}#{caption}".html_safe, parms, rest)  
+end
+
 ############################################################################
 # Creates code for link or ajax action type. Subroutine of dc_actions_for_result.
 ############################################################################
 def dc_link_or_ajax(yaml, parms) #:nodoc:
-  method  = yaml['method'] || yaml['request'] || 'get'
-  caption = yaml['caption'] || yaml['text']
+  rest = {}
+  rest['method']  = yaml['method'] || yaml['request'] || 'get'
+  rest['caption'] = yaml['caption'] || yaml['text']
+  rest['class']   =  rest['class'].to_s + ' dc-animate'
+  rest['title']   = yaml['title']
+  
+#  method  = yaml['method'] || yaml['request'] || 'get'
+#  caption = yaml['caption'] || yaml['text']
   p "Form: result_set:action:text directive will be deprecated. Use caption instead of text." if yaml['text']
 #
+=begin
   if yaml['type'] == 'link'
     if yaml['icon'] # icon
       link_to( image_tag(yaml['icon'], class: 'dc-link-img dc-link-ajax dc-animate'), parms, method: method, title: t(yaml['title'],yaml['title']) )
@@ -225,7 +281,32 @@ def dc_link_or_ajax(yaml, parms) #:nodoc:
     else            # caption
       %Q[<span class="dc-link-ajax dc-animate" data-url="#{url}" data-request="#{method}">#{caption}</span>]
     end
-  end    
+  end
+#####
+  caption = ''
+  if yaml['type'] == 'link'
+    if yaml['icon'] # icon
+      caption = if yaml['icon'].match('.')
+        image_tag(yaml['icon'], class: 'dc-link-img dc-link-ajax dc-animate')
+      else    
+        fa_icon("#{yaml['icon']} 2x" , class: 'dc-link-ajax dc-animate')
+      end
+    end
+    if yaml['caption']
+      caption << ' ' if caption.size > 0
+      caption << t(yaml['caption'],yaml['caption'])
+    end
+    link_to(caption, parms, method: method, title: t(yaml['title'],yaml['title']) ) 
+  else
+    ''
+  end
+=end
+  if yaml['type'] == 'link'
+    dc_link_to(yaml['caption'], yaml['icon'], parms, rest ) 
+  else
+    ''
+  end
+  
 end
 
 ############################################################################
@@ -233,7 +314,7 @@ end
 ############################################################################
 def dc_actions_for_result(record)
   actions = @form['result_set']['actions']
-  return '' if actions.nil?
+  return '' if actions.nil? or @form['readonly']
 # standard actions  
   actions = {'standard' => true} if actions.class == String && actions == 'standard'
   std_actions = {' 2' => 'edit', ' 3' => 'delete'}
@@ -250,23 +331,23 @@ def dc_actions_for_result(record)
     when yaml['type'] == 'edit' then
       parms['action'] = 'edit'
       parms['id']     = record.id
-      link_to( image_tag('drg_cms/edit.png', class: 'dc-link-img dc-animate'), parms )
+      dc_link_to( nil, 'pencil lg', parms )
     when yaml['type'] == 'duplicate' then
       parms['id']     = record.id
 # duplicate string will be added to these fields.
       parms['dup_fields'] = yaml['dup_fields'] 
-      link_to( image_tag('drg_cms/copy.png', class: 'dc-link-img dc-animate'), parms, data: { confirm: t('drgcms.confirm_dup') }, method: :post )
+      dc_link_to( nil, 'copy lg', parms, data: { confirm: t('drgcms.confirm_dup') }, method: :post )
     when yaml['type'] == 'delete' then
       parms['action'] = 'destroy'
       parms['id']     = record.id
-      link_to( image_tag('drg_cms/x.png', class: 'dc-link-img dc-animate'), parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete )
+      dc_link_to( nil, 'remove lg', parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete )
 # undocumented so far
     when yaml['type'] == 'edit_embedded'
       parms['controller'] = 'cmsedit'
       parms['table'] +=  ";#{yaml['table']}"
       parms['ids']   ||= ''
       parms['ids']   +=  "#{record.id};"
-      link_to( image_tag('drg_cms/cols.png', class: 'dc-link-img dc-animate'), parms, method: :get )
+      dc_link_to( nil, 'table lg', parms, method: :get )
     when yaml['type'] == 'link' || yaml['type'] == 'ajax' then
       if yaml['url']
         parms['controller'] = yaml['url']
@@ -294,7 +375,7 @@ end
 def dc_header_for_result()
   c = ''
   actions = @form['result_set']['actions']
-  c = '<th style="border-left: 0px;">&nbsp;</th>' unless actions.nil?
+  c = '<th style="border-left: 0px;">&nbsp;</th>' unless actions.nil?  or @form['readonly']
   
   if (columns = @form['result_set']['columns'])
     columns.each do |k,v|
@@ -382,7 +463,11 @@ def dc_columns_for_result(document)
 end
 
 ############################################################################
-# Creates actions div for edit form
+# Creates actions div for edit form.
+# 
+# Displaying readonly form turned out to be challenge. For now when readonly parameter
+# has value 2, back link will force readonly form. Value 1 or not set will result in
+# normal link.
 ############################################################################
 def dc_actions_for_form()
 # create standard actions  
@@ -390,7 +475,6 @@ def dc_actions_for_form()
                ' 3' => {'type' => 'submit', 'caption' => 'drgcms.save&back'} }
 # when edit only  
   unless @record.id.nil?
-#    std_actions.merge!({' 4' => 'delete', ' 6' => 'new'} ) # delete is not OK here
     std_actions.merge!({' 6' => 'new'} )
     std_actions.merge!(@record.active ? {' 5' => 'disable'} : {' 5' => 'enable'} ) if @record.respond_to?('active')
   end
@@ -399,6 +483,9 @@ def dc_actions_for_form()
   actions = nil if actions.class == String && actions == 'standard'
 # standard actions
   actions = std_actions if actions.nil?
+# readonly 
+  actions = {' 1' => 'back'} if @form['readonly']
+  
   if actions['standard']
     actions.merge!(std_actions)
     actions['standard'] = nil
@@ -416,7 +503,8 @@ def dc_actions_for_form()
 # Sort so that standard actions come first
   actions = actions.to_a.sort {|x,y| x[0].to_s <=> y[0].to_s} 
 # Add spinner to the beginning
-  c = %Q[<td id="dc-spinner" class="div-hidden">#{image_tag('drg_cms/spinner.gif')}</td>]
+  c = %Q[<td id="dc-spinner" class="div-hidden">#{fa_icon('spinner lg spin')}</td>]
+  
   actions.each do |element|
     session[:form_processing] = "form:actions: #{element}"
     v = element[1]
@@ -430,28 +518,35 @@ def dc_actions_for_form()
 #    
     parms = @parms.clone
     if v.class == String
+      next if params[:readonly] and !(v == 'back')
+      
       c << '<td class="dc-link dc-animate">'
       c << case 
         when (v == 'back' or v == 'cancle') then
 # If return_to is present link directly to URL        
           if parms['xreturn_to'] # disabled for now
-            link_to(t('drgcms.back'), parms['return_to'] )
+            dc_link_to( 'drgcms.back','arrow-left', parms['return_to'] )
           else
             parms['action'] = 'index'
-            link_to(t('drgcms.back'), parms)
+            parms['readonly'] = parms['readonly'].to_s.to_i < 2 ? nil : 1  
+            dc_link_to( 'drgcms.back','arrow-left', parms )
           end
         when v == 'delete' then
           parms['operation'] = v
           parms['id']   = @record.id
-          link_to( t('drgcms.delete'), parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete )
+          dc_link_to( 'drgcms.delete','remove', parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete )
         when v == 'new' then
           parms['action'] = v
-          #parms['id']   = @record.id
-          link_to( t('drgcms.new'), parms)
+          dc_link_to( 'drgcms.new', 'plus', parms)
         when (v == 'enable' or v == 'disable') then
           parms['operation'] = v
-          parms['id']   = @record.id
-          link_to( t("drgcms.#{v}"), parms, method: :delete )
+          parms['id']        = @record.id
+          icon = (v == 'enable' ? 'thumbs-o-up' : 'thumbs-o-down')
+          dc_link_to( "drgcms.#{v}",icon, parms, method: :delete )
+        when v == 'edit' then
+          parms['operation'] = v
+          parms['id']        = @record.id
+          dc_link_to( "drgcms.#{v}",v, parms )
       else 
         "err1 #{element[0]}=>#{v}"
       end
@@ -462,16 +557,18 @@ def dc_actions_for_form()
 # submit button
       when v['type'] == 'submit'
         caption = v['caption'] || 'drgcms.save'
+        icon    = v['icon'] || 'save'
         '<td class="dc-link-submit dc-animate">' + 
-          submit_tag(t(caption, caption), :data => v['params'], :class => 'dc-submit') + 
+          dc_submit_tag(caption, icon, {:data => v['params'], :title => v['title']}) + 
         '</td>'
 # delete with some sugar added
       when v['type'] == 'delete'
         parms['id']   = @record.id
         parms.merge!(v['params'])
         caption = v['caption'] || 'drgcms.delete'
+        icon = v['icon'] || 'remove'
         '<td class="dc-link dc-animate">' + 
-          link_to( t(caption, caption), parms, data: t('drgcms.confirm_delete'), method: :delete ) +
+          dc_link_to( caption, icon, parms, data: t('drgcms.confirm_delete'), method: :delete ) +
         '</td>'
 # ajax or link button
       when v['type'] == 'ajax' || v['type'] == 'link'
@@ -494,22 +591,24 @@ def dc_actions_for_form()
         if parms['controller'].nil?
           "<td>#{t('drgcms.error')}</td>"
         else
-          v['caption'] ||= v['text'] || 'Caption missing!'
+          v['caption'] ||= v['text'] 
           caption = t("#{v['caption'].downcase}", v['caption'])
           url     = url_for(parms)
           request = v['request'] || v['method'] || 'get'
+          icon    = v['icon'] ? "#{fa_icon(v['icon'])} " : ''
           if v['type'] == 'ajax' # ajax button
-            %Q[<td class="dc-link-ajax dc-animate" id="dc-submit-ajax" data-url="#{url}" data-request="#{request}">#{caption}</td>]
+            %Q[<td class="dc-link-ajax dc-animate" id="dc-submit-ajax" data-url="#{url}" 
+               data-request="#{request}" title="#{v['title']}">#{icon}#{caption}</td>]
           else                   # link button
-            %Q[<td class="dc-link dc-animate"><a href="#{url}">#{caption}</a></td>]
+            %Q[<td class="dc-link dc-animate" title="#{v['title']}><a href="#{url}">#{icon}#{caption}</a></td>]
           end
         end
 # Javascript action        
       when v['type'] == 'script'
-          v['caption'] ||= 'Caption missing!'
-          caption = t("#{v['caption'].downcase}", v['caption'])
+#          v['caption'] ||= 'Caption missing!'
+#          caption = t("#{v['caption'].downcase}", v['caption'])
           data = {'request' => 'script', 'script' => v['js']}
-         %Q[<td class="dc-link-ajax dc-animate">#{ link_to(caption, '#', data: data ) }</td>]
+         %Q[<td class="dc-link-ajax dc-animate">#{ dc_link_to(v['caption'],v['icon'], '#', data: data ) }</td>]
       else
         '<td>err2</td>'
       end
@@ -545,6 +644,7 @@ end
 ############################################################################
 def dc_fields_for_tab(fields) #:nodoc:
   @js ||= ''
+  double_field = 0
   html = '<table class="dc-form-table">'
   labels_pos = dc_check_and_default(@form['form']['labels_pos'], 'right', ['top','left','right'])
   reset_cycle()
@@ -556,7 +656,7 @@ def dc_fields_for_tab(fields) #:nodoc:
     next if params[:edit_only] and params[:edit_only] != options['name'] 
 # hidden_fields. Ignore description text, otherwise it will be seen on screen
     if options['type'] == 'hidden_field'
-      html << DrgcmsFormField::HiddenField.new(self, @record, options).render
+      html << DrgcmsFormFields::HiddenField.new(self, @record, options).render
       next
     end
 # label
@@ -568,26 +668,35 @@ def dc_fields_for_tab(fields) #:nodoc:
     end
     help ||= t('helpers.help.' + @form['table'] + '.' + options['name'],' ')    
     odd_even = cycle('odd','even')
+    odd_even = cycle('odd','even') if double_field == 2 # it should be same style as first
 # create field object from class and call its render method
     klas_string = options['type'].camelize
-    field_html = if DrgcmsFormField.const_defined?(klas_string) # check if field type is defined
-      klas = DrgcmsFormField.const_get(klas_string)
+    field_html = if DrgcmsFormFields.const_defined?(klas_string) # check if field type is defined
+      klas = DrgcmsFormFields.const_get(klas_string)
       field = klas.new(self, @record, options).render
       @js << field.js
       field.html 
     else # litle error string
       "Error: Code for field type #{options['type']} not defined!"
     end
+    double_field = 1 if options['double']
+    html << '<tr>' if double_field < 2
 #    
     html << if labels_pos == 'top' 
-      %Q[<tr><td class="dc-form-label dc-color-#{odd_even} dc-align-left" title="#{help}">
+      %Q[<td class="dc-form-label dc-color-#{odd_even} dc-align-left" title="#{help}" 
+      #{double_field == 0 ? 'colspan="2"' : 'style="width:50%;"'}>
       <div><label for="record_#{options['name']}">#{text} </label></div>
-      <div id="td_record_#{options['name']}" >#{field_html}</div></td></tr>]
+      <div id="td_record_#{options['name']}">#{field_html}</div></td>]
     else  
-      %Q[<tr><td class="dc-form-label dc-color-#{odd_even} dc-align-#{labels_pos}" title="#{help}">
+      %Q[<td class="dc-form-label dc-color-#{odd_even} dc-align-#{labels_pos}" title="#{help}">
       <label for="record_#{options['name']}">#{text} </label></td>
-      <td id=\"td_record_#{options['name']}\" class=\"dc-form-field dc-color-#{odd_even}\">#{field_html}</td></tr>]
+      <td id=\"td_record_#{options['name']}\" class=\"dc-form-field dc-color-#{odd_even}\" #{'colspan="3"' if double_field == 0 }>#{field_html}
+      </td>
+      ]
     end
+    html << '</tr>' if double_field != 1
+    double_field = 0 if double_field == 2
+    double_field = 2 if double_field == 1    
   end
   html << '</table></table>'
 end
@@ -653,6 +762,7 @@ end
 def dc_document_statistics
   return '' if @record.new_record? or dc_dont?(@form['form']['info'])
   html =  "<div id='dc-document-info'>#{t('drgcms.doc_info')}</div>"
+#  html =  "<div id='dc-document-info'>#{fa_icon 'info-circle 2x'}</div>"
   html << "<div id='dc-document-info-popup' class='div-hidden'><table>"
 #
   u = _get_user_for('created_by')
@@ -667,11 +777,12 @@ def dc_document_statistics
   parms[:controller] = 'dc_common'
   parms[:action]     = 'copy_clipboard'
   url = url_for(parms)
-  caption = image_tag('drg_cms/copy.png', title: t('drgcms.doc_copy_clipboard'))
-  html << %Q[<hr><img class="dc-link-img dc-link-ajax dc-animate" data-url="#{url}" data-request="get" #{caption}]
-
-  html << '</div>'
-  html.html_safe
+#  caption = image_tag('drg_cms/copy.png', title: t('drgcms.doc_copy_clipboard'))
+#  html << %Q[<hr><img class="dc-link-img dc-link-ajax dc-animate" data-url="#{url}" data-request="get" #{caption}]
+  html << fa_icon('copy 2x', class: 'dc-link-img dc-link-ajax dc-animate', 
+                  'data-url' => url, 'data-request' => 'get', title: t('drgcms.doc_copy_clipboard') )
+  (html << '</div>').html_safe
+#  html.html_safe
 end
 
 end