drg_cms 0.5.52.5 → 0.5.52.7

data/app/controllers/cmsedit_controller.rb

@@ -253,6 +253,7 @@ def index
     end
   end
 #
+  call_callback_method('dc_footer')
   respond_to do |format|
     format.html { render action:  :index }
     format.js   { render partial: :result }

data/app/controllers/dc_common_controller.rb

@@ -328,7 +328,7 @@ def fill_login_data(user, remember_me)
 # This was previously in dc_user_can. I belive it should be here. 
 #TODO This might not be the best idea. Check in the future.
   if session[:user_roles].size == 0
-    guest = DcUserRole.find_by(:system_name => 'guest')
+    guest = DcPolicyRole.find_by(:system_name => 'guest')
     session[:user_roles] << guest.id if guest
   end
 # Save remember me cookie if not CMS user and remember me is selected

data/app/forms/all_options.yml

@@ -47,17 +47,17 @@ result_set:
   table_class: tclass
   tr_style: 'color: green;'
   tr_class: trclass
+  tr_class: 
+    eval: "document['result'] < 0 ? 'color: red;' : 'color: #000;'"
   
   actions: standard
 
   actions: 
+    
     1: edit
     2: 
       type: duplicate
       dup_fields: name,another_field
-      td_class: class-name
-      td_style:
-        eval: "document['field'] == document['description'] ? 'color: gold;' : 'color: #000;'"
 
     3: 
       type: delete
@@ -77,7 +77,12 @@ result_set:
     1:  
       name: name
       eval: dc_name4_id,dc_site,name
-      style: 'align: left; width: 100px'
+      width: 10%
+      align: right (center)
+      style: 'color: red;'
+      td_class: class-name
+      td_style:
+        eval: "document['field'] == document['description'] ? 'color: gold;' : 'color: #000;'"
     2:  
       name: title
     3: 
@@ -129,6 +134,7 @@ form:
         type: hidden_field
         type: readonly
         type: file_select
+        preview: no
 
         size: 50 or
         html:

data/app/forms/dc_ad.yml

@@ -15,8 +15,10 @@ result_set:
   columns:
     0:  
       name: position
+      width: 10%
     2: 
       name: description
+      width: 30%      
     3: 
       name: displayed
     4: 

data/app/forms/dc_design.yml

@@ -19,6 +19,7 @@ result_set:
   columns:
     2: 
       name: description
+      width: 80%
 
 form:
   title: 

data/app/forms/dc_link.yml

@@ -17,6 +17,7 @@ result_set:
     1:  
       name: name
       style: "text-align: left;"
+      width: 40%
     2: 
       name: params
       style: "text-align: left;"

data/app/forms/dc_menu.yml

@@ -17,10 +17,9 @@ result_set:
   columns:
     10:  
       name: name
-      style: "text-align: left;"
     20: 
       name: description
-      style: "text-align: left;"
+      width: 50%      
 
 form:
   title: 

data/app/forms/dc_menu_item.yml

@@ -1,4 +1,4 @@
-## YAML Template for dc_simple_menu_items
+## dc_menu_items
 ---
 table: dc_menu_item
 
@@ -14,15 +14,11 @@ result_set:
   columns:
     1:  
       name: caption
-      style: "text-align: left;"
     2: 
       name: link
-      style: "text-align: left;"
-
     3: 
       name: order
-      style: "text-align: right;"
-
+      align: right
 
 form:
   title: 
@@ -35,35 +31,32 @@ form:
       10:
         name: caption
         type: text_field
-        html:
-          size: 30
+        size: 30
       20:
         name: picture
         type: file_select
-        html:
-          size: 50
+        size: 50
       30:
         name: link
         type: text_with_select
         eval: '@parent.dc_page_class.all_pages_for_site(@parent.dc_get_site)'
-        html:
-          size: 50
+        size: 50
+        
       40:
         name: link_prepend
         type: text_field
-        html:
-          size: 20
+        size: 20
          
       50:
         name: target
         type: text_field
-        html:
-          size: 10
+        size: 10
+
       60:
         name: order
         type: text_field
-        html:
-          size: 2
+        size: 2
+
       80:
         name: policy_id
         type: select

data/app/forms/dc_page.yml

@@ -17,6 +17,7 @@ result_set:
   columns:
     1:  
       name: subject
+      width: 40%
     2: 
       name: alt_link
     3: 

data/app/forms/dc_piece.yml

@@ -19,6 +19,7 @@ result_set:
       name: name
     1:  
       name: description
+      width: 30%      
     2: 
       name: div_id
     4: 

data/app/forms/dc_policy.yml

@@ -13,10 +13,10 @@ result_set:
   columns:
     1:  
       name: name
-      style: "text-align: left;"
+      width: 20%
     2: 
       name: description
-      style: "text-align: left;"
+      width: 50%
 
 form:
   title: 

data/app/forms/dc_policy_rule.yml

@@ -32,6 +32,7 @@ form:
       name: dc_policy_role_id
       type: select
       eval: DcPolicyRole.choices4_roles
+      width: 30%;
 
     20:
       name: permission

data/app/forms/dc_poll.yml

@@ -20,6 +20,7 @@ result_set:
       name: name
     2:  
       name: title
+      width: 40%
     3: 
       name: valid_from
     4: 

data/app/forms/dc_simple_menu.yml

@@ -17,10 +17,9 @@ result_set:
   columns:
     10:  
       name: name
-      style: "text-align: left;"
     20: 
       name: description
-      style: "text-align: left;"
+      width: 50%
 
 form:  
   title: 
@@ -33,25 +32,23 @@ form:
       10:
         name: name
         type: text_field
-        html:
-          size: 20
+        size: 20
 
       20:
         name: description
         type: text_field
-        html:
-          size: 20
+        size: 20
 
       30:
         name: div_name
         type: text_field
-        html:
-          size: 20
+        size: 20
+        
       40:
         name: link_prepend
         type: text_field
-        html:
-          size: 20
+        size: 20
+        
       50:
         name: dc_site_id
         type: select
@@ -71,7 +68,6 @@ form:
       20:
         name: css
         type: text_area
-        html:
-          size: 100x50
+        size: 100x50
 
   

data/app/forms/dc_simple_menu_item.yml

@@ -17,15 +17,14 @@ result_set:
 #      style: "text-align: left;"
     1:  
       name: caption
-      style: "text-align: left;"
+      width: 30%
     2: 
       name: link
-      style: "text-align: left;"
-
+      width: 30%
     3: 
       name: order
       style: "text-align: right;"
-
+      width: 5%
 form:
   title: 
     field: caption

data/app/forms/dc_site.yml

@@ -19,6 +19,7 @@ result_set:
       name: name
     2: 
       name: description
+      width: 80%
 
 form:
   title: 

data/app/helpers/cmsedit_helper.rb

@@ -48,7 +48,7 @@ def dc_actions_for_index()
 # start div with hidden spinner image 
   html = <<EOT
 <div id="dc-action-menu">
-  <span id="dc-spinner" class="div-hidden">#{fa_icon('spinner lg spin')}</span>
+  <span class="dc-spinner div-hidden">#{fa_icon('spinner lg spin')}</span>
   <ul class="dc-action-menu">
 EOT
 # Remove actions settings and sort
@@ -155,15 +155,14 @@ def dc_div_filter()
   html =<<EOT
   <div id="drgcms_filter" class="div-hidden">
     <h1>#{t('drgcms.filter_set')}</h1>
-    <table class="dc-menu"><td>
+    
     #{ 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>
-      <td class="dc-link dc-animate drgcms_popup_submit" data-url="#{url}">#{fa_icon('check-square-o')} #{t('drgcms.filter_on')}</td>
-      <td class="dc-link dc-animate">#{dc_link_to('drgcms.filter_off','close', {action: :index, filter: 'off', table: @form['table'], form_name: params['form_name']}) }</td>
-    </table>
-</div>
+    <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>
+  </div>
 EOT
   html.html_safe
 end
@@ -203,18 +202,27 @@ def dc_link_or_ajax(yaml, parms) #:nodoc:
 end
 
 ############################################################################
-# Creates actions that could be performed on single row of result set.
+# Determines actions and width of actions column
 ############################################################################
-def dc_actions_for_result(document)
+def dc_actions_column()
   actions = @form['result_set']['actions']
-  return '' if actions.nil? or @form['readonly']
 # standard actions  
   actions = {'standard' => true} if actions.class == String && actions == 'standard'
   std_actions = {' 2' => 'edit', ' 3' => 'delete'}
   actions.merge!(std_actions) if actions['standard']
 #  
   width = @form['result_set']['actions_width'] || 20*actions.size
-  html = "<td style=\"width: #{width}px;\">"
+  [ actions, "<div class=\"actions\" style=\"width: #{width}px;\">" ] 
+end
+
+############################################################################
+# Creates actions that could be performed on single row of result set.
+############################################################################
+def dc_actions_for_result(document)
+  actions = @form['result_set']['actions']
+  return '' if actions.nil? or @form['readonly']
+#  
+  actions, html = dc_actions_column()
   actions.each do |k,v|
     session[:form_processing] = "result_set:actions: #{k}=#{v}"
     next if k == 'standard' # ignore standard definition
@@ -259,7 +267,7 @@ def dc_actions_for_result(document)
       yaml['type'].to_s
     end
   end
-  html << '</td>'
+  html << '</div>'
   html.html_safe
 end
 
@@ -267,9 +275,11 @@ end
 # Creates header div for result set.
 ############################################################################
 def dc_header_for_result()
-  c = ''
-  actions = @form['result_set']['actions']
-  c = '<th>&nbsp;</th>' unless actions.nil?  or @form['readonly']
+  html = '<div class="dc-result-header">'
+  if @form['result_set']['actions'] and !@form['readonly']
+    ignore, code = dc_actions_column()
+    html << code + '</div>'
+  end
 # preparation for sort icon  
   sort_field, sort_direction = nil, nil
   if session[@form['table']]
@@ -279,8 +289,9 @@ def dc_header_for_result()
   if (columns = @form['result_set']['columns'])
     columns.each do |k,v|
       session[:form_processing] = "result_set:columns: #{k}=#{v}"
-      th = '<th '
-      v = {'name' => v} if v.class == String      
+#      
+      th = %Q[<div class="th" style="width: #{v['width'] || '15%'};text-align: #{v['align'] || 'left'};"]
+      v  = {'name' => v} if v.class == String      
       caption = v['caption'] || t("helpers.label.#{@form['table']}.#{v['name']}")
 # no sorting when embedded documents or custom filter is active 
       sort_ok = @form['result_set'].nil? || (@form['result_set'] && @form['result_set']['filter'].nil?)
@@ -290,14 +301,14 @@ def dc_header_for_result()
         if v['name'] == sort_field
           icon = sort_direction == '1' ? 'sort-alpha-asc lg' : 'sort-alpha-desc lg'
         end        
-        th << ">#{dc_link_to(caption, icon, sort: v['name'], table: params[:table], form_name: params[:form_name], action: :index )}</th>"
+        th << ">#{dc_link_to(caption, icon, sort: v['name'], table: params[:table], form_name: params[:form_name], action: :index, icon_pos: :last )}</div>"
       else
-        th << ">#{caption}</th>"
+        th << ">#{caption}</div>"
       end
-      c << th
+      html << "<div class=\"spacer\"></div>" + th
     end
   end
-  c.html_safe
+  (html << '</div>').html_safe
 end
 
 ############################################################################
@@ -347,7 +358,7 @@ end
 ############################################################################
 def dc_style_or_class(selector, yaml, value, record)
   return '' if yaml.nil?
-# alias record and value so both names can be used  
+# alias record and value so both names can be used in eval
   field = value
   document = record
   html = selector ? "#{selector}=\"" : ''
@@ -364,9 +375,9 @@ end
 # Creates tr code for each row of result set.
 ############################################################################
 def dc_row_for_result(document)
-  clas  = "dc-#{cycle('odd','even')} " + dc_style_or_class(nil,@form['result_set']['tr_class'],nil,document)
-  style = dc_style_or_class('style',@form['result_set']['tr_style'],nil,document)
-  "<tr class=\"#{clas}\" #{dc_clicks_for_result(document)} #{style}>".html_safe
+  clas  = "dc-#{cycle('odd','even')} " + dc_style_or_class(nil, @form['result_set']['tr_class'], nil, document)
+  style = dc_style_or_class('style', @form['result_set']['tr_style'], nil, document)
+  "<div class=\"dc-result-data #{clas}\" #{dc_clicks_for_result(document)} #{style}>".html_safe
 end
 
 ############################################################################
@@ -419,10 +430,19 @@ def dc_columns_for_result(document)
       "!!! #{v['name']}"
     end
 #
-    td = '<td '
-    td << dc_style_or_class('class',v['td_class'],value,document)
-    td << dc_style_or_class('style',v['td_style'] || v['style'],value,document)
-    html << "#{td}>#{value}</td>"
+    td = '<div class="spacer"></div><div class="td" '
+    td << dc_style_or_class('class', v['td_class'], value, document)
+
+    width_align = %Q[width: #{v['width'] || '15%'};text-align: #{v['align'] || 'left'};]
+    style = dc_style_or_class('style', v['td_style'] || v['style'], value, document)
+    style = if style.size > 1
+      # remove trailing " add width and add trailing " back
+      style.slice(0..-1) + width_align + '"'
+    else
+      # create style string
+      "style=\"#{width_align}\""
+    end
+    html << "#{td} #{style}>#{value}</div>"
   end
   html.html_safe
 end
@@ -470,7 +490,7 @@ def dc_actions_for_form()
 # Sort so that standard actions come first
   actions = actions.to_a.sort {|x,y| x[0].to_s <=> y[0].to_s} 
 # Add spinner to the beginning
-  c = %Q[<td id="dc-spinner" class="div-hidden">#{fa_icon('spinner lg spin')}</td>]
+  c = %Q[<span class="dc-spinner div-hidden">#{fa_icon('spinner lg spin')}</span><ul class="dc-menu">]
   
   actions.each do |element|
     session[:form_processing] = "form:actions: #{element}"
@@ -487,7 +507,7 @@ def dc_actions_for_form()
     if v.class == String
       next if params[:readonly] and !(v == 'back')
       
-      c << '<td class="dc-link dc-animate">'
+      c << '<li class="dc-link dc-animate">'
       c << case 
         when (v == 'back' or v == 'cancle') then
 # If return_to is present link directly to URL        
@@ -525,18 +545,18 @@ def dc_actions_for_form()
       when v['type'] == 'submit'
         caption = v['caption'] || 'drgcms.save'
         icon    = v['icon'] || 'save'
-        '<td class="dc-link-submit dc-animate">' + 
+        '<li class="dc-link-submit dc-animate">' + 
           dc_submit_tag(caption, icon, {:data => v['params'], :title => v['title']}) + 
-        '</td>'
+        '</li>'
 # delete with some sugar added
       when v['type'] == 'delete'
         parms['id']   = @record.id
         parms.merge!(v['params'])
         caption = v['caption'] || 'drgcms.delete'
         icon = v['icon'] || 'remove'
-        '<td class="dc-link dc-animate">' + 
+        '<li class="dc-link dc-animate">' + 
           dc_link_to( caption, icon, parms, data: t('drgcms.confirm_delete'), method: :delete ) +
-        '</td>'
+        '</li>'
 # ajax or link button
       when v['type'] == 'ajax' || v['type'] == 'link'
         parms = {}
@@ -556,7 +576,7 @@ def dc_actions_for_form()
         end
   # Error if controller param is missing
         if parms['controller'].nil?
-          "<td>#{t('drgcms.error')}</td>"
+          "<li>#{t('drgcms.error')}</li>"
         else
           v['caption'] ||= v['text'] 
           caption = t("#{v['caption'].downcase}", v['caption'])
@@ -564,11 +584,11 @@ def dc_actions_for_form()
           request = v['request'] || v['method'] || 'get'
           icon    = v['icon'] ? "#{fa_icon(v['icon'])} " : ''
           if v['type'] == 'ajax' # ajax button
-            %Q[<td class="dc-link-ajax dc-animate" id="dc-submit-ajax" data-url="#{url}" 
-               data-request="#{request}" title="#{v['title']}">#{icon}#{caption}</td>]
+            %Q[<li class="dc-link-ajax dc-animate" id="dc-submit-ajax" data-url="#{url}" 
+               data-request="#{request}" title="#{v['title']}">#{icon}#{caption}</li>]
           else                   # link button
 #            %Q[<td class="dc-link dc-animate" title="#{v['title']}><a href="#{url}">#{icon}#{caption}</a></td>]
-            %Q[<td class="dc-link dc-animate">#{dc_link_to(v['caption'],v['icon'], parms)}</td>]
+            %Q[<li class="dc-link dc-animate">#{dc_link_to(v['caption'],v['icon'], parms)}</li>]
           end
         end
 # Javascript action        
@@ -576,13 +596,13 @@ def dc_actions_for_form()
 #          v['caption'] ||= 'Caption missing!'
 #          caption = t("#{v['caption'].downcase}", v['caption'])
           data = {'request' => 'script', 'script' => v['js']}
-         %Q[<td class="dc-link-ajax dc-animate">#{ dc_link_to(v['caption'],v['icon'], '#', data: data ) }</td>]
+         %Q[<li class="dc-link-ajax dc-animate">#{ dc_link_to(v['caption'],v['icon'], '#', data: data ) }</li>]
       else
-        '<td>err2</td>'
+        '<li>err2</li>'
       end
     end
   end
-  c.html_safe
+  (c << '</ul>').html_safe
 end
 
 ############################################################################
@@ -591,13 +611,12 @@ end
 def dc_background_for_result(start)
   if start == :start
     html = '<div class="dc-result-div" ' 
-    html << (@form['result_set']['table_style'] ? "style=\"overflow-x: scroll;\" >" : '>')
-    html << "\n"  
+    html << (@form['result_set']['table_style'] ? 'style="overflow-x: scroll;" >' : '>')
   #
-    html << "<table class=\"dc-result #{@form['result_set']['table_class']}\" "
+    html << "\n<div class=\"dc-result #{@form['result_set']['table_class']}\" "
     html << (@form['result_set']['table_style'] ? "style=\"#{@form['result_set']['table_style']}\" >" : '>')
   else
-    html = '</table></div>'
+    html = '</div></div>'
   end
   html.html_safe
 end
@@ -776,29 +795,22 @@ end
 ############################################################################
 def dc_document_statistics
   return '' if @record.new_record? or dc_dont?(@form['form']['info'])
-  html =  "<div id='dc-document-info'>#{t('drgcms.doc_info')}</div>"
-#  html =  "<div id='dc-document-info'>#{fa_icon 'info-circle 2x'}</div>"
-  html =  '<div id="dc-document-info">' + fa_icon('info-circle lg') + '</div>'
+  html =  %Q[<div id="dc-document-info">#{fa_icon('info-circle lg')}</div> <div id="dc-document-info-popup" class="div-hidden"> ]
 #
-  html << "<div id='dc-document-info-popup' class='div-hidden'><table>"
   u = _get_user_for('created_by')
-  html << "<tr><td>#{t('drgcms.created_by', 'Created by')}: </td><td><b>#{u}</td></tr>" if u
+  html << %Q[<div><span>#{t('drgcms.created_by', 'Created by')}: </span><span>#{u}</span></div>] if u
   u = _get_user_for('updated_by')
-  html << "<tr><td>#{t('drgcms.updated_by', 'Updated by')}: </td><td><b>#{u}</td></tr>" if u
-  html << "<tr><td>#{t('drgcms.created_at', 'Created at')}: </td><td><b>#{dc_format_value(@record.created_at)}</td></tr>" if @record['created_at']
-  html << "<tr><td>#{t('drgcms.updated_at', 'Updated at')}: </td><td><b>#{dc_format_value(@record.updated_at)}</td></tr>" if @record['updated_at']
-  html << '</table>'
-# Copy to clipboard icon
+  html << %Q[<div><span>#{t('drgcms.updated_by', 'Updated by')}: </span><span>#{u}</span></div>] if u
+  html << %Q[<div><span>#{t('drgcms.created_at', 'Created at')}: </span><span>#{dc_format_value(@record.created_at)}</span></div>] if @record['created_at']
+  html << %Q[<div><span>#{t('drgcms.updated_at', 'Updated at')}: </span><span>#{dc_format_value(@record.updated_at)}</span></div>] if @record['updated_at']
+# copy to clipboard icon
   parms = params.clone
   parms[:controller] = 'dc_common'
   parms[:action]     = 'copy_clipboard'
   url = url_for(parms.permit!)
-#  caption = image_tag('drg_cms/copy.png', title: t('drgcms.doc_copy_clipboard'))
-#  html << %Q[<hr><img class="dc-link-img dc-link-ajax dc-animate" data-url="#{url}" data-request="get" #{caption}]
   html << fa_icon('copy 2x', class: 'dc-link-img dc-link-ajax dc-animate', 
                   'data-url' => url, 'data-request' => 'get', title: t('drgcms.doc_copy_clipboard') )
-  (html << '</div>').html_safe
-#  html.html_safe
+  (html << '</div></div>').html_safe
 end
 
 end