drg_cms 0.5.8.2 → 0.5.9

data/app/forms/all_options.yml

@@ -93,6 +93,8 @@ form:
   title:
     edit: Title for edit
     show: Title for show
+  labels_pos: top
+    
 
   actions: standard
   actions: none
@@ -117,11 +119,15 @@ form:
       
   tabs:
     tab1:
+      columns: 3 
+
       10:
         name: name
         type: text_field
         type: hidden_field
         type: readonly
+        colspan: 2
+        size: 50 or
         html:
           size: 50
       40:
@@ -135,6 +141,8 @@ form:
       40:
         name: operation
         type: select
+        bottom-line: 1
+        top-line: 1
 
       30:
         name: sub_text
@@ -181,3 +189,12 @@ form:
       20:
         name: odhod
         type: datetime_picker          
+      40:
+        name: customer_id
+        type: text_autocomplete
+        search: 
+          table: customer
+          field: custumer_name
+          method: search
+        with_new: customer
+        size: 50         

data/app/forms/dc_category.yml

@@ -29,26 +29,26 @@ form:
 
   fields:
 
-    0:
+    10:
       name: name
       type: text_field
       html:
         size: 30
-    1:
+    20:
       name: description
       type: text_field
       html:
         size: 100
-    2:
+    30:
       name: ctype
       type: select
 
-    3:
+    40:
       name: order
       type: text_field
       html:
         size: 5
-    4:
+    50:
       name: parent
       type: select
       eval: DcCategory.values_for_parent

data/app/forms/dc_site.yml

@@ -13,7 +13,6 @@ result_set:
     10: 
       type: duplicate
       dup_fields: name
-    
 
   columns:
     1:  
@@ -32,121 +31,100 @@ form:
       10:
         name: name
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       20:
         name: description
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       30:
         name: alias_for
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       40:
         name: page_title
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       50:
         name: homepage_link
         type: text_field
-        html:
-          size: 50
+        size: 50
       60:
         name: error_link
         type: text_field
-        html:
-          size: 50
+        size: 50
       70:
         name: files_directory
         type: text_field
-        html:
-          size: 50
+        size: 50
       80:
         name: logo
         type: file_select
-        html:
-          size: 50
+        size: 50
       90:
         name: active
         type: check_box
-        html:
-          size: 50
+        size: 50
 
     2parameters:
       10:
         name: route_name
         type: text_field
-        html:
-          size: 20
+        size: 20
       20:
         name: document_extension
         type: text_field
-        html:
-          size: 10
+        size: 10
       25:
         name: site_layout
         type: text_field
-        html:
-          size: 20
+        size: 20
       30:
         name: page_table
         type: text_field
-        html:
-          size: 20
+        size: 20
       40:
         name: page_class
         type: text_field
-        html:
-          size: 20
+        size: 20
       50:
         name: menu_class
         type: text_field
-        html:
-          size: 20
+        size: 20
       60:
         name: menu_name
         type: text_with_select
         eval: dc_choices4(@record.menu_class,'description','name')
-        html:
-          size: 30
+        size: 30
       90:
         name: settings
         type: text_area
-        html:
-          size: 100x20
+        size: 100x20
 
     3advanced:        
       10:
         name: header
         type: text_area
-        html:
-          size: 100x10
+        size: 100x10
 
       20:
         name: css
         type: text_area
-        html:
-          size: 100x40
+        size: 100x40
 
     4design:        
       10:
         name: rails_view
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       20:
         name: design
         type: text_area
-        html:
-          size: 130x40
+        size: 130x40
 
     5permissions:        
 

data/app/helpers/cmsedit_helper.rb

@@ -93,9 +93,12 @@ EOT
     when action == 'filter' then 
       caption = t('drgcms.filter')
       caption << '&nbsp;' + fa_icon('caret-down lg') + DcFilter.menu_filter(self)
-# add check image, so user will know that filter is active
+# add filter OFF link
       s = session[@form['table']]
-      caption << ('&nbsp;' << fa_icon('check')) if s and s[:filter]
+      if s and s[:filter]
+        caption << '&nbsp;&nbsp;' + dc_link_to(nil,'remove lg', controller: 'cmsedit', 
+                   filter: 'off', table: @form['table'], title: 'drgcms.filter_off') 
+      end
       caption
 # new
     when action == 'new' then 
@@ -141,8 +144,9 @@ def dc_div_filter()
   url = url_for(:table => @form['table'], filter: :on, filter_input: 1, action: :index, controller: :cmsedit)  
   html =<<EOT
   <div id="drgcms_filter" class="div-hidden">
+    <h1>#{t('drgcms.filter_set')}</h1>
     <table class="dc-menu"><td>
-    #{ select(nil, 'filter_field', options_for_select(choices, field_name), { include_blank: true }) }
+    #{ select(nil, 'filter_field1', options_for_select(choices, field_name), { include_blank: true }) }
     #{ select(nil, 'filter_oper', options_for_select(choices4_operators, operators_value)) }
 
       </td>
@@ -592,50 +596,57 @@ end
 ############################################################################
 # Creates top or bottom horizontal line on form. 
 ############################################################################
-def top_bottom_line(yaml)
+def top_bottom_line(yaml, columns=2)
   if  yaml.class == Hash 
     clas  = yaml['class'] 
     style = yaml['style'] 
   end
   clas ||= 'dc-separator'
-  "<tr><td colspan=\"4\" class=\"#{clas}\" style=\"#{style}\"></td></tr>"
+  "<tr><td colspan=\"#{columns*2}\" class=\"#{clas}\" style=\"#{style}\"></td></tr>"
 end    
 
 ############################################################################
-# Creates input field for one tab. Subroutine of dc_fields_for_form.
+# Creates input fields for one tab. Subroutine of dc_fields_for_form.
 ############################################################################
 def dc_fields_for_tab(fields) #:nodoc:
-  @js ||= ''
-  double_field = 0
-  html = '<table class="dc-form-table">'
+  @js      ||= ''
+  html       = '<table class="dc-form-table">'
   labels_pos = dc_check_and_default(@form['form']['labels_pos'], 'right', ['top','left','right'])
+  current_column = 0
+  hidden_fields  = ''
+  odd_even       = nil
   reset_cycle()
-# sort fields by name  
-  fields.to_a.sort.each do |element|
+# options and fields must be separated before sorting  
+  form_options = fields.select {|field| field.class != Fixnum }
+  columns      = form_options.try(:[],'columns') || 1
+# Select form fields and sort them by key
+  form_fields  = fields.select {|field| field.class == Fixnum }
+  form_fields.to_a.sort.each do |element|
     options = element.last
     session[:form_processing] = "form:fields: #{element.first}=#{options}"
 # ignore if edit_only singe field is required
     next if params[:edit_only] and params[:edit_only] != options['name'] 
-# hidden_fields. Ignore description text, otherwise it will be seen on screen
+# hidden_fields. Add them at the end
     if options['type'] == 'hidden_field'
-      html << DrgcmsFormFields::HiddenField.new(self, @record, options).render
+      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'])
-    else
+    else 
       t_name(options['name'], options['name'].capitalize.gsub('_',' ') )
     end
-#    options['text'] ||= options['name'].capitalize.gsub('_',' ')
-#    text = options['text'].match('helpers.') ? t(options['text']) : t_name(options['name'], options['text']) 
 # help text can be defined in form or in translations starting with helpers. or as helpers.help.collection.field
     help = if options['help'] 
       options['help'].match('helpers.') ? t(options['help']) : options['help']
     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 DrgcmsFormFields.const_defined?(klas_string) # check if field type is defined
@@ -646,30 +657,29 @@ def dc_fields_for_tab(fields) #:nodoc:
     else # litle error string
       "Error: Code for field type #{options['type']} not defined!"
     end
-# Separator
-    html << top_bottom_line(options['top-line']) if options['top-line']
-# Double entry fields in one row
-    double_field = 1 if options['double']
-    html << '<tr>' if double_field < 2
+# 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 << if labels_pos == 'top' 
-      %Q[<td class="dc-form-label dc-color-#{odd_even} dc-align-left" title="#{help}" 
-      #{double_field == 0 ? 'colspan="2"' : 'style="width:50%;"'}>
+    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>]
+      <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="3"' if double_field == 0 }>#{field_html}
-      </td>
-      ]
+      <td id="td_record_#{options['name']}" class="dc-form-field dc-color-#{odd_even}" 
+       colspan="#{colspan*2 - 1}">#{field_html}
+      </td> ]
     end
-    html << '</tr>' if double_field != 1
-    double_field = 0 if double_field == 2
-    double_field = 2 if double_field == 1    
-    html << top_bottom_line(options['bottom-line']) if options['bottom-line']
+# 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']
   end
-  html << '</table></table>'
+  html << '</table>' << hidden_fields
 end
 
 ############################################################################

data/app/helpers/dc_application_helper.rb

@@ -745,34 +745,6 @@ def forms_merge(hash1, hash2) #:nodoc:
   target.delete_if{ |k,v| v.nil? }
 end
 
-##########################################################################
-# Returns choices for creating collection edit select field on CMS top menu.
-##########################################################################
-def dc_choices4_cmsmenu()
-  menus = {}
-  DrgCms.paths(:forms).reverse.each do |path|
-    filename = "#{path}/cms_menu.yml"
-    next unless File.exist?(filename)
-    menu = YAML.load_file(filename) rescue nil      # load menu
-    next if menu.nil? or !menu['menu']              # not menu or error
-    menus = forms_merge(menu['menu'], menus)        # ignore top level part
- end
-#
-  choices = []
-  menus.to_a.sort.each do |one_menu|    # sort menus, result is array of sorted hashes
-    menu = one_menu[1]                  # value is the second (1) element of array
-    next unless menu['caption']
-    choices << ["--- #{ t(menu['caption'], menu['caption']) } ---",'#']
-    menu['items'].to_a.sort.each do |item|          # as above. sort items first 
-      key, value = item[0], item[1]
-      opts = { controller: value['controller'], action: value['action'] }
-      value['params'].each {|k,v| opts.merge!(k => v) }   # add parameters to options
-      choices << [ t(value['caption'], value['caption']), url_for( opts ) ] 
-    end   
-  end
-  choices
-end
-
 ##########################################################################
 # Returns choices for creating collection edit select field on CMS top menu.
 ##########################################################################
@@ -1057,28 +1029,6 @@ def dc_big_table(key)
   ret
 end
 
-########################################################################
-########################################################################
-def iframe_edit1() #:nodoc
-#  default_table = params[:table] if default_table.nil?
-#  p params
-   parms = {}
-  ret = if params.size > 2 #and default_table  # controller, action, path is minimum
-    parms[:controller] = 'cmsedit'
-    parms[:action]     = params[:oper] ? params[:oper] : 'index'
-    parms[:table]      = params[:table]
-    parms[:formname]   = params[:formname] || params[:table]
-    parms[:id]         = params[:idp]
-  p '**************', url_for(parms)    
-    "<iframe id='iframe_edit' name='iframe_edit' src='#{url_for parms}'></iframe>"
-  else
-    "<iframe id='iframe_edit' name='iframe_edit'></iframe>"
-  end
-  #bla
-  p ret
-  ret.html_safe
-end
-
 ########################################################################
 # Will return html code required for load DRG form into iframe. If parameters 
 # are passed to method iframe url will have initial value and thus enabling automatic form

data/app/models/dc_dummy.rb

@@ -69,15 +69,13 @@ class DcDummy
 # Respond_to should always return true.
 ########################################################################
 def respond_to?(m)
-#  p "respond_to #{m}"
   true
 end
 
 ########################################################################
 # Redefine send method. Send is used to assign value by cmsedit controller.
 ########################################################################
-def send(field,value)
-#  p "send #{field} #{value}"
+def send(field,value=nil)
   if field.to_s.match('=')
     field.chomp!('=')
     @internals ||= {}
@@ -90,7 +88,6 @@ end
 # @internals array or will assign new value to @internals hash if m matches '='.
 ########################################################################
 def method_missing(m, *args, &block) #:nodoc:
-#  p "#{m},#{args},#{block}"
   @internals ||= {}
   m = m.to_s
   if m.match('=')