drg_cms 0.6.1.9 → 0.7.0.2

data/app/assets/stylesheets/drg_cms/drg_cms.css

@@ -321,8 +321,9 @@ border-radius: 1px;
   margin: -6px 0 0 16px;
 }
 
-.dc-result-submenu ul .dc-link-ajax {
+.dc-result-submenu ul li {
   text-align: left;
+  padding: 5px;
 }
 
 .dc-result-submenu ul li a:link, .dc-result-submenu .dc-link a:link,
@@ -330,7 +331,6 @@ border-radius: 1px;
   font-size: 15px;
   line-height: 18px;
   font-weight: 500;
-  padding: 5px 10px;
   color: #666;
   display: inline-block;
   width: 100%;
@@ -359,9 +359,9 @@ border-radius: 1px;
 
 .dc-link-no i {
   color: #bbb;
+  vertical-align: top;
 }
 
-
 .dc-result-header .dc-check-all {
   font-size: 18px;
   padding: 6px 0;
@@ -374,6 +374,7 @@ border-radius: 1px;
 .dc-result-data .dc-link, .dc-result-data .dc-link-ajax {
   background-color: transparent;
   border: 0;
+  text-align: left;
 }
 
 .dc-result-data .dc-link, .dc-result-data .dc-link a, .dc-result-data .dc-link-ajax {
@@ -445,6 +446,12 @@ display: inline-table;
   cursor: pointer;
   filter: none;
 }
+.dc-window-open:hover {
+  transition: 0.3s;
+  color: #fff;
+  background: rgba(44, 142, 255, 1);
+  cursor: pointer;
+}
 
 .dc-link:hover > i, .dc-link-ajax:hover > i, .dc-submit:hover > i {
   color: #fff;
@@ -622,10 +629,25 @@ display: inline-table;
 
 /*****   FORM    *****/
 
+#dc-form-container {
+  display: flex;
+  padding-left: 4px;
+}
+
+#dc-form-left {
+  padding: 8px;
+  background-color: rgba(44, 142, 255, 0.15);;
+  display: none;
+  margin-top: 12px;
+}
+
+#dc-form-right {
+  flex: 1;
+}
+
 .dc-form-frame {
   margin: 0px;
   padding: 4px;
-  /*background-color: #f7f7f7;*/
 }
 
 .dc-form {
@@ -690,11 +712,12 @@ display: inline-table;
 }
 
 .dc-form-label-top {
-  color: #555;
   text-align: right;
   vertical-align: middle;
-  font-weight: bold;
-  padding: 3px 5px;
+  color: #555;
+  font-weight: 500;
+  line-height: 1.8em;
+  margin-top: 8px;
 }
 
 .dc-form-label.dc-color-odd, .dc-form-label.dc-color-even {background-color: transparent;}
@@ -816,6 +839,45 @@ display: flex;
   font-weight: normal;  
 }
 
+#dc-form-left #dc-steps-menu {
+  color: #222;
+}
+#dc-form-left #dc-steps-menu h2 {
+  font-size: 1.6em;
+  font-weight: 600;
+  border-bottom: 2px solid #444;
+  margin-bottom: 8px;
+}
+
+#dc-form-left #dc-steps-menu li {
+  filter: none;
+  border: none;
+  text-align: left;
+  background-color: transparent;
+  padding: 8px 0;
+  font-size: 1.1em;
+}
+
+#dc-form-left #dc-steps-menu li {
+  color: #222;
+}
+
+#dc-form-left #dc-steps-menu li.active {
+  color: #000;
+  font-weight: 600;
+}
+
+#dc-form-left #dc-steps-menu li.active:before {
+  font-family: MI;
+  content: '\e409';
+  vertical-align: middle;
+  margin-left: -4px;
+}
+
+#dc-form-left #dc-steps-menu .dc-link-ajax:hover {
+  color: rgba(44, 142, 255, 1);
+}
+
 /*** CMS toggle button */
 .cms-toggle {
   z-index: 1000000;
@@ -1125,7 +1187,7 @@ color: #000;
 }
 .iframe_embedded {
   padding: 4px;
-  /*background-color: #f7f7f7;*/
+  background-color: #fff;
   border-radius: 2px;
   border: 2px solid #666;
 }
@@ -1255,8 +1317,9 @@ color: #000;
   margin-right: 5px;
 }
 
-.dc-filter .mi-search_off {
+.dc-filter .mi-filter_alt_off {
   color: #c43;
+  font-size: 20px;
 }
 .dc-filter i:hover {
   color: rgba(44, 142, 255, 1);
@@ -1266,10 +1329,6 @@ color: #000;
   padding-top: 2px;
 }
 
-.dc-sort:hover > select {
-  color: rgba(44, 142, 255, 1);
-}
-
 .dc-sort-select {
   width: 18px;
   background: none;
@@ -1403,22 +1462,24 @@ color: #000;
 
 .filter-popup {
   background-color: #fff;
-  box-shadow: 2px 2px 5px #666;
+  filter: drop-shadow(2px 2px 8px #888);
+  border-radius: 2px;
 }
 
 .filter-popup div {
+  font-weight: 500;
   padding: 5px 10px;
   text-align: center;
-  background-color: #222;
-  color: #fff;
+  color: rgba(44, 142, 255, 1);
+  border-bottom: 2px solid rgba(44, 142, 255, 1);
 }
 
 .filter-popup li {
-  padding: 4px 8px;
+  padding: 5px 10px;
 }
 
 .filter-popup li:hover {
-  background-color: #aaa;
+  background-color: rgba(44, 142, 255, 1);
   color: #fff;
   cursor: pointer;
 }
@@ -1436,14 +1497,15 @@ cursor: pointer;
 }
 
 #dc-document-info-popup {
-text-align: left;
-padding: 6px;
-font-size: 0.9em;
-position:absolute;
-background-color: #fff;
-border: solid 1px #ccc;
-border-radius: 4px;
-z-index: 100;
+  text-align: left;
+  padding: 6px;
+  font-size: 0.9em;
+  position:absolute;
+  background-color: #fff;
+  border: solid 1px #eee;
+  border-radius: 2px;
+  z-index: 100;
+  filter: drop-shadow(0 8px 8px #ccc);
 }
 
 #dc-document-info-popup div span:first-child {
@@ -1454,6 +1516,7 @@ z-index: 100;
 }
 #dc-document-info-popup div span:last-child {font-weight: 600;}
 
+#dc-document-info-popup i {height: initial;}
 
 /************************** filter popup *************************/
 #drgcms_filter {

data/app/assets/stylesheets/drg_cms/jstree.css

@@ -117,11 +117,9 @@
 .vakata-context,
 .vakata-context ul {
   margin: 0;
-  padding: 2px;
   position: absolute;
-  background: #f5f5f5;
-  border: 1px solid #979797;
-  box-shadow: 2px 2px 2px #999999;
+  background: #fff;
+  filter: drop-shadow(1px 1px 6px #ddd);
 }
 .vakata-context ul {
   list-style: none;
@@ -140,19 +138,20 @@
 }
 .vakata-context li > a {
   display: block;
-  padding: 0 2em 0 2em;
+  padding: 4px;
   text-decoration: none;
   width: auto;
   color: black;
   white-space: nowrap;
-  line-height: 2.4em;
-  text-shadow: 1px 1px 0 white;
   border-radius: 1px;
 }
 .vakata-context li > a:hover {
   position: relative;
-  background-color: #e8eff7;
-  box-shadow: 0 0 2px #0a6aa1;
+  background-color: rgba(44, 142, 255, 1);
+  color: #fff;
+}
+.vakata-context li > a:hover > i {
+  color: #fff;
 }
 .vakata-context li > a.vakata-context-parent {
   background-image: url("data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==");
@@ -164,8 +163,6 @@
 }
 .vakata-context .vakata-context-hover > a {
   position: relative;
-  background-color: #e8eff7;
-  box-shadow: 0 0 2px #0a6aa1;
 }
 .vakata-context .vakata-context-separator > a,
 .vakata-context .vakata-context-separator > a:hover {
@@ -177,7 +174,6 @@
   max-height: 1px;
   padding: 0;
   margin: 0 0 0 2.4em;
-  border-left: 1px solid #e0e0e0;
   text-shadow: 0 0 0 transparent;
   box-shadow: 0 0 0 transparent;
   border-radius: 0;
@@ -195,25 +191,15 @@
 .vakata-context li > a > i {
   text-decoration: none;
   display: inline-block;
-  width: 2.4em;
-  height: 2.4em;
   background: transparent;
-  margin: 0 0 0 -2em;
-  vertical-align: top;
+  vertical-align: bottom;
   text-align: center;
-  line-height: 2.4em;
+  color: rgba(44, 142, 255, 1);
 }
 .vakata-context li > a > i:empty {
-  width: 2.4em;
-  line-height: 2.4em;
 }
 .vakata-context li > a .vakata-contextmenu-sep {
   display: inline-block;
-  width: 1px;
-  height: 2.4em;
-  background: white;
-  margin: 0 0.5em 0 0;
-  border-left: 1px solid #e2e3e3;
 }
 .vakata-context .vakata-contextmenu-shortcut {
   font-size: 0.8em;
@@ -233,9 +219,7 @@
   background-repeat: no-repeat;
 }
 .vakata-context-rtl .vakata-context-separator > a {
-  margin: 0 2.4em 0 0;
   border-left: 0;
-  border-right: 1px solid #e2e3e3;
 }
 .vakata-context-rtl .vakata-context-left ul {
   right: auto;
@@ -954,7 +938,8 @@
     margin-top: -10px;
   }
 }
-@media (max-width: 768px) {
+
+@media (max-width: 600px) {
   .jstree-default-responsive {
     /*
 	.jstree-open > .jstree-ocl,
@@ -1099,4 +1084,24 @@
     margin-left: 0;
     margin-right: 0;
   }
+}
+
+/* edit categorise as tree */
+#catagories-as-tree {
+  margin: 8px 4px;
+  border-top: 2px solid #bbb;
+  padding: 8px;
+  background-color: #f8f8f8;
+}
+
+#catagories-as-tree .jstree-anchor {
+  padding: 2px 4px;
+  font-weight: 400;
+}
+
+#catagories-as-tree .mi-o {
+  font-size: 22px;
+  color: #666;
+  padding-right: 4px;
+  vertical-align: top;
 }

data/app/assets/stylesheets/drg_cms/select-multiple.css

@@ -1,5 +1,6 @@
 .ms-container{
-  max-width: 200px;
+  width: fit-content;
+  max-width: 600px;
 }
 
 .ms-container:after{
@@ -62,7 +63,7 @@
 }
 
 .ms-container .ms-selectable li.ms-elem-selectable{
-  padding: 2px 10px;
+  padding: 3px 10px;
   color: #444;
   font-size: 14px;
 }
@@ -96,4 +97,5 @@
 .pull-right.ms-elem-selected{
   float: right;
   font-size: smaller;
+  padding-left: 4px;
 }

data/app/controllers/cmsedit_controller.rb

@@ -196,7 +196,7 @@ def new
   end
   # new_record callback. Set default values for new record
   if (m = callback_method('new_record') ) then call_callback_method(m)  end
-  @parms['action'] = 'create'
+  @form_params['action'] = 'create'
 end
 
 ########################################################################
@@ -279,8 +279,8 @@ def create
       flash[:info] = t('drgcms.doc_saved')
       params[:return_to] = 'index' if params[:commit] == t('drgcms.save&back') # save & back
       return process_return_to(params[:return_to]) if params[:return_to]
-      
-      @parms['id'] = @record.id # must be set, for proper update link
+
+      @form_params['id'] = @record.id # must be set, for proper update link
       params[:id]  = @record.id # must be set, for find_record
       edit
     else # error
@@ -309,7 +309,7 @@ def edit
     # don't do anything if return is false
     return index if ret.class == FalseClass
   end
-  @parms['action'] = 'update'
+  @form_params['action'] = 'update'
   render action: :edit
 end
 
@@ -331,7 +331,7 @@ def update
 
     if save_data
       params[:return_to] = 'index' if params[:commit] == t('drgcms.save&back') # save & back
-      @parms['action'] = 'update'
+      @form_params['action'] = 'update'
       # Process return_to
       return process_return_to(params[:return_to]) if params[:return_to]
     else
@@ -422,7 +422,7 @@ def destroy
 
   end
 
-  @parms['action'] = 'update'
+  @form_params['action'] = 'update'
   render action: :edit
 end
 
@@ -496,108 +496,6 @@ def user_has_permission?(permission, collection_name)
   true
 end
 
-########################################################################
-# Merges two forms when current form extends other form. Subroutine of read_drg_form.
-# With a little help of https://www.ruby-forum.com/topic/142809 
-########################################################################
-def forms_merge(hash1, hash2)
-  target = hash1.dup
-  hash2.keys.each do |key|
-    if hash2[key].is_a? Hash and hash1[key].is_a? Hash
-      target[key] = forms_merge(hash1[key], hash2[key])
-      next
-    end
-    target[key] = hash2[key] == '/' ? nil :  hash2[key]
-  end
-  # delete keys with nil value
-  target.delete_if { |k, v| v.nil? }
-end
-
-########################################################################
-# Extends DRGCMS form file. Extended file is processed first and then merged
-# with code in this form file. Form can extend only single form file.
-# 
-# [Parameters:]
-# [extend_option] : Value of @form['extend'] option
-########################################################################
-def extend_drg_form(extend_option)
-  form_file_name = dc_find_form_file(extend_option) 
-  @form_js << read_js_drg_form(form_file_name)
-  form  = YAML.load_file( form_file_name )
-  @form = forms_merge(form, @form)
-  # If combined form contains tabs and fields options, merge fields into tabs
-  if @form['form']['tabs'] && @form['form']['fields']
-    @form['form']['tabs']['fields'] = @form['form']['fields']
-    @form['form']['fields'] = nil
-  end
-end
-
-########################################################################
-# Include code from another DRGCMS form file. Included code is merged
-# with current form file code. Form can include more than one other DRGCMS forms.
-# 
-# [Parameters:]
-# [include_option] : Value of @form['include'] option
-########################################################################
-def include_drg_form(include_option)
-  includes = include_option.class == Array ? include_option : include_option.split(/\,|\;/)
-  includes.each do |include_file|
-    form_file_name = dc_find_form_file(include_file)    
-    @form_js << read_js_drg_form(form_file_name)
-    form  = YAML.load_file(form_file_name)    
-    @form = forms_merge(@form, form)
-  end
-end
-
-########################################################################
-# Will read data from form_file_name.js if exists.
-# 
-# [Parameters:]
-# [form_file_name] : Physical form filename
-########################################################################
-def read_js_drg_form(form_file_name)
-  js_form_file_name = form_file_name.sub('.yml','.js')
-  File.read(js_form_file_name) rescue ''
-end
-
-########################################################################
-# Read DRG form into @form object. Subroutine of check_authorization.
-########################################################################
-def read_drg_form
-  table_name = decamelize_type(CmsHelper.table_param(params).strip)
-  @tables = table_name.split(';').inject([]) { |r, v| r << [(v.classify.constantize rescue nil), v] }
-
-  # split ids passed when embedded document
-  ids = params[:ids].to_s.strip.downcase
-  @ids = ids.split(';').inject([]) { |r,v| r << v }
-
-  # form_name defaults to last table specified
-  form_name = CmsHelper.form_param(params) || @tables.last[1]
-  @form_js = ''
-
-  # dynamically generated form
-  @form = if CmsHelper.form_param(params) == 'method'
-            dc_eval_class_method(params[:form_method], params)
-          else
-            form_file_name = dc_find_form_file(form_name)
-            @form_js = read_js_drg_form(form_file_name)
-            YAML.load_file(form_file_name)
-          end
-
-  # form includes or extends another form file
-  include_drg_form(@form['include']) if @form['include']
-  extend_drg_form(@form['extend'])   if @form['extend']
-  @form['script'] = (@form['script'].blank? ? @form_js : @form['script'] + @form_js)
-  # add readonly key to form if readonly parameter is passed in url
-  @form['readonly'] = 1 if params['readonly'] #and %w(1 yes true).include?(params['readonly'].to_s.downcase.strip)
-
-  # !!!!!! Always use strings for key names since @parms['table'] != @parms[:table]
-  @parms = { 'table' => table_name, 'ids' => params[:ids], 'form_name' => form_name,
-             'return_to' => params['return_to'], 'edit_only' => params['edit_only'],
-             'readonly' => params['readonly'] 
-           }
-end
-
 ############################################################################
 # Load module if available. Try not to mask errors in control module
 ############################################################################
@@ -648,8 +546,7 @@ def check_authorization
      (table.size < 3 or !dc_user_can(DcPermission::CAN_VIEW))
     return render(action: 'error', locals: { error: t('drgcms.not_authorized')} )
   end
-  read_drg_form
-  return render( plain: t('drgcms.form_error') ) if @form.nil?
+  dc_form_read
 
   # Permissions can be also defined on form
   #TODO So far only can_view is used. Think about if using other permissions has sense
@@ -698,6 +595,7 @@ def update_standards(record = @record)
     # and will be directly visible only to admins
     record.dc_site_id = dc_get_site.id if record.respond_to?('dc_site_id') && record.dc_site_id.nil?
   end
+  record.send(:set_history, self) if record.respond_to?(:set_history)
 end
 
 ########################################################################
@@ -739,7 +637,7 @@ def callback_method(key) #:nodoc:
   callback = case
     when params['data'] && params['data'][data_key] then params['data'][data_key]
     # dc_ + key method is present then call it automatically
-    when @form['form'][key] then @form['form'][key]
+    when @form.dig('form', key) then @form['form'][key]
     when respond_to?('dc_' + key) then 'dc_' + key
     when params[data_key] then params[data_key]
     else nil

data/app/controllers/dc_application_controller.rb

@@ -114,27 +114,6 @@ def set_page_title
   dc_add_meta_tag(:name, 'description', @page.meta_description)
 end
 
-########################################################################
-# Searches forms path for file_name and returns full file name or nil if not found.
-# 
-# @param [String] Form file name. File name can be passed as gem_name.filename. This can
-# be useful when you are extending form but want to retain same name as original form
-# For example. You are extending dc_user form from drg_cms gem and want to
-# retain same dc_user name. This can be done by setting drg_cms.dc_user as extend option.
-# 
-# @return [String] Form file name including path or nil if not found.
-########################################################################
-def dc_find_form_file(form_file)
-  form_path = nil
-  form_path, form_file = form_file.split(/\.|\//) if form_file.match(/\.|\//)
-
-  DrgCms.paths(:forms).reverse.each do |path|
-    f = "#{path}/#{form_file}.yml"
-    return f if File.exist?(f) && (form_path.nil? || path.to_s.match(/\/#{form_path}(-|\/)/i))
-  end
-  raise "Exception: Form file '#{form_file}' not found!"
-end
-
 #######################################################################
 # Will render public/404.html file with some debug code includded.
 # 
@@ -445,7 +424,7 @@ end
 #   decamelize_type(ModelName) # 'ModelName' => 'model_name'
 ########################################################################
 def decamelize_type(model_string)
-  model_string ? model_string.underscore : nil
+  model_string ? model_string.to_s.underscore : nil
 end
 
 ####################################################################
@@ -460,7 +439,8 @@ def dc_error_messages_for(document)
 
   msg = ''
   document.errors.each do |error|
-    label = t("helpers.label.#{decamelize_type(document.class)}.#{error.attribute}", error.attribute)
+    label = t("helpers.label.#{decamelize_type(document.class)}.#{error.attribute}")
+    label = error.attribute if label.match( 'translation missing' )
     msg << "<li>#{label} : #{error.message}</li>"
   end
 
@@ -833,4 +813,101 @@ def redis
   Rails.cache.redis
 end
 
+########################################################################
+# Extends DRGCMS form file. Extended file is processed first and then merged
+# with code in this form file. Form can extend only single form file.
+#
+# [Parameters:]
+# [extend_option] : Value of @form['extend'] option
+########################################################################
+def dc_form_extend(extend_option)
+  form_file_name = CmsHelper.form_file_find(extend_option)
+  @form_js << read_js_drg_form(form_file_name)
+  form  = YAML.load_file( form_file_name )
+  @form = CmsHelper.forms_merge(form, @form)
+  # If combined form contains tabs and fields options, merge fields into tabs
+  if @form['form']['tabs'] && @form['form']['fields']
+    @form['form']['tabs']['fields'] = @form['form']['fields']
+    @form['form']['fields'] = nil
+  end
+end
+
+########################################################################
+# Include code from another DRGCMS form file. Included code is merged
+# with current form file code. Form can include more than one other DRGCMS forms.
+#
+# [Parameters:]
+# [include_option] : Value of @form['include'] option
+########################################################################
+def dc_form_include(include_option)
+  includes = include_option.class == Array ? include_option : include_option.split(/\,|\;/)
+  includes.each do |include_file|
+    form_file_name = CmsHelper.form_file_find(include_file)
+    @form_js << read_js_drg_form(form_file_name)
+    form  = YAML.load_file(form_file_name)
+    @form = CmsHelper.forms_merge(@form, form)
+  end
+end
+
+########################################################################
+# Will read data from form_file_name.js if exists.
+#
+# [Parameters:]
+# [form_file_name] : Physical form filename
+########################################################################
+def read_js_drg_form(form_file_name)
+  js_form_file_name = form_file_name.sub('.yml','.js')
+  File.read(js_form_file_name) rescue ''
+end
+
+########################################################################
+# Read DRG form into @form object. Subroutine of check_authorization.
+########################################################################
+def dc_form_read
+  params[:table] ||= params[:t] || CmsHelper.form_param(params)
+  table_name = decamelize_type(CmsHelper.table_param(params).strip)
+  @tables = table_name.split(';').inject([]) { |r, v| r << [(v.classify.constantize rescue nil), v] }
+
+  # split ids passed when embedded document
+  ids = params[:ids].to_s.strip.downcase
+  @ids = ids.split(';').inject([]) { |r,v| r << v }
+
+  # form_name defaults to last table specified
+  form_name = CmsHelper.form_param(params) || @tables.last[1]
+  @form_js = ''
+
+  # dynamically generated form
+  @form = if CmsHelper.form_param(params) == 'method'
+            dc_eval_class_method(params[:form_method], params)
+          else
+            form_file_name = CmsHelper.form_file_find(form_name)
+            @form_js = read_js_drg_form(form_file_name)
+            YAML.load_file(form_file_name)
+          end
+
+  # form includes or extends another form file
+  dc_form_include(@form['include']) if @form['include']
+  dc_form_extend(@form['extend'])   if @form['extend']
+  @form['script'] = (@form['script'].blank? ? @form_js : @form['script'] + @form_js)
+  # add readonly key to form if readonly parameter is passed in url
+  @form['readonly'] = 1 if params['readonly'] #and %w(1 yes true).include?(params['readonly'].to_s.downcase.strip)
+
+  # !!!!!! Always use strings for key names since @form_params['table'] != @form_params[:table]
+  @form_params = { 'table' => table_name, 'ids' => params[:ids], 'form_name' => form_name,
+                   'return_to' => params['return_to'], 'edit_only' => params['edit_only'],
+                   'readonly' => params['readonly'], 'window_close' => params['window_close']}
+end
+
+########################################################################
+# Will search for help file and return it's full path name if found.
+########################################################################
+def self.find_help_file(help_file_name)
+  file_name = nil
+  DrgCms.paths(:forms).reverse.each do |path|
+    f = "#{path}/help/#{help_file_name}.#{I18n.locale}"
+    file_name = f and break if File.exist?(f)
+  end
+  file_name
+end
+
 end