drg_cms 0.4.54 → 0.4.57

data/app/controllers/dc_application_controller.rb

@@ -287,7 +287,7 @@ def dc_process_default_request()
 # Add edit menu
   layout = 'content'
   if session[:edit_mode] > 0
-    layout = 'cms'
+#    layout = 'cms'
     session[:site_id]         = @site.id
     session[:site_page_table] = @site.page_table
     session[:page_id]         = @page.id

data/app/controllers/dc_common_controller.rb

@@ -149,7 +149,10 @@ end
 ####################################################################
 def restore_from_journal
 # Only administrators can perform this operation  
-  return render(text: t('drgcms.not_authorized') )  unless dc_user_has_role('admin')
+  unless dc_user_has_role('admin')
+    { 'msg_info' => (t ('drgcms.not_authorized')) }
+    return render inline: result.to_json, formats: 'js'
+  end
 # selected fields to hash  
   restore = params[:select].inject({}) {|r,v| r[v.first] = 0 if v.last == '1'; r}
   result = if restore.size == 0
@@ -248,7 +251,8 @@ def update_json(json, is_update=false) #:nodoc:
   result = {}
   json.each do |k,v|
     if v.class == Hash
-      result[k] = v['$oid'] if is_update
+      result[k] = v['$oid'] unless is_update
+#TODO Double check if unless works as expected
     elsif v.class == Array
       result[k] = []
       v.each {|e| result[k] << update_json(e, is_update)}

data/app/forms/all_options.yml

@@ -3,6 +3,10 @@
 extend: form_name
 table: table_name
 title: Some title
+controls: controls_file
+readonly: 1
+permissions:
+  can_view: role_name
 
 index:
   filter: name, id as text_field
@@ -87,11 +91,18 @@ form:
       action: priprava_odlocbe
       method: (get),put,post
       caption: Priprava odločbe
+    6: 
+      type: script
+      caption: Cancle 
+      js: parent.reload();
+      
   tabs:
     tab1:
       10:
         name: name
         type: text_field
+        type: hidden_field
+        type: readonly
         html:
           size: 50
       40:
@@ -102,42 +113,15 @@ form:
         html:
           include_blank: true        
 
-      20:
-        name: title
-        type: text_field
-        html:
-          size: 50
+      40:
+        name: operation
+        type: select
 
       30:
         name: sub_text
         type: html_field
         options: 'height: 400'
 
-      35:
-        name: pre_display
-        type: text_field
-        html:
-          size: 50
-      40:
-        name: operation
-        type: select
-
-      50:
-        name: display
-        type: select
-
-      60:
-        name: parameters
-        type: text_field
-        html:
-          size: 50
-
-      70:
-        name: captcha_type
-        type: text_field
-        html:
-          size: 10
-
       80:
         name: valid_from
         type: datetime_select
@@ -159,6 +143,7 @@ form:
       110:
         name: active
         type: check_box
+        
     tab2:
       10:
         name: form

data/app/forms/dc_menu.yml

@@ -45,6 +45,11 @@ form:
         type: text_field
         html:
           size: 20
+      40:
+        name: link_prepend
+        type: text_field
+        html:
+          size: 20
 
     tab2:
       10:

data/app/forms/dc_menu_item.yml

@@ -46,18 +46,18 @@ form:
         eval: '@parent.dc_page_class.all_pages_for_site(@parent.dc_get_site)'
         html:
           size: 50
-  #
-  #    30:
-  #      name: link
-  #      type: text_field
-  #      html:
-  #        size: 50
       40:
+        name: link_prepend
+        type: text_field
+        html:
+          size: 20
+         
+      50:
         name: target
         type: text_field
         html:
           size: 10
-      50:
+      60:
         name: order
         type: text_field
         html:

data/app/forms/dc_simple_menu.yml

@@ -45,6 +45,11 @@ form:
         type: text_field
         html:
           size: 20
+      40:
+        name: link_prepend
+        type: text_field
+        html:
+          size: 20
 
     tab2:
       10:

data/app/forms/dc_simple_menu_item.yml

@@ -43,32 +43,37 @@ form:
       html:
         size: 50
     30:
+      name: link_prepend
+      type: text_field
+      html:
+        size: 20
+    40:
       name: link
       type: text_with_select
       eval: '@parent.dc_page_class.all_pages_for_site(@parent.dc_get_site)'
       html:
         size: 50
-    40:
+    50:
       name: target
       type: text_field
       html:
         size: 10
-    50:
+    60:
       name: order
       type: text_field
       html:
         size: 2
-    60:
+    70:
       name: submenu
       type: text_area
       html:
         size: 60x20
-    70:
+    80:
       name: css
       type: text_area
       html:
         size: 60x10
-    80:
+    90:
       name: policy_id
       type: select
       eval: dc_choices4_site_policies

data/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/app/helpers/cmsedit_helper.rb

@@ -84,7 +84,7 @@ EOT
           choices << [ t("helpers.label.#{@form['table']}.#{s}"), s ]
         end
       end
-      t('drgcms.sort') + select('sort', 'sort', choices, { include_blank: true }, { class: 'drgcms_sort', 'data-table' => @form['table']} )
+      t('drgcms.sort')+ ' ' + select('sort', 'sort', choices, { include_blank: true }, { class: 'drgcms_sort', 'data-table' => @form['table']} )
 
     when action == 'filter' then # filter
       caption = t('drgcms.filter')
@@ -126,6 +126,13 @@ end
 ############################################################################
 def _get_field_div(name) #:nodoc:
 # field not defined on form. Must be defined: name as form_field_type  
+  filter = nil
+  if session[@form['table']] and session[@form['table']][:filter]
+    filter = session[@form['table']][:filter].split("\t")
+  end
+  
+#params[:filter_field], params[:filter_oper], params[:record][params[:filter_field]]
+
   if name.match(' as ')
     name, dummy, type = name.split(' ')
     field = {"name" => name, "type" => type, "html"=>{"size"=>20}}
@@ -133,6 +140,14 @@ def _get_field_div(name) #:nodoc:
     field = _get_field_def(name)
     field = {"name" => name, "type" => 'text_field', "html"=>{"size"=>20}} if field.nil?
   end
+#
+  if filter
+    if field['html'] 
+      field['html']['value'] = filter[2]
+    else
+      field['html'] = {"value"=>filter[2]}
+    end
+  end
   klas_string = field['type'].camelize
   klas = DrgcmsFormField::const_get(klas_string)
   o = klas.new(self, @record, field).render
@@ -155,14 +170,16 @@ def dc_div_filter()
     inputs << _get_field_div(f)
   end
   choices4_operators = t('drgcms.choices4_filter_operators').chomp.split(',').inject([]) {|r,v| r << (v.match(':') ? v.split(':') : v )}
+  s = session[@form['table']]
+  is_hidden = (s and s[:filter]) ? '' : ' class="div-hidden" '
   html =<<EOT
-  <div id="drgcms_filter">
+  <div id="drgcms_filter" #{is_hidden}>
+    <table class="dc-menu"><td>
   #{ form_tag :table => @form['table'], filter: :on, action: :index, method: :post }
     #{ select(nil, 'filter_field', choices, { include_blank: true}) }
     #{ select(nil, 'filter_oper', choices4_operators) }
     #{ inputs }
-    <br>
-    <table class="dc-menu">
+      </td>
       <td class="dc-link-submit dc-animate">#{submit_tag(t('drgcms.filter_on'), :class => 'dc-submit')}</td>
       <td class="dc-link dc-animate">#{link_to t('drgcms.filter_off'), action: 'index', filter: 'off', :table => @form['table']}</td>
     </table>
@@ -488,7 +505,7 @@ def dc_actions_for_form()
         end
 # Javascript action        
       when v['type'] == 'script'
-          v['caption'] ||= v['text'] || 'Caption missing!'
+          v['caption'] ||= 'Caption missing!'
           caption = t("#{v['caption'].downcase}", v['caption'])
           data = {'request' => 'script', 'script' => v['js']}
          %Q[<td class="dc-link-ajax dc-animate">#{ link_to(caption, '#', data: data ) }</td>]
@@ -578,9 +595,6 @@ end
 # Creates edit form div. 
 ############################################################################
 def dc_fields_for_form()
-  if @form['edit']
-    p "@form['edit']['title'] directive will be depricated. Use edit_title in form directive instead! #{@form['table']}"
-  end
   html, tabs, tdata = '',[], ''
 # Only fields defined  
   if (fields = @form['form']['fields'])

data/app/helpers/dc_application_helper.rb

@@ -140,11 +140,18 @@ end
 # String. HTML code for title.
 ############################################################################
 def dc_edit_title()
-  c = "#{t('drgcms.edit')} : "
-  c << (@form['title'] ? t( @form['title'], @form['title'] ) : t_tablename(@form['table'])) + ' : '
-  title = @form['form']['edit_title'] || @form['edit_title'] # edit_title bo šel ven
-  c << "#{@record[ title ]} : " if title and @record.respond_to?(title)
-  c << @record._id 
+  title = @form['form']['title']
+# defined as form:title:edit
+  if title and title['edit']
+    t( title['edit'], title['edit'] )
+  else
+# concatenate title 
+    c = "#{t('drgcms.edit')} : "
+    c << (@form['title'] ? t( @form['title'], @form['title'] ) : t_tablename(@form['table'])) + ' : '
+    title = (title and title['field']) ? title['field'] : @form['form']['edit_title']
+    c << "#{@record[ title ]} : " if title and @record.respond_to?(title)
+    c << @record._id 
+  end
 end
 
 ############################################################################
@@ -154,10 +161,16 @@ end
 # String. HTML code for title.
 ############################################################################
 def dc_new_title()
-  if @form['table'] == 'dc_dummy'
-    t( @form['title'], @form['title'] )
+  title = @form['form']['title']
+# defined as form:title:new
+  if title and title['new']
+    t( title['new'], title['new'] )
   else
-    "#{t('drgcms.new')} : #{t_tablename(@form['table'])}"    
+    if @form['table'] == 'dc_dummy'
+      t( @form['title'], @form['title'] )
+    else
+      "#{t('drgcms.new')} : #{t_tablename(@form['table'])}"    
+    end
   end
 end
 
@@ -431,7 +444,9 @@ def t(key, default='')
   if c.class == Hash or c.match( 'translation missing' )
     c = I18n.t(key, locale: 'en') 
 # Still not found. Return default if set
-    c = default if c.match( 'translation missing' ) and !default.blank?
+    if c.class == Hash or c.match( 'translation missing' )
+      c = default.blank? ? key : default
+    end
   end
   c
 end
@@ -938,4 +953,29 @@ def dc_big_table(key)
   ret
 end
 
+########################################################################
+# Will return html code required for open edit form in iframe. If parameters 
+# are found in url iframe will be initial loaded with url parameters thus
+# enabling forms load on page display.
+########################################################################
+def iframe_edit1()
+#  default_table = params[:table] if default_table.nil?
+#  p params
+   parms = {}
+  ret = if params.size > 2 #and default_table  # controller, action, path is minimum
+    parms[:controller] = 'cmsedit'
+    parms[:action]     = params[:oper] ? params[:oper] : 'index'
+    parms[:table]      = params[:table]
+    parms[:formname]   = params[:formname] || params[:table]
+    parms[:id]         = params[:idp]
+  p '**************', url_for(parms)    
+    "<iframe id='iframe_edit' name='iframe_edit' src='#{url_for parms}'></iframe>"
+  else
+    "<iframe id='iframe_edit' name='iframe_edit'></iframe>"
+  end
+  #bla
+  p ret
+  ret.html_safe
+end
+
 end

data/app/helpers/dc_common_renderer.rb

@@ -88,6 +88,15 @@ EOT
   html.html_safe
 end
 
+########################################################################
+# Will return html code required for open edit form in iframe. If parameters 
+# are found in url iframe will be initial loaded with url parameters thus
+# enabling forms load on page display.
+########################################################################
+def iframe_edit()
+  @parent.render(partial: 'dc_common/iframe_edit', formats: [:html])
+end
+
 ########################################################################
 # Return HTML part of code.
 ########################################################################

data/app/helpers/dc_menu_renderer.rb

@@ -73,17 +73,31 @@ end
 # Returns html code required to create single link in a menu. Subroutine of do_menu_level.
 ########################################################################
 def link_4menu(item)
-# link should start with '/'
-  item.link = ((item.link[0] == '/' ? '' : '/') + item.link) unless item.link.match('http')
+# 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
   (item.picture.blank? ? '' : 
-    @parent.link_to( @parent.image_tag(item.picture), item.link, {title: img_title, target: target} )) +
+    @parent.link_to( @parent.image_tag(item.picture), link, {title: img_title, target: target} )) +
   (caption.blank? ? '' : 
-    @parent.link_to(caption, item.link, {target: target}) )
+    @parent.link_to(caption, link, {target: target}) )
 end
 
 ########################################################################

data/app/helpers/dc_simple_menu_renderer.rb

@@ -79,19 +79,28 @@ end
 # [item] SimpleMenuItem.
 ########################################################################
 def link_4menu(item)
-# Link should start with /
-  item.link = ((item.link[0,1] == '/' ? '' : '/') + item.link) unless item.link.match('http:')
-  target = item.target.blank? ? nil : item.target
-  if item.caption.match('pic:')
-    p 'pic: value in caption will be deprecated. Use picture field instead.'
-    @parent.link_to( @parent.image_tag(item.caption.sub('pic:','')), item.link, {target: target} )
+# prepand to link  
+  link = if !item.link_prepend.blank?
+    item.link_prepend
+  elsif !@menu.link_prepend.blank?
+    @menu.link_prepend
   else
-  # - in first place won't write caption text
-    caption = item.caption[0] == '-' ? '' : item.caption.to_s
-    img_title = item.caption.to_s.sub('-','')
-    (item.picture.blank? ? '' : @parent.link_to( @parent.image_tag(item.picture), item.link, {title: img_title, target: target} )) +
-    ( caption.blank? ? '' : @parent.link_to(caption, item.link, {target: target}))
+    ''
   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('-','')
+  (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}))
 end
 
 ########################################################################
@@ -106,8 +115,7 @@ def as_table
 # use div_name if specified otherwise menu.name  
   div_name  = (@menu.div_name.to_s.size > 2 ? @menu.div_name : @menu.name).downcase
   html << "<table class=\"#{div_name}\"><tr>"
-# sort items acording to :order  
-#  items = @menu.dc_simple_menu_items.sort {|a,b| a.order <=> b.order}
+#
   items = @menu.dc_simple_menu_items.where(active: true).order(order: 1)
   items.each do |item|
 # menu can be hidden from user
@@ -119,6 +127,28 @@ def as_table
   end
   html << "</table>"
 end
+########################################################################
+# Renders menu as table. This is single level menu only and uses table elements to 
+# display menu options evenly justified. 
+########################################################################
+def as_responsive
+  html = link_4edit
+  return "#{html}#{@opts[:name]}<br>Menu not found!" if @menu.nil?
+#  
+  @selected = find_selected
+  klas = @opts[:classes] ? @opts[:classes] : 'small-2 middle-4 large-6 columns'
+  klas << ' columns' unless klas.match('column')
+  klas=''
+#  
+  items = @menu.dc_simple_menu_items.where(active: true).order(order: 1)
+  items.each do |item|
+# menu can be hidden from user
+    can_view, msg = dc_user_can_view(@parent, item)
+    next unless can_view
+    html << "<li class=\"#{klas}#{(item.id == @selected.id) ? 'selected' : 'item'}\">#{ link_4menu(item) }</li>" #
+  end
+  html
+end
 
 ########################################################################
 # Creates menu with single level dropdown menu. This is older version of method which