drg_cms 0.5.52.3 → 0.5.52.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cd8a24b6fe78291f0381645570f80c9f37f02a2
-  data.tar.gz: ae23416b365aad2e19b2a7d06db7d474f6522359
+  metadata.gz: ea79cbbc378571608364226320f13d300e1b0f8c
+  data.tar.gz: 77fd5dfe3c330b3d0ae59bc3895bd4cc3283090a
 SHA512:
-  metadata.gz: 3be8e8ecade1f23a24678a1fb06cf0591407b4108435c4e559fefed4d1524f2a134f10c86db5c34744fe8cf9750927b0e05ab115d25a75b9a48dd7562730e868
-  data.tar.gz: 62e72cfd6235f0965eca6936114a9a706d870aaf59ad59e79d33ac5addfab728c18041cfa7edd7771ebe74a5fb6a294dacbf4c26b8264ee303bc89d3d9a89384
+  metadata.gz: 36b5519ba85b2a272f51324c4ea23125dbc9efe69065798e853b4a01966c8851b63fd89eea06dc273c11876722fdc04c94202e41146884d6d0032501fc299e36
+  data.tar.gz: 2e9692ebed9d93f8dcebeaeeed060a0bd404b129e08f34e3ba759c32196e103b532e563a6951f8b2c03560f398dc2d5effe870f5075132d2c6defa7570df50fd

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

@@ -170,6 +170,17 @@ function dc_reload_window() {
   location.reload(); 
 }
 
+/*******************************************************************
+ * Will select first editable input field on form. Works only when tab
+ * is selected. Still have to find out, what to do on initial display.
+ *******************************************************************/
+function select_first_input_field(div_name) {
+  $(div_name + " :input:first").each( function() {
+    this.focus();
+    return true;
+  });
+}
+
 /*******************************************************************
  * Will scroll to position on the screen. This is replacement for 
  * location.hash, which doesn't work in Chrome.
@@ -188,6 +199,7 @@ $.fn.dc_scroll_view = function () {
  * 
  *******************************************************************/
 $(document).ready( function() {
+  
  /*******************************************************************
   * Register ad clicks
   *******************************************************************/
@@ -246,16 +258,16 @@ $(document).ready( function() {
     if (old_tab_id !== null) {
       $('#data_' + old_tab_id).toggleClass('div-hidden');
       $('#data_' + e.target.getAttribute("data-div")).toggleClass('div-hidden');
-// resize parent iframe if its size is less then selected div size      
-      var div_height = document.getElementById('data_' + e.target.getAttribute("data-div")).clientHeight + 120;
-//      if (window.frameElement.clientHeight < div_height) {
+// resize parent iframe to fit selected tab size
+      var div_height = document.getElementById('data_' + e.target.getAttribute("data-div")).clientHeight + 130;
         window.frameElement.style.height = div_height.toString() + 'px';
-//      }
+// it would be too easy      $('#cmsform :input:enabled:visible:first').focus();
+      select_first_input_field('#data_' + e.target.getAttribute("data-div"));
     }
   });  
 
 /*******************************************************************
- * Resize iframe_cms to the size of its contents. Make at least 500 px hight
+ * Resize iframe_cms to the size of its contents. Make at least 500 px high
  * unless on initial display.
  *******************************************************************/
   $('#iframe_cms').load( function() {
@@ -263,7 +275,7 @@ $(document).ready( function() {
     new_height = this.contentWindow.document.body.offsetHeight + 50;
     if (new_height < 500 & new_height > 60) new_height = 500;
     this.style.height = new_height + 'px'; 
-//    remove_background_from_iframe(this.contentWindow.document);
+// scroll to top
     $('#iframe_cms').dc_scroll_view();
   });
 
@@ -275,10 +287,9 @@ $(document).ready( function() {
 //    console.log(this.contentWindow.document.body.offsetHeight);
     if (this.contentWindow.document.body.offsetHeight > 10) {
       this.style.height = (this.contentWindow.document.body.offsetHeight + 30) + 'px'; 
-// scroll to it
+// scroll to top
       $('#iframe_edit').dc_scroll_view();
     }
-//    remove_background_from_iframe(this.contentWindow.document);
   });
   
 /*******************************************************************
@@ -286,11 +297,7 @@ $(document).ready( function() {
  *******************************************************************/
   $('.dc-link-ajax').on('click', function(e) {
     var target = e.target;
-//    if (e.target.src !== undefined) {
-//      target = e.target.parent(); // picture
-//    };
-//    dumpAttributes(target);
-    req = target.getAttribute("data-request");
+    var req    = target.getAttribute("data-request");
 /* Get some values from elements on the page: */
     if (req == "script") {
       eval (target.getAttribute("data-script"));

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

@@ -145,6 +145,7 @@ color: #666;
 font-weight: bold;
 text-decoration: none; 
 background: transparent;
+padding: 8px 0;
 }
 
 .dc-link a:hover, .dc-animate a:hover, .dc-result a:hover  { 
@@ -404,8 +405,8 @@ background: transparent linear-gradient(to bottom, #eee 0%, #eee 100%) repeat sc
   border-bottom:1px solid #ccc;*/
 }
 
-.dc-form-table {
-  width: 100%;
+.dc-form {
+  width: 99.8%;
   padding: 0px;
   padding-top: 4px;
   border: 1px solid #ddd;
@@ -413,6 +414,11 @@ background: transparent linear-gradient(to bottom, #eee 0%, #eee 100%) repeat sc
   background-color: #fcfcfc;
 }
 
+.dc-form .row-div {
+  display: flex;
+  align-items: center;
+}
+
 .dc-form-info {
   padding: 8px;
   background-image: linear-gradient(to bottom, #dff0d8 0px, #c8e5bc 100%);
@@ -479,6 +485,7 @@ background: transparent linear-gradient(to bottom, #eee 0%, #eee 100%) repeat sc
 .dc-form-field {
   text-align: left;
   padding: 3px 2px;
+  z-index: 10;
 /*  
   background-color: #f4f4f4;
   border-bottom: 1px solid #eee;
@@ -486,13 +493,14 @@ background: transparent linear-gradient(to bottom, #eee 0%, #eee 100%) repeat sc
 }
 
 .dc-readonly {
+  display: inline-block;
+  font-size: 14px;
   font-weight: normal;
+  color: #222;
   padding: 6px 3px;
   border: 2px solid #ddd;
   background-color: #eee;
   border-radius: 2px;
-  color: #222;
-  font-size: 14px;
 }
 
 .dc-color-odd {
@@ -544,7 +552,7 @@ border-bottom: 1px solid #eee;
 }
 
 .dc-separator {
-padding: 0px;
+padding: 5px 0;
 border-top: 2px solid #ddd;
 }
 
@@ -568,7 +576,7 @@ border-radius: 2px;
 font-size: 1.2em;
 }
 
-/*******    TOP MENU    *********/
+/*******   TOP MENU    *********/
 .cmsedit-top {
   width: 100%;
   background-color: #fff; 
@@ -665,6 +673,10 @@ display: none;
   text-align: left;
 }
 
+/*** JOURNAL  **/
+.dc-journal {width: 99%; }
+.dc-journal div { padding: 4px;}
+
 /****** jquery ui-autocomplete widget ***************/
 .ui-autocomplete-input {
   font-style: italic;
@@ -691,6 +703,7 @@ color: #000;
 }
 
 .ui-autocomplete-border {
+  display: inline-block;
   border-radius: 2px;
   border: solid 2px #ddd;
   padding: 8px;
@@ -915,6 +928,7 @@ position:absolute;
 background-color: #f8f8f8;
 border: 1px solid #ddd;
 border-radius: 2px;
+z-index: 100;
 }
 
 /************************** info popup *************************/
@@ -937,4 +951,20 @@ padding: 5px;
   background-color: #fff;
   padding: 10px;
   border: 2px solid #ddd;
-}
+}
+
+/****** MOBILE DEVICE *****/
+@media only screen and (max-width: 600px) {
+  .dc-form .row-div {
+    display: block;
+  }
+  .dc-form-field {
+    width: 100%;
+  }
+  .dc-form-label {
+    text-align: left;
+    width: 100%;
+    padding-bottom: 2px;
+    white-space: nowrap;
+  }
+}

data/app/controllers/cmsedit_controller.rb

@@ -585,8 +585,9 @@ def read_drg_cms_form
   @ids = ids.split(';').inject([]) { |r,v| r << v }
 # formname defaults to last table specified
   dc_deprecate("Parameter :formname will be deprecated in future. Use :form_name instead") if params[:formname]
-  form_name = params[:formname] || params[:form_name] || @tables.last[1]
-  @form  = YAML.load_file( dc_find_form_file(form_name) )
+  form_name = params[:form_name] || @tables.last[1]
+  @form  = YAML.load_file( dc_find_form_file(form_name) ) rescue nil
+  return unless @form
 # when form extends another form file. 
   if @form['extend']
     form = YAML.load_file( dc_find_form_file(@form['extend']) )
@@ -611,7 +612,7 @@ end
 # load DRG form.
 ############################################################################
 def check_authorization
-  params[:table] ||= params[:formname] || params[:form_name]
+  params[:table] ||= params[:form_name]
 # Just show menu
 #  return show if params[:action] == 'show'
   return login if params[:id].in?(%w(login logout))
@@ -622,9 +623,12 @@ def check_authorization
   end
 
   read_drg_cms_form
+  
 # Permissions can be also defined on form
+  if @form.nil?
+    render plain: t('drgcms.form_error')
 #TODO So far only can_view is used. Think about if using other permissions has sense
-  if @form['permissions'].nil? or @form['permissions']['can_view'].nil? or
+  elsif @form['permissions'].nil? or @form['permissions']['can_view'].nil? or
     dc_user_has_role(@form['permissions']['can_view'])
 # Extend class with methods defined in drgcms_controls module. May include embedded forms therefor ; => _ 
     controls_string = (@form['controls'] ? @form['controls'] : params[:table].gsub(';','_')) + '_control'

data/app/controllers/dc_application_controller.rb

@@ -103,12 +103,14 @@ def dc_get_site()
   @site
 end
 
-####################################################################
-# Determine and return site record from url. It would be nice but it is not working.
-####################################################################
-#def self.dc_get_site_() #:nodoc:
-#  self.dc_get_site()
-#end
+##########################################################################
+# Will set page title according to data on dc_page or dc_site
+#
+# Sets internal @page_title variable.
+##########################################################################
+def set_page_title()
+  @page_title = @page.title.blank? ? "#{@page.subject} - #{@site.page_title}" : @page.title
+end
 
 ########################################################################
 # Searches forms path for file_name and returns full file name or nil if not found.
@@ -326,7 +328,7 @@ def dc_process_default_request()
 # HOMEPAGE. When no parameters is set
   params[:path] = @site.homepage_link if params[:id].nil? and params[:path].nil?
 # some other process request. It shoud fail if not defined
-  return eval(@site.request_processor) if !@site.request_processor.blank?
+  return send(@site.request_processor) unless @site.request_processor.blank?
 
 # Search for page 
   pageclass = @site.page_table.classify.constantize
@@ -365,7 +367,7 @@ def dc_process_default_request()
 # Log only visits from non-editors
     dc_log_visit()
   end
-  @page_title = @page.title.blank? ? "#{@site.page_title}-#{@page.subject}" : @page.title
+  set_page_title()
   get_design_and_render @design
 end
 

data/app/controllers/dc_page_control.rb

@@ -44,9 +44,9 @@ end
 # Called just after record is saved to DB.
 ######################################################################
 def dc_after_save()
-  if params[:_record][:_update_menu] == '1'
-    menu_class = dc_get_site.menu_class.classify.constantize
-    menu_class.update_menu_item_link(@record)
+  if params[:_record] and params[:_record][:_update_menu] == '1'
+#    menu_class = dc_get_site.menu_class.classify.constantize
+    dc_get_site.menu_klass.update_menu_item_link(@record)
   end
 end
 

data/app/forms/all_options.yml

@@ -121,25 +121,26 @@ form:
       
   tabs:
     tab1:
-      columns: 3 
 
       10:
         name: name
         type: text_field
+        type: text_with_select
         type: hidden_field
         type: readonly
         type: file_select
-        
-        colspan: 2
+
         size: 50 or
         html:
           size: 50
+        group: 3
       40:
         name: dc_site_id
         type: select
         multiple: true || 1
         eval: "dc_choices4('model','description_field_name','_id',site: :with_nil)"
         eval: ModelName.choices4_site
+        eval: dc_big_table 'key-name'
         html:
           include_blank: true        
 

data/app/forms/dc_journal.yml

@@ -47,39 +47,42 @@ form:
       5:
         name: operation
         type: text_field
+        readonly: yes
         html:
           size: 10
       10:
         name: time
         type: datetime_select
+        readonly: yes
       20:
         name: site_id
         type: select
         eval: DcSite.choices4_site
+        readonly: yes
       30:
         name: user_id
         type: text_autocomplete
         search: dc_user.name
-        html:
-          size: 30 
+        readonly: yes
+        size: 30 
       40:
         name: tables
         type: text_field
-        html:
-          size: 50
+        readonly: yes
+        size: 50
       50:
         name: doc_id
         type: text_field
-        html:
-          size: 25
+        readonly: yes
+        size: 25
       60:
         name: ids
         type: text_field
-        html:
-          size: 70
+        readonly: yes
+        size: 70
 
       70:
         name: ip
         type: text_field
-        html:
-          size: 15
+        readonly: yes
+        size: 15

data/app/helpers/cmsedit_helper.rb

@@ -74,7 +74,6 @@ EOT
       url['action']     = yaml['action'] || action
       url['table']      = yaml['table']  if yaml['table']
       url['form_name']  = yaml['form_name'] if yaml['form_name']
-      url['form_name']  = yaml['formname']  if yaml['formname']
     end
 # html link options
     yhtml = yaml['html'] || {}
@@ -254,7 +253,6 @@ def dc_actions_for_result(document)
       parms['action']     = yaml['action']     if yaml['action']
       parms['table']      = yaml['table']      if yaml['table']
       parms['form_name']  = yaml['form_name']  if yaml['form_name']
-      parms['form_name']  = yaml['formname']   if yaml['formname']
       parms['target']     = yaml['target']     if yaml['target']
       dc_link_or_ajax(yaml, parms)
     else # error. 
@@ -313,7 +311,7 @@ def dc_clicks_for_result(document)
     opts[:controller] = yaml['controller'] || 'cmsedit'
     opts[:action]     = yaml['action']
     opts[:table]      = yaml['table']
-    opts[:form_name]  = yaml['form_name'] || yaml['formname']
+    opts[:form_name]  = yaml['form_name']
     opts[:method]     = yaml['method'] || 'get'
     opts[:id]         = document['id']
     html << ' data-dblclick=' + url_for(opts) 
@@ -551,7 +549,7 @@ def dc_actions_for_form()
           parms['controller'] = v['controller'] 
           parms['action']     = v['action'] 
           parms['table']      = v['table'] 
-          parms['form_name']  = v['form_name'] || v['formname'] 
+          parms['form_name']  = v['form_name']
           parms['id']         = @record.id
   # additional parameters          
           v['params'].each { |k,v| parms[k] = v } if v['params']
@@ -630,12 +628,7 @@ end
 # Creates top or bottom horizontal line on form. 
 ############################################################################
 def top_bottom_line(yaml, columns=2)
-  if  yaml.class == Hash 
-    clas  = yaml['class'] 
-    style = yaml['style'] 
-  end
-  clas ||= 'dc-separator'
-  "<tr><td>&nbsp;</td></tr><tr><td colspan=\"#{columns*2}\" class=\"#{clas}\" style=\"#{style}\"></td></tr><tr><td>&nbsp;</td></tr>"
+  '<div class="dc-separator"></div>'
 end    
 
 ############################################################################
@@ -643,15 +636,15 @@ end
 ############################################################################
 def dc_fields_for_tab(fields) #:nodoc:
   @js      ||= ''
-  html       = '<table class="dc-form-table">'
+  html       = '<div class="dc-form">'
   labels_pos = dc_check_and_default(@form['form']['labels_pos'], 'right', ['top','left','right'])
-  current_column = 0
   hidden_fields  = ''
   odd_even       = nil
+  group_option, group_count = 0, 0
   reset_cycle()
 # options and fields must be separated before sorting  
-  form_options = fields.select {|field| field.class != Integer }
-  columns      = form_options.try(:[],'columns') || 1
+#  form_options = fields.select {|field| field.class != Integer }
+#  columns      = form_options.try(:[],'columns') || 1
 # Select form fields and sort them by key
   form_fields  = fields.select {|field| field.class == Integer }
   form_fields.to_a.sort.each do |element|
@@ -664,11 +657,6 @@ def dc_fields_for_tab(fields) #:nodoc:
       hidden_fields << DrgcmsFormFields::HiddenField.new(self, @record, options).render
       next
     end
-# initialize when column is 0    
-    if current_column == 0 
-      odd_even = cycle('odd','even') 
-      current_column = columns
-    end
 # label
     text = if options['text']
       t(options['text'], options['text'])
@@ -691,28 +679,39 @@ def dc_fields_for_tab(fields) #:nodoc:
       "Error: Code for field type #{options['type']} not defined!"
     end
 # Line separator
-    html << top_bottom_line(options['top-line'], columns) if options['top-line']
-    html << '<tr>' if current_column == columns
-    colspan = options['colspan'] || 1
+    html << top_bottom_line(options['top-line']) if options['top-line']
+# Begining of new row
+    if group_count == 0
+      html << '<div class="row-div">' 
+      odd_even = cycle('odd','even')
+      group_count  = options['group'] || 1 
+      group_option = options['group'] || 1 
+    end
 #    
     html << if labels_pos == 'top'
-      %Q[<td class="dc-form-label-top dc-color-#{odd_even} dc-align-left" 
-      title="#{help}" colspan="#{colspan*2}">
-      <div><label for="record_#{options['name']}">#{text} </label></div>
-      <div id="td_record_#{options['name']}">#{field_html}</div></td> ]
-    else  
-      %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}" 
-       colspan="#{colspan*2 - 1}">#{field_html}
-      </td> ]
+%Q[
+<div class="dc-form-label-top dc-color-#{odd_even} dc-align-left" title="#{help}">
+  <label for="record_#{options['name']}">#{text} </label>
+  <div id="td_record_#{options['name']}">#{field_html}</div>
+</div> ]
+    else
+      label_width = 14
+      # less place for label when more then 1 field per row
+      label_width = 10 if group_option > 1 and group_option != group_count
+      data_width  = (94 - 10*group_option)/group_option
+%Q[
+<div class="dc-form-label dc-color-#{odd_even} dc-align-#{labels_pos}" style="width:#{label_width}%;" title="#{help}">
+  <label for="record_#{options['name']}">#{text} </label>
+</div>
+<div id="td_record_#{options['name']}" class="dc-form-field dc-color-#{odd_even}" style="width:#{data_width}%;">#{field_html}</div>
+]
     end
-# check if  must go to next line    
-    current_column -= colspan
-    html << '</tr>' if current_column == 0
-    html << top_bottom_line(options['bottom-line'], columns) if options['bottom-line']
+# check if must go to next row
+    group_count -= 1
+    html << '</div>' if group_count == 0
+    html << top_bottom_line(options['bottom-line']) if options['bottom-line']
   end
-  html << '</table>' << hidden_fields
+  html << '</div>' << hidden_fields
 end
 
 ############################################################################

data/app/helpers/dc_application_helper.rb

@@ -481,7 +481,7 @@ def dc_link_for_create(opts)
   title = opts.delete('title') #
   title = t(title, title) if title
   target = opts.delete('target')  || 'iframe_cms'
-  opts['form_name']  ||= opts['formname'] || opts['table'].to_s.split(';').last
+  opts['form_name']  ||= opts['table'].to_s.split(';').last
   opts['action']       = 'new'
   opts['controller'] ||= 'cmsedit'
   js = "$('##{target}').attr('src', '#{_origin.url_for(opts)}'); return false;"
@@ -511,7 +511,7 @@ def dc_link_for_edit(opts)
   icon   = opts.delete('icon') || 'edit lg'
   opts['controller'] ||= 'cmsedit'
   opts['action']     ||= 'edit'
-  opts['form_name']  ||= opts['formname'] || opts['table'].to_s.split(';').last
+  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'})
@@ -931,7 +931,7 @@ def dc_choices4_cmsmenu()
         { controller: value['controller'], 
           action: value['action'], 
           table: value['table'],
-          form_name: value['form_name'] || value['formname'] || value['table'],
+          form_name: value['form_name'] || value['table'],
           target: value['target'] || 'iframe_cms',
         }
         "<li>#{dc_link_to(t(value['caption']), value['icon'] || '', opts)}</li>"
@@ -1225,7 +1225,7 @@ def dc_iframe_edit(table, opts={})
     params[:action]     = (params[:oper] and (params[:oper] == 'edit')) ? 'edit' : 'index'
     params[:action]     = opts[:action] unless params[:oper]
     params[:table]      ||= table 
-    params[:form_name]  ||= opts[:form_name] || opts[:formname] || table 
+    params[:form_name]  ||= opts[:form_name] || table 
     params[:id]         ||= params[:idp] || opts[:id]
     params[:readonly]   ||= opts[:readonly]
     params[:path]       = nil

data/app/helpers/dc_part_renderer.rb

@@ -126,7 +126,7 @@ end
 #     </div>
 ########################################################################
 def default
-  html = ''
+  html = "<div class=\"#{@opts[:div_class]}\">"
 # Load all parts only once per call  
   load_parts if @parent.parts.nil?
   dc_deprecate 'DcPart: Parameter location will be deprecated! Please use position keyword.' if @opts['location']
@@ -145,7 +145,7 @@ def default
       html << render_particle(part[0], @opts) 
     end
   end
-  html
+  html << "</div>"
 end
 
 ########################################################################

data/app/models/drgcms_form_fields.rb

@@ -118,7 +118,7 @@ end
 ####################################################################
 def ro_standard(value=nil)
   value = @record[@yaml['name']] if value.nil? and @record.respond_to?(@yaml['name']) 
-  @html << (value.blank? ? '' : "<table class='dc-readonly'><td>#{value}</td></table>")
+  @html << (value.blank? ? '' : "<div class='dc-readonly'>#{value}</div>")
   self
 end
 
@@ -261,7 +261,7 @@ class Readonly < DrgcmsField
 ###########################################################################
 def render 
   @html << @parent.hidden_field('record', @yaml['name']) # retain field as hidden field
-  @html << '<table class="dc-readonly"><td>'
+  @html << '<div class="dc-readonly">'
   
   @html << if @yaml['eval']
     if @yaml['eval'].match('dc_name4_id')
@@ -279,7 +279,7 @@ def render
   else
     @parent.dc_format_value(@record[@yaml['name']],@yaml['format'])    
   end  
-  @html << '</td></table>'
+  @html << '</div>'
   self
 end
 end
@@ -384,15 +384,15 @@ class JournalDiff < DrgcmsField
 ###########################################################################
 def render 
   @yaml['name'] = 'old' if @record[@yaml['name']].nil?
-  @html << '<table width="99%">'
+  @html << '<div class="dc-journal">'
   JSON.parse(@record[@yaml['name']]).each do |k,v|
     old_value = v.class == Array ? v[0] : v
     new_value = v.class == Array ? v[1] : v
-    @html << "<tr><td style='background-color: #654ddd;'>#{@parent.check_box('select', k)} #{k}:</td></tr>
-             <tr><td style='background-color: #ffe;'>- #{old_value}</td></tr>
-             <tr><td style='background-color: #eff;'>+ #{new_value}</td></tr>"
+    @html << "<div style='background-color: #eee;'>#{@parent.check_box('select', k)} #{k}</div>
+              <div style='background-color: #fcc;'>-<br>#{old_value}</div>
+              <div style='background-color: #cfc;'>+<br>#{new_value}</div><br>"
   end
-  @html << '</table>'
+  @html << '</div>'
   self
 end
 end
@@ -485,7 +485,7 @@ def render
   @yaml['html']['value'] = ''   # must be. Otherwise it will look into record and return error
   @yaml['html']['placeholder'] = t('drgcms.search_placeholder')
   _name = '_' + @yaml['name']
-  @html << '<table class="ui-autocomplete-table"><td><div class="ui-autocomplete-border">'
+  @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.
 
   record = record_text_for(@yaml['name'])    
@@ -513,7 +513,7 @@ def render
       end
     end
   end
-  @html << "</div></div></td></table>"
+  @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'), '#', 
             onclick: "$('#rec_id').hide(); var v = $('##{record}_#{@yaml['name']}_rec_id'); v.val(\"-\" + v.val());return false;")
@@ -1184,10 +1184,10 @@ def render
   elsif @record and @record[@yaml['name']]
     @record[@yaml['name']]
   end
-# Found value to be written in field  
+# Found value to be written in field. If field is not found write out value.
   if value
     record = t.find(value)
-    value_displayed = record.send(ret_name) if record      
+    value_displayed = record ? record.send(ret_name) : value
   end
 # return if readonly
   return ro_standard(value_displayed) if @readonly
@@ -1264,7 +1264,7 @@ class TextArea < DrgcmsField
 ###########################################################################
 def ro_standard
   value = @record[@yaml['name']]
-  @html << "<table class='dc-readonly'><td>#{value.gsub("\n",'<br>')}</td></table>" unless value.blank?
+  @html << "<div class='dc-readonly'>#{value.gsub("\n",'<br>')}</div>" unless value.blank?
   self
 end
 

data/config/locales/drgcms_en.yml

@@ -58,7 +58,8 @@ en:
     login: Login into CMS
     username: User name
     password: Password
-
+    form_error: Error loading form #{form_name}
+    
     edit: Edit
     show: Prikaz
     new: New

data/config/locales/drgcms_sl.yml

@@ -58,7 +58,7 @@ sl:
     login: Prijava v CMS
     username: Uporabnik
     password: Geslo
-    
+    form_error: Napaka pri branju forme #{form_name}
 
     edit: Urejanje
     show: Prikaz

data/lib/drg_cms/version.rb

@@ -1,4 +1,4 @@
 module DrgCms #:nodoc:
   # drg_cms gem version
-  VERSION = "0.5.52.3"
+  VERSION = "0.5.52.5"
 end

data/lib/generators/new_drg_form/new_drg_form_generator.rb

@@ -2,7 +2,7 @@ class NewDrgFormGenerator < Rails::Generators::NamedBase
   
 source_root File.expand_path('../templates', __FILE__)
 #desc "This generator creates form for model at app/forms"
-#argument :formname, :type => :string, :default => ''
+#argument :form_name, :type => :string, :default => ''
 class_option :tabs, :type => :boolean, :default => false, :description => "Create form with tabulators" 
 
 ###########################################################################
@@ -11,12 +11,12 @@ class_option :tabs, :type => :boolean, :default => false, :description => "Creat
 def create_form_file
 #:TODO: find out how to prevent error when model class is not defined
   @file_name = file_name
-  formname = file_name #if formname.size == 0
+  form_name = file_name #if formname.size == 0
   @model = file_name.classify.constantize rescue nil
   return (p "Model #{file_name.classify} not found! Aborting.") if @model.nil?
 #  
   yml = top_level_options + index_options + result_set_options + form_top_options + form_fields_options + localize_options
-  create_file "app/forms/#{formname}.yml", yml
+  create_file "app/forms/#{form_name}.yml", yml
 end
 
 private
@@ -52,7 +52,7 @@ index:
 #      controller: controller_name
 #      action: action_name
 #      table: table_name
-#      formname: form_name
+#      form_name: form_name
 
 EOT
 end
@@ -75,7 +75,7 @@ result_set:
 #      controller: controller_name
 #      action: action_name
 #      table: table_name
-#      formname: form_name
+#      form_name: form_name
 #      target: target      
 #      method: (get),put,post      
 # 
@@ -172,7 +172,7 @@ def embedded_form_field(offset)
     yml << ' '*offset + "#{field_index}:\n"
     yml << ' '*(offset+2) + "name: #{embedded_name}\n"
     yml << ' '*(offset+2) + "type: embedded\n"
-    yml << ' '*(offset+2) + "formname: #{embedded_name[0,embedded_name.size - 1]}\n"
+    yml << ' '*(offset+2) + "form_name: #{embedded_name[0,embedded_name.size - 1]}\n"
     yml << '#' + ' '*(offset+2) + "html:\n"
     yml << '#' + ' '*(offset+4) + "height: 500\n"
     field_index += 10      

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.52.3
+  version: 0.5.52.5
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails