drg_cms 0.7.0.2 → 0.7.0.8

data/app/controls/design_element_settings_control.rb

@@ -1,4 +1,3 @@
-#encoding: utf-8
 #--
 # Copyright (c) 2014+ Damjan Rems
 #
@@ -23,7 +22,7 @@
 #++
 
 ######################################################################
-# DrgcmsControls for editing settings in a document.
+# DRG Controls for editing settings in a document.
 # 
 # Parameters to settings call:
 # :location - model_name where settings document is located. Typicaly dc_page or dc_site.
@@ -40,33 +39,36 @@ module DesignElementSettingsControl
 # Return:
 #   [document, data] : Mongoid document, yaml as String
 ######################################################################
-def get_settings()
-# On save. Set required variables
+def get_settings
+  # On save. Set required variables
   if params[:record]
     params[:location]   = params[:record][:dc_location]
     params[:field_name] = params[:record][:dc_field_name]
     params[:element]    = params[:record][:dc_element]
     params[:id]         = params[:record][:dc_document_id]    
   end
-# Check model
+
+  # Check model
   begin
     model = params[:location].classify.constantize    
   rescue 
     flash[:error] = "Invalid or undefined model name! #{params[:location]}"
     return false    
   end
-# Check fild name 
+
+  # Check fild name
   begin
     document = model.find(params[:id])
     params[:field_name] ||= (params[:location] == 'dc_site' ? 'settings' : 'params')
-# field not defined on document   
+    # field not defined on document
     raise unless document.respond_to?(params[:field_name])
     yaml = document[params[:field_name]] || ''
   rescue 
     flash[:error] = 'Invalid or undefined field name!'
     return false    
   end
-# Check data
+
+  # Check data
   begin
     data = YAML.load(yaml) || {}
   rescue 
@@ -81,14 +83,12 @@ end
 # 
 # Load fields on form with values from settings document.
 ######################################################################
-def dc_new_record()
+def dc_new_record
   document, data = get_settings
-  return false if document.class == FalseClass and data.nil?
-# fill values with settings values
-  if data['settings'] and data['settings'][ params[:element] ]
-    data['settings'][ params[:element] ].each { |key, value| @record.send("#{key}=", value) }
-  end
-# add some fields required at post as hidden fields to form
+  return false if document.class == FalseClass
+
+  record_fill_with_values(data)
+  # add some fields required at post as hidden fields to form
   form = @form['form']['tabs'] ? @form['form']['tabs'].to_a.last : @form['form']['fields']
   form[9999] = {'type' => 'hidden_field', 'name' => 'dc_location', 'html' => {'value' => params[:location]}}
   form[9998] = {'type' => 'hidden_field', 'name' => 'dc_field_name'}
@@ -96,7 +96,6 @@ def dc_new_record()
   form[9997] = {'type' => 'hidden_field', 'name' => 'dc_element'}
   @record.dc_element = params[:element]
   form[9996] = {'type' => 'hidden_field', 'name' => 'dc_document_id', 'html' => {'value' => params[:id]}}
-  true
 end
 
 ######################################################################
@@ -104,32 +103,84 @@ end
 # 
 # Convert data from fields on form to yaml and save it to document settings field.
 ######################################################################
-def dc_before_save()
+def dc_before_save
   document, data = get_settings
-  return false if document.class == FalseClass and data.nil?
-#
-  fields_on_form.each do |v|
-    session[:form_processing] = v['name'] # for debuging
-    next if v['type'].nil? or
-            v['readonly'] # fields with readonly option don't return value and would be wiped
-# return value from form field definition
-    value = DrgcmsFormFields.const_get(v['type'].camelize).get_data(params, v['name'])
-    value = value.map {|e| e.to_s} if value.class == Array
-# set to nil if blank
-    value = nil if value.blank?
-    data['settings'] ||= {}
-    data['settings'][ params[:element] ] ||= {}
-    data['settings'][ params[:element] ][ v['name'] ] = value
-  end
-# remove nil elements  
-  data['settings'][ params[:element] ].compact!
-# save data to document field  
+  return false if document.class == FalseClass
+
+  field_fill_with_values(data)
   document.send("#{params[:field_name]}=", data.to_yaml)
+  # save to journal
+  params[:table] = params[:location] # for journal
+  save_journal(:update, document.changes)
   document.save
-# to re-set form again
+  params[:table] = 'dc_memory' # restore
+  # to re-set form again
   dc_new_record
   false # must be 
 end
 
+private
 
-end 
+######################################################################
+# Fill @record with values found in document hash field
+######################################################################
+def record_fill_with_values(data)
+  # settings
+  if params[:element]
+    if data['settings'] && data['settings'][params[:element]]
+      data['settings'][params[:element]].each { |key, value| @record.send("#{key}=", value) }
+    end
+  else
+    # any field
+    fields_on_form.each do |field|
+      keys  = field['key'] ? field['key'].split(/\.|\,|\;/) : [field['name']]
+      value = data.dig(*keys)
+      @record.send("#{field['name']}=", value)
+    end
+  end
+end
+
+######################################################################
+# Fill field with values entered on a form
+######################################################################
+def field_fill_with_values(data)
+  fields_on_form.each do |field|
+    session[:form_processing] = field['name'] # for debuging
+    next if field['type'].nil? || field['readonly']
+
+    # return value from form field definition
+    value = DrgcmsFormFields.const_get(field['type'].camelize).get_data(params, field['name'])
+    value = value.map(&:to_s) if value.class == Array
+    # set to nil if blank
+    value = nil if value.blank?
+
+    keys = field['key'] ? field['key'].split(/\.|\,|\;/) : [field['name']]
+    if params[:element].present?
+      keys = ['settings', params[:element]] + keys
+    end
+
+    h = data
+    if value.blank?
+      # remove field from hash if empty
+      keys.each_with_index do |key, i|
+        if i + 1 == keys.size
+          h.delete(keys.last) if h
+        else
+          h = h[key]
+        end
+        break if h.nil?
+      end
+      # set hash element
+    else
+      keys.each_with_index do |key, i|
+        break if i + 1 == keys.size
+
+        h[key] = {} unless h.key?(key)
+        h = h[key]
+      end
+      h[keys.last] = value
+    end
+  end
+end
+
+end

data/app/forms/all_options.yml

@@ -10,6 +10,7 @@ controls: controls_file
 readonly: 1
 permissions:
   can_view: role_name
+class: angular-like
   
 script: "
 javascript code
@@ -129,13 +130,16 @@ result_set:
       eval: dc_name4_value      
 
 form:
-  title: 
-    field: description
-  height: 600
+  title: Title text
+  title:
+    field: field_name
   title:
-    edit: Title for edit
-    show: Title for show
-  labels_pos: top    
+    edit: Title text for edit
+    show: Title text for show
+
+  height: 600
+  labels_pos: top
+  multipart: true
 
   actions: standard
   actions: none
@@ -214,6 +218,7 @@ form:
         eval: "dc_choices4('model','description_field_name','_id',site: :with_nil)"
         eval: ModelName.choices4_site
         eval: dc_big_table 'key-name'
+        depend: field_on_form,another_field_on_form,and_so_on
         html:
           include_blank: true
       90:
@@ -274,12 +279,18 @@ form:
         html:
           height: 800      
       20:
-        name: odhod
+        name: time
         type: datetime_picker
+        step: 15
+        inline: true
       20:
         name: gender
         type: radio
         inline: true
+      30:
+        name: galery
+        type: method
+        eval: show_gallery
         
       40:
         name: customer_id

data/app/forms/cms_menu.yml

@@ -37,12 +37,17 @@ menu:
         controller: cmsedit
         icon: web
         table: dc_design
-      30: 
+      30:
         caption: helpers.label.dc_page.tabletitle
         controller: cmsedit
         icon: description-o
         table: dc_page
-      50: 
+      40:
+        caption: helpers.label.dc_image.tabletitle
+        controller: cmsedit
+        icon: image-o
+        table: dc_image
+      50:
         caption: helpers.label.dc_piece.tabletitle
         controller: cmsedit
         icon: extension-o

data/app/forms/dc_gallery.yml

@@ -1,7 +1,7 @@
 # Form for dc_gallery
 table: dc_gallery
 index:
-  filter: id as text_field, doc_id as text_field
+  filter: doc_id as text_field
   actions: standard
 
 result_set:

data/app/forms/dc_image.yml

@@ -0,0 +1,122 @@
+# Form for dc_image
+table: dc_image
+
+index:
+  actions: standard
+
+result_set:
+  actions: standard
+
+# Choose from
+# _id,created_at,updated_at,name,text,size_l,size_m,size_s,categories,created_by,dc_user_id
+  columns:
+    10:
+      name: short
+      width: 20%
+    20:
+      name: created_by
+      eval: dc_name4_id,dc_user,name
+    30:
+      name: created_at
+      format: '%d.%m.%Y'
+    40:
+      name: categories_line
+      width: 40%
+
+form:
+  actions: standard
+  multipart: true
+
+  fields:
+    10:
+      name: upload_file
+      type: file_field
+      group: 2
+    20:
+      name: image
+      type: method
+      caption: ' '
+      eval: dc_image_preview
+    30:
+      name: short
+      type: text_field
+      size: 50
+    40:
+      name: text
+      type: text_area
+      size: 80x5
+    50:
+      name: cats_input
+      type: text_area
+      size: 50x5
+      line: bottom
+    60:
+      name: keep_original
+      type: check_box
+    70:
+      name: size_o
+      type: readonly
+
+    100:
+      name: size_ls
+      type: text_with_select
+      eval: dc_image_choices_for_image_size
+      size: 8
+      group: 3
+    110:
+      name: size_ms
+      type: text_with_select
+      eval: dc_image_choices_for_image_size
+      size: 8
+    120:
+      name: size_ss
+      type: text_with_select
+      eval: dc_image_choices_for_image_size
+      size: 8
+    210:
+      name: offset_lx
+      type: text_field
+      help: helpers.help.dc_image.offset
+      size: 3
+      group: 3
+    220:
+      name: offset_mx
+      type: text_field
+      help: helpers.help.dc_image.offset
+      size: 3
+    230:
+      name: offset_sx
+      type: text_field
+      help: helpers.help.dc_image.offset
+      size: 3
+
+    310:
+      name: offset_ly
+      type: text_field
+      help: helpers.help.dc_image.offset
+      size: 3
+      group: 3
+    320:
+      name: offset_my
+      type: text_field
+      help: helpers.help.dc_image.offset
+      size: 3
+    330:
+      name: offset_sy
+      type: text_field
+      help: helpers.help.dc_image.offset
+      size: 3
+
+    410:
+      name: preview_l
+      type: method
+      group: 3
+      eval: dc_image_preview_resized
+    420:
+      name: preview_m
+      type: method
+      eval: dc_image_preview_resized
+    430:
+      name: preview_s
+      type: method
+      eval: dc_image_preview_resized

data/app/forms/dc_image_search.yml

@@ -0,0 +1,72 @@
+# Form for dc_image search
+table: dc_image
+title: drgcms.dc_image.search
+
+index:
+  actions:
+    1: close
+    2:
+      type: window
+      action: new
+      icon: plus
+      caption: drgcms.new
+      table: dc_image
+      params:
+        window_close: 0
+    3:
+      type: ajax
+      action: run
+      icon: search
+      caption: drgcms.search
+      method: post
+      control: dc_image.images_search
+      params:
+        field_name:
+          object: params
+          method: field_name
+
+    10:
+      type: field
+      name: short
+      field_type: text_field
+      size: 20
+
+    20:
+      type: field
+      name: categories
+      field_type: text_field
+      size: 40
+
+    30:
+      type: field
+      caption: user
+      name: created_by
+      field_type: select
+      eval: DcImage.all_users
+      html:
+        include_blank: true
+
+result_set:
+  filter: search_filter
+  actions: false
+
+  # Choose from
+  # _id,created_at,updated_at,name,text,size_l,size_m,size_s,categories,created_by,dc_user_id
+  columns:
+    10:
+      name: preview
+      eval: dc_image_first
+      caption: drgcms.dc_image.image
+      width: 20%
+    20:
+      name: short
+    30:
+      name: links
+      eval: dc_image_select_links
+      caption: drgcms.dc_image.available
+
+css: "
+.img-link {padding: 2px 4px; margin-right: 1rem; background-color: #ddd; border-bottom: 3px solid #222;}
+.dc-image-preview img {max-height: 3rem;}
+.img-link i:hover {color: #2C8EFF; cursor: pointer;}
+"

data/app/forms/dc_page.yml

@@ -58,7 +58,8 @@ form:
 
       70:
         name: publish_date
-        type: datetime_select
+        type: datetime_picker
+        step: 15
 
       80:
         name: picture
@@ -69,14 +70,14 @@ form:
         type: check_box
       100:
         name: valid_from
-        type: datetime_select
-        options:
-          include_blank: true
+        type: datetime_picker
+        step: 15
+
       110:
         name: valid_to
-        type: datetime_select
-        options:
-          include_blank: true
+        type: datetime_picker
+        step: 15
+
 #      120:
 #        name: kats
 #        type: select
@@ -96,7 +97,9 @@ form:
       10:
         name: dc_design_id
         type: select
-        eval: DcDesign.choices4_design(@parent.dc_get_site)
+        #        eval: DcDesign.choices4_design(@parent.dc_get_site)
+        eval: DcDesign.choices4_design
+        depend: dc_site_id
         html:
           include_blank: true
       15:

data/app/forms/dc_steps_template.yml

@@ -6,13 +6,14 @@ form:
       type: ajax
       caption: drgcms.cancel
       icon: cancel
-      method: post
       form_name: x
       action: run
       control: x.steps_cancel
       params:
         step: x
         next_step: x
+      html:
+        data-validate: false
 
     10:
       type: ajax

data/app/helpers/cms_common_helper.rb

@@ -44,20 +44,20 @@ 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' )
+  if c.class == Hash || c.match( /translation missing/i )
     c = I18n.t(key, locale: 'en') 
-# Still not found. Return default if set
-    if c.class == Hash or c.match( 'translation missing' )
-      c = default.nil? ? key : default
+    # Still not found, return default
+    if c.class == Hash || c.match( /translation missing/i )
+      c = default || key
     end
   end
   c
 end
 
 ####################################################################
-def t(key, default=nil) #:nodoc
+def t(key, default = nil) #:nodoc
   CmsCommonHelper.t(key, default)
 end
 
@@ -72,7 +72,7 @@ end
 # Returns: 
 # String. Translated text. 
 ####################################################################
-def t_tablename(tablename, default=nil)
+def t_tablename(tablename, default = nil)
   t('helpers.label.' + tablename + '.tabletitle', default || tablename)
 end
 
@@ -81,21 +81,29 @@ end
 # Translation is provided by lang.helpers.label.table_name.field_name locale. If
 # translation is not found method will capitalize field_name and replace '_' with ' '.
 ############################################################################
-def t_label_for_field(field_name, default='')
-  c = t("helpers.label.#{@form['table']}.#{field_name}", default)
-  c = field_name.capitalize.gsub('_',' ') if c.match( 'translation missing' )
-  c
+def t_label_for_field(field_name, default = '')
+  c = (@form['i18n_prefix'] || "helpers.label.#{@form['table']}") + ".#{field_name}"
+  c = field_name if field_name.match(/helpers\./)
+
+  label = t(c, default)
+  label = field_name.capitalize.gsub('_', ' ') if c.match( /translation missing/i )
+  label
 end
 
 ############################################################################
-# Returns label for field translated to current locale for usage browser header.
+# Returns label for field translated to current locale for usage in browser header.
 # Translation is provided by lang.helpers.label.table_name.field_name locale. If
 # not found method will look in standard drgcms translations.
-#
 ############################################################################
 def t_label_for_column(options)
   label = options['caption'] || options['label']
-  label = (options['name'] ? "helpers.label.#{@form['table']}.#{options['name']}" : '') if label.nil?
+  if label.blank?
+    label = if options['name']
+              prefix = @form['i18n_prefix'] || "helpers.label.#{@form['table']}"
+              "#{prefix}.#{options['name']}"
+            end
+    label = label.to_s
+  end
   label = t(label) if label.match(/\./)
   label = t("drgcms.#{options['name']}") if label.match('helpers.') # standard field names like created_by, updated_at
   label
@@ -161,8 +169,8 @@ end
 ############################################################################
 def self.dc_choices_for_field(model, field)
   c = CmsCommonHelper.t('helpers.label.' + model + '.choices4_' + field )
-  return ['error'] if c.match( 'translation missing' )
-  c.chomp.split(',').inject([]) {|r,v| r << v.split(':') }
+  return ['error'] if c.match( /translation missing/i )
+  c.chomp.split(',').inject([]) { |r, v| r << v.split(':') }
 end
 
 ############################################################################