drg_cms 0.6.1.6 → 0.6.1.9

data/app/helpers/cms_index_helper.rb

@@ -50,12 +50,7 @@ def dc_actions_for_index
     actions['standard'] = nil
   end
   
-  # start div with hidden spinner image
-  html = %(
-<form id="dc-action-menu">
-  <span class="dc-spinner">#{fa_icon('spinner lg spin')}</span>
-  <ul class="dc-action-menu">)
-
+  html_left, html_right = '', ''
   # Remove actions settings and sort
   only_actions = []
   actions.each { |key, value| only_actions << [key, value] if key.class == Integer }
@@ -72,7 +67,7 @@ def dc_actions_for_index
       action = 'link' 
     end
     # if return_to is present link directly to URL
-    if action == 'link' and yaml['url']
+    if action == 'link' && yaml['url']
       url = yaml['url']
     else
       url['controller'] = yaml['controller'] if yaml['controller']
@@ -82,53 +77,57 @@ def dc_actions_for_index
       url['control']    = yaml['control'] if yaml['control']
     end
     # html link options
-    yhtml = yaml['html'] || {}
-    yhtml['title'] = yaml['title'] if yaml['title']
-    code = case
+    html_options = yaml['html'] || {}
+    html_options['title'] = yaml['title'] if yaml['title']
+    case
     # sort
-    when action == 'sort' then 
-      choices = [['id','id']]
+    when action == 'sort'
+      choices = [%w[id id]]
       if @form['index']['sort']
-        @form['index']['sort'].split(',').each do |s| 
-          s.strip!
-          choices << [ t("helpers.label.#{@form['table']}.#{s}"), s ]
+        @form['index']['sort'].split(',').each do |e|
+          e.strip!
+          choices << [ t("helpers.label.#{@form['table']}.#{e}"), e ]
         end
       end
-      fa_icon('sort-alpha-asc') + ' ' + t('drgcms.sort') + ' ' + 
-              select('sort', 'sort', choices, { include_blank: true }, 
-              { class: 'drgcms_sort', 'data-table' => @form['table'], 'data-form' => params['form_name']} )
+      data = t('drgcms.sort') + select('sort', 'sort', choices, { include_blank: true }, { class: 'dc-sort-select',
+                                 'data-table' => @form['table'], 'data-form' => CmsHelper.form_param(params)} )
+      html_right << %(<li><div class="dc-sort">#{data}</li>)
 
     # filter
-    when action == 'filter' then 
-      caption = t('drgcms.filter')
-      caption << '&nbsp;' + fa_icon('caret-down lg') + DcFilter.menu_filter(self)
-      # add filter OFF link
-      sess = session[@form['table']]
-      if sess and sess[:filter]
-        caption << '&nbsp;&nbsp;' + dc_link_to(nil,'remove lg',
-                   { controller: 'cmsedit', filter: 'off', table: @form['table'], form_name: params['form_name'] },
-                   { title: DcFilter.title4_filter_off(sess[:filter]) })
-      end
-      caption
+    when action == 'filter'
+      table = session[@form['table']]
+      url = table&.dig(:filter) ?
+            url_for(controller: 'cmsedit', action: 'run', control: 'cmsedit.filter_off', t: @form['table'], f: CmsHelper.form_param(params)) :
+            ''
+      html_right << %(
+<li>
+  <div class="dc-filter" title="#{DcFilter.title4_filter_off(table)}" data-url="#{url.html_safe}">
+    #{mi_icon(url.blank? ? 'search' : 'search_off') }#{DcFilter.menu_filter(self).html_safe}
+  </div>
+</li>#{DcFilter.get_filter_field(self)}).html_safe
 
     # new
-    when action == 'new' then
+    when action == 'new'
       caption = yaml['caption'] || 'drgcms.new'
-      html << "<li class=\"dc-link plus-link dc-animate\">#{dc_link_to(caption, 'plus', url, yhtml )}</li>"
-      next
+      html_options['class'] = 'dc-link'
+      html_left << "<li>#{dc_link_to(caption, 'add', url, html_options)}</li>"
+
+    when action == 'close'
+      html_left << %(<li><div class="dc-link" onclick="window.close();"'>#{fa_icon('close')} #{t('drgcms.close')}</div></li>)
 
-    when action == 'close' then
-      html << %(<li class="dc-link dc-animate" onclick="window.close();"'>#{fa_icon('close')} #{t('drgcms.close')}</li>)
-      next
+    when action == 'back'
+      html_left << %(<li><div class="dc-link" onclick="history.back();"'>#{fa_icon('arrow_back')} #{t('drgcms.back')}</div></li>)
 
     # menu
-    when action == 'menu' then
-      if options['caption']
-        caption = t(options['caption'], options['caption']) + '&nbsp;' + fa_icon('caret-down lg')
-        caption + eval(options['eval'])
-      else # when caption is false, provide own actions
-        eval(options['eval'])
-      end
+    when action == 'menu'
+      code = if options['caption']
+               caption = t(options['caption'], options['caption']) + '&nbsp;' + fa_icon('caret-down')
+               caption + eval(options['eval'])
+             else # when caption is false, provide own actions
+               eval(options['eval'])
+             end
+      html_left << %(<li><div class="dc-link">#{code}</div></li>)
+
 =begin
 # reorder      
     when action == 'reorder' then  
@@ -140,27 +139,34 @@ def dc_actions_for_index
       dc_link_to( caption, 'reorder', parms, method: :delete )              
 =end     
     when action == 'script'
-      html << dc_script_action(options)
-      next
+      html_left << dc_script_action(options)
 
     when action == 'field'
-      html << dc_field_action(yaml) 
-      next 
+      html_right << dc_field_action(yaml)
 
-    when %w(ajax link window submit).include?(action)
-      html << dc_link_ajax_window_submit_action(options, nil)
-      next
+    when %w(ajax link window popup submit).include?(action)
+      html_left << dc_link_ajax_window_submit_action(options, nil)
 
     else
-      caption = yaml['caption'] || yaml['text']
-      icon    = yaml['icon'] ? yaml['icon'] : action
-      dc_link_to(caption, icon, url, yhtml)
+      caption = dc_get_caption(yaml) || t("drgcms.#{action}")
+      icon    = yaml['icon'] || action
+      html_options['class'] = 'dc-link'
+      code = dc_link_to(caption, icon, url, html_options)
+      html_left << %(<li>#{code}</li>)
     end
-    html << "<li class=\"dc-link dc-animate\">#{code}</li>"
-    html << DcFilter.get_filter_field(self) if action == 'filter'
   end
-  html << '</ul></form>'
-  html.html_safe
+
+  %(
+<form id="dc-action-menu">
+  <span class="dc-spinner">#{fa_icon('settings-o spin')}</span>
+
+  <div class="dc-action-menu">
+    <ul class="dc-left">#{html_left}</ul>
+    <ul class="dc-right">#{html_right}</ul>
+  </div>
+<div style="clear: both;"></div>
+</form>
+).html_safe
 end
 
 ############################################################################
@@ -168,53 +174,53 @@ end
 ############################################################################
 def dc_div_filter
   choices = []
-  filter = (@form['index'] and @form['index']['filter']) ? @form['index']['filter'] + ',' : ''
+  filter = @form['index'] && @form['index']['filter'] ? @form['index']['filter'] + ',' : ''
   filter << 'id as text_field' # filter id is added by default
   filter.split(',').each do |f| 
     f.strip!
     name = f.match(' as ') ? f.split(' ').first : f
     # like another field on the form
-    if f.match(' like ')
-      a    = f.split(' ')
-      name = a.first
-      f    = a.last
-    end
-    choices << [ t("helpers.label.#{@form['table']}.#{name}", name), f ] 
+    name, like, f = f.split(' ') if f.match(' like ')
+    choices << [ t("helpers.label.#{@form['table']}.#{name}", name), f ]
+  end
+  choices4_operators = t('drgcms.choices4_filter_operators').chomp.split(',').inject([]) do |r, v|
+    r << (v.match(':') ? v.split(':') : v )
   end
-  choices4_operators = t('drgcms.choices4_filter_operators').chomp.split(',').inject([]) {|r,v| r << (v.match(':') ? v.split(':') : v )}
   # currently selected options
-  if session[@form['table']] and session[@form['table']][:filter]
+  if session[@form['table']] && session[@form['table']][:filter]
     field_name, operators_value, dummy = session[@form['table']][:filter].split("\t")
   else
     field_name, operators_value = nil, nil
   end
-  #{ form_tag :table => @form['table'], filter: :on, filter_input: 1, action: :index, method: :post }
-  url = url_for(table: @form['table'],form_name: params['form_name'], filter: :on, filter_input: 1, action: :index, controller: :cmsedit)  
-  html =<<EOT
+  url_on  = url_for(controller: 'cmsedit', action: :run, control: 'cmsedit.filter_on' ,
+                    t: CmsHelper.table_param(params), f: CmsHelper.form_param(params), filter_input: 1)
+  url_off = url_for(controller: 'cmsedit', action: :run, control: 'cmsedit.filter_off',
+                    t: CmsHelper.table_param(params), f: CmsHelper.form_param(params))
+  %(
   <div id="drgcms_filter" class="div-hidden">
     <h1>#{t('drgcms.filter_set')}</h1>
     
     #{ select(nil, 'filter_field1', options_for_select(choices, field_name), { include_blank: true }) }
     #{ select(nil, 'filter_oper', options_for_select(choices4_operators, operators_value)) }
     <div class="dc-menu">
-      <div class="dc-link dc-animate drgcms_popup_submit" data-url="#{url}">#{fa_icon('check-square-o')} #{t('drgcms.filter_on')}</div>
-      <div class="dc-link dc-animate">#{dc_link_to('drgcms.filter_off','close', {action: :index, filter: 'off', table: @form['table'], form_name: params['form_name']}) }</div>
+      <div class="dc-link dc-filter-set" data-url="#{url_on}">#{fa_icon('done')} #{t('drgcms.filter_on')}</div>
+      <div class="dc-link-ajax" data-url="#{url_off}">
+         #{mi_icon('close')}#{t('drgcms.filter_off')}
+      </div>
     </div>
-  </div>
-EOT
-  html.html_safe
+  </div>).html_safe
 end
 
 ############################################################################
 # Creates popup div for setting filter on result set header.
 ############################################################################
 def dc_filter_popup
-  html = %Q[<div class="filter-popup" style="display: none;">
-  <div>#{t('drgcms.filter_set')}</div>
-  <ul>]
-  url = url_for(table: @form['table'],form_name: params['form_name'], filter: :on, filter_input: 1, action: :index, controller: :cmsedit)
+  html = %(<div class="filter-popup" style="display: none;"><div>#{t('drgcms.filter_set')}</div><ul>)
+  url  = url_for(controller: 'cmsedit', action: 'run', control: 'cmsedit.filter_on',
+                 t: @form['table'], f: params['form_name'], filter_input: 1)
+
   t('drgcms.choices4_filter_operators').chomp.split(',').each do |operator_choice|
-    caption,choice = operator_choice.split(':') 
+    caption, choice = operator_choice.split(':')
     html << %Q[<li data-operator="#{choice}" data-url="#{url}">#{caption}</li>]
   end 
   html << "</ul></div>"
@@ -245,18 +251,20 @@ end
 ############################################################################
 def dc_actions_column
   actions = @form['result_set']['actions']
-  return [{}, 0] if actions.nil? || dc_dont?(actions)
+  return [{}, 0, false] if actions.nil? || dc_dont?(actions)
 
   # standard actions
-  actions = {'standard' => true} if actions.class == String && actions == 'standard'
+  actions = { 'standard' => true } if actions.class == String && actions == 'standard'
   std_actions = { 2 => 'edit', 5 => 'delete' }
   if actions['standard']
     actions.merge!(std_actions) 
     actions.delete('standard')
   end
-
-  width = @form['result_set']['actions_width'] || 18*actions.size
-  [actions, width]
+  # check must be first action
+  has_check = actions.first[1] == 'check'
+  width = actions.size == 1 ? 22 : 44
+  width = 22 if actions.size > 2 and !has_check
+  [actions, width, has_check]
 end
 
 ############################################################################
@@ -265,8 +273,8 @@ end
 def dc_actions_column_for_footer
   return '' unless @form['result_set']['actions']
 
-  ignore, width = dc_actions_column
-  %Q[<div class="actions" style="width: #{width}px;"></div>].html_safe
+  ignore, width, ignore2 = dc_actions_column
+  %(<div class="dc-result-actions" style="width: #{width}px;"></div>).html_safe
 end
 
 ############################################################################
@@ -276,57 +284,75 @@ def dc_actions_for_result(document)
   actions = @form['result_set']['actions']
   return '' if actions.nil? || @form['readonly']
 
-  actions, width = dc_actions_column()
-  html = %Q[<ul class="actions" style="width: #{width}px;">]
-  actions.sort_by(&:first).each do |k, v|
-    session[:form_processing] = "result_set:actions: #{k}=#{v}"
+  actions, width, has_check = dc_actions_column()
+  has_sub_menu = actions.size > 2 || (has_check && actions.size > 1)
+
+  main_menu, sub_menu = '', ''
+  actions.sort_by(&:first).each do |num, action|
+    session[:form_processing] = "result_set:actions: #{num}=#{action}"
     parms = @parms.clone
     # if single definition simulate type parameter
-    yaml = v.class == String ? { 'type' => v } : v
-    # code already includes li tag
-    if %w(ajax link window submit).include?(yaml['type'])
+    yaml = action.class == String ? { 'type' => action } : action
+
+    if %w(ajax link window popup submit).include?(yaml['type'])
       @record = document # otherwise document fields can't be used as parameters
-      html << dc_link_ajax_window_submit_action(yaml, document)
+      html = dc_link_ajax_window_submit_action(yaml, document)
     else
-      html << '<li class="dc-link">'
-      html << case
-      when yaml['type'] == 'check' then
-        check_box_tag("check-#{document.id}", false,false,{ class: 'dc-check' })
-
-      when yaml['type'] == 'edit' then
+      caption = dc_get_caption(yaml) || "drgcms.#{yaml['type']}"
+      title   = t(yaml['help'] || caption, '')
+      caption = has_sub_menu ? t(caption, '') : nil
+      html = '<li>'
+      html << case yaml['type']
+      when 'check' then
+        main_menu << '<li>' + check_box_tag("check-#{document.id}", false, false, { class: 'dc-check' }) + '</li>'
+        next
+
+      when 'edit' then
         parms['action'] = 'edit'
-        parms['id']     = document.id
-        dc_link_to( nil, 'pencil lg', parms )
+        parms['id'] = document.id
+        dc_link_to( caption, 'edit-o', parms, title: title )
+
+      when 'show' then
+        parms['action'] = 'show'
+        parms['id'] = document.id
+        parms['readonly'] = true
+        dc_link_to( caption, 'eye', parms, title: title )
 
-      when yaml['type'] == 'duplicate' then
-        parms['id']     = document.id
+      when 'duplicate' then
+        parms['id'] = document.id
         # duplicate string will be added to these fields.
         parms['dup_fields'] = yaml['dup_fields'] 
         parms['action'] = 'create'
-        dc_link_to( nil, 'copy lg', parms, data: { confirm: t('drgcms.confirm_dup') }, method: :post )
+        dc_link_to( caption, 'content_copy-o', parms, data: { confirm: t('drgcms.confirm_dup') }, method: :post, title: title )
 
-      when yaml['type'] == 'delete' then
+      when 'delete' then
         parms['action'] = 'destroy'
-        parms['id']     = document.id
-        #parms['return_to'] = request.url
-        dc_link_to( nil, 'remove lg', parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete )
-
-      # undocumented so far
-      when yaml['type'] == 'edit_embedded'
-        parms['controller'] = 'cmsedit'
-        parms['table'] +=  ";#{yaml['table']}"
-        parms['ids']   ||= ''
-        parms['ids']   +=  "#{document.id};"
-        dc_link_to( nil, 'table lg', parms, method: :get )
-    
+        parms['id'] = document.id
+        dc_link_to( caption, 'delete-o', parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete, title: title )
+
       else # error. 
         yaml['type'].to_s
       end
       html << '</li>'
     end
+
+    if has_sub_menu
+      sub_menu << html
+    else
+      main_menu << html
+    end
   end
-  html << '</ul>'
-  html.html_safe
+
+  if has_sub_menu
+    %(
+<ul class="dc-result-actions" style="width: #{width}px;">#{main_menu}
+  <li><div class="dc-result-submenu">#{fa_icon('more_vert')}
+    <ul id="menu-#{document.id}">#{sub_menu}</ul>
+  </div></li>
+</ul>)
+  else
+    %(<ul class="dc-result-actions" style="width: #{width}px;">#{main_menu}</ul>)
+  end.html_safe
 end
 
 ############################################################################
@@ -334,12 +360,10 @@ end
 ############################################################################
 def dc_header_for_result
   html = '<div class="dc-result-header">'
-  if @form['result_set']['actions'] and !@form['readonly']
-    ignore, width = dc_actions_column()
-    if width > 0 && @form['result_set']['actions'][0].to_s == 'check'
-      check_all = fa_icon('check-square-o', class: 'dc-check-all')
-    end
-    html << %Q[<div class="actions" style="width:#{width}px;">#{check_all}</div>]
+  if @form['result_set']['actions'] && !@form['readonly']
+    ignore, width, has_check = dc_actions_column()
+    check_all = fa_icon('check-square-o', class: 'dc-check-all') if has_check
+    html << %(<div class="dc-result-actions" style="width:#{width}px;">#{check_all}</div>)
   end
   # preparation for sort icon  
   sort_field, sort_direction = nil, nil
@@ -352,25 +376,32 @@ def dc_header_for_result
       session[:form_processing] = "result_set:columns: #{k}=#{v}"
       next if v['width'].to_s.match(/hidden|none/i)
 
-      th = %Q[<div class="th" style="width:#{v['width'] || '15%'};text-align:#{v['align'] || 'left'};" data-name="#{v['name']}"]
+      th = %(<div class="th" style="width:#{v['width'] || '15%'};text-align:#{v['align'] || 'left'};" data-name="#{v['name']}")
       label = v['caption'] || v['label']
       label = (v['name'] ? "helpers.label.#{@form['table']}.#{v['name']}" : '') if label.nil?
       label = t(label) if label.match(/\./)
-      # no sorting when embedded documents or custom filter is active 
-      #sort_ok = @form['result_set'].nil? || (@form['result_set'] && @form['result_set']['filter'].nil?)
+      # no sorting when embedded documents or custom filter is active
       sort_ok = !dc_dont?(@form['result_set']['sort'], false)
       sort_ok = sort_ok || (@form['index'] && @form['index']['sort'])
       sort_ok = sort_ok && !dc_dont?(v['sort'], false)
-      if @tables.size == 1 and sort_ok
-        icon = 'sort lg'
+      if @tables.size == 1 && sort_ok
+        icon = 'sort_unset md-18'
+        filter_class = form_has_input_field?(v['name']) ? nil : 'no-filter'
         if v['name'] == sort_field
-          icon = sort_direction == '1' ? 'sort-alpha-asc lg' : 'sort-alpha-desc lg'
-        end        
-        th << ">#{dc_link_to(label, icon, sort: v['name'], table: params[:table], form_name: params[:form_name], action: :index, icon_pos: :last )}</div>"
+          icon = sort_direction == '1' ? 'sort_down md-18' : 'sort_up md-18'
+        else
+          # no icon if filter can not be set
+          icon = nil if filter_class
+        end
+        # sort and filter icon
+        icon = mi_icon(icon, class: filter_class) if icon
+        url = url_for(controller: 'cmsedit', action: 'run', control: 'cmsedit.sort', sort: v['name'],
+                      t: CmsHelper.table_param(params), f: CmsHelper.form_param(params))
+        th << %(><span data-url="#{url}">#{label}</span>#{icon}</div>)
       else
         th << ">#{label}</div>"
       end
-      html << "<div class=\"spacer\"></div>" + th
+      html << %(<div class="spacer"></div>) + th
     end
   end
   (html << '</div>').html_safe
@@ -386,8 +417,8 @@ def dc_clicks_for_result(document)
     opts = {}
     opts[:controller] = yaml['controller'] || 'cmsedit'
     opts[:action]     = yaml['action']
-    opts[:table]      = yaml['table']
-    opts[:form_name]  = yaml['form_name']
+    opts[:table]      = yaml['table'] || CmsHelper.table_param(params)
+    opts[:form_name]  = yaml['form_name'] || CmsHelper.form_param(params) || opts[:table]
     opts[:method]     = yaml['method'] || 'get'
     opts[:id]         = document['id']
     opts[:readonly]   = yaml['readonly'] if yaml['readonly']
@@ -396,8 +427,8 @@ def dc_clicks_for_result(document)
   else
      html << (' data-dblclick=' +
                 url_for(action: 'show', controller: 'cmsedit', id: document.id, ids: params[:ids],
-                        readonly: (params[:readonly] ? 2 : 1), table: params[:table],
-                        form_name: params[:form_name]) ) if @form['form']
+                        readonly: (params[:readonly] ? 2 : 1), t: CmsHelper.table_param(params),
+                        f: CmsHelper.form_param(params)) ) if @form['form']
   end
   html
 end
@@ -532,7 +563,7 @@ def dc_process_column_eval(yaml, document)
 
   # defined in helpers. For example dc_icon_for_boolean
   elsif respond_to?(yaml['eval'])
-    send(yaml['eval'], document[yaml['name']])
+    send(yaml['eval'], document, yaml['name'])
 
   # defined in model
   elsif document.respond_to?(yaml['eval'])
@@ -618,4 +649,14 @@ def dc_process_result_set_method
   end
 end
 
+############################################################################
+# Check if form has defined input field for field_name and that is not readonly field.
+############################################################################
+def form_has_input_field?(field_name)
+  field = dc_get_field_form_definition(field_name)
+  return if field.nil?
+
+  !(field['type'] == 'readonly' || field['readonly'])
+end
+
 end