drg_cms 0.6.0.8 → 0.6.1.5

data/app/forms/dc_help_1.yml

@@ -0,0 +1,110 @@
+## Form for creating help files
+---
+table: dc_temp
+title: drgcms.dc_help.title
+control: dc_help
+
+index:
+  actions:
+
+    10:
+      type: field
+      name: select_project
+      field_type: select
+      caption: drgcms.dc_help.project
+      eval: DcHelpControl.choices_for_project
+      default:
+        eval: '@parent.session[:help_project]'
+
+    20:
+      type: field
+      name: lang_1
+      caption: drgcms.dc_help.lang
+      field_type: text_with_select
+      size: 5
+      eval: DcHelpControl.choices_for_locales
+      default:
+        eval: '@parent.session[:help_lang]'
+      html:
+        placeholder: drgcms.dc_help.lang
+
+    50:
+      type: ajax
+      caption: drgcms.dc_help.project_refresh
+      title: drgcms.dc_help.project_refresh_title
+      icon: refresh
+      action: run
+      method: post
+      control: dc_help.project_refresh
+
+    60: new
+
+result_set:
+  filter: data_filter
+  actions:
+    1: edit
+  columns:
+    10:
+      name: form_name
+      caption: drgcms.dc_help.form_name
+      width: 10%
+    20:
+      name: lang
+      caption: drgcms.dc_help.lang
+      width: 10%
+    30:
+      name: updated_at
+      caption: drgcms.dc_help.updated_at
+      width: 10%
+      format: T
+
+form:
+  actions:
+    1: back
+    2: save
+
+  title:
+    edit: dc_help edit_title
+    show: dc_help show_title
+
+  tabs:
+    1basic:
+      caption: drgcms.dc_help.1basic
+      10:
+        name: project
+        type: readonly
+        size: 20
+      20:
+        name: form_name
+        caption: drgcms.dc_help.form_name
+        type: text_with_select
+        eval: DcHelpControl.choices_for_form_name(@parent.session)
+        size: 20
+        html:
+          minlength: 4
+      30:
+        name: lang
+        caption: drgcms.dc_help.lang
+        type: text_field
+        size: 2
+        html:
+          minlength: 2
+          maxlength: 2
+
+    2index:
+      caption: drgcms.dc_help.2index
+      10:
+        name: index
+        caption: false
+        line: top
+        type: html_field
+        options: "height: 600"
+
+    3form:
+      caption: drgcms.dc_help.3form
+      10:
+        name: form
+        caption: false
+        line: top
+        type: html_field
+        options: "height: 600"

data/app/forms/dc_journal.yml

@@ -14,9 +14,11 @@ result_set:
   columns:
     10: 
       name: operation
+      width: 10%
     15: 
       name: time
-    20: 
+      width: 10%
+    20:
       name: user_id
       eval: dc_name4_id,dc_user,first_name
     30: 

data/app/forms/dc_json_ld.yml

@@ -54,6 +54,3 @@ form:
       name: dc_json_lds
       type: embedded
       table: dc_json_ld
-      html:
-        height: 400
-      

data/app/forms/dc_link.yml

@@ -51,7 +51,7 @@ form:
       name: page_id
       type: text_autocomplete
       table: 
-        eval: '@parent.session[:site_page_table]'
+        eval: '@parent.dc_get_site.page_class'
       search: subject
       size: 60
      

data/app/forms/dc_menu.yml

@@ -32,25 +32,21 @@ 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
@@ -62,13 +58,13 @@ form:
       10:
         name: dc_menu_items
         type: embedded
+        caption: false
         form_name: dc_menu_item
-        html:
-          height: 1000
+        load: delay
 
     tab3:
       20:
         name: css
+        caption: false
         type: text_area
-        html:
-          size: 100x50
+        size: 100x50

data/app/forms/dc_menu_item.yml

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

data/app/forms/dc_page.yml

@@ -99,6 +99,10 @@ form:
         eval: DcDesign.choices4_design(@parent.dc_get_site)
         html:
           include_blank: true
+      15:
+        name: div_class
+        type: text_field
+        size: 20
 
       20:
         name: menu_id
@@ -143,16 +147,17 @@ 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:
-          height: 600
+        load: delay
           
     5iframe:
       10:

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_policy.yml

@@ -40,8 +40,7 @@ form:
     40:
       name: message
       type: text_area
-      html:
-        size: 100x5
+      size: 100x5
 
     50:
       name: active
@@ -51,6 +50,4 @@ form:
       name: dc_policy_rules
       type: embedded
       form_name: dc_policy_rule
-      html:
-        height: 400
-        
+

data/app/forms/dc_poll.yml

@@ -37,14 +37,12 @@ form:
       10:
         name: name
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       20:
         name: title
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       30:
         name: sub_text
@@ -54,8 +52,7 @@ form:
       35:
         name: pre_display
         type: text_field
-        html:
-          size: 50
+        size: 50
       40:
         name: operation
         type: select
@@ -63,8 +60,7 @@ form:
       50:
         name: parameters
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       60:
         name: display
@@ -73,8 +69,7 @@ form:
       70:
         name: captcha_type
         type: text_field
-        html:
-          size: 10
+        size: 10
 
       80:
         name: valid_from
@@ -92,8 +87,7 @@ form:
       100:
         name: css
         type: text_area
-        html:
-          size: 100x20
+        size: 100x20
 
       110:
         name: active
@@ -102,20 +96,23 @@ form:
       10:
         name: js
         type: text_area
+        caption: false
+        size: 100x50
         html:
-          size: 100x50
           style: 'font-family:courier;'
     tab3:
       20:
         name: dc_poll_items
+        caption: false
         type: embedded
         form_name: dc_poll_item
-        html:
-          height: 800      
+        load: delay
+
     tab4:
       10:
         name: form
+        caption: false
         type: text_area
+        size: 100x50
         html:
-          size: 100x50
           style: 'font-family:courier;'

data/app/forms/dc_seo.yml

@@ -29,5 +29,4 @@ form:
         help: helpers.help.dc_seo.dc_json_lds
         type: embedded
         table: dc_json_ld
-        html:
-          height: 600
+        load: delay

data/app/forms/dc_simple_menu.yml

@@ -61,13 +61,14 @@ form:
       10:
         name: dc_simple_menu_items
         type: embedded
+        caption: false
         form_name: dc_simple_menu_item
-        html:
-          height: 800
+        load: delay
 
     tab3:
       20:
         name: css
+        caption: false
         type: text_area
         size: 100x50
 

data/app/forms/dc_site.yml

@@ -132,8 +132,7 @@ form:
         type: text_area
         size: 130x40
 
-    5permissions:        
-
+    5permissions:
       10:
         name: inherit_policy
         type: select
@@ -143,15 +142,13 @@ form:
       20:
         name: dc_policies
         type: embedded
+        caption: false
         form_name: dc_policy
-        html:
-          height: 800
+        load: delay
+
     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,64 @@ 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.gsub("\n",'<br>')}</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 = '<a id="fields"></a>'
+  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.html_safe
+end
+
+############################################################################
+# Will return text from help files
+############################################################################
+def dc_help_body
+  (params[:type] == 'index' ? @help['index'] : @help['form']).html_safe
+end
+
 end