drg_cms 0.6.1.0 → 0.6.1.6

data/app/models/drgcms_form_fields/comment.rb

@@ -31,12 +31,17 @@ module DrgcmsFormFields
 # * +type:+ comment (required)
 # * +caption:+ Caption text written in label place. If set to false comment 
 # will occupy whole row. (required)
-# 
+# * +html:+ Optional html attributes will be added to div surrounding the comment.
+#
 # Form example:
 #    30:
 #      type: comment
 #      text: myapp.comment_text
 #      caption: false
+#      html:
+#        style: 'color: red'
+#        class: some_class
+#        id: some_id
 ###########################################################################
 class Comment < DrgcmsField
   
@@ -45,7 +50,11 @@ class Comment < DrgcmsField
 ###########################################################################
 def render
   comment = @yaml['comment'] || @yaml['text']
-  @html << "<div class=\"dc-comment\">#{t(comment, comment).gsub("\n",'<br>')}</div>"
+  @yaml['html'] ||= {}
+  @yaml['html']['class'] = 'dc-comment ' + @yaml['html']['class'].to_s
+  html = @yaml['html'].inject('') { |r, e| r << %( #{e[0]}="#{e[1]}") }
+
+  @html << %(<div #{html}>#{t(comment, comment).gsub("\n",'<br>')}</div>)
   self
 end
 end

data/app/models/drgcms_form_fields/date_picker.rb

@@ -78,6 +78,8 @@ def render
   @yaml['options']['lang']   ||= "'#{I18n.locale}'"
   @yaml['options']['format'] ||= "'#{t('datetimepicker.formats.date')}'"
   @yaml['options']['timepicker'] = false
+  @yaml['options']['scrollMonth'] ||= false
+  @yaml['options']['scrollInput'] ||= false
 
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field(record, @yaml['name'], @yaml['html'])

data/app/models/drgcms_form_fields/drgcms_field.rb

@@ -135,7 +135,8 @@ def ro_standard(value=nil)
       @record.respond_to?(@yaml['name']) ? @record.send(@yaml['name']) : nil
     end
   end
-  @html << (value.blank? ? '' : "<div class='dc-readonly'>#{value}</div>")
+  #@html << (value.blank? ? '' : "<div class='dc-readonly'>#{value}</div>")
+  @html << %(<div id="#{@yaml['name']}" class="dc-readonly">#{value}</div>)
   self
 end
 

data/app/models/drgcms_form_fields/embedded.rb

@@ -67,9 +67,11 @@ def render
     tables = @parent.tables.inject('') { |r,v| r << "#{v[1]};" } + @yaml['table']
     ids    = @parent.ids.inject('') { |r,v| r << "#{v};" } + @record.id
   end
-  opts = { controller: 'cmsedit', action: @yaml['action'], 
+  # edit enabled embedded form on a readonly form
+  readonly = @yaml['readonly'].class == FalseClass ? nil : @readonly
+  opts = { controller: 'cmsedit', action: @yaml['action'],
            ids: ids, table: tables, form_name: @yaml['form_name'], 
-           field_name: @yaml['name'], iframe: "if_#{@yaml['name']}", readonly: @readonly }
+           field_name: @yaml['name'], iframe: "if_#{@yaml['name']}", readonly: readonly }
   # additional parameters if specified
   @yaml['params'].each { |k,v| opts[k] = @parent.dc_value_for_parameter(v) } if @yaml['params']         
          

data/app/models/drgcms_form_fields/number_field.rb

@@ -69,14 +69,14 @@ def render
   @yaml['html']['data-delimiter'] = @yaml.dig('format','delimiter') || I18n.t('number.currency.format.delimiter')
   @yaml['html']['data-separator'] = @yaml.dig('format','separator') || I18n.t('number.currency.format.separator')
  # @yaml['html']['data-currency']  = @yaml.dig('format','currency') == 'yes' ? I18n.t('number.currency.format.currency') : @yaml.dig('format','currency')
-  value = @record[@yaml['name']] || 0 
+  value = @yaml['html']['value'] || @record[@yaml['name']] || 0
   @yaml['html']['value'] = @parent.dc_format_number(value, @yaml['html']['data-decimal'], @yaml['html']['data-separator'], @yaml['html']['data-delimiter'] )
   
   return ro_standard(@yaml['html']['value']) if @readonly
 
   @yaml['html']['autocomplete'] ||= 'off'
   @html << @parent.hidden_field( record, @yaml['name'], value: value )
-  @html << @parent.text_field( nil,"record_#{@yaml['name']}_", @yaml['html']) 
+  @html << @parent.text_field( nil, "record_#{@yaml['name']}_", @yaml['html'])
   self
 end
 
@@ -85,7 +85,8 @@ end
 ###########################################################################
 def self.get_data(params, name)
   return 0 if params['record'][name].blank?
-  params['record'][name].match('.') ? params['record'][name].to_f : Integer.new(params['record'][name])
+
+  params['record'][name].match('.') ? params['record'][name].to_f : params['record'][name].to_i
 end
 
 end

data/app/models/drgcms_form_fields/readonly.rb

@@ -51,29 +51,25 @@ class Readonly < DrgcmsField
 ###########################################################################
 # Render readonly field html code
 ###########################################################################
-def render 
+def render
   @html << @parent.hidden_field('record', @yaml['name']) # retain field as hidden field
   @html << '<div class="dc-readonly">'
-  
+
   @html << if @yaml['eval']
-    if @yaml['eval'].match('dc_name4_id')
-      a = @yaml['eval'].split(',')
-      if a.size == 3
-        @parent.dc_name4_id(a[1], a[2], nil, @record[ @yaml['name'] ])
-      else
-        @parent.dc_name4_id(a[1], a[2], a[3], @record[ @yaml['name'] ])
-      end
-      
-#      @parent.dc_name4_id(a[1], a[2], @record[ @yaml['name'] ])
-    else
-      eval( "#{@yaml['eval']} '#{@record.send(@yaml['name'])}'") 
-    end
-  else
-    @parent.dc_format_value(@record.send(@yaml['name']),@yaml['format'])    
-  end  
+             if @yaml['eval'].match(/dc_name4_id|dc_name_for_id/)
+               parms = @parent.dc_eval_to_array(@yaml['eval'])
+               parms << nil if parms.size == 3
+               @parent.dc_name_for_id(parms[1], parms[2], parms[3], @record[@yaml['name']])
+             else
+               eval( "#{@yaml['eval']} '#{@record.send(@yaml['name'])}'")
+             end
+           else
+             @parent.dc_format_value(@record.send(@yaml['name']), @yaml['format'])
+           end
   @html << '</div>'
   self
 end
+
 end
 
 end

data/app/models/drgcms_form_fields/select.rb

@@ -96,7 +96,7 @@ def choices_in_eval(e)
   if @yaml['depend'].nil?
     method = e.split(/\ |\(/).first
     return eval(e) if respond_to?(method) # id method defined here
-    return eval('@parent.'+e) if @parent.respond_to?(method) # is method defined in helpers
+    return eval('@parent.' + e) if @parent.respond_to?(method) # is method defined in helpers
     # eval whatever it is there
     eval e
   else
@@ -120,19 +120,18 @@ end
 ###########################################################################
 def get_choices
   begin
-    choices = case 
-              when @yaml['choices'] then
-                @yaml['choices'].match('helpers.') ? choices_in_helper(@yaml['choices']) : @yaml['choices']
+    choices = case
               when @yaml['eval'] then
                 choices_in_eval(@yaml['eval'])
+              when @yaml['choices'] then
+                @yaml['choices'].match('helpers.') ? choices_in_helper(@yaml['choices']) : @yaml['choices']
               else
                 choices_in_helper()
               end
-  # Convert string to Array
-    choices.class == String ?
-      choices.chomp.split(',').inject([]) { |r,v| r << (v.match(':') ? v.split(':') : v ) } :
-      choices
-  rescue Exception => e 
+    return choices unless choices.class == String
+
+    choices.chomp.split(',').map { |e| e.match(':') ? e.split(':') : e }
+  rescue Exception => e
     Rails.logger.debug "\nError in select eval. #{e.message}\n"
     Rails.logger.debug(e.backtrace.join($/)) if Rails.env.development?
     ['error'] # return empty array when error occures
@@ -145,8 +144,7 @@ end
 def add_view_code
   return '' if (data = @record.send(@yaml['name'])).blank?
 
-  ar = @yaml['view'].split(/\ |\,/).delete_if {|e| e.blank?}
-  table, form_name = *ar
+  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>)
@@ -159,9 +157,9 @@ def ro_standard
   value = @record.respond_to?(@yaml['name']) ? @record.send(@yaml['name']) : nil
   return self if value.blank?
 
+  html = ''
   choices = get_choices()
   if value.class == Array   # multiple choices
-    html = ''
     value.each do |element|
       choices.each do |choice|
         if choice.to_s == element.to_s
@@ -170,17 +168,17 @@ def ro_standard
         end
       end       
     end
-    return super(html)
   else
     choices.each do |choice|
       if choice.class == Array
-        return super(choice.first) if choice.last.to_s == value.to_s
+        (html = choice.first; break) if choice.last.to_s == value.to_s
       else
-        return super(choice) if choice.to_s == value.to_s
+        (html = choice; break) if choice.to_s == value.to_s
       end 
     end
+    html << add_view_code if @yaml['view']
   end
-  super('')
+  super(html)
 end
 
 ###########################################################################
@@ -193,9 +191,8 @@ def render
   # separate options and html part
   html_part = {}
   @yaml['html'].symbolize_keys!
-  %i(class id style required).each { |sym| html_part[sym] = @yaml['html'].delete(sym) if html_part[sym]}
+  %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']
-
   record = record_text_for(@yaml['name'])
   if html_part[:multiple]
     @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], html_part)
@@ -224,4 +221,5 @@ def self.get_data(params, name)
 end
 
 end
+
 end

data/app/models/drgcms_form_fields/text_autocomplete.rb

@@ -29,7 +29,8 @@ module DrgcmsFormFields
 # * +name:+ field name (required)
 # * +type:+ text_autocomplete (required)
 # * +table+ Collection (table) name. When defined search must contain field name
-# * +with_new+ Will add an icon for shortcut to add new document to collection
+# * +with_new+ Will add an icon for shortcut to add new document to related collection
+# * +with_edit+ Will add an icon for shortcut to edit (view) related document
 # * +is_id+ Field value represent value as id. If false, field will use entered value and not value selected with autocomplete. Default is true.
 # * +search:+ Search may consist of three parameters from which are separated either by dot (.) 
 #   * search_field_name; when table option is defined search must define field name which will be used for search query
@@ -43,8 +44,9 @@ module DrgcmsFormFields
 #      type: text_autocomplete
 #      search: dc_user.name
 #      is_id: false
-#      html:
-#        size: 30
+#      size: 30
+#      with_new: user
+#      with_edit: user
 ###########################################################################
 class TextAutocomplete < DrgcmsField
  
@@ -58,8 +60,8 @@ def render
     table    = @yaml['search']['table']
     ret_name = @yaml['search']['field']
     method   = @yaml['search']['method']
-  elsif @yaml['search'].match(/\./)
-    table, ret_name, method = @yaml['search'].split(/\.|\,/).map(&:strip)
+  elsif @yaml['search'].match(/\.|\,| /)
+    table, ret_name, method = @yaml['search'].split(/\.|\,| /).map(&:strip)
   else
     ret_name = @yaml['search']
   end
@@ -76,51 +78,62 @@ def render
   end
   return ro_standard 'Table or field keyword not defined!' unless (table && ret_name)
   # TODO check if table exists
-  t = table.classify.constantize
+  model_klass = table.classify.constantize
   # find record and return value of field
   value_send_as = 'p_' + @yaml['name']
   value = if @parent.params[value_send_as]
-    @parent.params[value_send_as]
-  elsif @record and @record[@yaml['name']]
-    @record[@yaml['name']]
-  end
+            @parent.params[value_send_as]
+          elsif @record && @record[@yaml['name']]
+            @record[@yaml['name']]
+          end
+  not_id = @parent.dc_dont?(@yaml['is_id'], false)
   # Found value to be written in field. If field is not found write out value.
-  if value
-    record = t.find(value) unless @yaml['not_id'] # don't if it's is not an id
-    value_displayed = record ? record.send(ret_name) : value
+  value_displayed = value
+  if value && !not_id
+    if BSON::ObjectId.legal?(value)
+      record = model_klass.find(value)
+      value_displayed = record.send(ret_name) if record
+    else
+      value_displayed = model_klass.send(ret_name, method, @parent, value)
+    end
   end
-  # return if readonly
   return ro_standard(value_displayed) if @readonly
+
   # Add method back, so autocomplete will know that it must search for method inside class
   ret_name = "#{ret_name}.#{method}" if method
   @yaml['html'] ||= {}
   @yaml['html']['value'] = value_displayed
   @yaml['html']['placeholder'] ||= t('drgcms.search_placeholder') || nil
-  #
+
   _name = '_' + @yaml['name']
   record = record_text_for(@yaml['name'])  
   @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'), 
-             style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )    
+    @html << ' ' + @parent.fa_icon('plus-square lg', 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'),
+             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
+  @html << '</span>' + @parent.hidden_field(record, @yaml['name'], value: value) # actual value will be in hidden field
+
   # JS stuff
   # allow unselected values on is_id: false option
-  not_id = @parent.dc_dont?(@yaml['is_id'], false)
   not_id_code = %(
 if (ui.item == null) {  
 $("##{record}_#{@yaml['name']}").val($("##{record}__#{@yaml['name']}").val() );
 return;
 } ) if not_id
-  #
+
   @js << <<EOJS
 $(document).ready(function() {
   $("##{record}_#{_name}").autocomplete( {
     source: function(request, response) {
       $.ajax({
-        url: '/dc_common/autocomplete',
+        url: "/dc_common/autocomplete",
         type: "POST",
         dataType: "json",
         data: { input: request.term, table: "#{table}", search: "#{ret_name}" #{(',id: "'+@yaml['id'] + '"') if @yaml['id']} },
@@ -131,11 +144,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
   });
 });
@@ -152,4 +167,5 @@ def self.get_data(params, name)
 end
 
 end
+
 end

data/app/renderers/dc_page_renderer.rb

@@ -72,6 +72,7 @@ end
 #########################################################################
 def iframe
   return '' if @page.if_url.blank?
+
   html =  "\n<iframe"
   html << " id=\"#{@page.if_id}\"" unless @page.if_id.blank?
   html << " class=\"#{@page.if_class}\"" unless @page.if_class.blank?
@@ -79,7 +80,7 @@ def iframe
   html << " height=\"#{@page.if_height}\"" unless @page.if_height.blank?
   html << " width=\"#{@page.if_width}\"" unless @page.if_width.blank?
   html << " scrolling=\"#{@page.if_scroll}\""
-# Parameters
+  # Parameters
   parameters = @page.if_url.match(/\?/) ? '' : '?' 
   params = YAML.load(@page.if_params) rescue {}
   params = {} unless params.class == Hash
@@ -98,20 +99,20 @@ end
 def default
   can_view, msg = dc_user_can_view(@parent, @page)
   return msg unless can_view
-# 
-  html = ''
+
+  html = "<div class=\"#{@page.div_class} #{@opts[:div_class]}\">"
   html << dc_page_edit_menu() if @opts[:edit_mode] > 1
   @parent.page_title = @page.title.blank? ? @page.subject : @page.title
   html << @page.body
-# render poll if defined
+  # render poll if defined
   if @page.dc_poll_id
     @opts.merge!(:poll_id => @page.dc_poll_id, :return_to => @parent.request.url, method: nil)
     comment = DcPollRenderer.new(@parent, @opts)
     html << "<div class='wrap row'>#{comment.render_html}</div>"
     @css << "\n#{comment.render_css}"
   end
-# also add iframe
-  html << iframe()
+  # also add iframe
+  html << iframe() << '</div>'
 end
 
 #########################################################################

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/cmsedit/_edit_stuff.html.erb

@@ -38,11 +38,14 @@
 
       </div>
     </div>
-    
-    <div class="cmsedit-container">  
+
+    <div id="menu-hamburger"><%= fa_icon('bars') %></div>
+
+    <div class="cmsedit-container">
       <div id="menu">
         <%= dc_choices4_cmsmenu.html_safe %>
       </div>
+
       <div class="cmsedit-iframe" style="width: 99%;">
         <iframe id="iframe_cms" name="iframe_cms"></iframe>
       </div>

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

@@ -1,6 +1,7 @@
 
-<%= dc_flash_messages %> 
-<%= dc_error_messages_for @record %> 
+<%= dc_flash_messages %>
+<%= dc_error_messages_for @record %>
+<%= dc_warning_messages_for @record %>
 
 <div class="dc-form-frame">
 

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

@@ -1,24 +1,27 @@
 
 <div class="dc-table-frame">
 
-  <% unless @records.nil? %>
-      <%= dc_background_for_result(:start) %>
-  
-      <%= dc_header_for_result %>
-      <% for document in @records %>
-        <%= dc_row_for_result(document) %>
-        <%= dc_actions_for_result(document) %>
-        <%= dc_columns_for_result(document) %>
-        </div>
-      <% end %>
-      <% if @record_footer %>
-        <div class="dc-result-data footer">
-        <%= dc_actions_column_for_footer() %>
-        <%= dc_columns_for_result(@record_footer) %>
-        </div>
-      <% end %>
-        
-      <%= dc_background_for_result(:end) %>
+  <% if @form['result_set']['type'] == 'method' %>
+    <%= dc_process_result_set_method %>
+  <% elsif @records %>
+    <%= dc_background_for_result(:start) %>
+    <%= dc_header_for_result %>
+
+    <% for document in @records %>
+      <%= dc_row_for_result(document) %>
+      <%= dc_actions_for_result(document) %>
+      <%= dc_columns_for_result(document) %>
+      </div>
+    <% end %>
+
+    <% if @record_footer %>
+      <div class="dc-result-data footer">
+      <%= dc_actions_column_for_footer() %>
+      <%= dc_columns_for_result(@record_footer) %>
+      </div>
+    <% end %>
+
+    <%= dc_background_for_result(:end) %>
   <% end %>
   <%= dc_filter_popup() %>
   

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

@@ -1,7 +1,8 @@
 <%= dc_head_for_form %>
 <%= dc_table_title dc_edit_title() %>
 
-<%= form_tag( @parms, method: :put, id: 'cmsform', multipart: @form['form']['multipart'] ) do %>
+<%= form_tag( @parms, method: :put, id: params['form_name'] || params['table'],
+              class: 'cmsform', multipart: @form['form']['multipart'] ) do %>
   <%= render partial: 'form' %>
 <% end %>
 

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

@@ -1,4 +1,4 @@
-<div class="dc-form-frame">
+<div id="<%= params['form_name'] || params['table'] %>" class="dc-form-frame">
   <%= dc_title_for_index @records %>
 
   <%= dc_actions_for_index %>

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

@@ -1,6 +1,7 @@
-<%= dc_table_title dc_new_title() %>
+<%= dc_table_title dc_new_title %>
 
-<%= form_tag( @parms, method: :post, id: 'cmsform', multipart: @form['form']['multipart'] ) do %>
+<%= form_tag(@parms, method: :post, id: params['form_name'] || params['table'],
+             class: 'cmsform', multipart: @form['form']['multipart']) do %>
   <%= render partial: 'form' %>
 <% end %>
 

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/app/views/layouts/cms.html.erb

@@ -3,15 +3,13 @@
 <head>
   <title><%= @page_title %></title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
   <%= stylesheet_link_tag "cms", media: 'all' %>
-<% if false %>  not require in cms mode
-  <style type="text/css" media="all"><%= "#{@site.css if @site}#{@design.css if @design}\n#{@page.css if @page}".html_safe  %></style>
-  <%= @site.header.html_safe if @site %>
-<% end %>
   <%= javascript_include_tag "cms" %>
   <%= csrf_meta_tags %>
 </head>
-<body>
+<body id="body-cms">
 
 <%= yield %>