drg_cms 0.6.0.8 → 0.6.1.0

data/app/forms/dc_menu_item.yml

@@ -73,6 +73,7 @@ form:
       10:
         name: dc_menu_items
         type: embedded
+        caption: false
         form_name: dc_menu_item
         html:
           height: 1000

data/app/forms/dc_page.yml

@@ -143,12 +143,14 @@ form:
     3content:
       10:
         name: body
+        caption: false
         type: html_field
         options: 'height: 1000'
        
     4parts:
       10:
         name: dc_parts
+        caption: false
         type: embedded
         form_name: dc_part
         html:

data/app/forms/dc_part.yml

@@ -81,6 +81,7 @@ form:
     2content:
       10:
         name: body
+        caption: false
         type: html_field
         options: 'height: 800'
 

data/app/forms/dc_piece.yml

@@ -100,6 +100,7 @@ form:
     tab3:
       10:
         name: body
+        caption: false
         type: html_field
         options: 'height: 800'
 

data/app/forms/dc_poll.yml

@@ -102,12 +102,14 @@ form:
       10:
         name: js
         type: text_area
+        caption: false
         html:
           size: 100x50
           style: 'font-family:courier;'
     tab3:
       20:
         name: dc_poll_items
+        caption: false
         type: embedded
         form_name: dc_poll_item
         html:
@@ -115,6 +117,7 @@ form:
     tab4:
       10:
         name: form
+        caption: false
         type: text_area
         html:
           size: 100x50

data/app/forms/dc_simple_menu.yml

@@ -61,6 +61,7 @@ form:
       10:
         name: dc_simple_menu_items
         type: embedded
+        caption: false
         form_name: dc_simple_menu_item
         html:
           height: 800
@@ -68,6 +69,7 @@ form:
     tab3:
       20:
         name: css
+        caption: false
         type: text_area
         size: 100x50
 

data/app/forms/dc_site.yml

@@ -143,15 +143,11 @@ form:
       20:
         name: dc_policies
         type: embedded
+        caption: false
         form_name: dc_policy
-        html:
-          height: 800
     6parts:
       10:
         name: dc_parts
+        caption: false
         type: embedded
         form_name: dc_part
-        html:
-          height: 1000
-          
-

data/app/forms/dc_user.yml

@@ -22,8 +22,9 @@ result_set:
       name: last_name
       width: 20%
     4: 
-      name: last_visit
-      width: 10%
+      name: active
+      eval: dc_icon4_boolean
+      width: 5%
 
 form:
   title: 
@@ -32,12 +33,18 @@ form:
   actions: standard
 
   tabs:
-    tab1:
+    1base:
 
       10:
         name: username
         type: text_field
         size: 10
+        group: 2
+        html:
+          autocomplete: 'off'
+      15:
+        name: group
+        type: check_box
       20:
         name: title
         type: text_field
@@ -45,7 +52,8 @@ form:
       30:
         name: first_name
         type: text_field
-        size: 20
+        size: 30
+        group: 3
 
       40:
         name: middle_name
@@ -65,12 +73,13 @@ form:
       70:
         name: address
         type: text_field
-        size: 50
+        size: 30
+        group: 2
 
       80:
         name: post
         type: text_field
-        size: 50
+        size: 30
 
       90:
         name: country
@@ -81,11 +90,12 @@ form:
         name: email
         type: text_field
         size: 30
+        group: 2
 
       110:
         name: phone
         type: text_field
-        size: 30
+        size: 20
 
       120:
         name: birthdate
@@ -101,12 +111,16 @@ form:
       140:
         name: about
         type: text_area
-        size: 100x10
+        size: 100x5
 
       150:
         name: password
         type: password_field
         size: 20
+        group: 2
+        line: top
+        html:
+          autocomplete: 'off'
 
       160:
         name: password_confirmation
@@ -120,6 +134,8 @@ form:
         size: 20
 
       180:
-        name: signature
-        type: text_area
-        size: 100x5
+        name: member
+        type: select
+        multiple: true
+        eval: DcUser.groups_for_select
+        size: 30

data/app/forms/dc_user_role.yml

@@ -14,13 +14,16 @@ result_set:
   columns:
     1:  
       name: dc_policy_role_id
+      width: 25%
       eval: dc_name4_id,dc_policy_role,name
 
     2: 
       name: valid_from
+      width: 10%
 
     3: 
       name: valid_to
+      width: 10%
 
     4: 
       name: active

data/app/helpers/cms_common_helper.rb

@@ -44,7 +44,7 @@ module CmsCommonHelper
 # Returns: 
 # String. Translated text. 
 ####################################################################
-def self.t(key, default=nil) 
+def self.t(key, default=nil)
   c = I18n.t(key)
   if c.class == Hash or c.match( 'translation missing' )
     c = I18n.t(key, locale: 'en') 
@@ -194,12 +194,13 @@ end
 ############################################################################
 def dc_name_for_id(model, field, field_name, id=nil)
   return '' if id.nil?
+
   field_name = (field_name || 'id').strip.to_sym
   field = field.strip.to_sym
-  
   model = model.strip.classify.constantize if model.class == String
-  rec = Mongoid::QueryCache.cache { model.find_by(field_name => id) }
-  rec.nil? ? '' : (rec.send(field) rescue 'not defined')
+  doc = Mongoid::QueryCache.cache { model.find_by(field_name => id) }
+
+  doc.nil? ? '' : (doc.send(field) rescue 'not defined')
 end
 
 ############################################################################
@@ -255,6 +256,13 @@ def self.dc_format_date_time(value, format=nil)
   value.strftime(format)
 end
 
+############################################################################
+# Returns html code for displaying date/time formatted by strftime. Will return '' if value is nil.
+#
+# Parameters:
+# [value] Date/DateTime/Time.
+# [format] String. strftime format mask. Defaults to locale's default format.
+############################################################################
 def dc_format_date_time(value, format=nil) #:nodoc:
   CmsCommonHelper.dc_format_date_time(value, format)
 end
@@ -304,8 +312,65 @@ def self.dc_format_number(value=0, decimals=nil, separator=nil, delimiter=nil, c
   "#{sign}#{ar.reverse.join(delimiter)}#{separator}#{dec}" 
 end
 
+############################################################################
+# Returns html code for displaying formatted number.
+#
+# Parameters:
+# [value] Numeric number.
+# [decimals] Integer. Number of decimals
+# [separator] String. Decimals separator
+# [delimiter] String. Thousands delimiter.
+# [currency] String. Currency symbol if applied to result string.
+############################################################################
 def dc_format_number(value=0, decimals=nil, separator=nil, delimiter=nil, currency=nil) #:nodoc:
   CmsCommonHelper.dc_format_number(value, decimals, separator, delimiter, currency)
 end
 
+############################################################################
+# Create help text for fields on single tab
+############################################################################
+def dc_help_for_tab(tab)
+  return '' if tab.nil?
+
+  html = ''
+  if tab.class == Array
+    tab_name = tab.last['caption'] || tab.first
+    tab_label, tab_help = dc_tab_label_help(tab_name)
+    html << %(<div class="help-tab">#{tab_label}</div><div class="help-tab-help">#{tab_help}</div>)
+
+    tab = tab.last
+  end
+
+  tab.each do |field|
+    label, help = dc_label_help(field.last)
+    next if help.blank?
+
+    html << %(<div class="help-field"><div class="help-label">#{label}</div><div class="help-text">#{help}</div></div>)
+  end
+  html
+end
+
+############################################################################
+# Will scoop fields and help text associated with them to create basic help text.
+############################################################################
+def dc_help_fields
+  return '' if @form['form'].nil?
+
+  html = '<div class="dc-handle" data-div="#the1"></div><div id="the1">'
+  if @form['form']['tabs']
+    @form['form']['tabs'].each { |tab| html << dc_help_for_tab(tab) }
+  else
+    html << dc_help_for_tab(@form['form']['fields'])
+  end
+  html << '</div>'
+  html.html_safe
+end
+
+############################################################################
+# Will return text from help files
+############################################################################
+def dc_help_body
+  (params[:type] == 'index' ? @help['index'] : @help['form']).html_safe
+end
+
 end

data/app/helpers/cms_edit_helper.rb

@@ -33,11 +33,13 @@ module CmsEditHelper
 # Will return value when internal or additional parameters are defined in action
 # Subroutine of dc_actions_for_form.
 ############################################################################
-def dc_value_for_parameter(param)#:nodoc:
+def dc_value_for_parameter(param, current_document = nil)#:nodoc:
   if param.class == Hash
-    dc_internal_var(param['object'] || 'record', param['method'])
+    dc_internal_var(param['object'] ||= 'record', param['method'], current_document)
+  elsif param.to_s.match(/record|document/)
+    current_document ? current_document : @record
   else
-    param    
+    param
   end
 end
 
@@ -51,9 +53,10 @@ end
 def dc_is_action_active?(options)
   if options['when_new']
     dc_deprecate("when_option will be deprecated and replaced by active: not_new_record! Form #{params[:form_name]}") 
-    return !(dc_dont?(options['when_new']) and @record.new_record?)
+    return !(dc_dont?(options['when_new']) && @record.new_record?)
   end
   return true unless options['active']
+
   # alias record and document so both can be used in eval
   record = document = @record
   option = options['active']
@@ -65,8 +68,7 @@ def dc_is_action_active?(options)
       (@record.new_record? && option == 'new_record') || (!@record.new_record? && option == 'not_new_record')
     elsif option.match(/\./)
       # shortcut for method and eval option
-      parms = @record ? @record : params
-      dc_process_eval(option,parms)
+      dc_process_eval(option, self)
     else
       eval(option['eval'])
     end
@@ -74,9 +76,8 @@ def dc_is_action_active?(options)
   when option['eval'] then
     eval(option['eval'])
   when option['method'] then
-    # if record present send record otherwise send params as parameter
-    parms = @record ? @record : params
-    dc_process_eval(option['method'],parms)
+    # if record present send record otherwise send self as parameter
+    dc_process_eval(option['method'], self)
   else
     false
   end  
@@ -233,7 +234,7 @@ 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<div class=\"dc-result #{@form['result_set']['table_class']}\" "
     html << (@form['result_set']['table_style'] ? "style=\"#{@form['result_set']['table_style']}\" >" : '>')
   else
@@ -335,9 +336,9 @@ def dc_fields_for_tab(fields_on_tab) #:nodoc:
 end
 
 ############################################################################
-# Creates edit form div. 
+# Creates edit form from fields or tabs options
 ############################################################################
-def dc_fields_for_form()
+def dc_fields_for_form
   html, tabs, tab_data = '',[], ''
   @js  ||= ''
   @css ||= ''
@@ -350,10 +351,10 @@ def dc_fields_for_form()
     first = true # first tab 
     @form['form']['tabs'].keys.sort.each do |tab_name|
       next if tab_name.match('actions')
-      # Tricky. If field name is not on the tab skip to next tab
+      # Tricky when editing single field. If field is not present on the tab skip to next tab
       if params[:edit_only]
         is_on_tab = false
-        @form['form']['tabs'][tab_name].each {|k,v| is_on_tab = true if params[:edit_only] == v['name'] }
+        @form['form']['tabs'][tab_name].each { |k, v| is_on_tab = true if params[:edit_only] == v['name'] }
         next unless is_on_tab
       end
       # first div is displayed, all others are hidden
@@ -361,17 +362,18 @@ def dc_fields_for_form()
       tab_data << ' class="div-hidden"' unless first
       tab_data << " style=\"height: #{@form['form']['height']}px;\"" if @form['form']['height']
       tab_data << ">#{dc_fields_for_tab(@form['form']['tabs'][tab_name])}</div>"
-      tab_label = @form['form']['tabs'][tab_name]['caption'] || tab_name 
-      tabs << [tab_name, tab_label]
+
+      tab_label, tab_title = dc_tab_label_help(tab_name)
+      tabs << [tab_name, tab_label, tab_title]
       first = false      
     end
     # make it all work together
     html << '<ul class="dc-form-ul" >'
     first = true # first tab must be selected
-    tabs.each do |tab_name, tab_label| 
-      html << "<li id=\"li_#{tab_name}\" data-div=\"#{tab_name.delete("\s\n")}\" class=\"dc-form-li"
-      html << ' dc-form-li-selected' if first 
-      html << "\">#{t(tab_label, t_name(tab_label, tab_label))}</li>"
+    tabs.each do |tab_name, tab_label, tab_title|
+      html << %(<li id="li_#{tab_name}" data-div="#{tab_name.delete("\s\n")}" title="#{tab_title}" class="dc-form-li)
+      html << ' dc-form-li-selected' if first
+      html << "\">#{tab_label}</li>"
       first = false
     end
     html << '</ul>'
@@ -391,11 +393,11 @@ end
 # Creates head form div. Head form div is used to display header data usefull
 # to be seen even when tabs are switched.
 ############################################################################
-def dc_head_for_form()
+def dc_head_for_form
   @css ||= ''
   head = @form['form']['head']
   return '' if head.nil?
-  html    = %Q[<div class="dc-head #{head['class']}">\n<div class="dc-row">]
+  html    = %(<div class="dc-head #{head['class']}">\n<div class="dc-row">)
   split   = head['split'] || 4
   percent = 100/split
   current = 0
@@ -429,7 +431,7 @@ def dc_head_for_form()
     style = dc_style_or_class(nil, options['style'], field, @record)
     html << %Q[<div class="dc-column #{klass}" style="width:#{percent*span}%;#{style}">
   #{label.blank? ? '' : "<span class=\"label\">#{label}</span>"}
-  <span class="field">#{field}</span>
+  <span id="head-#{options['name']}" class="field">#{field}</span>
 </div>]
     current += span
     if current == split
@@ -471,8 +473,14 @@ def dc_document_statistics
   parms[:controller] = 'dc_common'
   parms[:action]     = 'copy_clipboard'
   url = url_for(parms.permit!)
-  html << fa_icon('copy 2x', class: 'dc-link-img dc-link-ajax dc-animate', 
+  html << fa_icon('copy lg', class: 'dc-link-img dc-link-ajax dc-animate',
                   'data-url' => url, 'data-request' => 'get', title: t('drgcms.doc_copy_clipboard') )
+
+  url = url_for(controller: :cmsedit, action: :index, table: 'dc_journal', filter: 'on',
+                filter_oper: 'eq', filter_field: 'doc_id', filter_value: @record.id)
+  html << fa_icon('history lg', class: 'dc-link-img dc-animate dc-window-open',
+                  'data-url' => url, title: t('helpers.label.dc_journal.tabletitle') )
+
   (html << '</div></div>').html_safe
 end