drg_cms 0.6.1.6 → 0.6.1.9

data/app/forms/cms_menu.yml

@@ -24,124 +24,124 @@
 menu:
   10_system_menu:
     caption: drgcms.cms_main
-    icon: support lg
+    icon: support
     
     items:
       10: 
         caption: helpers.label.dc_site.tabletitle
         controller: cmsedit
-        icon: globe lg
+        icon: public
         table: dc_site
       20: 
         caption: helpers.label.dc_design.tabletitle
         controller: cmsedit
-        icon: credit-card lg
+        icon: web
         table: dc_design
       30: 
         caption: helpers.label.dc_page.tabletitle
         controller: cmsedit
-        icon: file-text-o lg
+        icon: description-o
         table: dc_page
       50: 
         caption: helpers.label.dc_piece.tabletitle
         controller: cmsedit
-        icon: puzzle-piece lg
+        icon: extension-o
         table: dc_piece
       60: 
         caption: helpers.label.dc_link.tabletitle
         controller: cmsedit
-        icon: link lg
+        icon: link
         table: dc_link
       70: 
         caption: helpers.label.dc_menu.tabletitle
         controller: cmsedit
-        icon: th-list lg
+        icon: menu
         table: dc_menu
       80: 
         caption: helpers.label.dc_simple_menu.tabletitle
         controller: cmsedit
-        icon: ellipsis-h lg
+        icon: more_horiz-o
         table: dc_simple_menu
       90: 
         caption: helpers.label.dc_category.tabletitle
         controller: cmsedit
-        icon: list lg
+        icon: list
         table: dc_category
       100: 
         caption: helpers.label.dc_poll.tabletitle
         controller: cmsedit
-        icon: list-alt lg
+        icon: poll-o
         table: dc_poll
       110: 
         caption: helpers.label.dc_poll_result.tabletitle
         controller: cmsedit
-        icon: database lg
+        icon: leaderboard
         table: dc_poll_result
       120: 
         caption: helpers.label.dc_ad.tabletitle
         controller: cmsedit
-        icon: money lg
+        icon: ads_click
         table: dc_ad
 
   11_system_menu:
     caption: drgcms.cms_advanced
-    icon: star lg
+    icon: star
     items:
       10: 
         caption: helpers.label.dc_user.tabletitle
         controller: cmsedit
-        icon: users lg
+        icon: account_circle-o
         table: dc_user
       20: 
         caption: helpers.label.dc_policy_role.tabletitle
         controller: cmsedit
-        icon: user-secret lg
+        icon: manage_accounts
         table: dc_policy_role
       30: 
         caption: helpers.label.dc_permission.tabletitle
         controller: cmsedit
-        icon: shield lg
+        icon: security
         table: dc_permission
       40: 
         caption: helpers.label.dc_folder_permission.tabletitle
         controller: cmsedit
-        icon: shield lg
+        icon: shield-o
         table: dc_folder_permission
       60: 
         caption: helpers.label.dc_big_table.tabletitle
         controller: cmsedit
-        icon: table lg
+        icon: topic-o
         table: dc_big_table
       70: 
         caption: helpers.label.dc_key_value_store.tabletitle
         controller: cmsedit
-        icon: list lg
+        icon: view_list
         table: dc_key_value_store
       80: 
         caption: helpers.label.dc_filter.tabletitle
         controller: cmsedit
-        icon: filter lg
+        icon: topic-o
         table: dc_filter
       90: 
         caption: helpers.label.dc_removed_url.tabletitle
         controller: cmsedit
-        icon: trash-o lg
+        icon: link_off
         table: dc_removed_url
       400:
         caption: drgcms.dc_help.title
         controller: cmsedit
-        icon: question-circle lg
+        icon: help-o
         table: dc_temp
         form_name: dc_help_1
       500: 
         caption: helpers.label.dc_journal.tabletitle
         controller: cmsedit
-        icon: history lg
+        icon: history
         table: dc_journal
 
       600: 
         caption: drgcms.browse_collections
         controller: cmsedit
-        icon: table lg
+        icon: list_alt
         table: dc_memory
         form_name: dc_browse_models

data/app/forms/dc_browse_fields.yml

@@ -6,27 +6,31 @@ controls: browse_models
 permissions:
   can_view: admin
 
+index:
+  actions:
+    1: back
+
 result_set:
-  filter: fields
-  tr_style:
-    eval: "document['field'] == document['description'] ? 'color: #669;' : 'color: #000;'"
+  filter: all_fields
 
   columns:
     10:   
       name: collection
       caption: Collection
-      td_style: 'width: 150px;'
-    20:  
+      width: 10%
+    20:
       name: field
       caption: Field name
-      td_style: 'width: 150px;'
-    30:  
+    30:
       name: type
       caption: Field type
-    40:  
+    40:
       name: description
       caption: description
-    50:  
+      width: 25%
+      style:
+        eval: "document['field'] == document['description'] ? 'color: #f43;' : 'color: #000;'"
+    50:
       name: _default
       caption: Default
       

data/app/forms/dc_poll_result_export.yml

@@ -8,7 +8,7 @@ form:
       type: script
       caption: drgcms.back
       js: 'history.back();'
-      icon: arrow-left
+      icon: arrow_back
 
     3: 
       type: ajax

data/app/helpers/cms_common_helper.rb

@@ -213,13 +213,14 @@ end
 
 ############################################################################
 # Return html code for icon presenting boolean value. Icon is a picture of checked or unchecked box.
+# If second parameter (fiel_name) is ommited value is supplied as first parameter.
 # 
 # Parameters:
 # [value] Boolean.  
 # 
 # Example:
 #    # usage from program
-#    dc_icon4_boolean(some_value)
+#    dc_icon4_boolean(document, field_name)
 #
 #    # usage from form description
 #    columns:
@@ -227,16 +228,17 @@ end
 #        name: active
 #        eval: dc_icon4_boolean
 ############################################################################
-def dc_icon_for_boolean(value=false)
-  dc_dont?(value, true) ? fa_icon('square-o lg') : fa_icon('check-square-o lg') 
+def dc_icon_for_boolean(document = false, field_name = nil)
+  value = field_name.nil? ? document : document[field_name]
+  dc_dont?(value, true) ? fa_icon('check_box_outline_blank md-18') : fa_icon('check_box-o md-18')
 end
 
 ############################################################################
 #
 ############################################################################
-def dc_icon4_boolean(value=false) #nodoc
+def dc_icon4_boolean(document = false, field_name = false) #nodoc
   #dc_deprecate('dc_icon4_boolean will be deprecated. Use dc_icon_for_boolean instead.')
-  dc_icon_for_boolean(value)
+  dc_icon_for_boolean(document, field_name)
 end
 
 ############################################################################

data/app/helpers/cms_edit_helper.rb

@@ -52,7 +52,7 @@ 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]}") 
+    dc_deprecate("when_option will be deprecated and replaced by active: not_new_record! Form #{CmsHelper.form_param(params)}")
     return !(dc_dont?(options['when_new']) && @record.new_record?)
   end
   return true unless options['active']
@@ -137,56 +137,57 @@ def dc_actions_for_form(position)
   actions.delete('standard')
   actions = actions.to_a.sort { |x, y| x[0] <=> y[0] }
   # Add spinner to the beginning
-  html = %Q[<span class="dc-spinner">#{fa_icon('spinner lg spin')}</span><ul class="dc-menu #{position}">]
+  html = %Q[<span class="dc-spinner">#{fa_icon('settings-o spin')}</span><ul class="dc-menu #{position}">]
 
   actions.each do |key, options|
     session[:form_processing] = "form:actions: #{key} #{options}"
     next if options.nil?  # yes it happens
+
     parms = @parms.clone
     if options.class == String
       next if @form['readonly'] and !options.match(/back|close/)
-      
-      html << '<li class="dc-link dc-animate">'
-      html << case 
-        when (options == 'back' or options == 'cancle') then
+
+      html << '<li>'
+      html << case
+        when (options == 'back' || options == 'cancle')
           # If return_to is present link directly to URL
           if parms['xreturn_to'] # disabled for now
-            dc_link_to( 'drgcms.back','arrow-left', parms['return_to'] )
+            dc_link_to( 'drgcms.back', 'arrow_back', parms['return_to'], class: 'dc-link' )
           else
             parms['action'] = 'index'
             parms['readonly'] = parms['readonly'].to_s.to_i < 2 ? nil : 1  
-            dc_link_to( 'drgcms.back','arrow-left', parms )
+            dc_link_to( 'drgcms.back', 'arrow_back', parms, class: 'dc-link' )
           end
           
-        when options == 'delete' then
+        when options == 'delete'
           parms['operation'] = options
           parms['id']   = @record.id
-          dc_link_to( 'drgcms.delete','remove', parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete )
+          dc_link_to( 'drgcms.delete','remove', parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete, class: 'dc-link' )
           
-        when options == 'new' then
+        when options == 'new'
           parms['action'] = options
-          dc_link_to( 'drgcms.new', 'plus', parms)
+          dc_link_to( 'drgcms.new', 'add', parms, class: 'dc-link')
           
-        when (options == 'enable' or options == 'disable') then
+        when (options == 'enable' || options == 'disable')
           parms['operation'] = options
           parms['id']        = @record.id
-          icon = (options == 'enable' ? 'thumbs-o-up' : 'thumbs-o-down')
-          dc_link_to( "drgcms.#{options}",icon, parms, method: :delete )
+          icon = (options == 'enable' ? 'check_box-o' : 'check_box_outline_blank')
+          dc_link_to( "drgcms.#{options}",icon, parms, method: :delete, class: 'dc-link' )
           
-        when options == 'edit' then
+        when options == 'edit'
           parms['operation'] = options
           parms['id']        = @record.id
-          dc_link_to( "drgcms.#{options}",options, parms )
+          dc_link_to( "drgcms.#{options}", options, parms, class: 'dc-link' )
           
-        when options == 'refresh' then
-          "<div onclick='window.location.href=window.location.href;'>#{fa_icon('refresh')} #{t('drgcms.refresh')}</div></li>"
+        when options == 'refresh'
+          %(<div class="dc-link" onclick='window.location.href=window.location.href;'>#{fa_icon('refresh')} #{t('drgcms.refresh')}</div></li>)
           
-        when options == 'close' then
+        when options == 'close'
           close = params[:window_close].to_i
           if close < 2
-            "<div onclick='window.close();'>#{fa_icon('close')} #{t('drgcms.close')}</div></li>"
+            %(<div class="dc-link" onclick='window.close();'>#{fa_icon('close')} #{t('drgcms.close')}</div></li>)
           else
-            "<div onclick='history.back();'>#{fa_icon('close')} #{t('drgcms.close')}</div></li>"
+            %(<div class="dc-link" onclick='history.back();'>#{fa_icon('close')} #{t('drgcms.close')}</div></li>)
           end
       else 
         "err1 #{key}=>#{options}"
@@ -203,14 +204,14 @@ def dc_actions_for_form(position)
       when options['type'] == 'submit'
         caption = options['caption'] || 'drgcms.save'
         icon    = options['icon'] || 'save'
-        prms = {}
-        options['params'].each { |k,v| prms[k] = dc_value_for_parameter(v) } if options['params']
+        parameters = {}
+        options['params'].each { |k, v| parameters[k] = dc_value_for_parameter(v) } if options['params']
         if dc_is_action_active?(options) 
-          '<li class="dc-link-submit dc-animate">' + 
-             dc_submit_tag(caption, icon, {:data => prms, :title => options['title'] }) +
+          '<li>' +
+             dc_submit_tag(caption, icon, { data: parameters, title: options['title'] }) +
           '</li>'
         else
-          "<li class=\"dc-link-no\">#{fa_icon(icon)} #{caption}</li>"
+          %(<li><div class="dc-link-no">#{fa_icon(icon)} #{caption}</div></li>)
         end
       
       # delete with some sugar added
@@ -219,21 +220,22 @@ def dc_actions_for_form(position)
         parms.merge!(options['params'])
         caption = options['caption'] || 'drgcms.delete'
         icon = options['icon'] || 'remove'
-        '<li class="dc-link dc-animate">' + 
-          dc_link_to( caption, icon, parms, data: t('drgcms.confirm_delete'), method: :delete ) +
+        '<li class="">' +
+          dc_link_to( caption, icon, parms, data: t('drgcms.confirm_delete'), method: :delete, class: 'dc-link' ) +
         '</li>'
-      
+
       # ajax or link button
-      when %w(ajax link window).include?(options['type'])
+      when %w(ajax link window popup).include?(options['type'])
         dc_link_ajax_window_submit_action(options, @record)
-        
-# Javascript action        
+
+      # Javascript action
       when options['type'] == 'script'
         dc_script_action(options)
       else
         '<li>err2</li>'
       end
     end
+
   end
   (html << '</ul>').html_safe
 end
@@ -409,6 +411,7 @@ def dc_head_for_form
   @css ||= ''
   head = @form['form']['head']
   return '' if head.nil?
+
   html    = %(<div class="dc-head #{head['class']}">\n<div class="dc-row">)
   split   = head['split'] || 4
   percent = 100/split
@@ -470,29 +473,33 @@ end
 # + 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'])
-  html =  %Q[<div id="dc-document-info">#{fa_icon('info-circle lg')}</div> <div id="dc-document-info-popup" class="div-hidden"> ]
-#
+  return '' if @record.id.nil? || dc_dont?(@form['form']['info'])
+
+  html =  %(<div id="dc-document-info">#{fa_icon('info md-18')}</div> <div id="dc-document-info-popup" class="div-hidden">)
   u = dc_document_user_for('created_by')
-  html << %Q[<div><span>#{t('drgcms.created_by', 'Created by')}: </span><span>#{u}</span></div>] if u
+  html << %(<div><span>#{t('drgcms.created_by', 'Created by')}: </span><span>#{u}</span></div>) if u
   u = dc_document_user_for('updated_by')
-  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
+  html << %(<div><span>#{t('drgcms.updated_by', 'Updated by')}: </span><span>#{u}</span></div>) if u
+
+  html << %(<div><span>#{t('drgcms.created_at', 'Created at')}: </span><span>#{dc_format_value(@record.created_at)}</span></div>) if @record['created_at']
+  html << %(<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!)
-  html << fa_icon('copy lg', class: 'dc-link-img dc-link-ajax dc-animate',
+  html << fa_icon('content_copy-o md-18', class: 'dc-link-img dc-link-ajax',
                   'data-url' => url, 'data-request' => 'get', title: t('drgcms.doc_copy_clipboard') )
 
-  url = url_for(controller: :cmsedit, action: :index, table: 'dc_journal', filter: 'on',
+  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',
+  html << fa_icon('history md-18', class: 'dc-link-img dc-window-open',
                   'data-url' => url, title: t('helpers.label.dc_journal.tabletitle') )
+  html << %(<span>ID: </span><span id="record-id" class="hover" onclick="dc_copy_to_clipboard('record-id');" title="Copy document ID to clipboard">#{@record.id}</span>)
+
+  #dc_copy_to_clipboard
 
-  (html << '</div></div>').html_safe
+  (html << '</div>').html_safe
 end
 
 private

data/app/helpers/cms_helper.rb

@@ -34,11 +34,9 @@ module CmsHelper
 # Creates code for script action type.
 ############################################################################
 def dc_script_action(yaml)
-#  data = {'request' => 'script', 'script' => yaml['js'] || yaml['script'] }
-#  %Q[<li class="dc-link-ajax with-link dc-animate">#{ dc_link_to(yaml['caption'], yaml['icon'], '#', data: data ) }</li>]
   icon = dc_icon_for_link yaml['icon']
   data = %(data-request="script" data-script="#{yaml['js'] || yaml['script']}" data-url="script")
-  %Q[<li class="dc-link-ajax dc-animate" #{data}>#{icon} #{ t(yaml['caption'],yaml['caption']) }</li>]
+  %(<li><div class="dc-link-ajax" #{data}>#{icon} #{ t(yaml['caption'],yaml['caption']) }</div></li>)
 end
 
 ############################################################################
@@ -49,11 +47,11 @@ def dc_get_field_form_definition(name) #:nodoc:
   return if @form['form'].nil?
   
   @form['form']['tabs'].each do |tab|
-# Array with 2 elements. First is tabname, second is data      
+    # Array with 2 elements. First is tab name, second is data
     my_fields = tab.last
-    my_fields.each {|k,v| return v if (k.class == Integer and v['name'] == name) }
+    my_fields.each { |k, v| return v if (k.class == Integer && v['name'] == name) }
   end if @form['form']['tabs'] #  I know. But nice. 
-#
+
   @form['form']['fields'].each do |field|
     next unless field.first.class == Integer # options
     return field.last if field.last['name'] == name
@@ -160,7 +158,7 @@ def dc_field_action(yaml)
   end
   # input field will have label as placeholder
   field = field.sub('input',"input placeholder=\"#{label}\"")
-  %Q[<li class="no-background">#{field}</li>]
+  %(<li class="no-background">#{field}</li>)
 end
 
 ############################################################################
@@ -168,9 +166,17 @@ end
 ############################################################################
 def dc_html_data(yaml)
   return '' if yaml.blank?
-  yaml.inject(' ') {|result, e| result = e.last.nil? ? result : result << "#{e.first}=\"#{e.last}\" "}
+
+  yaml.inject(' ') { |result, e| result = e.last.nil? ? result : result << "#{e.first}=\"#{e.last}\" " }
 end
 
+############################################################################
+# There are several options for defining caption (caption,label, text). This method
+# will ensure that caption is returned anyhow provided.
+############################################################################
+def dc_get_caption(yaml)
+  yaml['caption'] || yaml['text'] || yaml['label']
+end
 ############################################################################
 # Creates code for link, ajax or windows action for index or form actions.
 # 
@@ -184,12 +190,12 @@ end
 ############################################################################
 def dc_link_ajax_window_submit_action(yaml, record = nil, action_active = true)
   parms = {}
-  caption = yaml['caption'] || yaml['text']
+  caption = dc_get_caption(yaml)
   caption = caption ? t("#{caption.downcase}", caption) : nil
   icon    = yaml['icon'] ? "#{fa_icon(yaml['icon'])}" : ''
   # action is not active
   unless dc_is_action_active?(yaml)
-    return "<li class=\"dc-link-no\">#{icon} #{caption}</li>" 
+    return %(<li><div class="dc-link-no">#{icon} #{caption}</div></li>)
   end
   # set data-confirm when confirm 
   yaml['html'] ||= {}
@@ -218,41 +224,57 @@ def dc_link_ajax_window_submit_action(yaml, record = nil, action_active = true)
 
   parms['table'] = parms['table'].underscore if parms['table'] # might be CamelCase
   # error if controller parameter is missing
-  if parms['controller'].nil? && parms['url'].nil?
-    "<li>#{'Controller not defined'}</li>"
-  else
-    #yaml['caption'] ||= yaml['text']
-    html_data = dc_html_data(yaml['html'])
-    url = url_for(parms) rescue 'URL error'
-    url = nil if parms['url'] == '#'
+  return "<li>#{'Controller not defined'}</li>" if parms['controller'].nil? && parms['url'].nil?
 
-    request = yaml['request'] || yaml['method'] || 'get'
-    if yaml['type'] == 'ajax' # ajax button
-      clas = "dc-link-ajax dc-animate"
-      %Q[<li class="#{clas}" data-url="#{action_active ? url : ''}" #{html_data}
-         data-request="#{request}" title="#{yaml['title']}">#{icon}#{caption}</li>]
+  html_data = dc_html_data(yaml['html'])
+  url = url_for(parms) rescue 'URL error'
+  url = nil if parms['url'] == '#'
+  request = yaml['request'] || yaml['method'] || 'get'
 
-    elsif yaml['type'] == 'submit'  # submit button
-      # It's dirty hack, but will prevent not authorized message and render index action correctly
-      parms[:filter] = 'on' 
-      url  = url_for(parms) rescue 'URL error'
-      clas = "dc-action-submit"
-      %Q[<li class="#{clas}" data-url="#{action_active ? url : ''}" #{html_data}
-         data-request="#{request}" title="#{yaml['title']}">#{icon}#{caption}</li>]
+  code = case yaml['type']
+  when 'ajax' # ajax button
+    clas = 'dc-link-ajax'
+    %(<div class="#{clas}" data-url="#{action_active ? url : ''}" #{html_data}
+       data-request="#{request}" title="#{yaml['title']}">#{icon}#{caption}</div>)
 
-    elsif yaml['type'] == 'link'  # link button
-      clas = "dc-link plus-link dc-animate"
-      link = dc_link_to(caption, yaml['icon'], parms, yaml['html'] )
-      %Q[<li class="#{clas}">#{action_active ? link : caption}</li>]
+  when 'submit'  # submit button
+    # It's dirty hack, but will prevent not authorized message and render index action correctly
+    parms[:filter] = 'on'
+    url  = url_for(parms) rescue 'URL error'
+    clas = 'dc-action-submit'
+    %(<div class="#{clas}" data-url="#{action_active ? url : ''}" #{html_data}
+       data-request="#{request}" title="#{yaml['title']}">#{icon}#{caption}</div>)
 
-    elsif yaml['type'] == 'window'
-      clas = "dc-link dc-animate dc-window-open"
-      %Q[<li class="#{clas}" data-url="#{action_active ? url : ''}" #{html_data}>#{icon}#{caption}</li>]
+  when 'link'  # link button
+    yaml['html'] = dc_yaml_add_option(yaml['html'], class: 'dc-link')
+    link = dc_link_to(caption, yaml['icon'], parms, yaml['html'] )
+    %(#{action_active ? link : caption})
 
-    else
-      '<li>Action Type error</li>'
-    end
+  when 'window' # open window
+    clas = 'dc-link dc-window-open'
+    %(<div class="#{clas}" data-url="#{action_active ? url : ''}" #{html_data}>#{icon}#{caption}</div>)
+
+  when 'popup' # popup dialog
+    clas = 'dc-link dc-popup-open'
+    %(<div class="#{clas}" data-url="#{action_active ? url : ''}" #{html_data}>#{icon}#{caption}</div>)
+
+  else
+    'Type error!'
   end
+  "<li>#{code}</li>"
+end
+
+############################################################################
+# Add new option to yaml. Subroutine of dc_link_ajax_window_submit_action.
+############################################################################
+def dc_yaml_add_option(source, options) #nodoc
+  options.each do |k, v|
+    key = k.to_s
+    source[key] ||= ''
+    # only if not already present
+    source[key] << " #{v}" unless source[key].match(v.to_s)
+  end
+  source
 end
 
 ############################################################################
@@ -264,5 +286,19 @@ def dc_log_exception(exception, where = '')
   
   logger.error log
 end
-  
+
+############################################################################
+# Will return form_name from parameter regardless if set as form_name or just f.
+############################################################################
+def self.form_param(params)
+  params[:form_name] || params[:f]
+end
+
+############################################################################
+# Will return table name from parameter regardless if set as table or just t.
+############################################################################
+def self.table_param(params)
+  params[:table] || params[:t]
+end
+
 end