drg_cms 0.4.39 → 0.4.53

data/app/controllers/dc_main_controller.rb

@@ -23,7 +23,7 @@
 #++
 
 ##########################################################################
-# This is entry point for processing pages with DRG
+# DRG CMS entry point for processing page request.
 ##########################################################################
 class DcMainController < DcApplicationController
 
@@ -34,7 +34,4 @@ def page
   dc_process_default_request
 end
 
-# It's easy to alias default action
-#alias :default_action :page
-
 end

data/app/controllers/drgcms_controls/dc_page_controls.rb

@@ -22,6 +22,9 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+######################################################################
+# DrgcmsControls for DcPage model.
+######################################################################
 module DrgcmsControls::DcPageControls
 
 ######################################################################

data/app/forms/all_options.yml

@@ -174,3 +174,6 @@ form:
         formname: dc_poll_item
         html:
           height: 800      
+      20:
+        name: odhod
+        type: datetime_picker          

data/app/forms/cms_menu.yml

@@ -22,121 +22,104 @@
 #++
 
 menu:
-  section: drgcms.system_menu
-  items:
-  - 
-     caption: helpers.label.dc_site.tabletitle
-     controller: cmsedit
-     picture: dc_site.png
-     params:
-       table: dc_site
-  - 
-     caption: helpers.label.dc_design.tabletitle
-     controller: cmsedit
-     picture: dc_design.png
-     params:
-       table: dc_design
-  - 
-     caption: helpers.label.dc_category.tabletitle
-     controller: cmsedit
-     picture: dc_category.png
-     params:
-       table: dc_category
-  -
-     caption: helpers.label.dc_page.tabletitle
-     controller: cmsedit
-     picture: dc_page.png
-     params:
-       table: dc_page
-  - 
-     caption: helpers.label.dc_piece.tabletitle
-     controller: cmsedit
-     picture: dc_piece.png
-     params:
-       table: dc_piece
-  - 
-     caption: helpers.label.dc_link.tabletitle
-     controller: cmsedit
-     picture: dc_link.png
-     params:
-       table: dc_link
-  - 
-     caption: helpers.label.dc_menu.tabletitle
-     controller: cmsedit
-     picture: dc_menu.png
-     params:
-       table: dc_menu
-  - 
-     caption: helpers.label.dc_simple_menu.tabletitle
-     controller: cmsedit
-     picture: dc_simple_menu.png
-     params:
-       table: dc_simple_menu
-  - 
-     caption: helpers.label.dc_poll.tabletitle
-     controller: cmsedit
-     picture: dc_poll.png
-     params:
-       table: dc_poll
-  - 
-     caption: helpers.label.dc_ad.tabletitle
-     controller: cmsedit
-     picture: dc_ad.png
-     params:
-       table: dc_ad
-  - 
-     caption: helpers.label.dc_user.tabletitle
-     controller: cmsedit
-     picture: dc_user.png
-     params:
-       table: dc_user
-  - 
-     caption: helpers.label.dc_mail.tabletitle
-     controller: cmsedit
-     picture: dc_mail.png
-     params:
-       table: dc_mail
-  - 
-     caption: helpers.label.dc_mail_list.tabletitle
-     controller: cmsedit
-     picture: dc_mail_list.png
-     params:
-       table: dc_mail_list
-  - 
-     caption: helpers.label.dc_mail_address.tabletitle
-     controller: cmsedit
-     picture: dc_mail_address.png
-     params:
-       table: dc_mail_address
-  - 
-     caption: helpers.label.dc_big_table.tabletitle
-     controller: cmsedit
-     picture: dc_big_table.png
-     params:
-       table: dc_big_table
-  - 
-     caption: helpers.label.dc_policy_role.tabletitle
-     controller: cmsedit
-     picture: dc_policy_role.png
-     params:
-       table: dc_policy_role
-  - 
-     caption: helpers.label.dc_permission.tabletitle
-     controller: cmsedit
-     picture: dc_permission.png
-     params:
-       table: dc_permission
-  - 
-     caption: helpers.label.dc_folder_permission.tabletitle
-     controller: cmsedit
-     picture: dc_permission.png
-     params:
-       table: dc_folder_permission
-  - 
-     caption: helpers.label.dc_journal.tabletitle
-     controller: cmsedit
-     picture: dc_journal.png
-     params:
-       table: dc_journal
-       
+  50_system_menu:
+    caption: drgcms.system_menu
+    items:
+      10: 
+        caption: helpers.label.dc_site.tabletitle
+        controller: cmsedit
+        picture: dc_site.png
+        params:
+          table: dc_site
+      20: 
+        caption: helpers.label.dc_design.tabletitle
+        controller: cmsedit
+        picture: dc_design.png
+        params:
+          table: dc_design
+      30: 
+        caption: helpers.label.dc_category.tabletitle
+        controller: cmsedit
+        picture: dc_category.png
+        params:
+          table: dc_category
+      40: 
+        caption: helpers.label.dc_page.tabletitle
+        controller: cmsedit
+        picture: dc_page.png
+        params:
+          table: dc_page
+      50: 
+        caption: helpers.label.dc_piece.tabletitle
+        controller: cmsedit
+        picture: dc_piece.png
+        params:
+          table: dc_piece
+      60: 
+        caption: helpers.label.dc_link.tabletitle
+        controller: cmsedit
+        picture: dc_link.png
+        params:
+          table: dc_link
+      70: 
+        caption: helpers.label.dc_menu.tabletitle
+        controller: cmsedit
+        picture: dc_menu.png
+        params:
+          table: dc_menu
+      80: 
+        caption: helpers.label.dc_simple_menu.tabletitle
+        controller: cmsedit
+        picture: dc_simple_menu.png
+        params:
+          table: dc_simple_menu
+      90: 
+        caption: helpers.label.dc_poll.tabletitle
+        controller: cmsedit
+        picture: dc_poll.png
+        params:
+          table: dc_poll
+      100: 
+        caption: helpers.label.dc_ad.tabletitle
+        controller: cmsedit
+        picture: dc_ad.png
+        params:
+          table: dc_ad
+      110: 
+        caption: helpers.label.dc_user.tabletitle
+        controller: cmsedit
+        picture: dc_user.png
+        params:
+          table: dc_user
+      120: 
+        caption: helpers.label.dc_big_table.tabletitle
+        controller: cmsedit
+        picture: dc_big_table.png
+        params:
+          table: dc_big_table
+      130: 
+        caption: helpers.label.dc_policy_role.tabletitle
+        controller: cmsedit
+        picture: dc_policy_role.png
+        params:
+          table: dc_policy_role
+      140: 
+        caption: helpers.label.dc_permission.tabletitle
+        controller: cmsedit
+        picture: dc_permission.png
+        params:
+          table: dc_permission
+      150: 
+        caption: helpers.label.dc_folder_permission.tabletitle
+        controller: cmsedit
+        picture: dc_permission.png
+        params:
+          table: dc_folder_permission
+      160: 
+        caption: helpers.label.dc_journal.tabletitle
+        controller: cmsedit
+        picture: dc_journal.png
+        params:
+          table: dc_journal
+
                 

data/app/forms/dc_design.yml

@@ -52,7 +52,7 @@ form:
         name: body
         type: text_area
         html:
-          size: 150x30
+          size: 140x30
 
       50:
         name: css

data/app/forms/dc_ident.yml

@@ -0,0 +1,37 @@
+---
+title: Additional identification
+table: dc_ident
+
+index:
+  actions:
+    1: new
+
+result_set:
+  actions: 
+    1: edit
+    2: delete
+
+  columns:
+    1:  
+      name: key
+      style: "text-align: left;"
+    2: 
+      name: value
+      style: "text-align: left;"
+
+form:
+  edit_title: caption
+  actions: standard
+
+  fields:
+    10:
+      name: key
+      type: text_field
+      html:
+        size: 30
+    20:
+      name: value
+      type: file_select
+      html:
+        size: 50
+  

data/app/forms/dc_menu_item.yml

@@ -25,9 +25,9 @@ result_set:
       name: order
       style: "text-align: right;"
 
-edit_title: caption
 
 form:
+  edit_title: caption
   actions: standard
 
   tabs:

data/app/forms/dc_permission.yml

@@ -33,7 +33,7 @@ form:
     10:
       name: table_name
       type: text_with_select
-      eval: dc_choices4_tables_list      
+      eval: dc_choices4_all_collections      
       html:
         size: 30
         

data/app/forms/dc_site.yml

@@ -10,6 +10,10 @@ result_set:
   actions: 
     1: edit
     2: delete
+    10: 
+      type: duplicate
+      dup_fields: name
+    
 
   columns:
     1:  

data/app/helpers/cmsedit_helper.rb

@@ -20,35 +20,19 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
-module CmseditHelper
-  attr_reader :js
 
-############################################################################
+###########################################################################
 # 
-############################################################################
-def dc_choices4_menu
-  m_clas = dc_get_site.menu_class
-  m_clas = 'DcSimpleMenu' if m_clas.blank?
-  klass  = m_clas.classify.constantize
-  klass.choices4_menu(dc_get_site)
-end
-
-########################################################################
-# Since tabs it is a little more complicated to return all field names on form
-########################################################################
-def dc_fields_on_form()
-  r = []
-  @form['form'].keys.each do |k|
-# ignore some keywords    
-    next if k.match('actions')
-# second element of array is hash. Get only name element of hash   
-    @form['form'][k].each {|f| r << f[1]['name'] }
-  end
-  r
-end
+# CmseditHelper module defines helper methods used by cmsedit actions. Output is controlled by 
+# data found in 3 major sections of DRG CMS form: index, result_set and form sections. 
+#
+###########################################################################
+module CmseditHelper
+  # javascript part created by form helpers
+  attr_reader :js 
 
 ############################################################################
-# Creates actions for list (index) dialog
+# Creates action div for cmsedit index action. 
 ############################################################################
 def dc_actions_for_index()
   return '' if @form['index'].nil?
@@ -126,7 +110,7 @@ end
 ############################################################################
 # Subroutine of dc_div_filter
 ############################################################################
-def _get_field_def(name) #NODOC
+def _get_field_def(name) #:nodoc:
   @form['form'].each do |tab|
     next if tab.first.match('actions')
     tab.each do |field|
@@ -140,7 +124,7 @@ end
 ############################################################################
 # Finds field definition on form and use it for filter input. Subroutine of dc_div_filter.
 ############################################################################
-def _get_field_div(name) #NODOC
+def _get_field_div(name) #:nodoc:
 # field not defined on form. Must be defined: name as form_field_type  
   if name.match(' as ')
     name, dummy, type = name.split(' ')
@@ -156,7 +140,7 @@ def _get_field_div(name) #NODOC
 end
   
 ############################################################################
-# Creates filter div for index/filter action.
+# Creates filter div for cmsedit index/filter action.
 ############################################################################
 def dc_div_filter()
   choices, inputs = [], ''
@@ -190,7 +174,8 @@ EOT
 end
 
 ############################################################################
-# Creates title for result
+# Creates title div for cmsedit index result set records. Title div also includes paging 
+# options.
 ############################################################################
 def dc_table_title_for_result(result=nil)
   title = if @form['title'] # form has title section
@@ -202,9 +187,9 @@ def dc_table_title_for_result(result=nil)
 end
 
 ############################################################################
-# Creates code for link or ajax action type
+# Creates code for link or ajax action type. Subroutine of dc_actions_for_result.
 ############################################################################
-def dc_link_or_ajax(yaml, parms)
+def dc_link_or_ajax(yaml, parms) #:nodoc:
   method  = yaml['method'] || yaml['request'] || 'get'
   caption = yaml['caption'] || yaml['text']
   p "Form: result_set:action:text directive will be deprecated. Use caption instead of text." if yaml['text']
@@ -226,7 +211,7 @@ def dc_link_or_ajax(yaml, parms)
 end
 
 ############################################################################
-# Creates actions for result set row
+# Creates actions that could be performed on single row of result set.
 ############################################################################
 def dc_actions_for_result(record)
   actions = @form['result_set']['actions']
@@ -286,7 +271,7 @@ def dc_actions_for_result(record)
 end
 
 ############################################################################
-# Creates table header for result set
+# Creates header div for result set.
 ############################################################################
 def dc_header_for_result()
   c = ''
@@ -314,10 +299,10 @@ def dc_header_for_result()
 end
 
 ############################################################################
-# Formats value acording to format supplied or data type. There is lots of things missing here.
-#TODO Enable formating numbers.
+# Formats value according to format supplied or data type. There is lots of things missing here.
 ############################################################################
 def dc_format_value(value, format=nil)
+# :TODO: Enable formating numbers.
   return '' if value.nil?
   klass = value.class.to_s
   if klass.match('Time')
@@ -332,7 +317,7 @@ def dc_format_value(value, format=nil)
 end      
 
 ############################################################################
-# Creates columns for result set
+# Creates div with documents of current result set.
 ############################################################################
 def dc_columns_for_result(document)
   html = ''  
@@ -379,19 +364,12 @@ def dc_columns_for_result(document)
 end
 
 ############################################################################
-# 
-############################################################################
-def dc_dialog_for_sort()
-  
-end
-
-############################################################################
-# Creates actions for form
+# Creates actions div for edit form
 ############################################################################
 def dc_actions_for_form()
 # create standard actions  
-  std_actions = {' 1' => 'back', ' 2' => {'type' => 'submit', 'caption' => 'Save'},
-               ' 3' => {'type' => 'submit', 'caption' => 'Save&Back'} }
+  std_actions = {' 1' => 'back', ' 2' => {'type' => 'submit', 'caption' => 'drgcms.save'},
+               ' 3' => {'type' => 'submit', 'caption' => 'drgcms.save&back'} }
 # when edit only  
   unless @record.id.nil?
 #    std_actions.merge!({' 4' => 'delete', ' 6' => 'new'} ) # delete is not OK here
@@ -411,9 +389,9 @@ def dc_actions_for_form()
   actions.each do |k,v| 
     if v.class == String 
       if v.match(/save\&back/i)
-        actions[k] = {'type' => 'submit', 'caption' => 'Save&Back'}
+        actions[k] = {'type' => 'submit', 'caption' => 'drgcms.save&back'}
       elsif v == 'save'
-        actions[k] = {'type' => 'submit', 'caption' => 'Save'}      
+        actions[k] = {'type' => 'submit', 'caption' => 'drgcms.save'}      
       end
     end
   end
@@ -438,7 +416,7 @@ def dc_actions_for_form()
       c << case 
         when (v == 'back' or v == 'cancle') then
 # If return_to is present link directly to URL        
-          if parms['xreturn_to']
+          if parms['xreturn_to'] # disabled for now
             link_to(t('drgcms.back'), parms['return_to'] )
           else
             parms['action'] = 'index'
@@ -465,16 +443,17 @@ def dc_actions_for_form()
       c << case 
 # submit button
       when v['type'] == 'submit'
-        v['caption'] ||= v['text'] || 'save'
+        caption = v['caption'] || 'drgcms.save'
         '<td class="dc-link-submit dc-animate">' + 
-          submit_tag(t('drgcms.' + v['caption'].downcase, v['caption']), :data => v['params'], :class => 'dc-submit') + 
+          submit_tag(t(caption, caption), :data => v['params'], :class => 'dc-submit') + 
         '</td>'
 # delete with some sugar added
       when v['type'] == 'delete'
         parms['id']   = @record.id
         parms.merge!(v['params'])
+        caption = v['caption'] || 'drgcms.delete'
         '<td class="dc-link dc-animate">' + 
-          link_to( t('drgcms.delete'), parms, data: t('drgcms.confirm_delete'), method: :delete ) +
+          link_to( t(caption, caption), parms, data: t('drgcms.confirm_delete'), method: :delete ) +
         '</td>'
 # ajax or link button
       when v['type'] == 'ajax' || v['type'] == 'link'
@@ -523,14 +502,15 @@ end
 
 ############################################################################
 # Checks if value is defined and sets default. If values are sent it also checks
-# if value is found in values. If not it will report error and set value to default
+# if value is found in values. If not it will report error and set value to default.
+# Subroutine of dc_fields_for_tab.
 ############################################################################
-def dc_check_and_default(value, default, values=nil)
+def dc_check_and_default(value, default, values=nil) #:nodoc:
   return default if value.nil?
 # check if value is within allowed values  
   if values
     if !values.index(value) 
-# parameters should be in downcas. Check downcase version.
+# parameters should be in downcase. Check downcase version.
       if n = values.index(value.downcase)
         return values[n]
       else
@@ -545,7 +525,7 @@ end
 ############################################################################
 # Creates input field for one tab. Subroutine of dc_fields_for_form.
 ############################################################################
-def dc_fields_for_tab(fields) #NODOC
+def dc_fields_for_tab(fields) #:nodoc:
   @js ||= ''
   html = '<table class="dc-form-table">'
   labels_pos = dc_check_and_default(@form['form']['labels_pos'], 'right', ['top','left','right'])
@@ -574,9 +554,9 @@ def dc_fields_for_tab(fields) #NODOC
     klas_string = options['type'].camelize
     field_html = if DrgcmsFormField.const_defined?(klas_string) # check if field type is defined
       klas = DrgcmsFormField.const_get(klas_string)
-      o = klas.new(self, @record, options).render
-      @js << o.js
-      o.html 
+      field = klas.new(self, @record, options).render
+      @js << field.js
+      field.html 
     else # litle error string
       "Error: Code for field type #{options['type']} not defined!"
     end
@@ -590,22 +570,12 @@ def dc_fields_for_tab(fields) #NODOC
       <label for="record_#{options['name']}">#{text} </label></td>
       <td id=\"td_record_#{options['name']}\" class=\"dc-form-field dc-color-#{odd_even}\">#{field_html}</td></tr>]
     end
-=begin    
-    html << "<tr><td class=\"dc-form-label-#{odd_even}\" title=\"#{help}\">"
-    html << "<label for=\"record_#{options['name']}\">#{text} </label>"
-    html << (labels_pos == 'top' ? '<br> ': '</td>')
-    html << (labels_pos == 'top' ? '<div ' : '<td ')
-    html << "id=\"td_record_#{options['name']}\" class=\"dc-form-field-#{odd_even}\">#{field_html}"
-    html << (labels_pos == 'top' ? '</div>': '</td>')
-    html << '</tr>'
-=end    
-#    html << "<td id=\"td_record_#{options['name']}\" class=\"dc-form-field-#{odd_even}\">#{field_html}</td></tr>"
   end
   html << '</table></table>'
 end
 
 ############################################################################
-# Main method for creating data input form
+# Creates edit form div. 
 ############################################################################
 def dc_fields_for_form()
   if @form['edit']
@@ -651,9 +621,9 @@ def dc_fields_for_form()
 end
 
 ############################################################################
-# Subroutine of dc_document_statistics
+# Returns username for id. Subroutine of dc_document_statistics
 ############################################################################
-def _get_user_for(field_name) #NODOC
+def _get_user_for(field_name) #:nodoc:
   if @record[field_name]
     u = DcUser.find(@record[field_name])
     return u ? u.name : @record[field_name]
@@ -662,8 +632,8 @@ def _get_user_for(field_name) #NODOC
 end
 
 ############################################################################
-# Display record statistics (created_by, created_at, .... on the bottom of edit form.
-# + lots of more.
+# Creates current document statistics div (created_by, created_at, ....) at the bottom of edit form.
+# + lots of more. At the moment also adds icon for dumping current document as json text.
 ############################################################################
 def dc_document_statistics
   return '' if @record.new_record? or dc_dont?(@form['form']['info'])
@@ -689,10 +659,4 @@ def dc_document_statistics
   html.html_safe
 end
 
-############################################################################
-# Insert edit menu into page
-############################################################################
-def dc_get_edit_stuff(body) #NODOC
-end
-
 end