drg_cms 0.7.0.2 → 0.7.1.1

data/app/renderers/dc_menu_renderer.rb

@@ -55,7 +55,7 @@ def find_selected
     top_menu_id = @parent.page.menu_id.split(';')[1] if @parent.page.menu_id.match(';')
     ret = @menu.dc_menu_items.find(top_menu_id)
   end
-# return first if not found (something is wrong)
+  # return first if not found (something is wrong)
   ret ||= @menu.dc_menu_items[0]
 end
 
@@ -64,50 +64,11 @@ end
 ########################################################################
 def link_4edit(opts) #:nodoc:
   html = ''
-#  return html unless @opts[:edit_mode] > 1
-
   opts.merge!( { controller: 'cmsedit', action: 'edit' } )
   title = "#{t('drgcms.edit')}: "
   opts[:title] = "#{title} #{opts[:title]}"
   
-  html << '<li>'+dc_link_for_edit(opts)+'</li>'
-end
-
-########################################################################
-# Returns html code required to create single link in a menu. Subroutine of do_menu_level.
-########################################################################
-def link_4menu(item)
-# prepand to link  
-  link = if !item.link_prepend.blank?
-    item.link_prepend
-  elsif !@menu.link_prepend.blank?
-    @menu.link_prepend
-  else
-    ''
-  end
-  
-  if item.link.match('http')
-    link = item.link
-  else
-    link += (item.link[0] == '/' ? '' : '/') + item.link
-    link  = '/' + link unless link[0] == '/'   # link should start with '/'
-  end
-
-  target = item.target.blank? ? nil : item.target
-# - in first place won't write caption text
-  caption   = item.caption[0] == '-' ? '' : item.caption.to_s
-  img_title = item.caption.to_s.sub('-','')
-# add picture if picture is not blank
-  html = ''
-  if !item.picture.blank?
-    if item.picture[0,3] == 'fa-' 
-      caption << @parent.fa_icon(item.picture[3,20])
-    else
-      html = @parent.link_to( @parent.image_tag(item.picture), link, {title: img_title, target: target} ) rescue ''
-    end
-  end
-  html << @parent.link_to(caption.html_safe, link, {target: target}) unless caption.blank?
-  html
+  html << "<li>#{dc_link_for_edit(opts)}</li>"
 end
 
 ########################################################################
@@ -117,9 +78,9 @@ end
 # [item] MenuItem.
 ########################################################################
 def link_4menu(item)
-# just horizontal line
+  # just horizontal line
   return item.caption if item.caption == '<hr>'
-# prepand to link  
+  # prepand to link
   link = if !item.link_prepend.blank?
     item.link_prepend
   elsif !@menu.link_prepend.blank?
@@ -160,27 +121,29 @@ end
 ########################################################################
 # Creates HTML code required for submenu on single level. Subroutine of default.
 ########################################################################
-def do_menu_level(menu, options={})
+def do_menu_level(menu, options = {})
   html = "<ul>"
   if @opts[:edit_mode] > 1
     options[:title] = menu.respond_to?('name') ? menu.name : menu.caption # 1. level or submenus
-    options[:id] = menu._id
+    options[:id]    = menu._id
     html << link_4edit(options)
   end
-# sort items acording to :order  
+  # sort items according to :order
   menu.dc_menu_items.order_by(order: 1).each do |item|
     next unless item.active
-# menu can be hidden from user    
+    # menu can be hidden from user
     can_view, msg = dc_user_can_view(@parent, item)
     next unless can_view
-    
-    html << if item.id == @selected.id 
-      "<li class=\"menu-selected\">#{ link_4menu(item) }"
-    else
-      "<li>#{ link_4menu(item) }"
-    end
-# do submenu    
-    if (sub = item.dc_menu_items).size > 0
+
+    html << if @opts[:path]&.include?(item.link)
+              %(<li class="menu-selected">#{ link_4menu(item) })
+            elsif item.id == @selected.id
+              %(<li class="menu-selected">#{ link_4menu(item) })
+            else
+              "<li>#{ link_4menu(item) }"
+            end
+    # do submenu
+    if item.dc_menu_items.size > 0
       if @opts[:edit_mode] > 1
         opts = options.clone
         opts['ids']   = (opts['ids']   ? "#{opts['ids']};" : '')   + menu._id.to_s
@@ -199,12 +162,12 @@ end
 ########################################################################
 def default
   return "(#{@opts[:name]}) menu not found!" if @menu.nil?
-#  
+
   @selected = find_selected
   html = ''
-  html << "<div id='#{@menu.div_name}'>" unless @menu.div_name.blank?  
+  html << "<div id='#{@menu.div_name}'>" if @menu.div_name.present?
   html << do_menu_level(@menu, table: 'dc_menu')
-  html << "</div>" unless @menu.div_name.blank? 
+  html << "</div>" if @menu.div_name.present?
   html
 end
 

data/app/renderers/dc_page_renderer.rb

@@ -41,7 +41,7 @@ include CmsCommonHelper
 ########################################################################
 # Object initialization.
 ########################################################################
-def initialize( parent, opts={} ) #:nodoc:
+def initialize( parent, opts = {} ) #:nodoc:
   @parent = parent
   @opts   = opts
   @page   = @parent.page
@@ -74,11 +74,11 @@ def iframe
   return '' if @page.if_url.blank?
 
   html =  "\n<iframe"
-  html << " id=\"#{@page.if_id}\"" unless @page.if_id.blank?
-  html << " class=\"#{@page.if_class}\"" unless @page.if_class.blank?
+  html << " id=\"#{@page.if_id}\"" if @page.if_id.present?
+  html << " class=\"#{@page.if_class}\"" if @page.if_class.present?
   html << " border=\"#{@page.if_border}\""  
-  html << " height=\"#{@page.if_height}\"" unless @page.if_height.blank?
-  html << " width=\"#{@page.if_width}\"" unless @page.if_width.blank?
+  html << " height=\"#{@page.if_height}\"" if @page.if_height.present?
+  html << " width=\"#{@page.if_width}\"" if @page.if_width.blank?
   html << " scrolling=\"#{@page.if_scroll}\""
   # Parameters
   parameters = @page.if_url.match(/\?/) ? '' : '?' 
@@ -88,7 +88,7 @@ def iframe
     val = @parent.dc_internal_var(value['object'], value['method'])
     parameters << "&#{key}=#{val}" if val # only when not nil
   end
-  url = @page.if_url + (parameters.size > 1 ? parameters : '')
+  url = @page.if_url + (parameters.blank? ? '' : parameters)
   html << "src=\"#{url}\" ></iframe>\n"
   html
 end
@@ -106,7 +106,7 @@ def default
   html << @page.body
   # render poll if defined
   if @page.dc_poll_id
-    @opts.merge!(:poll_id => @page.dc_poll_id, :return_to => @parent.request.url, method: nil)
+    @opts.merge!(poll_id: @page.dc_poll_id, return_to: @parent.request.url, method: nil)
     comment = DcPollRenderer.new(@parent, @opts)
     html << "<div class='wrap row'>#{comment.render_html}</div>"
     @css << "\n#{comment.render_css}"

data/app/renderers/dc_poll_renderer.rb

@@ -110,7 +110,7 @@ def do_one_item(poll, yaml)
     if !@end_of_data 
       html << (poll.display == 'lr' ? "</div><br>\n" : "</div>\n")
       # captcha
-      if poll.captcha_type.to_s.size > 1
+      if poll.captcha_type.present?
         @opts.merge!(:captcha_type => poll.captcha_type)
         captcha = DcCaptchaRenderer.new(@parent, @opts)
         html << captcha.render_html
@@ -157,7 +157,7 @@ end
 ########################################################################
 def default
   # poll_id may be defined in params or opts
-  poll_id = @opts[:poll_id] || @parent.params[:poll_id]
+  poll_id = @opts[:id] || @opts[:poll_id] || @parent.params[:poll_id]
   return '<br>Poll id is not defined?<br>' if poll_id.nil?
 
   poll = DcPoll.find(poll_id)
@@ -191,18 +191,19 @@ def default
   html <<  %(<div class="poll-div">\n)
   # edit link
   if @opts[:edit_mode] > 1
-    @opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', id: poll._id, table: 'dc_poll', form_name: 'dc_poll' )
+    @opts[:editparams].merge!( controller: :cmsedit, action: :edit, id: poll._id, table: :dc_poll, form_name: :dc_poll )
     @opts[:editparams].merge!(title: "#{t('drgcms.edit')}: #{poll.name}")
     @opts[:editparams].delete(:ids) # this is from page, but it gets in a way
     html << dc_link_for_edit( @opts[:editparams] )
   end
 
   html << case
-  when poll.operation == 'poll_submit' then
-    @parent.form_tag(action: poll.operation, method: :put)
-  when poll.operation == 'link' then
-    @parent.form_tag( poll.parameters, method: :put)
-  end
+          when poll.operation == 'poll_submit'
+            @parent.form_tag(action: poll.operation, method: :put, return_to: params[:return_to])
+          when poll.operation == 'link'
+            poll.parameters << "?return_to=#{params[:return_to]}" if params[:return_to]
+            @parent.form_tag( poll.parameters, method: :put)
+          end
   # header, - on first position will not display title
   html << %(<div class="poll-title">#{poll.title}</div>) unless poll.title[0] == '-'
   html << %(<div class="poll-text">#{poll.sub_text}</div>)
@@ -212,10 +213,10 @@ def default
             %(<div class="poll-data-div">\n)
           end
   # items. Convert each item to yaml
-  @end_od_data = false
+  @end_of_data = false
   if poll.form.to_s.size < 10
     items = poll.dc_poll_items
-    items.sort! { |a,b| a.order <=> b.order }
+    items.sort! { |a, b| a.order <=> b.order }
     items.each do |item|
       next unless item.active # disabled items
       # convert options to yaml
@@ -232,12 +233,12 @@ def default
       html << do_one_item(poll, yaml)
     end
   else
-    yaml = YAML.load(poll.form.gsub('&nbsp;',' ')) # very annoying. They come with copy&paste ;-)
+    yaml = YAML.load(poll.form.gsub('&nbsp;', ' ')) # very annoying. They come with copy&paste ;-)
     # if entered without numbering yaml is returned as Hash otherwise as Array
     yaml.each { |i| html << do_one_item(poll, (i.class == Hash ? i : i.last)) } # 
   end
   # hide some fields usefull as parameters
-  html << @parent.hidden_field_tag('return_to', @opts[:return_to] || @parent.params[:return_to] || @parent.request.url)
+  html << @parent.hidden_field_tag('return_to', @opts[:return_to] || @parent.params[:return_to])
   html << @parent.hidden_field_tag('return_to_error', @parent.request.url )
   html << @parent.hidden_field_tag('poll_id', poll_id )
   html << @parent.hidden_field_tag('page_id', @parent.page.id )

data/app/renderers/dc_simple_menu_renderer.rb

@@ -162,8 +162,8 @@ def as_responsive
   items.each do |item|
 # menu can be hidden from user
     can_view, msg = dc_user_can_view(@parent, item)
-    p msg unless can_view
     next unless can_view
+
     html << "<li class=\"#{klas}#{(item.id == @selected.id) ? 'selected' : 'item'}\">#{ link_4menu(item) }</li>" #
   end
   html

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

@@ -35,6 +35,9 @@
             {controller: 'dc_common', action: 'paste_clipboard'}, target: 'iframe_cms') %>
 
         <%= DrgcmsFormFields::Elfinder.file_manager_url(self) %>
+        <span>|</span>
+
+        <%= link_to(session[:user_name], '/cms/logout', { title: t('drgcms.logout') }) %>
 
       </div>
     </div>
@@ -43,7 +46,7 @@
 
     <div class="cmsedit-container">
       <div id="cms-menu">
-        <%= dc_choices4_cmsmenu.html_safe %>
+        <%= dc_cms_menu %>
       </div>
 
       <div class="cmsedit-iframe" style="width: 99%;">

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

@@ -1,6 +1,6 @@
 <% dc_form_update %>
 
-<div <%= dc_form_id %>>
+<div <%= dc_form_id %> <%= dc_form_class %> >
   <%= dc_head_for_form %>
   <%= dc_table_title dc_edit_title() %>
 

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

@@ -1,6 +1,6 @@
 <% dc_form_update %>
 
-<div <%= dc_form_id %> class="dc-form-frame">
+<div <%= dc_form_id %> <%= dc_form_class('dc-form-frame') %> >
   <%= dc_title_for_index @records %>
 
   <%= dc_actions_for_index %>

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

@@ -1,6 +1,7 @@
 <% dc_form_update %>
 
 <div <%= dc_form_id %>>
+  <%= dc_head_for_form %>
   <%= dc_table_title dc_new_title %>
 
   <%= form_tag(@form_params, method: :post, id: CmsHelper.form_param(params) || CmsHelper.table_param(params),

data/config/locales/drgcms_en.yml

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2012-2013 Damjan Rems
+# Copyright (c) 2012+ Damjan Rems
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -40,6 +40,7 @@ en:
     doc_paste_update: Update existing document if document._id exists
     doc_no_delete: Document can not be deleted!
     doc_no_update: Document can not be updated!
+    doc_no_edit: Document can not be edited!
     edit_content: Edit content
     edit_advanced: Advanced edit
     edit_new_page: Create new page
@@ -53,11 +54,13 @@ en:
     menu_plus: Show alternative menu
     not_email: is not valid e-mail address!
     updated_by_other: Document was updated by other user. Please reenter your data.
+    dfs: Double submit error! Returning back in history is prohibited.
     not_id: Value entered is not ID!
     cms_main: CMS main tables
     cms_advanced: CMS advanced
     search_placeholder: Start typing to search
     login: Login into CMS
+    logout: Logout
     username: User name
     password: Password
     form_error: Error loading form %{form_name}
@@ -65,7 +68,8 @@ en:
     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
-    
+    not_valid: Value is not valid!
+
     toggle_cms: Toggle CMS edit/view mode
     edit: Edit
     show: Show
@@ -87,6 +91,7 @@ en:
     save: Save
     save&back: Save & back
     save&close: Save & close
+    search: Search
     filter_on: Filter ON
     filter_off: Filter OFF
     filter_set: Set filter
@@ -97,6 +102,9 @@ en:
     errors_no: 'No. of errors:'
     runtime_error: Runtime error!
     two_chars: type in at least two chars
+    print: Print
+    export: Export
+    result: Result
 
     created_by: Created by
     updated_by: Updated by
@@ -116,6 +124,8 @@ en:
     category_has_subs: Category can't be deleted, because it contains sub-elements.
     category_as_tree: Edit in treeview
 
+    iframe_save_to_view: Data must be saved in order to view content
+
     dc_journal:
       zero_selected: No data selected!
       restored: Data has been restored.      
@@ -141,3 +151,13 @@ en:
       1basic: Basic
       2index: Index
       3form: Form
+
+    dc_image:
+      wrong_type: Image type not allowed! Types allowed are (jpg jpeg png gif svg webp).
+      no_file: Original image file not present. Try to upload image file again.
+      invoke: Invoke images manager.
+      search: Search and select image
+      select: Click to select
+      preview: Click to view image
+      available: Available image sizes
+      offset_error: Enter either X or Y offset.

data/config/locales/drgcms_sl.yml

@@ -32,17 +32,18 @@ sl:
     not_authorized: Uporabnik nima pravic za to operacijo!
     doc_disabled: Dokument onemogočen!
     doc_enabled:  Dokument omogočen!
-    doc_saved: Dokument zapisan!
-    doc_info: Info  
-    doc_copy_clipboard: Kopija vsebine dokumenta v novem oknu.
-    doc_paste_clipboard: Obdelaj podatke    
+    doc_paste_clipboard: Obdelaj podatke
     doc_paste_title: Ustvari (spremeni) dokumente iz JSON zapisa
     doc_paste_update: Spremeni obstoječ dokument, če dokument._id obstaja
     doc_no_delete: Dokumenta ni možno izbrisati!
     doc_no_update: Dokumenta ni možno spremeniti!
+    doc_no_edit: Dokumenta ni možno urejati!
     edit_content: Urejanje vsebine
     edit_advanced: Napredno urejanje
     edit_new_page: Ustvarite novo stran
+    doc_saved: Dokument zapisan!
+    doc_info: Info  
+    doc_copy_clipboard: Kopija vsebine dokumenta v novem oknu.
     edit_new_part: Ustvarite nov element na strani
     edit_design: 'Uredi: Dizajn'
     edit_site: 'Uredi: Spletišče'
@@ -53,18 +54,21 @@ sl:
     menu_plus: Malo drugačen menu
     not_email: ni veljaven e-naslov!
     updated_by_other: Dokument je spremenil drug uporabnik. Prosimo ponovite vpis podatkov.
+    dfs: Dvojno shranjevanje. Vračanje v zgodovino brskalnika ni dovoljeno.
     not_id: Vsebina polja ni ključ ID! 
     cms_main: CMS tabele
     cms_advanced: CMS napredne opcije   
     search_placeholder: Vpišite pojem za iskanje
     login: Prijava v CMS
+    logout: Odjava
     username: Uporabnik
     password: Geslo
     form_error: Napaka pri branju forme %{form_name}
     img_large: Klik za večjo sliko
     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    
+    img_alt_not_present: Vse slike v vsebini morajo imeti vpisano nadomestno besedilo
+    not_valid: Nedovoljena vrednost!
 
     toggle_cms: Preklopi med CMS urejanjem in prikazom
     edit: Urejanje
@@ -87,6 +91,7 @@ sl:
     save: Shrani
     save&back: Shrani in nazaj
     save&close: Shrani in zapri
+    search: Išči
     filter_on: Vklopi filter
     filter_off: Izklopi filter
     filter_set: Nastavi filter
@@ -97,6 +102,9 @@ sl:
     errors_no: 'Število napak:'
     runtime_error: Napaka med izvajanjem programa!
     two_chars: vpišite vsaj dva znaka
+    print: Tiskanje
+    export: Izvoz
+    result: Rezultat
 
     created_by: Ustvaril
     updated_by: Spremenil
@@ -116,6 +124,8 @@ sl:
     category_has_subs: Kategorije ni mogoče izbrisati, ker vsebuje podrejene elemente.
     category_as_tree: Uredi v drevesnem pogledu
 
+    iframe_save_to_view: Za prikaz vsebine je potrebno predhodno shraniti podatke.
+
     dc_journal:
       zero_selected: Ni izbranih podatkov!
       restored: Podatki so restavrirani.
@@ -139,4 +149,13 @@ sl:
       2index: Index
       3form: Forma
 
-
+    dc_image:
+      wrong_type: Nedovoljena vrsta slike. Dovoljene so vrste (jpg jpeg png gif svg webp).
+      no_file: Nisem našel originalne slike. Predlagam, da sliko ponovno naložite.
+      invoke: Zagon iskalnika slik.
+      search: Poiščite in izberite sliko
+      select: Kliknite za izbiro
+      preview: Kliknite za ogled slike
+      image: Slika
+      available: Velikosti na voljo
+      offset_error: Vpišite samo X ali Y zamik.

data/config/locales/models_en.yml

@@ -570,7 +570,37 @@ en:
         dc_json_lds: Schema sub element
         active: Active
 
-# help for forms #####################################################
+      dc_image:
+        tabletitle: Images manager
+
+        upload_file: Upload
+        name: File name
+        short: Short description
+        text: Description text
+        keep_original: Keep original
+        size_o: Original dimension
+        size_l: Large dimension
+        size_m: Medium dimension
+        size_s: Small dimension
+        size_ls: Large dimension
+        size_ms: Medium dimension
+        size_ss: Small dimension
+        categories: Categories
+        cats_input: Categories
+        categories_line: Categories
+        created_by: Uploaded by
+
+      dc_setup:
+        tabletitle: Applications settings
+        tab0: Options
+        tab00: Form
+
+        name: Setup name
+        form: Form
+        data: Data
+        editors: Editors
+
+# help for forms ##############################################################################################
 
     help:
       dc_site:
@@ -973,3 +1003,22 @@ en:
         active: Document is active
         add_schema: Add new schema
         add_error: Schema element %{schema} already exists!
+
+      dc_image:
+        upload_file: Select file to upload
+        name: Original file name
+        short: Short image description
+        text: Longer image description text
+        keep_original: Keep original image
+        size_o: Dimension of original image
+        size_l: Dimension for large image
+        size_m: Dimension form medium size image
+        size_s: Dimension for small size image
+        categories: Categories for later searching of image
+        created_by: Image was uploaded by
+
+      dc_setup:
+        name: Setup name (typically application or module name)
+        form: Form definition for entering settings. Edit fields must be defined on tabs
+        data: Actual data saved
+        editors: List of users, which can edit this setup beside administrators

data/config/locales/models_sl.yml

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2012-2013 Damjan Rems
+# Copyright (c) 2012+ Damjan Rems
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -574,6 +574,46 @@ sl:
         active: Aktiven
         dc_json_lds: Podelement strukture
 
+      dc_image:
+        tabletitle: Organizator slik
+
+        upload_file: Naloži datoteko
+        name: Originalno ime
+        short: Kratek opis
+        text: Daljši opis
+        keep_original: Ohrani original
+        size_o: Prvotna dimenzija
+        size_l: Velika dimenzija
+        size_m: Srednja dimenzija
+        size_s: Mala dimenzija
+        size_ls: Velika dimenzija
+        size_ms: Srednja dimenzija
+        size_ss: Mala dimenzija
+        offset_lx: Zamik X
+        offset_ly: Zamik Y
+        offset_mx: Zamik X
+        offset_my: Zamik Y
+        offset_sx: Zamik X
+        offset_sy: Zamik Y
+        preview_s: Slika
+        preview_m: Slika
+        preview_l: Slika
+
+        categories: Kategorije
+        cats_input: Kategorije
+        categories_line: Kategorije
+        created_by: Naložil
+
+      dc_setup:
+        tabletitle: Tabela nastavitev aplikacij
+        tab0: Nastavitve
+        tab00: Form
+
+        name: Naziv nastavitev
+        form: Obrazec za zajem
+        data: Vsebina
+        editors: Urejevalci
+
 # help pomoč na obrazcih ####################################################
 
     help:
@@ -985,3 +1025,22 @@ sl:
         add_schema: Dodaj strukturo
         add_error: Element %{schema} že obstaja!
 
+      dc_image:
+        upload_file: Naloži datotekov obdelavo
+        name: Originalno ime datoteke
+        short: Kratek opis slike
+        text: Daljši opis slike
+        keep_original: Ohrani originalno sliko
+        size_o: Dimenzije originalne slike
+        size_l: Dimenzije velike slike
+        size_m: Dimenzije srednje velike slike
+        size_s: Dimenzije male slike
+        categories: Kategorije za poznejše lažje iskanje slike
+        created_by: Uporabnik, ki je naložil sliko
+        offset: Offset image before resizing. Offset origin is the top left corner.
+
+      dc_setup:
+        name: Naziv nastavitev (tipično ime aplikacije, modula)
+        form: Definicija posamezne nastavitve in obrazec za zajem
+        data: Vsebina nastavitev (kot je shranjena v bazi podatkov)
+        editors: Seznam zaposlenih, ki lahko poleg administratorjev urejajo zapis

data/drg_cms.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails'#, '~> 6.1'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails'
-  s.add_dependency 'non-stupid-digest-assets'  
+  s.add_dependency 'non-digest-assets'
 
   s.add_dependency 'bcrypt' #, '~> 3.0.0'
   s.add_dependency 'mongoid'#, '~> 7'

data/lib/drg_cms/version.rb

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