drg_cms 0.6.1.4 → 0.6.1.9

data/app/models/drgcms_form_fields/select.rb

@@ -144,9 +144,8 @@ end
 def add_view_code
   return '' if (data = @record.send(@yaml['name'])).blank?
 
-  ar = @yaml['view'].split(/\ |\,/).delete_if {|e| e.blank?}
-  table, form_name = *ar
-  url  = @parent.url_for(controller: :cmsedit, id: data, action: :edit, table: table, form_name: form_name, readonly: true, window_close: 1 )
+  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>)
 end
@@ -158,9 +157,9 @@ def ro_standard
   value = @record.respond_to?(@yaml['name']) ? @record.send(@yaml['name']) : nil
   return self if value.blank?
 
+  html = ''
   choices = get_choices()
   if value.class == Array   # multiple choices
-    html = ''
     value.each do |element|
       choices.each do |choice|
         if choice.to_s == element.to_s
@@ -169,17 +168,17 @@ def ro_standard
         end
       end       
     end
-    return super(html)
   else
     choices.each do |choice|
       if choice.class == Array
-        return super(choice.first) if choice.last.to_s == value.to_s
+        (html = choice.first; break) if choice.last.to_s == value.to_s
       else
-        return super(choice) if choice.to_s == value.to_s
+        (html = choice; break) if choice.to_s == value.to_s
       end 
     end
+    html << add_view_code if @yaml['view']
   end
-  super('')
+  super(html)
 end
 
 ###########################################################################
@@ -190,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
@@ -223,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[@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( {

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,6 +1,7 @@
 
-<%= dc_flash_messages %> 
-<%= dc_error_messages_for @record %> 
+<%= dc_flash_messages %>
+<%= dc_error_messages_for @record %>
+<%= dc_warning_messages_for @record %>
 
 <div class="dc-form-frame">
 

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

@@ -1,24 +1,27 @@
 
 <div class="dc-table-frame">
 
-  <% unless @records.nil? %>
-      <%= dc_background_for_result(:start) %>
-  
-      <%= dc_header_for_result %>
-      <% for document in @records %>
-        <%= dc_row_for_result(document) %>
-        <%= dc_actions_for_result(document) %>
-        <%= dc_columns_for_result(document) %>
-        </div>
-      <% end %>
-      <% if @record_footer %>
-        <div class="dc-result-data footer">
-        <%= dc_actions_column_for_footer() %>
-        <%= dc_columns_for_result(@record_footer) %>
-        </div>
-      <% end %>
-        
-      <%= dc_background_for_result(:end) %>
+  <% if @form['result_set']['type'] == 'method' %>
+    <%= dc_process_result_set_method %>
+  <% elsif @records %>
+    <%= dc_background_for_result(:start) %>
+    <%= dc_header_for_result %>
+
+    <% for document in @records %>
+      <%= dc_row_for_result(document) %>
+      <%= dc_actions_for_result(document) %>
+      <%= dc_columns_for_result(document) %>
+      </div>
+    <% end %>
+
+    <% if @record_footer %>
+      <div class="dc-result-data footer">
+      <%= dc_actions_column_for_footer() %>
+      <%= dc_columns_for_result(@record_footer) %>
+      </div>
+    <% end %>
+
+    <%= dc_background_for_result(:end) %>
   <% end %>
   <%= dc_filter_popup() %>
   

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/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

@@ -60,14 +60,16 @@ en:
     login: Login into CMS
     username: User name
     password: Password
-    form_error: Error loading form #{form_name}
+    form_error: Error loading form %{form_name}
     img_large: Click for larger image
-    no_class: Class %{class} not defined!
+    no_class: Class [%{class}] not defined!
+    no_method: Method (helper) [%{method}] not defined!
     img_alt_not_present: All images in body must have alternative text entered
     
     toggle_cms: Toggle CMS edit/view mode
     edit: Edit
     show: Show
+    duplicate: Duplicate
     new: New
     sort: Sort
     filter: Filter
@@ -116,7 +118,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

@@ -60,15 +60,17 @@ sl:
     login: Prijava v CMS
     username: Uporabnik
     password: Geslo
-    form_error: Napaka pri branju forme #{form_name}
+    form_error: Napaka pri branju forme %{form_name}
     img_large: Klik za večjo sliko
-    no_class: Class %{class} ni definiran!
+    no_class: Razred (class) [%{class}] ni definiran!
+    no_method: Metoda (helper) [%{method}] ne obstaja!
     img_alt_not_present: Vse slike v vsebini morajo imeti vpisano nadomestno besedilo    
 
     toggle_cms: Preklopi med CMS urejanjem in prikazom
     edit: Urejanje
     show: Prikaz
     new: Dodaj
+    duplicate: Podvoji
     sort: Razvrsti
     filter: Filter
     refresh: Osveži
@@ -113,7 +115,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/config/locales/models_sl.yml

@@ -984,3 +984,4 @@ sl:
         active: Podatki so aktivni
         add_schema: Dodaj strukturo
         add_error: Element %{schema} že obstaja!
+

data/drg_cms.gemspec

@@ -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.4'.freeze
+  VERSION = '0.6.1.9'.freeze
 end

data/lib/drg_cms.rb

@@ -140,12 +140,8 @@ end
 def self.model_check(document, crash = false)
   return nil unless document.errors.any?
 
-  msg = ""
-  document.errors.each do |attribute, errors_array|
-    msg << "#{attribute}: #{errors_array}\n"
-  end
-  #
-  if crash and msg.size > 0
+  msg = document.errors.inject('') { |r, error| r << "#{error.attribute}: #{error.message}\n" }
+  if crash && msg.size > 0
     msg = "Validation errors in #{document.class}:\n" + msg
     pp msg
     Rails.logger.error(msg)
@@ -223,27 +219,25 @@ 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
 
 end
-
-DrgCms.add_patches_path(File.dirname(__FILE__) + '../app/models/drgcms_form_fields/patches')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.1.4
+  version: 0.6.1.9
 platform: ruby
 authors:
 - Damjan Rems
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: font-awesome-rails
+  name: drg_material_icons
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -163,6 +163,12 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/fonts/ibm-plex-sans-300.woff2
+- app/assets/fonts/ibm-plex-sans-400.woff2
+- app/assets/fonts/ibm-plex-sans-500.woff2
+- app/assets/fonts/ibm-plex-sans-600.woff2
+- app/assets/fonts/ibm-plex-sans-700.woff2
+- app/assets/fonts/ibm-plex-sans-italic.woff2
 - app/assets/images/32px.png
 - app/assets/images/drg_cms/32px.png
 - app/assets/images/drg_cms/40px.png
@@ -210,6 +216,7 @@ files:
 - app/controllers/dc_common_controller.rb
 - app/controllers/dc_main_controller.rb
 - app/controls/browse_models_control.rb
+- app/controls/cmsedit_control.rb
 - app/controls/dc_help_control.rb
 - app/controls/dc_page_control.rb
 - app/controls/dc_poll_result_control.rb
@@ -352,8 +359,6 @@ files:
 - app/renderers/dc_poll_renderer.rb
 - app/renderers/dc_renderer.rb
 - app/renderers/dc_simple_menu_renderer.rb
-- app/views/cmsedit/__remove_edit_stuff.js.erb
-- app/views/cmsedit/__show.html.erb
 - app/views/cmsedit/_edit_stuff.html.erb
 - app/views/cmsedit/_form.html.erb
 - app/views/cmsedit/_result.html.erb

data/app/views/cmsedit/__remove_edit_stuff.js.erb

@@ -1,6 +0,0 @@
-
-<% if session[:edit_mode] == 2 %>
-  <%= javascript_tag do %>
-    /* $('div[id^="drgcms-"]').css('border', '1px dotted blue') */
-  <% end %>
-<% end %>

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

@@ -1,21 +0,0 @@
-<% if session[:edit_mode] and session[:edit_mode] > 0 %>
-  <%= render partial: 'edit_stuff' %>
-  <%= render partial: 'edit_stuff', formats: ['js']  %>
-<% else %>
-  <h2>CMS login</h2>
-  <%= dc_flash_messages %>   
-  <%= form_tag controller: 'dc_common', action: 'process_login', return_to: '/cmsedit/show', method: :put do %>
-    <table>
-      <tr>
-        <td>Username:</td>
-        <td><%=  text_field('record', 'username') %>
-      </tr><tr>  
-        <td>Password:</td>
-        <td><%=  password_field('record', 'password') %>
-      </tr><tr>  
-        <td><%= submit_tag 'Login' %></td>
-      </tr>
-    </table>
-    <%= hidden_field_tag('return_to_error', request.url ) %>
-  <% end %>
-<% end %>