drg_cms 0.7.0.2 → 0.7.1.1

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

@@ -45,7 +45,7 @@
   font-family: DrgSans;
   font-style: normal;
   font-weight: 600;
-  src: url('ibm-plex-sans-600.woff2') format('woff2')
+  src: url('ibm-plex-sans-600.woff2') format('woff2');
 }
 @font-face {
   font-family: DrgSans;
@@ -83,7 +83,6 @@ time, mark, audio, video {
 	margin:  0;
 	padding:  0;
 	border:  0;
-	font-size: 100%;
 	font: inherit;
 	vertical-align: baseline;
 }
@@ -138,6 +137,10 @@ textarea, input, select {
   max-width: 200px;
 }
 
+.dc-action-menu .ui-autocomplete-input {
+  padding: 8px 4px 8px 12px;
+}
+
 textarea:focus, input:focus, select:focus {
   border: 1px solid rgba(44, 142, 255, 1);
   outline: 1px solid rgba(44, 142, 255, 1);
@@ -212,6 +215,13 @@ img { vertical-align:bottom; }
 .dc-image-preview img { max-height: 2rem; padding-left: 0.5rem;}
 .dc-image-preview img:hover { cursor: zoom-in;}
 
+#dc-image-preview {
+  padding: 2px;
+  background-color: #fff;
+  filter: drop-shadow(0 0 1rem #000);
+  display: none;
+}
+
 .text-with-select { width: 20px; }
 
 .no-borders {
@@ -396,7 +406,7 @@ border-radius: 1px;
 .dc-result-data.footer {
   border-top: 2px solid #222;
   color: #000;
-  font-weight: bold;
+  font-weight: 600;
   background-color: #eee;
 }
 
@@ -548,6 +558,12 @@ display: inline-table;
   background-color: #444;
 }
 
+.dc-inline-link.dc-link-ajax {
+  padding: initial;
+  border: none;
+  background: initial;
+}
+
 .skip-next {
   text-align: center;
   border:1px solid #888;
@@ -630,8 +646,7 @@ display: inline-table;
 /*****   FORM    *****/
 
 #dc-form-container {
-  display: flex;
-  padding-left: 4px;
+  /*display: flex;*/
 }
 
 #dc-form-left {
@@ -646,7 +661,7 @@ display: inline-table;
 }
 
 .dc-form-frame {
-  margin: 0px;
+  margin: 0;
   padding: 4px;
 }
 
@@ -670,7 +685,6 @@ display: inline-table;
   border-radius: 2px;
   margin: 2px 0;
 }
-
 .dc-form-warning {
   padding: 8px;
   background-image: linear-gradient(to bottom, rgba(213, 143, 218, 0.1) 0, rgba(213, 143, 218, 0.5) 100%);
@@ -702,7 +716,7 @@ display: inline-table;
   color: #555;
   text-align: right;
   vertical-align: middle;
-  font-weight: 600;
+  font-weight: 500;
   padding: 10px 2px;
   width: 150px;
 }
@@ -721,7 +735,8 @@ display: inline-table;
 }
 
 .dc-form-label.dc-color-odd, .dc-form-label.dc-color-even {background-color: transparent;}
-.dc-form-field.dc-color-odd, .dc-form-field.dc-color-even {background-color: transparent;}
+
+.dc-form-label.dc-width-0 { padding: 0;}
 
 .dc-align-left {
   text-align: left;
@@ -733,7 +748,9 @@ display: inline-table;
 .dc-form-field {
   text-align: left;
   padding: 4px 2px;
-  z-index: 10;
+  /*z-index: 10;*/
+  white-space: nowrap;
+  text-overflow: fade;
 }
 
 .dc-form-field .action li {
@@ -878,6 +895,10 @@ display: flex;
   color: rgba(44, 142, 255, 1);
 }
 
+.dc-popup-open:hover {
+  color: rgba(44, 142, 255, 1);
+}
+
 /*** CMS toggle button */
 .cms-toggle {
   z-index: 1000000;
@@ -1058,6 +1079,7 @@ font-size: 1.2em;
   font-size: 1.1em;
   line-height: 1.4em;
 }
+
 /****** jquery ui-autocomplete widget ***************/
 .ui-autocomplete-input {
   padding: 8px 4px 8px 12px;
@@ -1119,16 +1141,7 @@ color: #000;
   margin-left: 4px;
 }
 
-
-.dc-red { color: #f76;}
-.dc-red:hover { color: #c43;}
-.dc-green { color: #9c9;}
-.dc-green:hover { color: #6a6;}
-
-.aui-corner-all {
-  background-color: lightyellow;
-}
-
+/************* login *************/
 #dc-login {
   position: fixed;
   top: 50%;
@@ -1166,16 +1179,18 @@ color: #000;
   border-radius: 2px;
   z-index: 100;
   list-style-type: none;
-  filter: drop-shadow(1px 1px 4px #eee);
+  filter: drop-shadow(1px 1px 6px #ccc);
 }
 
 .drgcms_popmenu_class i {
   vertical-align: sub;
   color: rgba(44, 142, 255, 1);
+  font-size: 22px;
 }
 
 .drgcms_popmenu_item {
   padding: 4px;
+  font-size: 1.1em;
 }
 
 .drgcms_popmenu_item:hover {
@@ -1186,14 +1201,14 @@ color: #000;
   color: white;
 }
 .iframe_embedded {
-  padding: 4px;
+  padding: 2px;
   background-color: #fff;
   border-radius: 2px;
-  border: 2px solid #666;
+  border: 2px solid #888;
 }
 
 #iframe_edit, #iframe_cms {
-  height: 1px;
+/*  height: 1px;*/
   width: 100%;
   border:  0;
   margin-bottom:  0;
@@ -1367,6 +1382,7 @@ color: #000;
   max-height: 700px;
   overflow-y: auto;
   max-width: 800px;
+  line-height: 1.5em;
 }
 
 #popup .dc-help h1 {
@@ -1460,6 +1476,35 @@ color: #000;
   display: inline-flex;
 }
 
+#popup:has(.popup-info) {
+  padding: 1rem;
+  background-image: linear-gradient(to bottom, #dff0d8 0, #c8e5bc 100%);
+  color: darkgreen;
+  font-weight: 600;
+  font-size: 1.1em;
+  min-width: 30%;
+  border: 2px solid darkgreen;
+}
+
+#popup:has(.popup-error) {
+  padding: 1rem;
+  background-image: linear-gradient(to bottom, #f2dede 0, #e7c3c3 100%);
+  color: #a94442;
+  font-weight: 600;
+  font-size: 1.1em;
+  min-width: 30%;
+  border: 2px solid #a94442;
+}
+
+#popup .popup-info button, #popup .popup-error button {
+  margin-top: 1rem;
+  padding: 4px 2rem;
+  line-height: initial;
+  filter: none;
+  border: 2px solid #222;
+  border-radius: 5px;
+}
+
 .filter-popup {
   background-color: #fff;
   filter: drop-shadow(2px 2px 8px #888);
@@ -1529,7 +1574,7 @@ cursor: pointer;
 
 #drgcms_filter h1 {
   font-size: 1.8em;
-  font-width: 600;
+  font-weight: 600;
   color: rgba(44, 142, 255, 1);
 }
 
@@ -1552,6 +1597,36 @@ cursor: pointer;
   margin-left: 1px;
 }
 
+/**** reports ****/
+.report .dc-title { color: #003A68; }
+.report .dc-result-header {
+  border-bottom: 2px solid #003A68;
+}
+.report .dc-result-header .th {
+  color: #003A68;
+  padding: 3px;
+}
+
+.report .dc-result-data {
+  padding: 0;
+}
+
+.report.dc-form-frame {
+  padding: 0;
+}
+
+
+.report .dc-result-data .td {
+  padding: 3px;
+}
+
+.iframe_embedded#if_dc_temp {
+  border: none;
+  padding: 0;
+}
+
+.report .dc-odd {background-color: #e0eeff;}
+
 /**  Radio button input field **/
 
 .dc-radio {
@@ -1576,23 +1651,30 @@ cursor: pointer;
   margin: 6px 4px 0 0;
 }
 
+.dc-image-preview-1 {
+  right: 1rem;
+  position: absolute;
+  top: 5rem;
+  max-height: 150px;
+  max-width: 200px;
+}
+
+#dc_image .dc-image-preview img {
+  max-height: 150px;
+  max-width: 200px;
+}
+
 /****** MOBILE DEVICE *****/
 @media only screen and (max-device-width: 600px) {
   #body-cms {font-size: 11px;}
   #site-top div:nth-of-type(2) {padding-top: 0 !important;}
-  .dc-title { font-size: 1.5em;}
-
-
-  .dc-form {
-    border: none;
-    border-top: 2px solid #888;
-    border-bottom: 2px solid #888;
-    margin-top: 4px;
+  .dc-title {
+    font-size: 1.5em;
+    padding-bottom: 4px;
   }
+  .dc-form-field { padding-bottom: 4px; }
 
-  .dc-form .row-div {
-    display: block;
-  }
+  .dc-form .row-div { display: block; }
   .dc-form-li {margin-top: 3px;}
 
   .dc-form-label {
@@ -1603,6 +1685,7 @@ cursor: pointer;
   }
   .dc-form-label label {
     font-size: 15px;
+    padding: 0;
   }
 
   .dc-menu { padding: 0;}
@@ -1638,6 +1721,13 @@ cursor: pointer;
     font-size: 2em;
   }
 
+  #menu-hamburger .mi:before{
+    background-color: #222;
+    color: #fff;
+    padding: 1px;
+    border-radius: 2px;
+  }
+
   .cmsedit-container {display: block;}
   .cmsedit-container #cms-menu {display: none;}
   .cmsedit-container #cms-menu.visible {

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

@@ -34,7 +34,7 @@
   -moz-border-radius: 1px;
   border-radius: 1px;
   position: relative;
-  height: 200px;
+  max-height: 200px;
   padding: 0;
   overflow-y: auto;
 }
@@ -63,20 +63,19 @@
 }
 
 .ms-container .ms-selectable li.ms-elem-selectable{
-  padding: 3px 10px;
+  padding: 5px 10px;
   color: #444;
-  font-size: 14px;
 }
 
-.ms-container .ms-selectable li:nth-child(odd) {
-  background-color: #f4f4f4;
+.ms-container .ms-selectable li:nth-child(even) {
+  background-color: #f8f8f8;
 }
 
 .ms-container .ms-selectable li.ms-hover{
   cursor: pointer;
   color: #fff;
   text-decoration: none;
-  background-color: #08c;
+  background-color: rgba(76,154,255, 0.6);
 }
 
 .ms-container .ms-selectable li.disabled{
@@ -92,10 +91,10 @@
 
 .ms-container .ms-selected {
   font-weight: 600;
+  color: darkblue !important;
 }
 
 .pull-right.ms-elem-selected{
   float: right;
-  font-size: smaller;
   padding-left: 4px;
 }

data/app/controllers/cmsedit_controller.rb

@@ -77,7 +77,7 @@
 ########################################################################
 class CmseditController < DcApplicationController
 before_action :check_authorization, :except => [:login, :logout, :test, :run]
-protect_from_forgery with: :null_session, only: Proc.new { |c| c.request.format.json? }
+protect_from_forgery with: :null_session, only: Proc.new { _1.request.format.json? }
   
 layout 'cms'
 
@@ -108,12 +108,17 @@ end
 ########################################################################
 def show
   find_record
+  if @record.nil?
+    flash[:error] ||= t('drgcms.doc_no_edit')
+    return index
+  end
   # before_show callback
   if (m = callback_method('before_show') )
     ret = call_callback_method(m)
     if ret.class == FalseClass
       @form['readonly'] = nil # must be
-      return index 
+      flash[:error] ||= t('drgcms.not_authorized')
+      return index
     end
   end  
 
@@ -269,11 +274,8 @@ def create
   # create document
   if params['id'].nil?
     # Prevent double form submit
-    params[:form_time_stamp] = params[:form_time_stamp].to_i
-    session[:form_time_stamp] ||= 0
-    return index if params[:form_time_stamp] <= session[:form_time_stamp]
+    return index if double_form_submit?
 
-    session[:form_time_stamp] = params[:form_time_stamp]
     create_new_empty_record
     if save_data
       flash[:info] = t('drgcms.doc_saved')
@@ -385,7 +387,7 @@ def destroy
       save_journal(:delete)
       flash[:info] = t('drgcms.record_deleted')
       # after_delete callback
-      if (m = callback_method('after_delete') ) 
+      if (m = callback_method('after_delete') )
         call_callback_method(m)
       elsif params['after-delete'].to_s.match('return_to')
         params[:return_to] = params['after-delete']
@@ -548,14 +550,14 @@ def check_authorization
   end
   dc_form_read
 
-  # Permissions can be also defined on form
+  # Permissions can be also defined in form
   #TODO So far only can_view is used. Think about if using other permissions has sense
   can_view = @form.dig('permissions','can_view')
-  if can_view.nil? or dc_user_has_role(can_view)
+  if can_view.nil? || can_view.split(',').any? { |role| dc_user_has_role(role) }
     extend_with_control_module
   else
     render(action: 'error', locals: { error: t('drgcms.not_authorized')} )
-  end  
+  end
 end
 
 ########################################################################
@@ -613,7 +615,7 @@ def save_journal(operation, changes = {})
 
   if (operation != :update) || changes.size > 0
     # determine site_id
-    site_id = @record.site_id if @record.respond_to?('site_id')
+    site_id = @record.site_id if @record && @record.respond_to?('site_id')
     site_id = dc_get_site._id if site_id.nil? && dc_get_site
 
     DcJournal.create(site_id: site_id,
@@ -637,8 +639,9 @@ 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.dig('form', key) then @form['form'][key]
+    when @form.dig('permissions', key) then @form['permissions'][key]
     when respond_to?('dc_' + key) then 'dc_' + key
+    when respond_to?(key) then key
     when params[data_key] then params[data_key]
     else nil
   end
@@ -714,10 +717,10 @@ def save_data
 
   form_fields.each do |v|
     session[:form_processing] = v['name'] # for debuging
-    next if v['type'].nil? or v['name'].nil? or
-            v['type'].match('embedded') or # don't wipe embedded types
-            (params[:edit_only] and params[:edit_only] != v['name']) or # otherwise other fields would be wiped
-            v['readonly'] or # fields with readonly option don't return value and would be wiped
+    next if v['type'].nil? || v['name'].nil? ||
+            v['type'].match('embedded') || # don't wipe embedded types
+            (params[:edit_only] && params[:edit_only] != v['name']) || # otherwise other fields would be wiped
+            v['readonly'] || # fields with readonly option don't return value and would be wiped
             !@record.respond_to?(v['name']) # there are temporary fields on the form
     # good to know! How to get type of field @record.fields[v['name']].type
     # return value from form field definition
@@ -734,7 +737,7 @@ def save_data
 
   # save data
   changes = @record.changes
-  update_standards() if changes.size > 0  # update only if there has been some changes
+  update_standards if changes.size > 0  # update only if there has been some changes
   if (saved = @record.save)
     operation = @record.new_record? ? :new : :update
     save_journal(operation, @record.previous_changes)
@@ -749,9 +752,9 @@ end
 # in select_fields and deny_fields
 ########################################################################
 def separated_to_symbols(data)
-  data.chomp.split(',').map { |e| e.strip.downcase.to_sym }
+  data.chomp.split(',').map { _1.strip.downcase.to_sym }
 end
-  
+
 ########################################################################
 # Will process only (select_fields) and without (deny_fields) option
 ########################################################################
@@ -843,24 +846,20 @@ def process_collections #:nodoc
     check_sort_options()
   end  
   # result set is defined by filter method in control object
-  form_filter = @form['result_set']['filter']
-  if form_filter
-    if respond_to?(form_filter)
-      @records = send(form_filter)
-      # something went wrong. flash[] should have explanation.
-      if @records.class == FalseClass
-        @records = []
-        render(action: :index)
-        return true
-      end
-      process_select_and_deny_fields           
-      # pagination but only if not already set
-      unless (@form['table'] == 'dc_memory' || @records.options[:limit])
-        per_page = (@form['result_set']['per_page'] || 25).to_i
-        @records = @records.page(params[:page]).per(per_page) if per_page > 0
-      end
-    elsif form_filter != 'dc_filter'
-      Rails.logger.error "Error: result_set:filter: #{@form['result_set']['filter']} not found in controls!"
+  form_filter = @form['result_set']['filter'] || 'default_filter'
+  if respond_to?(form_filter)
+    @records = send(form_filter)
+    # something went wrong. flash[] should have explanation.
+    if @records.class == FalseClass
+      @records = []
+      render(action: :index)
+      return true
+    end
+    process_select_and_deny_fields
+    # pagination but only if not already set
+    unless (@form['table'] == 'dc_memory' || (@records.respond_to?(:options) && @records.options[:limit]))
+      per_page = (@form['result_set']['per_page'] || 25).to_i
+      @records = @records.page(params[:page]).per(per_page) if per_page > 0
     end
   else
     if @tables.size > 1 
@@ -871,7 +870,7 @@ def process_collections #:nodoc
       @records = rec.send(embedded_field_name)   # current embedded set
       # sort by order if order field is present in model
       if @tables.last[1].classify.constantize.respond_to?(:order)
-        @records = @records.order_by('order asc')
+        @records = @records.order_by(order: 1)
       end
     end
   end
@@ -879,19 +878,14 @@ def process_collections #:nodoc
 end
 
 ########################################################################
-# Process index action for in memory data.
+# Process index action for in memory data. default_filter method must fill @records array
+# with data, that will be shown in browser.
 ########################################################################
 def process_in_memory #:nodoc
   @records = []
   # result set is defined by filter method in control object
-  if (method = @form['result_set']['filter'])
-    send(method) if respond_to?(method)    
-  end
-  # result set is defined by class method
-  if (klass_method = @form['result_set']['filter_method'])
-    _klass, method = klass_method.split('.')
-    klass = _klass.classify.constantize
-    @records = klass.send(method) if klass.respond_to?(method)
+  if (method = @form['result_set']['filter'] || 'default_filter')
+    send(method) if respond_to?(method)
   end
   # ensure that record has id field
   if @records.size > 0
@@ -900,4 +894,41 @@ def process_in_memory #:nodoc
   false
 end
 
+########################################################################
+# Prevent double form submit
+#
+# There was a problem with old solution when user opened another browser session while
+# entering data into new document. If in new session user added document to some other
+# collection, save to document in primary session was silently ignored. Now creation time for last three forms
+# is remembered. This will work unless user tries to add new document to the same collection in another session.
+# But that is highly unlikely.
+########################################################################
+def double_form_submit?
+  session[:dfs] ||= {}
+  form_name = CmsHelper.form_param(params) || CmsHelper.table_param(params)
+  params[:form_time_stamp] = params[:form_time_stamp].to_i
+  if params[:form_time_stamp] <= update_dfs_time(form_name) && !Rails.env.test? # test must be excluded
+    flash[:error] = I18n.t('drgcms.dfs')
+    return true
+  end
+  update_dfs_time(form_name, params[:form_time_stamp])
+
+  false
+end
+
+########################################################################
+# Updates double_form_submit timings.
+########################################################################
+def update_dfs_time(form_name, time = nil)
+  if time.nil?
+    session[:dfs][form_name] ||= 0
+  else
+    session[:dfs][form_name] = time
+    if session[:dfs].size > 3
+      oldest = session[:dfs].invert.min
+      session[:dfs].delete(oldest.last)
+    end
+  end
+end
+
 end