drg_cms 0.6.1.6 → 0.6.1.9

data/app/helpers/dc_application_helper.rb

@@ -260,9 +260,9 @@ def dc_table_title(text, result_set = nil)
   c = %(<div class="dc-title">#{text})
   # help button
   type = result_set.nil? ? 'form' : 'index'
-  form_name = params[:form_name] || params[:table]
-  url = url_for(controller: :dc_common, action: :help, type: type, form_name: form_name)
-  c << %(<div class="dc-help dc-link-ajax" data-url=#{url}>#{fa_icon('question-circle')}</div>)
+  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>)
 
   if result_set and result_set.respond_to?(:current_page)
     c << %(<div class="dc-paginate">#{paginate(result_set, :params => {action: 'index', clear: 'no', filter: nil})}</div>)
@@ -281,21 +281,19 @@ def dc_edit_title
   session[:form_processing] = "form:title:"
   title = @form['form']['title']
   # defined as form:title:edit
-  if title and title['edit'] and !@form['readonly']
+  if title && title['edit'] && !@form['readonly']
     t( title['edit'], title['edit'] )
-  elsif title and title['show'] and @form['readonly']
+  elsif title && title['show'] && @form['readonly']
     t( title['show'], title['show'] )
   else
     # concatenate title
     c = (@form['readonly'] ? t('drgcms.show') : t('drgcms.edit')) + " : "
-    c << (@form['title'].class == String ? t( @form['title'], @form['title'] ) : t_tablename(@form['table'])) + ' : '
-    title = (title and title['field']) ? title['field'] : @form['form']['edit_title']
-    dc_deprecate('form:edit_title will be deprecated. Use form:title:field instead.') if @form['form']['edit_title']
+    c << (@form['title'].class == String ? t( @form['title'], @form['title'] ) : t_tablename(@form['table']))
+    title = title.try('field')
 
-    c << "#{@record[ title ]} : " if title and @record.respond_to?(title)
-    c << @record.id if @record
+    c << "#{@record[ title ]}" if title && @record.respond_to?(title)
+    c
   end
-  c
 end
 
 ############################################################################
@@ -341,10 +339,10 @@ 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'
+  parms['class'] ||= 'dc-link'
   if icon
     icon_image = if icon.match(/\./)
-      image_tag(icon, class: 'dc-animate')
+      image_tag(icon)
     elsif icon.match('<i')
       icon
     else
@@ -360,10 +358,10 @@ end
 # Returns icon code if icon is specified
 ############################################################################
 def dc_icon_for_link(icon)
-  return nil if icon.nil?
+  return '' if icon.blank?
 
   if icon.match(/\./)
-    _origin.image_tag(icon, class: 'dc-link-img dc-animate')
+    _origin.image_tag(icon, class: 'dc-link-img')
   elsif icon.match('<i')
     icon
   else
@@ -379,20 +377,20 @@ def dc_link_to(caption, icon, parms, rest={})
   if parms.class == Hash
     parms.stringify_keys!
     rest.stringify_keys!
-    rest['class'] = rest['class'].to_s + ' dc-animate' unless rest['class'].to_s.match('dc-animate')
+    url = parms.delete('url')
     rest['target'] ||=  parms.delete('target')
     parms['controller'] ||= 'cmsedit'
     icon_pos = parms.delete('icon_pos') || 'first'
   end
-#  
+
   icon_image = dc_icon_for_link(icon)
   if caption
     caption = t(caption, caption)
     icon_image << ' ' if icon_image
   end
-  icon_pos == 'first' ?
-    _origin.link_to("#{icon_image}#{caption}".html_safe, parms, rest) :
-    _origin.link_to("#{caption} #{icon_image}".html_safe, parms, rest)
+
+  body = (%w[first left].include?(icon_pos) ? "#{icon_image}#{caption}" : "#{caption} #{icon_image}").html_safe
+  url ? _origin.link_to(body, url, rest) : _origin.link_to(body, parms, rest)
 end
 
 ####################################################################
@@ -417,7 +415,7 @@ def dc_flash_messages()
     _origin.flash[:info]    = nil
     _origin.flash[:note]    = nil
   end
-# Update fields on the form
+  # Update fields on the form
   if _origin.flash[:update]
     html << "<div class=\"dc-form-updates\">\n"
     _origin.flash[:update].each do |field, value|
@@ -461,13 +459,11 @@ def dc_error_messages_for(doc)
     r << "<li>#{label} : #{error.message}</li>"
   end
 
-  html = <<eot
+  %(
 <div class="dc-form-error"> 
   <h2>#{t('drgcms.errors_no')} #{doc.errors.size}</h2>  
   <ul>#{msgs}</ul>  
-</div>
-eot
-  html.html_safe
+</div>).html_safe
 end
 
 ####################################################################
@@ -490,13 +486,11 @@ def dc_warning_messages_for(doc)
     msgs << "<li>#{label} : #{error.message}</li>"
   end
 
-  html = <<eot
+  %(
 <div class="dc-form-warning"> 
   <h2>#{t('drgcms.warnings_no')} #{doc.warnings.size}</h2>  
   <ul>#{msgs}</ul>  
-</div>
-eot
-  html.html_safe
+</div>).html_safe
 end
 
 ####################################################################
@@ -534,8 +528,8 @@ def dc_link_for_create(opts)
   opts['action']       = 'new'
   opts['controller'] ||= 'cmsedit'
   js = "$('##{target}').attr('src', '#{_origin.url_for(opts)}'); return false;"
-  dc_link_to(nil, _origin.fa_icon('plus-circle lg', class: 'dc-inline-link'), '#',
-             { onclick: js, title: title, alt: 'Create'}).html_safe
+  dc_link_to(nil, _origin.fa_icon('plus-circle'), '#',
+             { onclick: js, title: title, alt: 'Create', class: 'dc-inline-link'}).html_safe
 end
 
 ####################################################################
@@ -557,13 +551,13 @@ def dc_link_for_edit(opts)
   title  = opts.delete('title') #
   title  = t(title)
   target = opts.delete('target') || 'iframe_cms'
-  icon   = opts.delete('icon') || 'edit lg'
+  icon   = opts.delete('icon') || 'edit-o'
   opts['controller'] ||= 'cmsedit'
   opts['action']     ||= 'edit'
   opts['form_name']  ||= opts['table'].to_s.split(';').last
   js  = "$('##{target}').attr('src', '#{_origin.url_for(opts)}'); return false;"
-  dc_link_to(nil, _origin.fa_icon(icon, class: 'dc-inline-link'), '#', 
-             { onclick: js, title: title, alt: 'Edit'})
+  dc_link_to(nil, _origin.fa_icon(icon), '#',
+             { onclick: js, title: title, class: 'dc-inline-link', alt: 'Edit'})
 end
 
 ####################################################################
@@ -572,8 +566,8 @@ end
 def dc_link_menu_tag(title) #:nodoc:
   html = %(
 <dl>
-  <dt><div class='drgcms_popmenu' href="#">
-    #{_origin.fa_icon('file-text-o lg', class: 'dc-inline-link', title: title)}
+  <dt><div class='drgcms_popmenu dc-inline-link' href="#">
+    #{_origin.fa_icon('file-text-o', title: title)}
   </div></dt>
   <dd>
     <ul class=' div-hidden drgcms_popmenu_class'>
@@ -628,17 +622,17 @@ def dc_page_edit_menu(opts = @opts)
   title = "#{t('drgcms.edit')}: #{page.subject}"
   opts[:editparams] ||= {}
   dc_link_menu_tag(title) do |html|
-    opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', 'icon' => 'edit' )
-    opts[:editparams].merge!( :id => page.id, :table => _origin.site.page_class.underscore, form_name: opts[:form_name], edit_only: 'body' )
+    opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', 'icon' => 'edit-o' )
+    opts[:editparams].merge!( :id => page.id, :t => _origin.site.page_class.underscore, f: opts[:form_name], edit_only: 'body' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_content') )
     
-    opts[:editparams].merge!( edit_only: nil, 'icon' => 'pencil' )
+    opts[:editparams].merge!( edit_only: nil, 'icon' => 'edit-o' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_advanced') )
     
     opts[:editparams].merge!( action: 'new', 'icon' => 'plus' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_new_page') )
 
-    opts[:editparams].merge!(ids: page.id, form_name: 'dc_part', 'icon' => 'plus-square-o', 
+    opts[:editparams].merge!(ids: page.id, form_name: 'dc_part', 'icon' => 'plus',
                              table: "#{_origin.site.page_class.underscore};dc_part"  )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_new_part') )
   end.html_safe
@@ -785,7 +779,7 @@ def dc_choices4_cmsmenu
   menus.to_a.sort.each do |index, menu|    # sort menus, result is array of sorted hashes
     next unless menu['caption']
     icon = menu['icon'].match('/') ? image_tag(menu['icon']) : fa_icon(menu['icon']) #external or fa- image
-    html << "<li class=\"cmsedit-top-level-menu\">#{icon}#{t(menu['caption'])}<ul>"
+    html << %(<li class="cmsedit-top-level-menu"><div>#{icon}#{t(menu['caption'])}</div><ul>)
     menu['items'].to_a.sort.each do |index1, value|   # again, sort menu items first 
       html << if value['link']
         opts = { target: value['target'] || 'iframe_cms' }
@@ -1085,9 +1079,9 @@ end
 # Html code for edit iframe
 ########################################################################
 def dc_iframe_edit(table, opts={})
-  ret = if params.to_unsafe_h.size > 2 and table  # controller, action, path is minimal
+  ret = if params.to_unsafe_h.size > 2 && table  # controller, action, path is minimal
     params[:controller] = 'cmsedit'
-    params[:action]     = (params[:oper] and (params[:oper] == 'edit')) ? 'edit' : 'index'
+    params[:action]     = (params[:oper] && (params[:oper] == 'edit')) ? 'edit' : 'index'
     params[:action]     = opts[:action] unless params[:oper]
     params[:table]      ||= table 
     params[:form_name]  ||= opts[:form_name] || table 

data/app/models/concerns/dc_page_concern.rb

@@ -161,7 +161,7 @@ end
 # Return filter options
 ########################################################################
 def self.dc_filters
-  {'title' => 'drgcms.filters.this_site_only', 'operation' => 'eq', 
+  {'title' => I18n.t('drgcms.filters.this_site_only'), 'operation' => 'eq',
    'field' => 'dc_site_id', 'value' => '@current_site'}
 end
 

data/app/models/dc_filter.rb

@@ -91,11 +91,11 @@ end
 def self.get_field_form_definition(name, parent) #:nodoc:
   form = parent.form
   form['form']['tabs'].each do |tab|
-# Array with 2 elements. First is tabname, second is data      
+    # Array with 2 elements. First is tabname, second is data
     my_fields = tab.last
     my_fields.each {|k,v| return v if (k.class == Integer and v['name'] == name) }
   end if form['form']['tabs'] #  I know. But nice. 
-#
+
   form['form']['fields'].each do |field|
     next unless field.first.class == Integer # options
     return field.last if field.last['name'] == name
@@ -133,15 +133,15 @@ def self.get_filter_field(parent)
   field['type']     = filter['input'] if filter['input'].to_s.size > 5
   field['type']   ||= 'text_field'
   field['readonly'] = false   # must be
+  # let text fields size be no more then 20
+  field['size'] = 20 if field['type'].match('text') && field['size'].to_i > 20
   field['html']   ||= {}
-  field['html']['size'] = 20
   # Start with last entered value
   field['html']['value']    = filter['value'] unless filter['value'] == '#NIL'
   field['html']['selected'] = field['html']['value'] # for select field
   # url for filter ON action
-  field['html']['data-url'] = parent.url_for(
-    controller: 'cmsedit', action: :index, filter: 'on',
-    table: parent.form['table'], form_name: parent.params['form_name'])
+  field['html']['data-url'] = parent.url_for(controller: 'cmsedit', action: 'run', control: 'cmsedit.filter_on',
+                                             t: CmsHelper.table_param(parent.params), f: CmsHelper.form_param(parent.params))
   url = field['html']['data-url']
   # remove if present
   field['with_new'] = nil if field['with_new']
@@ -155,7 +155,7 @@ def self.get_filter_field(parent)
       js = drg_field.js.blank? ? '' : parent.javascript_tag(drg_field.js)
       html = %(<li class="no-background">
 <span class="filter_field" data-url="#{url}">#{drg_field.html}
-  #{parent.fa_icon('search lg', class: 'record_filter_field_icon')}
+  #{parent.fa_icon('search', class: 'record_filter_field_icon')}
   #{js}</span></li>)
     else
       # Error. Forget filter
@@ -163,7 +163,7 @@ def self.get_filter_field(parent)
     end
   end
   parent.form['readonly'] = saved_readonly
-  html
+  html.html_safe
 end
 
 ######################################################################
@@ -178,41 +178,49 @@ def self.menu_filter(parent)
     html << "<li data-filter=\"#{document.id}\">#{description}</li>"
   end
 
-# add filters defined in model
+  # add filters defined in model
   model = table.classify.constantize
-  filters = model.dc_filters rescue nil
+  filters = model.dc_filters if model.respond_to?(:dc_filters)
   if filters
-# only single defined. Convert to array.    
+    # only single defined. Convert to array.
     filters = [filters] if filters.class == Hash
-    filters.each do |filter| 
-      url = parent.dc_link_to(filter['title'], nil,controller: :cmsedit, action: :index, table: table,
-                           form_name: parent.params[:form_name], 
+    filters.each do |filter|
+      url = parent.dc_link_to(filter['title'], nil, controller: 'cmsedit', action: :run, t: table,
+                              f: CmsHelper.form_param(parent.params),
+                              control: 'cmsedit.filter_on',
+                              filter_field: filter['field'],
+                              filter_oper: filter['operation'],
+                              filter_value: filter['value'])
+
+      url = parent.url_for(controller: 'cmsedit', action: :run, t: table, f: CmsHelper.form_param(parent.params),
+                           control: 'cmsedit.filter_on',
                            filter_field: filter['field'],
                            filter_oper: filter['operation'],
-                           filter_value: filter['value'],
-                           filter: 'on')
-      html << "<li>#{url}</li>"
+                           filter_value: filter['value'])
+      html << %(<li class="dc-link-ajax in-menu" data-url="#{url}">#{filter['title']}</li>)
     end
   end
 # divide standard and custom filter options  
   html << '<hr>' if html.size > 30 # 
-  html << '<li id="open_drgcms_filter">' + I18n.t('drgcms.filter_set') + '</li>'
-  html << '</ul>'
+  html << %(<li class="dc-link in-menu" id="open_drgcms_filter">#{I18n.t('drgcms.filter_set')}</li></ul>)
+  html.html_safe
 end
 
 ######################################################################
 # Creates title for turn filter off, which consists of displaying curently
 # active filter and text to turn it off.
 ######################################################################
-def self.title4_filter_off(filter_yaml)
-  filter = YAML.load(filter_yaml)
+def self.title4_filter_off(filter_data)
+  return '' unless filter_data&.dig(:filter)
+
+  filter = YAML.load(filter_data[:filter])
   operations = I18n.t('drgcms.choices4_filter_operators').chomp.split(',').inject([]) {|r,v| r << v.split(':') }
   operation = ''
   if filter['operation'] == 'eval'
    filter['field']
   else
     operations.each{|a| (operation = a.first; break) if a.last == filter['operation']}
-#
+
     '[ ' + I18n.t("helpers.label.#{filter['table']}.#{filter['field']}") + 
     " ] #{operation} [ #{filter['value'].to_s} ] : #{I18n.t('drgcms.filter_off')}"
   end

data/app/models/dc_json_ld.rb

@@ -144,7 +144,7 @@ def self.add_schema_menu(parent)
   yaml.each do |schema_name, schema_data|
     next if level == 1 and schema_data['level'].nil?
     url = "/dc_common/add_json_ld_schema?table=#{parent.params['table']}&ids=#{parent.params['ids']}&schema=#{schema_name}&url=#{parent.request.url}"
-    html << %Q[<li class="dc-link-ajax dc-animate" data-url="#{url}">#{schema_name}</li>]    
+    html << %Q[<li class="dc-link-ajax in-menu" data-url="#{url}">#{schema_name}</li>]
   end
   html << '</ul>' 
 end

data/app/models/dc_part.rb

@@ -62,15 +62,25 @@
 # taken into account when rendering part.
 ########################################################################
 class DcPart 
-  include DcPieceConcern
-  
-  field :_type,       type: String, default: 'DcPart' # needed when changed to Concern
-  field :policy_id,   type: BSON::ObjectId
-  field :link,        type: String
-  
-  embedded_in :dc_parts, polymorphic: true
-  
-  before_save :do_before_save
+include DcPieceConcern
+
+field :_type,       type: String, default: 'DcPart' # needed when changed to Concern
+field :policy_id,   type: BSON::ObjectId
+field :link,        type: String
+
+embedded_in :dc_parts, polymorphic: true
+
+before_save :do_before_save
+
+after_save :cache_clear
+after_destroy :cache_clear
+
+####################################################################
+# Clear parent's record from cache if cache is configured
+####################################################################
+def cache_clear
+  _parent.cache_clear() if _parent&.respond_to?(:cache_clear)
+end
   
 ######################################################################
 # Implementation of before_save callback.

data/app/models/drgcms_form_fields/drgcms_field.rb

@@ -171,10 +171,16 @@ def set_default_value(opt1, opt2)
   return if @record && @record[@yaml['name']].present?
 
   @yaml[opt1][opt2] = if @yaml['default'].class == Hash
-    eval(@yaml['default']['eval'])
-  else
-    @yaml['default']
-  end
+                        evaluate = @yaml['default']['eval']
+                        return if evaluate.blank?
+                        # add @parent if it's a method call and @parent is not present
+                        if evaluate[0] != evaluate[0].upcase && !evaluate.match('@parent')
+                          evaluate.prepend('@parent.')
+                        end
+                        eval(evaluate)
+                      else
+                        @yaml['default']
+                      end
 end
 
 ####################################################################

data/app/models/drgcms_form_fields/link_to.rb

@@ -51,7 +51,7 @@ class LinkTo < DrgcmsField
 ###########################################################################
 def render
   @yaml['html'] ||= {}
-  @yaml['html']['class'] ||= 'dc-link dc-animate'
+  @yaml['html']['class'] ||= 'dc-link'
   @yaml['html'].symbolize_keys!
 
   @yaml[:id] = record._id if @yaml[:id] == 'id'

data/app/models/drgcms_form_fields/multitext_autocomplete.rb

@@ -111,7 +111,7 @@ def render
   @yaml['html']['placeholder'] = t('drgcms.search_placeholder')
   _name = '_' + @yaml['name']
   @html << '<div class="ui-autocomplete-border">'
-  @html << @parent.link_to(@parent.fa_icon('plus-square lg', class: 'dc-animate dc-green'), '#',onclick: 'return false;') # dummy add. But it is usefull.
+  @html << @parent.link_to(@parent.fa_icon('plus-square-o', class: 'dc-green'), '#',onclick: 'return false;') # dummy add. But it is usefull.
 
   record = record_text_for(@yaml['name'])
   # text field for autocomplete
@@ -119,7 +119,7 @@ def render
   # direct link for adding new documents to collection
   if @yaml['with_new'] and !@readonly
     @html << ' ' + 
-             @parent.fa_icon('plus-square lg', class: 'in-edit-add', title: t('drgcms.new'), 
+             @parent.fa_icon('plus-square-o', class: 'in-edit-add', title: t('drgcms.new'),
              style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )    
   end
   # div to list active selections
@@ -137,9 +137,9 @@ def render
       end
 # Related data is missing. It happends.
       @html << if rec
-        link  = @parent.link_to(@parent.fa_icon('remove lg', class: 'dc-animate dc-red'), '#',
+        link  = @parent.link_to(@parent.fa_icon('remove_circle', class: 'dc-red'), '#',
                 onclick: "$('##{rec.id}').hide(); var v = $('##{record}_#{@yaml['name']}_#{rec.id}'); v.val(\"-\" + v.val());return false;")
-        link  = @parent.fa_icon('check lg', class: 'dc-green') if @readonly      
+        link  = @parent.fa_icon('check', class: 'dc-green') if @readonly
         field = @parent.hidden_field(record, "#{@yaml['name']}_#{rec.id}", value: element)
         "<div id=\"#{rec.id}\" style=\"padding:4px;\">#{link} #{rec.send(field_name)}<br>#{field}</div>"
       else
@@ -149,7 +149,7 @@ def render
   end
   @html << "</div></div>"
 # Create text for div to be added when new category is selected  
-  link    = @parent.link_to(@parent.fa_icon('remove lg', class: 'dc-animate dc-red'), '#', 
+  link    = @parent.link_to(@parent.fa_icon('remove_circle', class: 'dc-red'), '#',
             onclick: "$('#rec_id').hide(); var v = $('##{record}_#{@yaml['name']}_rec_id'); v.val(\"-\" + v.val());return false;")
   field   = @parent.hidden_field(record, "#{@yaml['name']}_rec_id", value: 'rec_id')
   one_div = "<div id=\"rec_id\" style=\"padding:4px;\">#{link} rec_search<br>#{field}</div>"

data/app/models/drgcms_form_fields/readonly.rb

@@ -52,6 +52,9 @@ class Readonly < DrgcmsField
 # Render readonly field html code
 ###########################################################################
 def render
+  set_initial_value
+  @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">'
 

data/app/models/drgcms_form_fields/select.rb

@@ -145,7 +145,7 @@ def add_view_code
   return '' if (data = @record.send(@yaml['name'])).blank?
 
   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 )
+  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>)
 end
@@ -189,16 +189,17 @@ def render
 
   set_initial_value('html','selected')
   # separate options and html part
-  html_part = {}
+  options_part = {}
   @yaml['html'].symbolize_keys!
-  %i(class id style required).each { |sym| html_part[sym] = @yaml['html'].delete(sym) if @yaml['html'][sym] }
-  html_part[:multiple] = true if @yaml['multiple']
+  %i(selected include_blank).each { |sym| options_part[sym] = @yaml['html'].delete(sym) if @yaml['html'][sym] }
+  @yaml['html'][:multiple] = true if @yaml['multiple']
+
   record = record_text_for(@yaml['name'])
-  if html_part[:multiple]
-    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], html_part)
+  if @yaml['html'][:multiple]
+    @html << @parent.select(record, @yaml['name'], get_choices, options_part, @yaml['html'])
     @js   << "$('##{record}_#{@yaml['name']}').selectMultiple();"
   else
-    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], html_part)
+    @html << @parent.select(record, @yaml['name'], get_choices, options_part, @yaml['html'])
     # add code for view more data
     @html << add_view_code() if @yaml['view']
   end

data/app/models/drgcms_form_fields/text_autocomplete.rb

@@ -110,12 +110,12 @@ def render
   @html << '<span class="dc-text-autocomplete">' + @parent.text_field(record, _name, @yaml['html']) + '<span></span>'
   # with new icon
   if @yaml['with_new']
-    @html << ' ' + @parent.fa_icon('plus-square lg', class: 'in-edit-add', title: t('drgcms.new'),
+    @html << ' ' + @parent.fa_icon('plus-square-o', class: 'in-edit-add', title: t('drgcms.new'),
              style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )
   end
   # with edit icon
   if @yaml['with_edit'] && @record[@yaml['name']].present?
-    @html << ' ' + @parent.fa_icon('edit lg', class: 'in-edit-add', title: t('drgcms.edit'),
+    @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
   @html << '</span>' + @parent.hidden_field(record, @yaml['name'], value: value) # actual value will be in hidden field

data/app/renderers/dc_part_renderer.rb

@@ -64,7 +64,7 @@ def render_particle(particle, opts)
   return msg unless can_view
   html = ''
   if @opts[:edit_mode] > 1
-    opts[:editparams].merge!(title: "#{t('drgcms.edit')}: #{particle.name}", controller: :cmsedit)    
+    opts[:editparams].merge!(title: "#{t('drgcms.edit')}: #{particle.name}", controller: 'cmsedit')
     html << dc_link_for_edit( opts[:editparams] )
   end
 #

data/app/renderers/dc_poll_renderer.rb

@@ -120,7 +120,7 @@ def do_one_item(poll, yaml)
     end
     # submit and link tag
     clas = yaml['type'].match(/submit_tag/) ? '' : 'dc-link-submit'
-    html << "<span class='#{clas} dc-animate'>#{field_html}#{yaml['separator']}</span>"
+    html << "<span class='#{clas}'>#{field_html}#{yaml['separator']}</span>"
   # other fields
   else
     html << case

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

@@ -2,36 +2,36 @@
   <button class="cms-toggle mode-<%= session[:edit_mode] %>" title="<%= t('drgcms.toggle_cms')%>">CMS</button>
   <% # = link_to('CMS', controller: 'dc_common', action: 'toggle_edit_mode', return_to: request.url) %>
   <% if session[:edit_mode] > 1 %>
-    <div class="cmsedit-table cmsedit-top">
-      <div id="menu">
+    <div class="cmsedit-top">
+      <div id="cms-top-menu">
 
         <% if @page %>
-          <%= link_to( fa_icon('file-text-o lg', class: "dc-animate", title: "#{t('drgcms.edit_page')}"),
+          <%= link_to( fa_icon('description-o', title: "#{t('drgcms.edit_page')}"),
               {controller: 'cmsedit', action: 'edit', table: @site.page_class, id: @page._id}, target: 'iframe_cms') %>
         <% end %>
 
         <% if @design %>
-          <%= link_to( fa_icon('credit-card lg', class: "dc-animate", title: "#{t('drgcms.edit_design')}"),
+          <%= link_to( fa_icon('web', title: "#{t('drgcms.edit_design')}"),
               {controller: 'cmsedit', action: 'edit', table: 'dc_design', id: @design._id}, target: 'iframe_cms') %>
         <% end %>
 
         <% if @site %>
-          <%= link_to( fa_icon('globe lg', class: "dc-animate", title: "#{t('drgcms.edit_site')}"),
+          <%= link_to( fa_icon('public', title: "#{t('drgcms.edit_site')}"),
               {controller: 'cmsedit', action: 'edit', table: 'dc_site', id: @site._id}, target: 'iframe_cms') %>
         <% end %>
-        <b>&nbsp; | &nbsp; </b>
+        <span>|</span>
         
-        <%= link_to( fa_icon('compress lg', class: "dc-animate", title: t('drgcms.minimize')), '#',
+        <%= link_to( fa_icon('compress', title: t('drgcms.minimize')), '#',
             onclick: "$('#iframe_cms').height(1); return false;" ) %>
 
-        <%= link_to( fa_icon('expand lg', class: "dc-animate", title: t('drgcms.maximize')), '#',
+        <%= link_to( fa_icon('expand', title: t('drgcms.maximize')), '#',
             onclick: "$('#iframe_cms').height( $('#iframe_cms').height() + 500);; return false;")  %>
 
-        <%= link_to( fa_icon('refresh lg', class: "dc-animate", title: t('drgcms.reload')), '#',
+        <%= link_to( fa_icon('refresh', title: t('drgcms.reload')), '#',
             onclick: "document.location.reload(true); return false;")  %>
-        <b>&nbsp; | &nbsp; </b>
+        <span>|</span>
 
-        <%= link_to( fa_icon('copy lg', class: "dc-animate", title: "#{t('drgcms.doc_paste_title')}"),
+        <%= link_to( fa_icon('content_paste-o', title: t('drgcms.doc_paste_title')),
             {controller: 'dc_common', action: 'paste_clipboard'}, target: 'iframe_cms') %>
 
         <%= DrgcmsFormFields::Elfinder.file_manager_url(self) %>
@@ -42,7 +42,7 @@
     <div id="menu-hamburger"><%= fa_icon('bars') %></div>
 
     <div class="cmsedit-container">
-      <div id="menu">
+      <div id="cms-menu">
         <%= dc_choices4_cmsmenu.html_safe %>
       </div>
 

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

@@ -12,7 +12,7 @@
       <div class="input"><%= password_field('record', 'password') %></div>
       
       <div class="label"></div>
-      <div class="input"><%= submit_tag t('drgcms.login'), class: 'dc-animate-button' %></div>
+      <div class="input"><%= submit_tag t('drgcms.login'), class: 'dc-submit' %></div>
       <%= hidden_field_tag('return_to_error', request.url ) %>
     <% end %>
   </div>

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

@@ -2,7 +2,7 @@
 <%= dc_table_title t('drgcms.doc_paste_title') %>
 
 <div class="dc-form-frame"><br>
-  <span class="dc-link dc-link-ajax dc-animate" data-request="post" title="<%= t('drgcms.doc_paste_clipboard') %>"
+  <span class="dc-link-ajax" data-request="post" title="<%= t('drgcms.doc_paste_clipboard') %>"
         data-url="<%= url_for(controller: 'dc_common', action: 'paste_clipboard') %>"><%= t('drgcms.doc_paste_clipboard') %>
   </span>
   

data/config/locales/drgcms_en.yml

@@ -69,6 +69,7 @@ en:
     toggle_cms: Toggle CMS edit/view mode
     edit: Edit
     show: Show
+    duplicate: Duplicate
     new: New
     sort: Sort
     filter: Filter
@@ -117,7 +118,7 @@ en:
       simple_message: Please write in the name of month no %{number} in a year.
 
     filters:
-      this_site_only: Documents for currently selected site only
+      this_site_only: Only documents of currently selected web site
 
     dc_help:
       help: HELP