drg_cms 0.5.52.12 → 0.6.0.8

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

@@ -36,6 +36,7 @@
 class DcPageRenderer
 
 include DcApplicationHelper
+include CmsCommonHelper
 
 ########################################################################
 # Object initialization.
@@ -49,6 +50,25 @@ end
 
 #########################################################################
 # Render IFrame part if defined on page
+# 
+# Parameters forwarded to iframe are defined in if_params field as yaml as:
+#   param_name:
+#     object: internal object name (params, session, site, page)
+#     method: method name (variable) holding the value of parameter
+#     
+#   example: Forward id parameter to iframe 
+#   id:
+#     object: params
+#     method: id
+#     
+#   example: Forward user id and edit_mode to iframe
+#   user_id:
+#     object: session
+#     method: user_id
+#   edit:
+#     object: session
+#     method: edit_mode
+#     
 #########################################################################
 def iframe
   return '' if @page.if_url.blank?
@@ -64,7 +84,7 @@ def iframe
   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'])
+    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 : '')
@@ -92,8 +112,6 @@ def default
   end
 # also add iframe
   html << iframe()
-    html
-
 end
 
 #########################################################################

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

@@ -42,6 +42,7 @@
 class DcPartRenderer
 
 include DcApplicationHelper
+include CmsCommonHelper
 
 ########################################################################
 # Object initialization.
@@ -98,7 +99,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 +162,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 +175,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_piece_renderer.rb

@@ -33,7 +33,7 @@
 class DcPieceRenderer
 
 include DcApplicationHelper
-
+include CmsCommonHelper
 ########################################################################
 # Object initialization. It also loads requested dc_piece document.
 ########################################################################

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

@@ -27,9 +27,9 @@
 ########################################################################
 class DcPollRenderer
   
-include CmseditHelper
+include CmsCommonHelper
 include DcApplicationHelper
-include ActionView::Helpers::FormHelper # for form hepers
+include ActionView::Helpers::FormHelper # for form helpers
 include ActionView::Helpers::FormOptionsHelper # for select helper
 
 ########################################################################
@@ -39,6 +39,7 @@ def initialize( parent, opts={} ) #:nodoc:
   @parent   = parent
   @opts     = opts
   @part_css = ''
+  @part_js  = ''
   self
 end
 
@@ -56,49 +57,59 @@ def do_one_item(poll, yaml)
   html = ''
   yaml['separator'] ||= ''
   yaml['text']      ||= ''
-# 
+  # label
   text = yaml['text'].match(/\./) ? t(yaml['text']) : yaml['text'] 
   if yaml['mandatory']
-    text << '<font color="red"> *</font>' 
+    text << ( poll.display == 'in' ? ' *' : '<font color="red"> *</font>' )
     yaml['html'] ||= {}
     yaml['html']['required'] = true
+  else
+    text << " &nbsp;" if poll.display == 'lr' and !yaml['type'].match(/submit_tag|link_to/)
   end
   
-# Just add text if comment and go to next one    
+  # Just add text if comment and go to next one
   if yaml['type'] == 'comment'
     html << if poll.display == 'lr'
-      "<tr><td colspan='2' class='poll-data-text'>#{text}</td></tr>"
+      "<div class='row-div'><div class='dc-form-label poll-data-text comment'>#{text}</div></div>"
     else
-      "<div class='poll-data-text'>#{text}</div>"
+      "<div class='poll-data-text comment'>#{text}</div>"
     end    
     return html
   end
-# Set default value, if not already set
+
+  # Set default value, if not already set
   if yaml['default'] 
     if yaml['default'].match('eval')
       e = yaml['default'].match(/\((.*?)\)/)[1]
       yaml['default'] = eval e
+    elsif yaml['default'].match('params')
+      param_name = yaml['default'].split(/\.|\ |\,/)[1]
+      yaml['default'] = @parent.params[param_name]
     end
     key = "p_#{yaml['name']}"
     params[key] = yaml['default'] unless params[key]
   end
-# create form_field object and retrieve html code
+  # 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
-#TODO collect all javascript and add it at the end
-    o.html + (o.js.size > 0 ? @parent.javascript_tag(o.js) : '')
-  else # litle error string
+    field = clas.new(@parent, @record, yaml).render
+    @part_js << field.js
+    field.html
+  else # error string
     "Error: Code for field type #{yaml['type']} not defined!"
   end
 
-#  field = send('dc_' + yaml['type'], yaml) # call dc_xxx method to get field html code
   if yaml['type'].match(/submit_tag|link_to/)
-# There can be more than one links on form. End the data at first link or submit.
+    # There can be more than one links on form. End the data at first link or submit.
     if !@end_of_data 
       html << if poll.display == 'lr'
-        "</table><br>\n"
+        "</div><br>\n"
       else
         "</div>\n"
       end
@@ -109,109 +120,133 @@ def do_one_item(poll, yaml)
         html << captcha.render_html
         @part_css = captcha.render_css
       end
-      @end_od_data = true
+      @end_of_data = true
     end
-# submit and link tag 
+    # 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'
-      "<tr><td class='poll-data-text'>#{text}</td><td class='poll-data-field #{yaml['class']}'>#{field_html}</td></tr>\n"
-    else
-      "<div class='poll-data-text'>#{text}</div><div class='poll-data-field #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
+    html << case
+      when poll.display == 'lr' then
+      "<div class='row-div'><div class='dc-form-label poll-data-text lr #{yaml['class']}'>#{text}</div><div class='poll-data-field td #{yaml['class']}'>#{field_html}</div></div>\n"
+      when poll.display == 'td' then
+      "<div class='poll-data-text td #{yaml['class']}'>#{text}</div><div class='poll-data-field td #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
+      else
+      "<div class='poll-data-field in #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
     end    
   end
 end
 
+########################################################################
+# Call method before poll is displayed. Usefull for filling predefined values into flash[:record][value]
+# Method cane be defined as ClassName.method or only method. 
+# If only method is defined then method name must exist in helpers.
+# 
+# Called method must return at least one result if process can continue.
+########################################################################
+def eval_pre_display(code)
+  a = code.strip.split('.')
+  if a.size == 1
+    continue, message = @parent.send(a.first)
+  else
+    klass = a.first.classify.constantize
+    continue, message = klass.send(a.last,@parent)
+  end
+  [continue, message]
+end
+
 ########################################################################
 # Default poll renderer method. Renders data for specified pool.
 ########################################################################
 def default
-# poll_id may be defined in params or opts
+  # poll_id may be defined in params or opts
   poll_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)
   poll = DcPoll.find_by(name: poll_id) if poll.nil? # name instead of id
   return "<div class=\"dc-form-error\">Invalid Poll id #{poll_id}</div>" if poll.nil?
+  # If parent cant be seen. so cant be polls
+  can_view, message = dc_user_can_view(@parent, @parent.page)
+  return "<div class=\"dc-form-error\">#{message}</div>" unless can_view
+
   html = @opts[:div] ? "<div id='#{@opts[:div]}'>" : ''
   html << '<a name="poll-top"></a>'
-
-  # Operation called before poll is displayed. Usefull for filling predefined values into flash[:record][value]
-  # Called method must return at least one result if process can continue.
-  if poll.pre_display.to_s.size > 1
+  unless poll.pre_display.blank?
     begin
-      continue, message = eval(poll.pre_display.strip + '(@parent)')
+      continue, message = eval_pre_display(poll.pre_display)
     rescue Exception => e
       return "<div class=\"dc-form-error\">Error! Poll pre display. Error: #{e.message}</div>" 
     end
     return message unless continue
+
     html << message if message
   end
-
-# there might be more than one poll displayed on page. Check if messages and values are for me
-  if @parent.flash[:poll_id].nil? or @parent.flash[:poll_id] == poll_id
-# If flash[:record] is present copy content to params record hash
+  # there might be more than one poll displayed on page. Check if messages and values are for me
+  if @parent.flash[:poll_id].nil? || @parent.flash[:poll_id].to_s == poll_id.to_s
+    # If flash[:record] is present copy content to params record hash
     @parent.flash[:record].each {|k,v| @parent.params["p_#{k}"] = v } if @parent.flash[:record]  
-# Error during procesing request
+    # Error during procesing request
     html << "<div class=\"dc-form-error\">#{@parent.flash[:error]}</div>\n" if @parent.flash[:error].to_s.size > 0
     html << "<div class=\"dc-form-info\">#{@parent.flash[:info]}</div>\n" if @parent.flash[:info]
   end
-# div and form tag
+  # div and form tag
   html <<  "<div class=\"poll-div\">\n"
-# edit link  
+  # 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!(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
-# header 
-  html << "<div class='poll-title'>#{poll.title}</div>" unless poll.title[0] == '-' # - on first position will not display title
-  html << poll.sub_text.to_s # if poll.sub_text.to_s.size > 5
+  # header, - on first position will not display title
+  html << "<div class='poll-title'>#{poll.title}</div>" unless poll.title[0] == '-'
+  html << poll.sub_text.to_s
   html << if poll.display == 'lr'
-    "\n" + '<table class="poll-data-table">'
+    "\n" + '<div class="poll-data-table">'
   else
     '<div class="poll-data-div">' + "\n"
   end
-# items. Convert each item to yaml
+  # items. Convert each item to yaml
   @end_od_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
+      # convert options to yaml
       yaml = YAML.load(item.options) || {}
+      yaml = {} if yaml.class == String
       yaml['name'] = item.name
       yaml['html'] ||= {}
       yaml['html']['size'] = item.size
       (yaml['html']['class'] ||= 'dc-submit') if item.type == 'submit_tag'
       yaml['text'] = item.text
-      yaml['mandatory']  = item.mandatory
-      yaml['type']       = item.type
+      yaml['mandatory'] = item.mandatory
+      yaml['type'] = item.type
       html << do_one_item(poll, yaml)
     end
-# Form. Just call do_one_item for each form item
+  # FORM. Just call do_one_item for each form item
   else
     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
+    # 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  
-# was html << @parent.hidden_field_tag('return_to', @opts[:return_to] || @parent.params[:return_to] || '/')
+  # 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_error', @parent.request.url )
   html << @parent.hidden_field_tag('poll_id', poll_id )
   html << @parent.hidden_field_tag('page_id', @parent.page.id )
+  # Add javascript code
+  html << @parent.javascript_tag(@part_js + poll.js.to_s)
   html << "</form></div>"
   html << '</div>' if @opts[:div]
   

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

@@ -32,6 +32,7 @@ class DcRenderer
 ########################################################################
 def initialize( parent, opts={} )
   @parent   = parent
+  @page     = parent.page
   @opts     = opts
   @css = ''
   self

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

@@ -34,6 +34,7 @@
 class DcSimpleMenuRenderer
 
 include DcApplicationHelper
+include CmsCommonHelper
 ########################################################################
 # Object initialization.
 ########################################################################

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

@@ -1,15 +1,13 @@
-
 <div id="cmsedit-div">
-  <%= link_to('CMS', controller: 'dc_common', action: 'toggle_edit_mode', return_to: request.url) %>
+  <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">
-        
-        <%= link_to( fa_icon('user lg',class: "dc-animate", title: "#{t('drgcms.login')}"), '/cms/login' ) %>
 
         <% 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 +20,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 +30,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 +53,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 %>

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

@@ -4,12 +4,13 @@
 
 <div class="dc-form-frame">
 
-  <%= dc_actions_for_form %>
+  <%= dc_actions_for_form 'top' %>
   
   <%= dc_fields_for_form %>
   <%= dc_document_statistics %>
 
-  <%= dc_actions_for_form %>
+  <%= dc_actions_for_form 'bottom' %>
 </div>
 
-<%= javascript_tag(@js) unless @js.blank? %>
+<%= javascript_tag(@js)  unless @js.blank? %>
+<% unless @css.blank? %><style type="text/css"><%= @css %></style><% end %>