drg_cms 0.6.0.1 → 0.6.0.3

data/app/models/dc_key_value.rb

@@ -0,0 +1,48 @@
+#--
+# Copyright (c) 2019+ Damjan Rems
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+#########################################################################
+# == Schema information
+#
+# Collection name: dc_key_value : Key value items
+#
+#  _id                  BSON::ObjectId       _id
+#  key                  String               Key
+#  value                String               Value
+# 
+# Key-Value items can be embedded into any model and are replacing Hash fields.
+# They can also appear cyclic if required.
+#########################################################################
+class DcKeyValue
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :key,         type: String
+  field :value,       type: String
+
+  field :created_by,  type: BSON::ObjectId
+  field :updated_by,  type: BSON::ObjectId
+
+  embedded_in :key_values, polymorphic: true
+  
+end

data/app/models/dc_page.rb

@@ -31,7 +31,6 @@
 #  created_at           Time                 created_at
 #  updated_at           Time                 Updated
 #  subject              String               Articles subject
-#  title                String               Browser title. Optimization for SEO.
 #  subject_link         String               Friendly link defined
 #  alt_link             String               Alternative link, by which page could be found
 #  sub_subject          String               Sub subject, short description of text

data/app/models/drgcms_form_fields/hash_field.rb

@@ -0,0 +1,86 @@
+#--
+# Copyright (c) 2019+ Damjan Rems
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+module DrgcmsFormFields
+
+###########################################################################
+# Implementation of text_field DRG CMS form field.
+# 
+# ===Form options:
+# * +type:+ text_field (required)
+# * +name:+ Field name (required) 
+# * +html:+ html options which apply to text_field field (optional)
+# 
+# Form example:
+#    10:
+#      name: title
+#      type: text_field
+#      size: 30
+#      html:
+#        required: yes
+###########################################################################
+class HashField < DrgcmsField
+  
+###########################################################################
+# Returns value for readonly field
+###########################################################################
+def ro_standard()
+  return self if @record[@yaml['name']].nil?
+  html = ''
+  @record[@yaml['name']].each do |key, value|
+    html << "#{key}:#{value}<br>"
+  end
+  super(html)
+end
+  
+###########################################################################
+# Render text_field field html code
+###########################################################################
+def render
+  return ro_standard if @readonly
+  set_initial_value
+#
+  record = record_text_for(@yaml['name'])
+# Convert Hash to values separated by colon  
+  if @record[@yaml['name']]
+    @yaml['html']['value'] = @record[@yaml['name']].to_a.inject('') {|r, e| r << "#{e.first}:#{e.last}\n"}
+  end
+  @html << @parent.text_area( record, @yaml['name'], @yaml['html']) 
+  self
+end
+
+###########################################################################
+# Return value. Return nil if input field is empty
+###########################################################################
+def self.get_data(params, name)
+  return nil if params['record'][name].blank?
+#
+  result = params['record'][name].split("\n").select {|e| !e.blank? }
+  return nil if result.size == 0
+# convert to Hash
+  ret = {}
+  result.map { |e| key,value = e.chomp.split(':'); ret[key.strip] = value.strip unless value.blank? }
+  ret
+end
+
+end
+end

data/app/models/drgcms_form_fields/select.rb

@@ -44,6 +44,8 @@ module DrgcmsFormFields
 #   your local language then select choices will be localized.
 #    en.helpers.model_name.choices4_status: 'OK:0,Ready:1,Error:2'
 #    sl.helpers.model_name.choices4_status: 'V redu:0,Pripravljen:1,Napaka:2'
+# * +depend:+ Select options may depend on a value in some other field. If depend option is specified
+#   then chices must be provided by class method and defined in eval option.
 # * +html:+ html options which apply to select field (optional)
 #      
 # Form example:
@@ -56,35 +58,66 @@ module DrgcmsFormFields
 #      eval: DcCategory.values_for_parent
 #      html:
 #        include_blank: true      
+#    50:
+#      name: company
+#      type: select
+#      choices: Audi,BMW,Mercedes
+#    60:
+#      name: type
+#      type: select
+#      eval: Cars.choices4_type
+#      depend: company
 ###########################################################################
 class Select < DrgcmsField
   
 ###########################################################################
-# Return values, when choices options will be returned by evaluating expression
+# Choices are defined in helper as:
+# helper.label.table_name.choices_for_fieldname or
+# choices4_tablename_fieldname
+###########################################################################
+def choices_in_helper(all)
+  helper = "helpers.label.#{@form['table']}.choices4_#{@yaml['name']}"
+  c = t(helper)
+  if c.match( 'translation missing' )
+    helper = "choices_for_#{@form['table']}_#{@yaml['name']}"
+    return "Error. #{helper} not defined" if c.match( 'translation missing' )
+  end
+  c
+end
+
+###########################################################################
+# Choices are defined by evaluating an exspression. This is most common class
+# method defined in a class. SomeClass.get_choices4.
 ###########################################################################
-def do_eval(e)
+def choices_in_eval(e, all=false)
   e.strip!
-  method = e.split(/\ |\(/).first
-  return eval(e) if respond_to?(method) # id method defined here
-  return eval('@parent.'+e) if @parent.respond_to?(method) # is method defined in helpers
-# eval whatever it is
-  eval e
+  if @yaml['depend'].nil?
+    method = e.split(/\ |\(/).first
+    return eval(e) if respond_to?(method) # id method defined here
+    return eval('@parent.'+e) if @parent.respond_to?(method) # is method defined in helpers
+    # eval whatever it is there
+    eval e
+  else
+    # add event listener to depend field
+    @js << "$('#record_#{@yaml['depend']}').change( function(e) { update_select_depend('#{@yaml['name']}', '#{@yaml['depend']}','#{e}');})\n"
+    depend_value = @record[@yaml['depend']]
+    e << " '#{depend_value}'"
+    eval e
+  end
 end
-  
+
 ###########################################################################
 # Create choices array for select field.
 ###########################################################################
-def get_choices
+def get_choices(all=false)
   begin
     choices = case 
     when @yaml['choices'] then 
-      (@yaml['choices'].match('helpers.') ) ? t(@yaml['choices']) : @yaml['choices']
+      @yaml['choices']
     when @yaml['eval']    then
-      do_eval(@yaml['eval'])
-    else 
-      c = t('helpers.label.' + @form['table'] + '.choices4_' + @yaml['name'] )
-      c = 'Error' if c.match( 'translation missing' )
-      c
+      choices_in_eval(@yaml['eval'], all)
+    else
+      choices_in_helper(all)
     end
   # Convert string to Array
     choices.class == String ?

data/app/models/drgcms_form_fields/text_autocomplete.rb

@@ -29,6 +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
+# * +not_id+ Field value represent value not an id. Field will save entered value when not selected wit autocomplete.
 # * +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
 #   * collection_name.search_field_name; Same as above except that table options must be ommited.
@@ -84,7 +86,7 @@ def render
   end
 # Found value to be written in field. If field is not found write out value.
   if value
-    record = t.find(value)
+    record = t.find(value) unless @yaml['not_id'] # don't if it's is not an id
     value_displayed = record ? record.send(ret_name) : value
   end
 # return if readonly
@@ -104,7 +106,15 @@ def render
              style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )    
   end
   @html << @parent.hidden_field(record, @yaml['name'], value: value)        # actual value will be in hidden field
-# JS stuff    
+# JS stuff
+# allow unselected values on not_id: true option
+  not_id_code = %Q[
+if (ui.item == null) {  
+$("##{record}_#{@yaml['name']}").val($("##{record}__#{@yaml['name']}").val() );
+return;
+}
+] if @yaml['not_id']             
+#  
   @js << <<EOJS
 $(document).ready(function() {
   $("##{record}_#{_name}").autocomplete( {
@@ -122,7 +132,9 @@ $(document).ready(function() {
       });
     },
     change: function (event, ui) { 
+      #{not_id_code}
       $("##{record}_#{@yaml['name']}").val(ui.item.id);
+      
     },
     minLength: 2
   });

data/app/models/drgcms_form_fields/tree_select.rb

@@ -95,7 +95,10 @@ def render
   @html << "<div id=\"#{@yaml['name']}\" class=\"tree-select\" #{set_style()} >"
 # Fill @choices hash. The key is parent object id
   @choices = {}
-  do_eval(@yaml['eval']).each {|data| @choices[ data[2].to_s ] ||= []; @choices[ data[2].to_s ] << (data << false)}
+  choices_in_eval(@yaml['eval']).each do |data| 
+    @choices[ data[2].to_s ] ||= [] 
+    @choices[ data[2].to_s ] << (data << false)
+  end
 # put current values hash with. To speed up selection when there is a lot of categories
   current_values = {}
   current = @record[@yaml['name']] || []

data/app/{helpers → renderers}/dc_menu_renderer.rb

@@ -97,10 +97,16 @@ def link_4menu(item)
   caption   = item.caption[0] == '-' ? '' : item.caption.to_s
   img_title = item.caption.to_s.sub('-','')
 # add picture if picture is not blank
-  (item.picture.blank? ? '' : 
-    @parent.link_to( @parent.image_tag(item.picture), link, {title: img_title, target: target} )) +
-  (caption.blank? ? '' : 
-    @parent.link_to(caption, link, {target: target}) )
+  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
 end
 
 ########################################################################

data/app/{helpers → renderers}/dc_part_renderer.rb

@@ -98,7 +98,7 @@ def load_parts #:nodoc:
 # add parts in page
   @parent.page.dc_parts.where(active: true).each do |part|
     type = decamelize_type(part._type) || 'dc_part'
-    @parent.parts << [part, @parent.page.id, type, "#{@parent.site.page_table};#{type}"]
+    @parent.parts << [part, @parent.page.id, type, "#{@parent.site.page_class.underscore};#{type}"]
   end
 # add parts in site
   @parent.site.dc_parts.where(active: true).each do |part|
@@ -161,11 +161,11 @@ end
 def in_page
 # Part is in page with id  
   page = if @opts[:page_id]
-    pageclass = @parent.site.page_table.classify.constantize
+    pageclass = @parent.site.page_klass
     pageclass.find(@opts[:page_id])
 # Part is in page with subject link
   elsif @opts[:page_link]
-    pageclass = @parent.site.page_table.classify.constantize
+    pageclass = @parent.site.page_klass
     @page = pageclass.find_by(dc_site_id: @parent.site._id, subject_link: @opts[:page_link])
 # Part is in current page
   else
@@ -174,7 +174,7 @@ def in_page
   return "Error DcPart: Page not found!" if page.nil?
 #  
   if part = page.dc_parts.find_by(name: @opts[:name])
-    @opts[:editparams].merge!(id: part, ids: page._id, form_name: 'dc_part', table: "#{@parent.site.page_table};dc_part" )
+    @opts[:editparams].merge!(id: part, ids: page._id, form_name: 'dc_part', table: "#{@parent.site.page_class.underscore};dc_part" )
     render_particle(part, @opts) 
   else
     "Part with name #{@opts[:name]} not found in page!"

data/app/{helpers → renderers}/dc_poll_renderer.rb

@@ -82,13 +82,18 @@ def do_one_item(poll, yaml)
     key = "p_#{yaml['name']}"
     params[key] = yaml['default'] unless params[key]
   end
+# Label as placeholder
+  if poll.display == 'in'
+    yaml['html'] ||= {}
+    yaml['html']['placeholder'] = text
+  end
 # create form_field object and retrieve html code
   clas_string = yaml['type'].camelize
   field_html = if DrgcmsFormFields.const_defined?(clas_string) 
     clas = DrgcmsFormFields.const_get(clas_string)
-    o = clas.new(@parent, @record, yaml).render
+    field = clas.new(@parent, @record, yaml).render
 #TODO collect all javascript and add it at the end
-    o.html + (o.js.size > 0 ? @parent.javascript_tag(o.js) : '')
+    field.html + (field.js.size > 0 ? @parent.javascript_tag(field.js) : '')
   else # litle error string
     "Error: Code for field type #{yaml['type']} not defined!"
   end
@@ -114,12 +119,15 @@ def do_one_item(poll, yaml)
 # submit and link tag 
     clas = yaml['type'].match(/submit_tag/) ? '' : 'dc-link-submit'
     html << "<span class='#{clas} dc-animate'>#{field_html}#{yaml['separator']}</span>"
-# other elements
+# other fields
   else
-    html << if poll.display == 'lr'
+    html << case
+      when poll.display == 'lr' then
       "<div class='row-div'><div class='dc-form-label poll-data-text #{yaml['class']}'>#{text}</div><div class='dc-form-field poll-data-field #{yaml['class']}'>#{field_html}</div></div>\n"
-    else
+      when poll.display == 'tb' then
       "<div class='poll-data-text #{yaml['class']}'>#{text}</div><div class='poll-data-field #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
+      else
+      "<div class='poll-data-field #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
     end    
   end
 end

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

@@ -1,5 +1,5 @@
-
 <div id="cmsedit-div">
+  <div class="cms-toggle mode-<%= session[:edit_mode] %>" title="<%= t('drgcms.toggle_cms')%>">CMS</div>
   <%= 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">
@@ -9,7 +9,7 @@
 
         <% if @page %>
           <%= link_to( fa_icon('file-text-o lg', class: "dc-animate", title: "#{t('drgcms.edit_page')}"),
-              {controller: 'cmsedit', action: 'edit', table: @site.page_table, id: @page._id}, target: 'iframe_cms') %>
+              {controller: 'cmsedit', action: 'edit', table: @site.page_class, id: @page._id}, target: 'iframe_cms') %>
         <% end %>
 
         <% if @design %>
@@ -22,6 +22,7 @@
               {controller: 'cmsedit', action: 'edit', table: 'dc_site', id: @site._id}, target: 'iframe_cms') %>
         <% end %>
         <b>&nbsp; | &nbsp; </b>
+        
         <%= link_to( fa_icon('compress lg', class: "dc-animate", title: t('drgcms.minimize')), '#',
             onclick: "$('#iframe_cms').height(1); return false;" ) %>
 
@@ -31,13 +32,6 @@
         <%= link_to( fa_icon('refresh lg', class: "dc-animate", title: t('drgcms.reload')), '#',
             onclick: "document.location.reload(true); return false;")  %>
         <b>&nbsp; | &nbsp; </b>
-        
-  <% if false %>     
-        <%= select('record', 'select', dc_choices4_cmsmenu ) %>
-        
-        <%= link_to( fa_icon('bars lg', class: "dc-animate", title: t('drgcms.edit_selected')), '#',
-            onclick: "$('#iframe_cms').attr('src', $('#record_select').val() ); return false;")  %>
-  <% end %>
 
         <%= link_to( fa_icon('copy lg', class: "dc-animate", title: "#{t('drgcms.doc_paste_title')}"),
             {controller: 'dc_common', action: 'paste_clipboard'}, target: 'iframe_cms') %>
@@ -61,16 +55,3 @@
   
   <% end %>
 </div>
-
-
-<% if false %>
-<%= javascript_tag do %>
-// 
-$('#cmsedit-edit-button').click(function() {
-  $('#iframe_cms').attr('src', $('#record_select').val() );
-});
-$('#record_select').change( function(e) {
-  $('#iframe_cms').attr('src', e.target.value );
-});
-<% end %>
-<% end %>