drg_cms 0.6.1.5 → 0.6.1.11

data/app/models/drgcms_form_fields/multitext_autocomplete.rb

@@ -111,7 +111,7 @@ def render
   @yaml['html']['placeholder'] = t('drgcms.search_placeholder')
   _name = '_' + @yaml['name']
   @html << '<div class="ui-autocomplete-border">'
-  @html << @parent.link_to(@parent.fa_icon('plus-square lg', class: 'dc-animate dc-green'), '#',onclick: 'return false;') # dummy add. But it is usefull.
+  @html << @parent.link_to(@parent.fa_icon('plus-square-o', class: 'dc-green'), '#',onclick: 'return false;') # dummy add. But it is usefull.
 
   record = record_text_for(@yaml['name'])
   # text field for autocomplete
@@ -119,7 +119,7 @@ def render
   # direct link for adding new documents to collection
   if @yaml['with_new'] and !@readonly
     @html << ' ' + 
-             @parent.fa_icon('plus-square lg', class: 'in-edit-add', title: t('drgcms.new'), 
+             @parent.fa_icon('plus-square-o', class: 'in-edit-add', title: t('drgcms.new'),
              style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )    
   end
   # div to list active selections
@@ -137,9 +137,9 @@ def render
       end
 # Related data is missing. It happends.
       @html << if rec
-        link  = @parent.link_to(@parent.fa_icon('remove lg', class: 'dc-animate dc-red'), '#',
+        link  = @parent.link_to(@parent.fa_icon('remove_circle', class: 'dc-red'), '#',
                 onclick: "$('##{rec.id}').hide(); var v = $('##{record}_#{@yaml['name']}_#{rec.id}'); v.val(\"-\" + v.val());return false;")
-        link  = @parent.fa_icon('check lg', class: 'dc-green') if @readonly      
+        link  = @parent.fa_icon('check', class: 'dc-green') if @readonly
         field = @parent.hidden_field(record, "#{@yaml['name']}_#{rec.id}", value: element)
         "<div id=\"#{rec.id}\" style=\"padding:4px;\">#{link} #{rec.send(field_name)}<br>#{field}</div>"
       else
@@ -149,7 +149,7 @@ def render
   end
   @html << "</div></div>"
 # Create text for div to be added when new category is selected  
-  link    = @parent.link_to(@parent.fa_icon('remove lg', class: 'dc-animate dc-red'), '#', 
+  link    = @parent.link_to(@parent.fa_icon('remove_circle', class: 'dc-red'), '#',
             onclick: "$('#rec_id').hide(); var v = $('##{record}_#{@yaml['name']}_rec_id'); v.val(\"-\" + v.val());return false;")
   field   = @parent.hidden_field(record, "#{@yaml['name']}_rec_id", value: 'rec_id')
   one_div = "<div id=\"rec_id\" style=\"padding:4px;\">#{link} rec_search<br>#{field}</div>"

data/app/models/drgcms_form_fields/readonly.rb

@@ -52,8 +52,11 @@ class Readonly < DrgcmsField
 # Render readonly field html code
 ###########################################################################
 def render
+  set_initial_value
+  @record[@yaml['name']] = @yaml['html']['value'] if @yaml['html']['value']
+
   @html << @parent.hidden_field('record', @yaml['name']) # retain field as hidden field
-  @html << '<div class="dc-readonly">'
+  @html << %(<div class="dc-readonly" id="record_#{@yaml['name']}_">)
 
   @html << if @yaml['eval']
              if @yaml['eval'].match(/dc_name4_id|dc_name_for_id/)

data/app/models/drgcms_form_fields/select.rb

@@ -145,9 +145,9 @@ def add_view_code
   return '' if (data = @record.send(@yaml['name'])).blank?
 
   table, form_name = @yaml['view'].split(/\ |\,/).delete_if { |e| e.blank? }
-  url  = @parent.url_for(controller: :cmsedit, id: data, action: :edit, table: table, form_name: form_name, readonly: true, window_close: 1 )
-  icon = @parent.fa_icon('eye')
-  %(<span class="dc-window-open" data-url="#{url}">#{icon}</span>)
+  url  = @parent.url_for(controller: 'cmsedit', id: data, action: :edit, table: table, form_name: form_name, readonly: true, window_close: 1 )
+  icon = @parent.mi_icon('eye-o md-18')
+  %(<span class="dc-window-open" data-url="#{url}"> #{icon}</span>)
 end
 
 ###########################################################################
@@ -189,17 +189,17 @@ def render
 
   set_initial_value('html','selected')
   # separate options and html part
-  html_part = {}
+  options_part = {}
   @yaml['html'].symbolize_keys!
-  %i(class id style required).each { |sym| html_part[sym] = @yaml['html'].delete(sym) if html_part[sym]}
-  html_part[:multiple] = true if @yaml['multiple']
+  %i(selected include_blank).each { |sym| options_part[sym] = @yaml['html'].delete(sym) if @yaml['html'][sym] }
+  @yaml['html'][:multiple] = true if @yaml['multiple']
 
   record = record_text_for(@yaml['name'])
-  if html_part[:multiple]
-    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], html_part)
+  if @yaml['html'][:multiple]
+    @html << @parent.select(record, @yaml['name'], get_choices, options_part, @yaml['html'])
     @js   << "$('##{record}_#{@yaml['name']}').selectMultiple();"
   else
-    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], html_part)
+    @html << @parent.select(record, @yaml['name'], get_choices, options_part, @yaml['html'])
     # add code for view more data
     @html << add_view_code() if @yaml['view']
   end
@@ -222,4 +222,5 @@ def self.get_data(params, name)
 end
 
 end
+
 end

data/app/models/drgcms_form_fields/text_autocomplete.rb

@@ -29,7 +29,8 @@ module DrgcmsFormFields
 # * +name:+ field name (required)
 # * +type:+ text_autocomplete (required)
 # * +table+ Collection (table) name. When defined search must contain field name
-# * +with_new+ Will add an icon for shortcut to add new document to collection
+# * +with_new+ Will add an icon for shortcut to add new document to related collection
+# * +with_edit+ Will add an icon for shortcut to edit (view) related document
 # * +is_id+ Field value represent value as id. If false, field will use entered value and not value selected with autocomplete. Default is true.
 # * +search:+ Search may consist of three parameters from which are separated either by dot (.) 
 #   * search_field_name; when table option is defined search must define field name which will be used for search query
@@ -43,8 +44,9 @@ module DrgcmsFormFields
 #      type: text_autocomplete
 #      search: dc_user.name
 #      is_id: false
-#      html:
-#        size: 30
+#      size: 30
+#      with_new: user
+#      with_edit: user
 ###########################################################################
 class TextAutocomplete < DrgcmsField
  
@@ -58,8 +60,8 @@ def render
     table    = @yaml['search']['table']
     ret_name = @yaml['search']['field']
     method   = @yaml['search']['method']
-  elsif @yaml['search'].match(/\./)
-    table, ret_name, method = @yaml['search'].split(/\.|\,/).map(&:strip)
+  elsif @yaml['search'].match(/\.|\,| /)
+    table, ret_name, method = @yaml['search'].split(/\.|\,| /).map(&:strip)
   else
     ret_name = @yaml['search']
   end
@@ -102,16 +104,22 @@ def render
   @yaml['html'] ||= {}
   @yaml['html']['value'] = value_displayed
   @yaml['html']['placeholder'] ||= t('drgcms.search_placeholder') || nil
-  #
+
   _name = '_' + @yaml['name']
   record = record_text_for(@yaml['name'])  
   @html << '<span class="dc-text-autocomplete">' + @parent.text_field(record, _name, @yaml['html']) + '<span></span>'
+  # with new icon
   if @yaml['with_new']
-    @html << ' ' + 
-             @parent.fa_icon('plus-square lg', class: 'in-edit-add', title: t('drgcms.new'), 
-             style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )    
+    @html << ' ' + @parent.fa_icon('plus-square-o', class: 'in-edit-add', title: t('drgcms.new'),
+             style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )
+  end
+  # with edit icon
+  if @yaml['with_edit'] && @record && @record[@yaml['name']].present?
+    @html << ' ' + @parent.fa_icon('edit-o', class: 'in-edit-add', title: t('drgcms.edit'),
+             style: "vertical-align: top;", 'data-table' => @yaml['with_edit'], 'data-id' => @record[@yaml['name']] )
   end
-  @html << '</span>' + @parent.hidden_field(record, @yaml['name'], value: value)        # actual value will be in hidden field
+  @html << '</span>' + @parent.hidden_field(record, @yaml['name'], value: value) # actual value will be in hidden field
+
   # JS stuff
   # allow unselected values on is_id: false option
   not_id_code = %(
@@ -119,7 +127,7 @@ if (ui.item == null) {
 $("##{record}_#{@yaml['name']}").val($("##{record}__#{@yaml['name']}").val() );
 return;
 } ) if not_id
-  #
+
   @js << <<EOJS
 $(document).ready(function() {
   $("##{record}_#{_name}").autocomplete( {
@@ -140,7 +148,7 @@ $(document).ready(function() {
     change: function (event, ui) { 
       #{not_id_code}
       if (ui.item == null) return;
-      $("##{record}_#{@yaml['name']}").val(ui.item.id);
+      $("##{record}_#{@yaml['name']}").val(ui.item.id).trigger('change');
     },
 
     minLength: 2

data/app/models/drgcms_form_fields/text_with_select.rb

@@ -83,6 +83,7 @@ $(document).ready(function() {
  $('##{@yaml['name']}_').change( function() {
   if ($(this).val().toString().length > 0) {
     $('##{record}_#{@yaml['name']}').val( $(this).val() );
+    $('##{record}_#{@yaml['name']}').trigger("change");
   }
   $('##{record}_#{@yaml['name']}').focus();
  });

data/app/renderers/dc_common_renderer.rb

@@ -68,9 +68,10 @@ end
 #    dc_render(:dc_common_renderer, method: 'google_analytics', code: 'UA-12345678-9')
 ########################################################################
 def google_analytics
+  html = ''
   ga_acc = @opts[:code] || @opts[:ga_acc]
-  return '' if ga_acc.nil? or ga_acc == '/'
-  html =<<EOT 
+  if ga_acc && ga_acc != '/'
+    html << %(
   <!-- Google analytics. -->
 <script type="text/javascript">
   (function(i,s,o,g,r,a,m){
@@ -86,7 +87,23 @@ def google_analytics
     ga('send', 'pageview')
   }
 </script>
-EOT
+)
+  end
+
+  ga4_acc = @opts[:code4] || @opts[:ga4_acc]
+  if ga4_acc && ga4_acc != '/'
+    html << %(
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=#{ga4_acc}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '#{ga4_acc}');
+</script>)
+  end
+
   html.html_safe
 end
 

data/app/renderers/dc_part_renderer.rb

@@ -64,7 +64,7 @@ def render_particle(particle, opts)
   return msg unless can_view
   html = ''
   if @opts[:edit_mode] > 1
-    opts[:editparams].merge!(title: "#{t('drgcms.edit')}: #{particle.name}", controller: :cmsedit)    
+    opts[:editparams].merge!(title: "#{t('drgcms.edit')}: #{particle.name}", controller: 'cmsedit')
     html << dc_link_for_edit( opts[:editparams] )
   end
 #

data/app/renderers/dc_poll_renderer.rb

@@ -120,7 +120,7 @@ def do_one_item(poll, yaml)
     end
     # submit and link tag
     clas = yaml['type'].match(/submit_tag/) ? '' : 'dc-link-submit'
-    html << "<span class='#{clas} dc-animate'>#{field_html}#{yaml['separator']}</span>"
+    html << "<span class='#{clas}'>#{field_html}#{yaml['separator']}</span>"
   # other fields
   else
     html << case

data/app/views/cmsedit/_edit_stuff.html.erb

@@ -2,36 +2,36 @@
   <button class="cms-toggle mode-<%= session[:edit_mode] %>" title="<%= t('drgcms.toggle_cms')%>">CMS</button>
   <% # = link_to('CMS', controller: 'dc_common', action: 'toggle_edit_mode', return_to: request.url) %>
   <% if session[:edit_mode] > 1 %>
-    <div class="cmsedit-table cmsedit-top">
-      <div id="menu">
+    <div class="cmsedit-top">
+      <div id="cms-top-menu">
 
         <% if @page %>
-          <%= link_to( fa_icon('file-text-o lg', class: "dc-animate", title: "#{t('drgcms.edit_page')}"),
+          <%= link_to( fa_icon('description-o', title: "#{t('drgcms.edit_page')}"),
               {controller: 'cmsedit', action: 'edit', table: @site.page_class, id: @page._id}, target: 'iframe_cms') %>
         <% end %>
 
         <% if @design %>
-          <%= link_to( fa_icon('credit-card lg', class: "dc-animate", title: "#{t('drgcms.edit_design')}"),
+          <%= link_to( fa_icon('web', title: "#{t('drgcms.edit_design')}"),
               {controller: 'cmsedit', action: 'edit', table: 'dc_design', id: @design._id}, target: 'iframe_cms') %>
         <% end %>
 
         <% if @site %>
-          <%= link_to( fa_icon('globe lg', class: "dc-animate", title: "#{t('drgcms.edit_site')}"),
+          <%= link_to( fa_icon('public', title: "#{t('drgcms.edit_site')}"),
               {controller: 'cmsedit', action: 'edit', table: 'dc_site', id: @site._id}, target: 'iframe_cms') %>
         <% end %>
-        <b>&nbsp; | &nbsp; </b>
+        <span>|</span>
         
-        <%= link_to( fa_icon('compress lg', class: "dc-animate", title: t('drgcms.minimize')), '#',
+        <%= link_to( fa_icon('compress', title: t('drgcms.minimize')), '#',
             onclick: "$('#iframe_cms').height(1); return false;" ) %>
 
-        <%= link_to( fa_icon('expand lg', class: "dc-animate", title: t('drgcms.maximize')), '#',
+        <%= link_to( fa_icon('expand', title: t('drgcms.maximize')), '#',
             onclick: "$('#iframe_cms').height( $('#iframe_cms').height() + 500);; return false;")  %>
 
-        <%= link_to( fa_icon('refresh lg', class: "dc-animate", title: t('drgcms.reload')), '#',
+        <%= link_to( fa_icon('refresh', title: t('drgcms.reload')), '#',
             onclick: "document.location.reload(true); return false;")  %>
-        <b>&nbsp; | &nbsp; </b>
+        <span>|</span>
 
-        <%= link_to( fa_icon('copy lg', class: "dc-animate", title: "#{t('drgcms.doc_paste_title')}"),
+        <%= link_to( fa_icon('content_paste-o', title: t('drgcms.doc_paste_title')),
             {controller: 'dc_common', action: 'paste_clipboard'}, target: 'iframe_cms') %>
 
         <%= DrgcmsFormFields::Elfinder.file_manager_url(self) %>
@@ -42,7 +42,7 @@
     <div id="menu-hamburger"><%= fa_icon('bars') %></div>
 
     <div class="cmsedit-container">
-      <div id="menu">
+      <div id="cms-menu">
         <%= dc_choices4_cmsmenu.html_safe %>
       </div>
 

data/app/views/cmsedit/_form.html.erb

@@ -1,17 +1,24 @@
+<div id="dc-form-container">
+  <div id="dc-form-left">
+    <%= dc_form_left %>
+  </div>
 
-<%= dc_flash_messages %>
-<%= dc_error_messages_for @record %>
-<%= dc_warning_messages_for @record %>
+  <div id="dc-form-right">
+    <%= dc_flash_messages %>
+    <%= dc_error_messages_for @record %>
+    <%= dc_warning_messages_for @record %>
 
-<div class="dc-form-frame">
+    <div class="dc-form-frame">
+    <% fields = dc_fields_for_form %>
+    <%= dc_actions_for_form 'top' %>
 
-  <%= dc_actions_for_form 'top' %>
-  
-  <%= dc_fields_for_form %>
-  <%= dc_document_statistics %>
+    <%= fields %>
+    <%= dc_document_statistics %>
 
-  <%= dc_actions_for_form 'bottom' %>
-</div>
+    <%= dc_actions_for_form 'bottom' %>
+    </div>
 
-<%= javascript_tag(@js)  unless @js.blank? %>
-<% unless @css.blank? %><style type="text/css"><%= @css %></style><% end %>
+    <%= javascript_tag(@js)  unless @js.blank? %>
+    <% unless @css.blank? %><style><%= @css %></style><% end %>
+  </div>
+</div>

data/app/views/cmsedit/edit.html.erb

@@ -1,9 +1,13 @@
-<%= dc_head_for_form %>
-<%= dc_table_title dc_edit_title() %>
+<% dc_form_update %>
 
-<%= form_tag( @parms, method: :put, id: params['form_name'] || params['table'],
-              class: 'cmsform', multipart: @form['form']['multipart'] ) do %>
-  <%= render partial: 'form' %>
-<% end %>
+<div <%= dc_form_id %>>
+  <%= dc_head_for_form %>
+  <%= dc_table_title dc_edit_title() %>
+
+  <%= form_tag( @form_params, method: :put, id: CmsHelper.form_param(params) || CmsHelper.table_param(params),
+                class: 'cmsform', multipart: @form['form']['multipart'], window_close: params[:window_close] ) do %>
+    <%= render partial: 'form' %>
+  <% end %>
+</div>
 
 <div id="popup" style="display: none;"></div>

data/app/views/cmsedit/index.html.erb

@@ -1,12 +1,14 @@
-<div id="<%= params['form_name'] || params['table'] %>" class="dc-form-frame">
+<% dc_form_update %>
+
+<div <%= dc_form_id %> class="dc-form-frame">
   <%= dc_title_for_index @records %>
 
   <%= dc_actions_for_index %>
   <%= dc_div_filter %>
   <%= dc_flash_messages %> 
-  <div id='result'> <%= render partial: 'result' %></div>
+  <div id="result"> <%= render partial: 'result' %></div>
 </div>
 
 <%= javascript_tag(@js) unless @js.blank? %>
-<% unless @css.blank? %><style type="text/css"><%= @css %></style><% end %>
+<% unless @css.blank? %><style><%= @css %></style><% end %>
 <div id="popup" style="display: none;"></div>

data/app/views/cmsedit/login.html.erb

@@ -12,7 +12,7 @@
       <div class="input"><%= password_field('record', 'password') %></div>
       
       <div class="label"></div>
-      <div class="input"><%= submit_tag t('drgcms.login'), class: 'dc-animate-button' %></div>
+      <div class="input"><%= submit_tag t('drgcms.login'), class: 'dc-submit' %></div>
       <%= hidden_field_tag('return_to_error', request.url ) %>
     <% end %>
   </div>

data/app/views/cmsedit/new.html.erb

@@ -1,8 +1,12 @@
-<%= dc_table_title dc_new_title %>
+<% dc_form_update %>
 
-<%= form_tag(@parms, method: :post, id: params['form_name'] || params['table'],
-             class: 'cmsform', multipart: @form['form']['multipart']) do %>
-  <%= render partial: 'form' %>
-<% end %>
+<div <%= dc_form_id %>>
+  <%= dc_table_title dc_new_title %>
+
+  <%= form_tag(@form_params, method: :post, id: CmsHelper.form_param(params) || CmsHelper.table_param(params),
+               class: 'cmsform', multipart: @form['form']['multipart']) do %>
+    <%= render partial: 'form' %>
+  <% end %>
+</div>
 
 <div id="popup" style="display: none;"></div>

data/app/views/dc_common/_help.html.erb

@@ -8,6 +8,7 @@
     <% if @commnets %>
       <button onclick="location.href='#comments'; return false;"><%= t('drgcms.dc_help.comments_button') %></button>
     <% end %>
+    <div style="float: right"><%= fa_icon('close', class: 'dc-link') %></div>
   </div>
 
   <div class="help-body"><%= dc_help_body if @help %></div>

data/app/views/dc_common/paste_clipboard.html.erb

@@ -2,7 +2,7 @@
 <%= dc_table_title t('drgcms.doc_paste_title') %>
 
 <div class="dc-form-frame"><br>
-  <span class="dc-link dc-link-ajax dc-animate" data-request="post" title="<%= t('drgcms.doc_paste_clipboard') %>"
+  <span class="dc-link-ajax" data-request="post" title="<%= t('drgcms.doc_paste_clipboard') %>"
         data-url="<%= url_for(controller: 'dc_common', action: 'paste_clipboard') %>"><%= t('drgcms.doc_paste_clipboard') %>
   </span>
   

data/app/views/layouts/cms.html.erb

@@ -3,15 +3,13 @@
 <head>
   <title><%= @page_title %></title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
   <%= stylesheet_link_tag "cms", media: 'all' %>
-<% if false %>  not require in cms mode
-  <style type="text/css" media="all"><%= "#{@site.css if @site}#{@design.css if @design}\n#{@page.css if @page}".html_safe  %></style>
-  <%= @site.header.html_safe if @site %>
-<% end %>
   <%= javascript_include_tag "cms" %>
   <%= csrf_meta_tags %>
 </head>
-<body>
+<body id="body-cms">
 
 <%= yield %>
 

data/config/locales/drgcms_en.yml

@@ -69,12 +69,17 @@ en:
     toggle_cms: Toggle CMS edit/view mode
     edit: Edit
     show: Show
+    duplicate: Duplicate
     new: New
     sort: Sort
     filter: Filter
     refresh: Refresh
     back: Back
+    next: Next
+    finish: Finish
+    steps: Steps
     close: Close
+    cancel: Cancel
     delete: Delete
     enable: Enable
     disable: Disable
@@ -97,6 +102,7 @@ en:
     updated_by: Updated by
     created_at: Created at
     updated_at: Updated at
+    active: Active
     new_record: New record
     
     filter_poll: Filter
@@ -117,7 +123,7 @@ en:
       simple_message: Please write in the name of month no %{number} in a year.
 
     filters:
-      this_site_only: Documents for currently selected site only
+      this_site_only: Only documents of currently selected web site
 
     dc_help:
       help: HELP

data/config/locales/drgcms_sl.yml

@@ -70,11 +70,16 @@ sl:
     edit: Urejanje
     show: Prikaz
     new: Dodaj
+    duplicate: Podvoji
     sort: Razvrsti
     filter: Filter
     refresh: Osveži
     back: Nazaj
+    next: Naprej
+    steps: Koraki
+    finish: Zaključek
     close: Zapri
+    cancel: Preklic
     delete: Izbris
     enable: Omogoči
     disable: Onemogoči
@@ -97,6 +102,7 @@ sl:
     updated_by: Spremenil
     created_at: Ustvarjeno
     updated_at: Spremenjeno
+    active: Aktiven
     new_record: Nov zapis
     
     filter_poll: Filter
@@ -114,7 +120,7 @@ sl:
       restore: Restavriraj      
       
     filters:
-      this_site_only: Dokumenti samo trenutno izbrane strani
+      this_site_only: Samo dokumenti trenutne spletne strani
 
     dc_help:
       help: POMOČ

data/config/locales/kaminari.yml

@@ -23,4 +23,4 @@ sx:
       last: "Zadnja »"
       previous: "‹ Nazaj"
       next: "Naprej ›"
-      truncate: "..."            
+      truncate: "..."

data/drg_cms.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.7'
 
-  s.add_dependency 'rails', '~> 6.1'
+  s.add_dependency 'rails'#, '~> 6.1'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails'
   s.add_dependency 'non-stupid-digest-assets'  
@@ -30,6 +30,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'kaminari-mongoid'
   s.add_dependency 'kaminari-actionview'
-  s.add_dependency 'font-awesome-rails'
+  s.add_dependency 'drg_material_icons'
   s.add_dependency 'sort_alphabetical'
 end

data/lib/drg_cms/version.rb

@@ -23,5 +23,5 @@
 
 # drg_cms gem version
 module DrgCms #:nodoc:
-  VERSION = '0.6.1.5'.freeze
+  VERSION = '0.6.1.11'.freeze
 end

data/lib/drg_cms.rb

@@ -219,24 +219,24 @@ end
 ###############################################################################
 def self.routes
   Rails.application.routes.draw do
-    #  match '/dc_common/:action' => 'dc_common#:action', via: [:get, :put, :post]
     controller :dc_common do
       post 'dc_common/autocomplete'     => :autocomplete
       post 'dc_common/ad_click'         => :ad_click
       get 'dc_common/toggle_edit_mode'  => :toggle_edit_mode
       match 'dc_common/process_login'   => :process_login, via: [:put, :post]
-      get 'dc_common/logout'            => :logout
       get 'dc_common/login'             => :login
+      get 'dc_common/logout'            => :logout
       get 'dc_common/copy_clipboard'    => :copy_clipboard
       match 'dc_common/paste_clipboard' => :paste_clipboard, via: [:get, :post]
       put 'dc_common/restore_from_journal'  => :restore_from_journal
       get 'dc_common/add_json_ld_schema'    => :add_json_ld_schema
       get 'dc_common/help' => :help
     end
-    match 'elfinder' => 'dc_elfinder#connector', via: [:get, :post]
+    match 'elfinder'    => 'dc_elfinder#connector', via: [:get, :post]
+    get   'cms/login'   => 'cmsedit#login'
+    get   'cms/logout'  => 'cmsedit#logout'
     match 'cmsedit/run' => 'cmsedit#run', via: [:get, :put, :post]
     resources :cmsedit
-    resources :cms, controller: :cmsedit
   end
 end