drg_cms 0.5.51.1 → 0.5.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28c4645b1f1f465ae3f3678fd8b154a657769533
-  data.tar.gz: 8d994123e909afe602059a65c266ff8843384fa8
+  metadata.gz: a614de80487c062c05877045536c7cb2c5eec76c
+  data.tar.gz: ad4b065e2b97c8c16f1a5024bb7d23b745553071
 SHA512:
-  metadata.gz: 7718848e9cbe9b01f9c01313032ee1bb697e7939d6daf35afac702008fdfc146aee0d33f446e8530f30767909613ed0e812c5561ff038a479b8cb382f0852faa
-  data.tar.gz: 67583a0e7c488d72a08c87f7fec10f62e3051647caf27b3cb9f42c1e8002af22293b640d5eef57b181463800666c0d5aceda4b3221d64eb45591f506fd2068f4
+  metadata.gz: 97e1cef3db8fd9b1afdf629aa7c24b273522064ed9368c7016f7a6525ca067048fdc2781b4ac403bc86ecf1514591dba01ce9f2460f9ac0bb3837701e256e400
+  data.tar.gz: b5131f8e268aa68f7450e8f50379cce65e3b4938dc95d71bf4ac06febe44fad27f603822b4fab9e4323426a2312ba66afd2a64a95c7df12fc4a3ebb5111f7315

data/app/assets/javascripts/drg_cms/drg_cms.js

@@ -96,61 +96,69 @@ $(function() {
  *    render json: {'record_name' => "Damjan", 'record_surname' => 'Rems'}.to_json
  *  will replace values of two fields on the form.
  *******************************************************************/
+
 process_json_result = function(json) {
-  var c = '';
+  var i,operation,what, selector;
   $.each(json, function(key, val) {
     i = key.search('_');
     if (i > 1) {
-      oper = key.substring(0,i);
+      operation = key.substring(0,i);
       what = key.substring(i+1,100);
-      switch (oper) {
-      /* update field */
-      case 'record':
-        $('#'+key).val(val);
-        break;
-      /* display message */  
-      case 'msg': 
-        selector = 'dc-form-' + what;
-        if ($('.'+selector).length == 0) {
-          val = '<div class="' + selector + '">' + val + '</div>';
-          $('.dc-title').after(val);
-      } else
-          $('.'+selector).html(val);
-        break;
-      /* update div */
-      case '#div+':
-        $('#'+what).append(val);
-        break;
-      case '#+div':
-        $('#'+what).prepend(val);
-        break;
-      case '#div':
-        $('#'+what).html(val);
-        break;
-      case '.div+':
-        $('.'+what).append(val);
-        break;
-      case '.+div':
-        $('.'+what).prepend(val);
-        break;
-      case '.div':
-        $('.'+what).html(val);
-        break;
-      /* goto url */
-      case 'url':
-        window.location.href = val;
-        break;
-      case 'alert':
-        alert(val);
-        break;
-      case 'window':
-        w = window.open(val, what);
-        w.focus();        
-        break;
-      case 'reload':
-        location.reload(); 
-        break;
+    } else {
+      operation = key;
+      what = '';
+    }
+//    
+    switch (operation) {
+    // update field 
+    case 'record':
+      $('#'+key).val(val);
+      break;
+    // display message   
+    case 'msg': 
+      selector = 'dc-form-' + what;
+      if ( $('.'+selector).length == 0 ) {
+        val = '<div class="' + selector + '">' + val + '</div>';
+        $('.dc-title').after(val);
+      } else {
+        $('.'+selector).html(val);
       }
+      break;
+    // update div 
+    case '#div+':
+      $('#'+what).append(val);
+      break;
+    case '#+div':
+      $('#'+what).prepend(val);
+      break;
+    case '#div':
+      $('#'+what).html(val);
+      break;
+    case '.div+':
+      $('.'+what).append(val);
+      break;
+    case '.+div':
+      $('.'+what).prepend(val);
+      break;
+    case '.div':
+      $('.'+what).html(val);
+      break;
+    // goto url 
+    case 'url':
+      window.location.href = val;
+      break;
+    case 'alert':
+      alert(val);
+      break;
+    case 'window':
+      w = window.open(val, what);
+      w.focus();        
+      break;
+    case 'reload':
+      location.reload(); 
+      break;
+    default: 
+      console.log("DRGCMS: Invalid ajax result operation: " + operation);
     }
   });
 };

data/app/controllers/cmsedit_controller.rb

@@ -771,11 +771,11 @@ end
 def fields_on_form() #:nodoc:
   fields = []
   if @form['form']['fields']
-# read only field elements (key is Fixnum)
-    @form['form']['fields'].each {|key,options| fields << options if key.class == Fixnum }
+# read only field elements (key is Integer)
+    @form['form']['fields'].each {|key,options| fields << options if key.class == Integer }
   else
     @form['form']['tabs'].keys.each do |tab|
-      @form['form']['tabs'][tab].each {|key,options| fields << options if key.class == Fixnum }
+      @form['form']['tabs'][tab].each {|key,options| fields << options if key.class == Integer }
     end  
   end
   fields

data/app/controllers/dc_application_controller.rb

@@ -327,6 +327,7 @@ def dc_process_default_request()
   params[:path] = @site.homepage_link if params[:id].nil? and params[:path].nil?
 # some other process request. It shoud fail if not defined
   return eval(@site.request_processor) if !@site.request_processor.blank?
+
 # Search for page 
   pageclass = @site.page_table.classify.constantize
   if params[:id]
@@ -365,20 +366,6 @@ def dc_process_default_request()
     dc_log_visit()
   end
   @page_title = @page.title.blank? ? "#{@site.page_title}-#{@page.subject}" : @page.title
-# define design
-=begin
-  design      = @design ? @design.body : @site.design
-# render view. inline if defined in design
-  view_filename = @design ? @design.rails_view.to_s : ''
-  view_filename = @site.rails_view.to_s if view_filename.blank?
-  if view_filename.size < 5
-    design = "<%= render partial: 'cmsedit/edit_stuff' %>\n" + design if session[:edit_mode] > 0 
-    design << '<style type="text/css"><%= @css.html_safe %></style><%= javascript_tag @js %>'
-    render(inline: design, layout: layout)
-  else
-    render view_filename, layout: layout
-  end
-=end
   get_design_and_render @design
 end
 
@@ -412,16 +399,6 @@ def dc_single_sitedoc_request
 #  
   @page_title = "#{@site.page_title} #{@part.name}"
   @js, @css = '', ''
-=begin  
-  layout = @site.site_layout.blank? ? 'content' : @site.site_layout
-  if @site.rails_view.blank?
-    design = @site.design + '<style type="text/css"><%= @css.html_safe %></style><%= javascript_tag @js %>'
-    design = "<%= render partial: 'cmsedit/edit_stuff' %>\n" + design if session[:edit_mode] > 0 
-    render(inline: design, layout: layout)
-  else
-    render @site.rails_view, layout: layout
-  end
-=end
   get_design_and_render nil
 end
 

data/app/controllers/dc_common_controller.rb

@@ -71,7 +71,7 @@ end
 # Register and record click when ad link is clicked.
 ########################################################################
 def ad_click
-  if (ad = DcAd.find(params[:id]))
+  if params[:id] and (ad = DcAd.find(params[:id]))
     ad.clicked += 1
     ad.save
     DcAdStat.create!(dc_ad_id: params[:id], ip: request.ip, type: 2 ) 
@@ -79,7 +79,7 @@ def ad_click
     logger.error "ERROR ADS: Invalid ad id=#{params[:id]} ip=#{request.ip}."
   end
 
-  render :nothing => true
+  render body: nil
 end
 
 ##########################################################################

data/app/controllers/design_element_settings_control.rb

@@ -119,10 +119,14 @@ def dc_before_save()
             v['readonly'] # fields with readonly option don't return value and would be wiped
 # return value from form field definition
     value = DrgcmsFormFields.const_get(v['type'].camelize).get_data(params, v['name'])
+# set to nil if blank
+    value = nil if value.blank?
     data['settings'] ||= {}
     data['settings'][ params[:element] ] ||= {}
     data['settings'][ params[:element] ][ v['name'] ] = value
   end
+# remove nil elements  
+  data['settings'][ params[:element] ].compact!
 # save data to document field  
   document.send("#{params[:field_name]}=", data.to_yaml)
   document.save

data/app/forms/dc_page.yml

@@ -3,7 +3,7 @@
 table: dc_page
 
 index:
-  filter: subject, sub_subject as text_field, subject_link, author_name, dc_site_id, body as text_field
+  filter: subject, sub_subject as text_field, subject_link, alt_link, author_name, dc_site_id, body as text_field
   actions: standard
 
 result_set:
@@ -34,23 +34,19 @@ form:
       10:
         name: subject
         type: text_field
-        html:
-          size: 50
+        size: 50
       20:
         name: subject_link
         type: text_field
-        html:
-          size: 50
+        size: 50
       30:
         name: title
         type: text_field
-        html:
-          size: 50
+        size: 50
       40:
         name: alt_link
         type: text_field
-        html:
-          size: 50
+        size: 50
         text: Alternative link
       50:
         name: sub_subject
@@ -60,8 +56,7 @@ form:
       60:
         name: author_name
         type: text_field
-        html:
-          size: 30
+        size: 30
 
       70:
         name: publish_date
@@ -70,13 +65,11 @@ form:
       80:
         name: picture
         type: file_select
-        html:
-          size: 50
+        size: 50
       90:
         name: gallery
         type: text_field
-        html:
-          size: 20
+        size: 20
       100:
         name: valid_from
         type: datetime_select
@@ -100,7 +93,7 @@ form:
         type: tree_select
         eval: "DcCategory.choices4_categories(@parent.dc_get_site)"
         style: 'max-height: 300px'
-          
+        multiple: true       
 
     2advanced:
       10:
@@ -115,7 +108,6 @@ form:
         type: tree_select
         eval: '@parent.dc_menu_class.choices4_menu_as_tree(@record.dc_site_id)'        
         style: 'max-height: 300px'
-        single: true       
 
 #      20:
 #        name: menu_id
@@ -125,8 +117,7 @@ form:
       30:
         name: params
         type: text_area
-        html:
-          size: 100x10
+        size: 100x10
       40:
         name: dc_site_id
         type: select
@@ -155,8 +146,8 @@ form:
       20:
         name: css
         type: text_area
-        html:
-          size: 100x20
+        size: 100x20
+        
     4parts:
       10:
         name: dc_parts
@@ -164,4 +155,37 @@ form:
         formname: dc_part
         html:
           height: 1000
+          
+    5iframe:
+      10:
+        name: if_url
+        type: text_field
+        size: 80
+      20:
+        name: if_border
+        type: text_field
+        size: 2
+      30:
+        name: if_width
+        type: text_field
+        size: 5
+      40:
+        name: if_height
+        type: text_field
+        size: 5
+      50:
+        name: if_scroll
+        type: select
+      60:
+        name: if_id
+        type: text_field
+        size: 10
+      70:
+        name: if_class
+        type: text_field
+        size: 10
+      80:
+        name: if_params
+        type: text_area
+        size: 80x10
     

data/app/helpers/cmsedit_helper.rb

@@ -53,7 +53,7 @@ def dc_actions_for_index()
 EOT
 # Remove actions settings and sort
   only_actions = []
-  actions.each { |key, value| only_actions << [key, value] if key.class == Fixnum }
+  actions.each { |key, value| only_actions << [key, value] if key.class == Integer }
   only_actions.sort_by!(&:first)
   only_actions.each do |element|
     k,v = element
@@ -649,10 +649,10 @@ def dc_fields_for_tab(fields) #:nodoc:
   odd_even       = nil
   reset_cycle()
 # options and fields must be separated before sorting  
-  form_options = fields.select {|field| field.class != Fixnum }
+  form_options = fields.select {|field| field.class != Integer }
   columns      = form_options.try(:[],'columns') || 1
 # Select form fields and sort them by key
-  form_fields  = fields.select {|field| field.class == Fixnum }
+  form_fields  = fields.select {|field| field.class == Integer }
   form_fields.to_a.sort.each do |element|
     options = element.last
     session[:form_processing] = "form:fields: #{element.first}=#{options}"
@@ -671,14 +671,14 @@ def dc_fields_for_tab(fields) #:nodoc:
 # label
     text = if options['text']
       t(options['text'], options['text'])
-    else 
+    elsif options['name']
       t_name(options['name'], options['name'].capitalize.gsub('_',' ') )
     end
 # help text can be defined in form or in translations starting with helpers. or as helpers.help.collection.field
     help = if options['help'] 
       options['help'].match('helpers.') ? t(options['help']) : options['help']
     end
-    help ||= t('helpers.help.' + @form['table'] + '.' + options['name'],' ')    
+    help ||= t('helpers.help.' + @form['table'] + '.' + options['name'],' ') if options['name'] 
 # create field object from class and call its render method
     klas_string = options['type'].camelize
     field_html = if DrgcmsFormFields.const_defined?(klas_string) # check if field type is defined
@@ -735,7 +735,7 @@ def dc_fields_for_form()
         next unless is_on_tab
       end
 # first div is displayed all other are hidden      
-      tdata << "<div id='data_#{tabname}'"
+      tdata << "<div id='data_#{tabname.delete("\s\n")}'"
       tdata << ' class="div-hidden"' unless first
       tdata << " style=\"height: #{@form['form']['height']}px;\"" if @form['form']['height']
       tdata << ">#{dc_fields_for_tab(@form['form']['tabs'][tabname])}</div>"
@@ -746,7 +746,7 @@ def dc_fields_for_form()
     html << '<ul class="dc-form-ul" >'
     first = true # first tab must be selected
     tabs.each do |tab| 
-      html << "<li id='li_#{tab}' data-div='#{tab}' class='dc-form-li #{'dc-form-li-selected' if first }'>#{t_name(tab, tab)}</li>" 
+      html << "<li id='li_#{tab}' data-div='#{tab.delete("\s\n")}' class='dc-form-li #{'dc-form-li-selected' if first }'>#{t_name(tab, tab)}</li>" 
       first = false
     end
     html << '</ul>'

data/app/helpers/dc_application_helper.rb

@@ -170,8 +170,9 @@ end
 # This helper is replacement dc_render_from_site method which will soon be deprecated. 
 ########################################################################
 def dc_render_design_part(part) 
+  
   case
-  when part.nil? then ''
+  when part.nil? then logger.error('ERROR dc_render_design_part! part is NIL !'); ''
 # Send as array. Part may be defined with options on page. First element has
 # name of element which defines what to do. If not defined default behaviour is 
 # called. That is what is defined in second part of array.
@@ -506,7 +507,7 @@ def dc_link_for_edit(opts)
   icon   = opts.delete('icon') || 'edit lg'
   opts['controller'] ||= 'cmsedit'
   opts['action']     ||= 'edit'
-  opts['formname']   ||= opts['table'].split(';').last
+  opts['formname']   ||= opts['table'].to_s.split(';').last
   js  = "$('##{target}').attr('src', '#{_origin.url_for(opts)}'); return false;"
   dc_link_to(nil, _origin.fa_icon(icon, class: 'dc-inline-link'), '#', 
              { onclick: js, title: title, alt: 'Edit'})
@@ -1226,4 +1227,37 @@ def dc_iframe_edit(table, opts={})
   ret.html_safe
 end
 
+########################################################################
+# Will return value from internal DRG variables.
+# This objects can be params, session, ...
+# 
+# Parameters:
+# [object] String: Internal object holding variable. Current values can be session, params, site, page
+# [var_name] String[symbol]: Variable name (:user_name, 'user_id', ...)
+# 
+# Example:
+#    # called when constructiong iframe for display
+#    dc_internal_var(session, :user_id)
+#    dc_internal_var(params, :some_external_parameter)
+#    dc_internal_var(site, :name)
+# 
+# Returns:
+# Value of variable or nil when not found
+########################################################################
+def dc_internal_var(object, var_name)
+  begin
+    case
+      when object == 'session' then _origin.session[var_name]
+      when object == 'params'  then _origin.params[var_name]
+      when object == 'site'    then _origin.dc_get_site.send(var_name)
+      when object == 'page'    then _origin.page.send(var_name)
+    else
+      'VARIABLE: UNKNOWN OBJECT'
+    end
+  rescue Exception => e
+    Rails.logger.debug "Method dc_internal var. Runtime error. #{e.message}"
+    'VARIABLE: ERROR'
+  end
+end
+
 end

data/app/helpers/dc_page_renderer.rb

@@ -47,17 +47,53 @@ def initialize( parent, opts={} ) #:nodoc:
   @css    = ''
 end
 
+#########################################################################
+# Render IFrame part if defined on page
+#########################################################################
+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 << " 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 << " scrolling=\"#{@page.if_scroll}\""
+# Parameters
+  parameters = @page.if_url.match(/\?/) ? '' : '?' 
+  params = YAML.load(@page.if_params) rescue {}
+  params = {} unless params.class == Hash
+  params.each do |key, value|
+    val = @parent.dc_internal_var(value['object'], value['variable'])
+    parameters << "&#{key}=#{val}" if val # only when not nil
+  end
+  url = @page.if_url + (parameters.size > 1 ? parameters : '')
+  html << "src=\"#{url}\" ></iframe>\n"
+  html
+end
+
 #########################################################################
 # Default DcPage render method
 #########################################################################
 def default
   can_view, msg = dc_user_can_view(@parent, @page)
   return msg unless can_view
-#  
+# 
   html = ''
   html << dc_page_edit_menu() if @opts[:edit_mode] > 1
   @parent.page_title = @page.title.blank? ? @page.subject : @page.title
   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)
+    comment = DcPollRenderer.new(@parent, @opts)
+    html << "<div class='wrap row'>#{comment.render_html}</div>"
+    @css << "\n#{comment.render_css}"
+  end
+# also add iframe
+  html << iframe()
+    html
+
 end
 
 #########################################################################

data/app/helpers/dc_part_renderer.rb

@@ -67,6 +67,7 @@ def render_particle(particle, opts)
     html << dc_link_for_edit( opts[:editparams] )
   end
 #
+=begin
   if particle.piece_id
     opts[:id] = particle.piece_id
     piece = DcPieceRenderer.new(@parent, opts)
@@ -76,7 +77,9 @@ def render_particle(particle, opts)
     html << particle.body
     @part_css << particle.css.to_s
   end
-  html
+=end
+  @part_css << particle.css.to_s
+  html << particle.body
 end
 
 ########################################################################

data/app/helpers/dc_piece_renderer.rb

@@ -58,6 +58,7 @@ def link_4edit()
   html = ''
   return html if @opts[:edit_mode] < 2
   @opts[:editparams].merge!( { table: 'dc_piece', 
+                               formname: 'dc_piece', 
                                controller: 'cmsedit', 
                                action: 'edit', 
                                id: @piece.id,

data/app/helpers/dc_simple_menu_renderer.rb

@@ -100,12 +100,14 @@ def link_4menu(item)
 
   caption = ''
   unless item.picture.blank? 
-    caption = if item.picture.match(/\./)
-      @parent.image_tag(item.picture)
-    elsif item.picture.match('<i')
-      item.picture
-    else
-      @parent.fa_icon(item.picture)
+    caption = case
+      when item.picture[0] == '@' then # call method
+        method = item.picture.sub('@','')
+        return eval(method) rescue 'ERROR!'
+      when item.picture.match(/\./) then @parent.image_tag(item.picture)
+      when item.picture.match('<i') then item.picture
+      else
+        @parent.fa_icon(item.picture)
     end
     caption << ' '
    end

data/app/models/concerns/dc_page_concern.rb

@@ -57,6 +57,15 @@ field :created_by,   type: BSON::ObjectId
 field :updated_by,   type: BSON::ObjectId
 field :kats,         type: Array         # Categories
 
+field :if_url,       type: String
+field :if_border,    type: Integer, default: 0
+field :if_width,     type: Integer
+field :if_height,    type: Integer
+field :if_scroll,    type: String
+field :if_id,        type: String
+field :if_class,        type: String
+field :if_params,    type: String
+
 field :policy_id,    type: BSON::ObjectId
 
 embeds_many :dc_parts

data/app/models/dc_filter.rb

@@ -89,11 +89,11 @@ def self.get_field_form_definition(name, parent) #:nodoc:
   form['form']['tabs'].each do |tab|
 # Array with 2 elements. First is tabname, second is data      
     fields = tab.last
-    fields.each {|k,v| return v if (k.class == Fixnum and v['name'] == name) }
+    fields.each {|k,v| return v if (k.class == Integer and v['name'] == name) }
   end if form['form']['tabs'] #  I know. But nice. 
 #
   form['form']['fields'].each do |field|
-    next unless field.first.class == Fixnum # options
+    next unless field.first.class == Integer # options
     return field.last if field.last['name'] == name
   end if form['form']['fields']
   nil

data/app/models/drgcms_form_fields.rb

@@ -445,7 +445,12 @@ end
 ###########################################################################
 def render 
 # search field name
-  if @yaml['search'].to_s.match(/\./)
+  if @yaml['search'].class == Hash
+    table    = @yaml['search']['table']
+    field_name = @yaml['search']['field']
+    method   = @yaml['search']['method']
+    search = method.nil? ? field_name : "#{field_name}.#{method}"
+  elsif @yaml['search'].to_s.match(/\./)
     table, field_name, method = @yaml['search'].split(/\.|\,/) 
     search = method.nil? ? field_name : "#{field_name}.#{method}"
   else # search and table name are separated
@@ -765,7 +770,7 @@ class Comment < DrgcmsField
 # Render comment field html code
 ###########################################################################
 def render
-  @html << t(@yaml['text'], @yaml['text'])
+  @html << t(@yaml['comment'], @yaml['comment'])
   self
 end
 end
@@ -1124,7 +1129,7 @@ end
 # * +name:+ field name (required)
 # * +type:+ text_autocomplete (required)
 # * +table+ Collection (table) name. When defined search must contain field name
-# * +search:+ Search may consist of three parameters from which are separated either by dot (.) or comma(,)
+# * +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.
 #   * collection_name.search_field_name.method_name; When searching is more complex custom search
@@ -1479,7 +1484,8 @@ def render
 $(function(){
   $("##{@yaml['name']}").jstree( {
     "checkbox" : {"three_state" : false},        
-    "core" : { "themes" : { "icons": false } },
+    "core" : { "themes" : { "icons": false },
+               "multiple" : #{@yaml['multiple'] ? 'true' : 'false'}  },
     "plugins" : ["checkbox"]
   });
 });

data/config/locales/models_en.yml

@@ -248,10 +248,12 @@ en:
       dc_page:
         tabletitle: Pages
         choices4_comments: 'Allowed:1,Not allowed:0'
+        choices4_if_scroll: 'Auto,Yes,No'
         1base: Base
         2advanced: Advanced
         3content: Content
         4parts: Parts
+        5iframe: IFrame
 
         subject: Subject
         subject_link: Subject link
@@ -279,6 +281,14 @@ en:
         kats: Categories
         gallery: Gallery name
         updated_at: Updated
+        if_url: URL
+        if_width:  Width
+        if_height: Height
+        if_scroll: Scrolling
+        if_border: Border
+        if_params: Parameters
+        if_id: CSS id
+        if_class: CSS class        
 
       dc_part:
         tabletitle: Parts of page
@@ -703,6 +713,15 @@ en:
         kats: Categories for this article
         gallery: Gallery pictures are defined in parts of page. Value defines name of parts which hold data about pictures in gallary.
         body: Content of this page
+        if_url: URL adress of page which will be loaded into IFrame
+        if_width:  IFrame area width
+        if_height: IFrame area height
+        if_scroll: Scroll bars visibility
+        if_border: Thickness of border around IFrame area. When 0, no border is shown.
+        if_params: Parameters added to URL address    
+        if_id: CSS id of IFrame object
+        if_class: CSS class of IFrame object
+        
 
       dc_part:
         name: Parts can be searched by name or by id

data/config/locales/models_sl.yml

@@ -276,10 +276,12 @@ sl:
       dc_page:
         tabletitle: Strani
         choices4_comments: 'Dovoljeno:1,Ni dovoljeno:0'
+        choices4_if_scroll: 'Avto:Auto,Da:Yes,Ne:No'
         1base: Osnovno
         2advanced: Napredno
         3content: Vsebina
         4parts: Elementi
+        5iframe: IFrame
 
         subject: Zadeva
         subject_link: Povezava
@@ -311,7 +313,15 @@ sl:
         updated_at: Spremenjeno
         picture: Slika
         dc_poll_id: Anketa
-
+        if_url: URL naslov
+        if_width:  Širina
+        if_height: Višina
+        if_scroll: Pomikanje
+        if_border: Okvir
+        if_params: Parametri
+        if_id: CSS id
+        if_class: CSS class        
+        
       dc_part:
         tabletitle: Elementi strani
         1base: Osnovno
@@ -734,7 +744,14 @@ sl:
         gallery: Posamezne slike so definirane v elementih strani. Podatek določa ime elementov, ki pripadajo galeriji.
         picture: Slika uporabljena za prikaz sestavka
         dc_poll_id: Anketa, če sestavek vsebuje tudi anketo
-
+        if_url: URL naslov od koder bo naložena vsebina IFrame-a
+        if_width:  Širina IFrame področja
+        if_height: Višina IFrame področja
+        if_scroll: Prikaz drsnikov za pomikanje okna
+        if_border: Debelina okvira IFrame okna. 0 je brez okvirja.
+        if_params: Pramateri posredovani v URL naslovu
+        if_id: CSS id IFrame objekta
+        if_class: CSS class IFrame objekta
 
       dc_part:
         name: Naziv elementa
@@ -878,4 +895,3 @@ sl:
         filter: Vsebina filtra
         public: Filter je na voljo vsem uporabnikom
         sort: Privzeto sortiranje ob izbiri filtra
-        

data/drg_cms.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md", "History.log", "drg_cms.gemspec"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency 'rails'#, '~> 4'
+  s.required_ruby_version = '>= 2.4'
+
+  s.add_dependency 'rails', '>= 5'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails'
   s.add_dependency 'non-stupid-digest-assets'  

data/lib/drg_cms.rb

@@ -128,7 +128,7 @@ def self.routes
       get 'dc_common/logout'            => :logout
       get 'dc_common/login'             => :login
       get 'dc_common/copy_clipboard'    => :copy_clipboard
-      post 'dc_common/paste_clipboard'  => :paste_clipboard
+      match 'dc_common/paste_clipboard'  => :paste_clipboard, via: [:get, :post]
       put 'dc_common/restore_from_journal'  => :restore_from_journal
     end
     match 'elfinder' => 'dc_elfinder#connector', via: [:get, :post]

data/lib/drg_cms/version.rb

@@ -1,4 +1,4 @@
 module DrgCms #:nodoc:
   # drg_cms gem version
-  VERSION = "0.5.51.1"
+  VERSION = "0.5.52"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.51.1
+  version: 0.5.52
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -387,7 +387,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -395,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: 'DRG CMS: Rapid web application development tool for Ruby, Rails and MongoDB'