drg_cms 0.6.0.1 → 0.6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de756db4ff8ac1e6dbe88ef41e0d6dd213dbf20c91c7e2ec20b9cacdc5f80a1b
-  data.tar.gz: 64f7ac1107e10c095e6aa6a60308ae27622b10909c5e5ca529fd74e541e591d3
+  metadata.gz: 4b6e9f20a0a4ab04d8c5faa736a556f29a9a9709a324fb5438e66f4563c985de
+  data.tar.gz: e6c20a842d10be10c73a4d3129caafc43445a6552d0f6cbabd981b05981d20f2
 SHA512:
-  metadata.gz: 7fbfc08b2186e653b4a4cd09b21b9ff2435a5e14622559a4ae2301b41a59189fba6fb455cf67a93feff1676ed016f21dc8b47691e36337ae0ff9968bedc229d4
-  data.tar.gz: 2a7f6bcc224965503f491b50b598d4e45bc60e7cdb6524b29ed85c3f51ad3d3b096f1d62f50d9fa945995f64717db09365c5c36788be4cd51aa613e9dd1d7644
+  metadata.gz: fd974c1b182db06f63cd0f7673b979bbbb4a0c0d2b200e9f6cd9fe428dfabc3d879348046882e97a7400e41961bfe6cbea4c147193bb0de2aca50e2bdbb7b738
+  data.tar.gz: bd4a6d8897a424ea22b403f70f4b4a12228798564ebe0023f5596e6a987de798ca304ee25c590966e688ba5588243ee566b6d4d897127ef37350b0c0aef55526

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

@@ -28,6 +28,7 @@
  *******************************************************************/
 $.getUrlParam = function(name) {
   var results = new RegExp('[\\?&]' + name + '=([^&#]*)').exec(window.location.href);
+  if (results == null) return null;
   return results[1] || 0;
 };
 
@@ -52,6 +53,31 @@ remove_background_from_iframe = function(obj) {
   $(head).append(css);    
 };
 
+/*******************************************************************
+ * Will update select field on the form which select options are dependend on other field
+ *******************************************************************/
+update_select_depend = function(select_name, depend_name, method) {
+  var select_field = $('#'+select_name);
+  var depend_field = $('#'+depend_name);
+ /* 
+  $.ajax({
+    url: "/dc_common/autocomplete",
+    type: "POST",
+    dataType: "json",
+    data: { input: request.term, table: "#{table}", search: "#{search}" #{(',id: "'+@yaml['id'] + '"') if @yaml['id']} },
+    success: function(data) {
+      response( $.map( data, function(key) {
+        return key;
+      }));
+    }
+  });  
+*/  
+  
+};
+
+/*******************************************************************
+ * Format number input field according to data
+ *******************************************************************/
 format_number_field = function(e) {
   var decimals  = e.attr("data-decimal") || 2;
   var delimiter = e.attr("data-delimiter") || '.';
@@ -99,10 +125,10 @@ $(function() {
  * 
  * Protocol consists of operation and value which are returned as json by
  * called controller. Controller will return an ajax call usually like this:
- *    render json: {operation: value}.to_json
+ *    render json: {operation: value}
  *    
  * Operation is further divided into source and determinator which are divided by underline char.
- *    render json: {#div_status: 'OK!'}.to_json
+ *    render json: {#div_status: 'OK!'}
  * will replace html in div="status" with value 'OK!'. Source is '#div' determinator is 'status'.
  * 
  * Possible operators are:
@@ -144,7 +170,7 @@ process_json_result = function(json) {
       operation = key;
       what = '';
     }
-//    
+//  
     switch (operation) {
     // update field 
     case 'record':
@@ -195,6 +221,9 @@ process_json_result = function(json) {
       w = window.open(val, what);
       w.focus();        
       break;
+    case 'eval':
+      eval (val);
+      break;
     case 'reload':
       location.reload(); 
       break;
@@ -248,6 +277,13 @@ $(document).ready( function() {
 //    select_first_input_field('.dc-form');
   }
 */
+ /*******************************************************************
+  * It will scroll display to ypos if return_to_ypos parameter is present
+  *******************************************************************/
+  if (window.location.href.match(/return_to_ypos=/))
+  {
+    window.scrollTo(0, $.getUrlParam('return_to_ypos'));
+  }
   
  /*******************************************************************
   * Register ad clicks
@@ -257,6 +293,17 @@ $(document).ready( function() {
     return true;
   });
   
+ /*****************************************************************
+ * Toggle CMS mode. When clicked on left 30 pixels, window will be scrolled approximately 
+ * to the position wher toggle was clicked. When clicked from pixel 31 and on it will
+ * stay on the top of window.
+ ******************************************************************/  
+  $('.cms-toggle').bind('click', function(e) {
+    var url = '/dc_common/toggle_edit_mode?return_to=' + window.location.href;
+    if (e.pageX < 30) url = url + '&return_to_ypos=' + e.pageY ;
+    window.location.href = url;
+  });
+ 
  /*******************************************************************
   * Popup or close CMS edit menu on icon click
   *******************************************************************/
@@ -319,7 +366,7 @@ $(document).ready( function() {
  * Resize iframe_cms to the size of its contents. Make at least 500 px high
  * unless on initial display.
  *******************************************************************/
-  $('#iframe_cms').load( function() {
+  $('#iframe_cms').on('load', function() {
 //    alert('bla 1');
     new_height = this.contentWindow.document.body.offsetHeight + 50;
     if (new_height < 500 && new_height > 60) new_height = 500;
@@ -332,7 +379,7 @@ $(document).ready( function() {
  * Same goes for editiframe. Resize it + 30px
  * unless on initial display with no data 
  *******************************************************************/
-  $('#iframe_edit').load( function() {
+  $('#iframe_edit').on('load', function() {
 //    console.log(this.contentWindow.document.body.offsetHeight);
     if (this.contentWindow.document.body.offsetHeight > 10) {
       this.style.height = (this.contentWindow.document.body.offsetHeight + 30) + 'px'; 
@@ -534,7 +581,7 @@ element = $(this).find(':first').attr('id');
 /*******************************************************************
  * Experimental. Force reload of parent page if this div appears. 
  *******************************************************************/
-  $('#div-reload-parent').load( function() {
+  $('#div-reload-parent').on('load', function() {
 //    alert('div-reload-parent 1');
     parent.location.href = parent.location.href;
   });
@@ -544,7 +591,7 @@ element = $(this).find(':first').attr('id');
  * 
  * Just an Idea. Not needed yet.
  *******************************************************************/
-  $('#div-reload').load( function() {
+  $('#div-reload').on('load', function() {
     alert('div-reload 1');
 //    location.href = location.href;
   });

data/app/assets/javascripts/drg_cms_application.js

@@ -4,7 +4,7 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
-//= require jquery2
+//= require jquery3
 //= require drg_cms/jquery-migrate
 //= require jquery_ujs
 //= require drg_cms/drg_cms

data/app/assets/javascripts/drg_cms_cms.js

@@ -5,7 +5,7 @@
 // the compiled file.
 
 //= #require_self
-//= require jquery2
+//= require jquery3
 //= require drg_cms/jquery-migrate.js
 //= require jquery_ujs
 

data/app/assets/stylesheets/drg_cms/drg_cms.css

@@ -647,8 +647,39 @@ padding: 5px 0;
 border-top: 2px solid #ddd;
 }
 
+/*** CMS toggle button */
+.cms-toggle {
+  z-index: 1000000;
+  position: fixed;
+  top: 1px; left: 1px;
+  padding: 4px;
+  color: #fff;
+  background-color: #000;
+  font-weight: bold;
+  font-size: 14px;
+  box-shadow: 2px 2px 6px #666;
+  border-radius: 3px;
+}
+
+.cms-toggle:hover {
+  color: #000;
+  background-color: #fff;
+  cursor: pointer;
+}
+
+.cms-toggle.mode-1:before {
+  font-family: 'FontAwesome';
+  content: '\f06e\20';
+  color: lightskyblue;
+}
+.cms-toggle.mode-2:before {
+  font-family: 'FontAwesome';
+  content: '\f040\20';
+  color: lightcoral;
+}
+
 #cmsedit-div {
-font-family: helvetica;
+font-family: Arial, sans-serif;
 font-size: 13px;
 line-height: 13px;
 }

data/app/controllers/cmsedit_controller.rb

@@ -246,7 +246,9 @@ def process_collections #:nodoc
     if @tables.size > 1 
       rec = @tables.first[0].find(@ids.first)          # top most document.id
       1.upto(@tables.size - 2) { |i| rec = rec.send(@tables[i][1].pluralize).find(@ids[i]) }  # find embedded childrens by ids
-      @records = rec.send(@tables.last[1].pluralize)   # current embedded set
+# TO DO. When field name is different then pluralized class name. Not working yet.
+      embedded_field_name = @tables.last[0] ? @tables.last[1].pluralize : @tables.last[1]
+      @records = rec.send(embedded_field_name)   # current embedded set
 # sort by order if order field is present in model
       if @tables.last[1].classify.constantize.respond_to?(:order)
         @records = @records.order_by('order asc')
@@ -275,9 +277,10 @@ def process_in_memory #:nodoc
 end
 
 ########################################################################
-# Indx action 
+# Index action 
 ########################################################################
 def index
+  @form['result_set'] ||= {}
   redirected = (@form['table'] == 'dc_memory' ? process_in_memory : process_collections)
   return if redirected
 #  
@@ -321,7 +324,7 @@ end
 ########################################################################
 def login
   if    params[:id] == 'test' then set_test_site
-  elsif params[:ok]           then redirect_to '/'
+  elsif params[:ok]           then render action: 'login', layout: 'cms' 
   else
     session[:edit_mode] = 0
     render action: 'login', layout: 'cms'
@@ -460,15 +463,14 @@ def create
     session[:form_time_stamp] = params[:form_time_stamp]
 #    
     create_new_empty_record
-    params[:return_to] = 'index' if params[:commit] == t('drgcms.save&back') # save & back
     if save_data
-      flash[:info]    = t('drgcms.doc_saved')
+      flash[:info] = t('drgcms.doc_saved')
+      params[:return_to] = 'index' if params[:commit] == t('drgcms.save&back') # save & back
       return process_return_to(params[:return_to]) if params[:return_to]
       
       @parms['id']     = @record.id     # must be set, for proper update link
       params[:id]      = @record.id     # must be set, for find_record
       edit
-      #      render action: :edit
     else # error
       return process_return_to(params[:return_to]) if params[:return_to]
       render action: :new
@@ -642,29 +644,58 @@ def forms_merge(hash1, hash2)
   target.delete_if{ |k,v| v.nil? }
 end
 
+########################################################################
+# Extends DRGCMS form file. Extended file is processed first and then merged
+# with code in this form file. Form can extend only single form file.
+# 
+# [Parameters:]
+# [extend_option] : Value of @form['extend'] option
+########################################################################
+def extend_drg_cms_form(extend_option)
+  form = YAML.load_file( dc_find_form_file(extend_option) )
+  @form = forms_merge(form, @form)
+# If combined form contains tabs and fields options, merge fields into tabs
+  if @form['form']['tabs'] and @form['form']['fields']
+    @form['form']['tabs']['fields'] = @form['form']['fields']
+    @form['form']['fields'] = nil
+  end
+end
+
+########################################################################
+# Include code from another DRGCMS form file. Included code is merged
+# with current form file code. Form can include more than one other DRGCMS forms.
+# 
+# [Parameters:]
+# [include_option] : Value of @form['include'] option
+########################################################################
+def include_drg_cms_form(include_option)
+  includes = include_option.class == Array ? include_option : include_option.split(/\,|\;/)
+  includes.each do |include_file|
+    form = YAML.load_file( dc_find_form_file(include_file) )
+    @form = forms_merge(@form, form)
+  end
+end
+
 ########################################################################
 # Read drgcms form into yaml object. Subroutine of check_authorization.
 ########################################################################
 def read_drg_cms_form
   table_name = decamelize_type(params[:table].strip)
-  @tables = table_name.split(';').inject([]) { |r,v| r << [v.classify.constantize, v] }
+  @tables = table_name.split(';').inject([]) { |r,v| r << [(v.classify.constantize rescue nil), v] }
 # split ids passed when embedded document
   ids = params[:ids].to_s.strip.downcase
   @ids = ids.split(';').inject([]) { |r,v| r << v }
 # form_name defaults to last table specified
   form_name = params[:form_name] || @tables.last[1]
-  @form  = YAML.load_file( dc_find_form_file(form_name) ) rescue nil
-  return unless @form
-# when form extends another form file. 
-  if @form['extend']
-    form = YAML.load_file( dc_find_form_file(@form['extend']) )
-    @form = forms_merge(form, @form)
-# If combined form contains tabs and fields options, merge fields into tabs
-    if @form['form']['tabs'] and @form['form']['fields']
-      @form['form']['tabs']['fields'] = @form['form']['fields']
-      @form['form']['fields'] = nil
-    end
+# dynamicaly generated form  
+  @form = if params[:form_name] == 'method'
+    dc_eval_class_method(params[:form_method], params)
+  else
+    YAML.load_file( dc_find_form_file(form_name) ) rescue nil
   end
+# form includes or extends another form file
+  include_drg_cms_form(@form['include']) if @form['include']
+  extend_drg_cms_form(@form['extend'])   if @form['extend']
 # add readonly key to form if readonly parameter is passed in url
   @form['readonly'] = 1 if params['readonly'] #and %w(1 yes true).include?(params['readonly'].to_s.downcase.strip)
 # !!!!!! Always use strings for key names since @parms['table'] != @parms[:table]

data/app/controllers/dc_application_controller.rb

@@ -105,7 +105,8 @@ end
 # Sets internal @page_title variable.
 ##########################################################################
 def set_page_title()
-  @page_title = @page.title.blank? ? "#{@page.subject} - #{@site.page_title}" : @page.title
+  @page_title = @page.title.blank? ? @page.subject : @page.title
+  dc_add_meta_tag(:name, 'description', @page.meta_description)
 end
 
 ########################################################################
@@ -127,7 +128,7 @@ def dc_find_form_file(form_file)
     f = "#{path}/#{form_file}.yml"
     return f if File.exist?(f) and (form_path.nil? or path.to_s.match(/\/#{form_path}\//i))
   end
-  p "Form file #{form_file} not found!"
+  logger.error "Form file #{form_file} not found!"
   nil
 end
 
@@ -141,7 +142,7 @@ end
 #   return dc_render_404('Site') unless site
 ########################################################################
 def dc_render_404(where_the_error_is=nil)
-  logger.info("Error 404;#{request.env['REQUEST_URI']};#{request.referer};#{where_the_error_is}")
+  logger.info("Error 404;#{request.env['REQUEST_URI'] rescue ''};#{request.referer};#{where_the_error_is}")
   render(file: Rails.root.join('public/404.html'), status: 404)
 end
 
@@ -286,23 +287,27 @@ def get_design_and_render(design_doc)
     extend controller if controller
     return send @options[:action] if respond_to?(@options[:action])
   end
-#  
+# design doc present 
   if design_doc
-    if !design_doc.rails_view.blank? 
-      if design_doc.rails_view.downcase != 'site'
-        return render design_doc.rails_view, layout: layout
-      end
-    elsif !design_doc.body.blank?
-      design = site_top + design_doc.body + site_bottom
-      return render(inline: design, layout: layout)
+    # defined as rails view
+    design = if design_doc.rails_view.blank? or design_doc.rails_view == 'site'
+      @site.rails_view
+    else
+      design_doc.rails_view
     end
+    return render design, layout: layout unless design.blank?
+    # defined as inline code
+    design = design_doc.body.blank? ? @site.design : design_doc.body
+    design = site_top + design + site_bottom
+    return render(inline: design, layout: layout) unless design.blank?
   end
-# 
+# Design doc not defined
   if @site.rails_view.blank? 
     design = site_top + @site.design + site_bottom
-    return render(inline: design, layout: layout)
-  end
-  render @site.rails_view, layout: layout
+    render(inline: design, layout: layout)
+  else
+    render @site.rails_view, layout: layout
+  end  
 end
 
 ##########################################################################
@@ -331,13 +336,13 @@ def dc_process_default_request()
   dc_set_options(@site.settings)
 # HOMEPAGE. When no parameters is set
   params[:path]   = @site.homepage_link if params[:id].nil? and params[:path].nil?
-  @options[:path] = params[:path].to_s.split('/')
+  @options[:path] = params[:path].to_s.downcase.split('/')
   params[:path]   = @options[:path].first if @options[:path].size > 1
 # some other process request. It should fail if not defined
   return send(@site.request_processor) unless @site.request_processor.blank?
 
 # Search for page 
-  pageclass = @site.page_table.classify.constantize
+  pageclass = @site.page_klass
   if params[:id]
     #Page.where(id: params[:id]).or(subject_link: params[:id]).first    
     @page = pageclass.find_by(:dc_site_id.in => [@site._id, nil], subject_link: params[:id], active: true)
@@ -357,17 +362,19 @@ def dc_process_default_request()
   end
 # if @page is not found render 404 error
   return dc_render_404('Page!') unless @page
-  dc_set_options @page.params
   dc_set_is_mobile unless session[:is_mobile] # do it only once per session
 # find design if defined. Otherwise design MUST be declared in site
   if @page.dc_design_id
     @design = DcDesign.find(@page.dc_design_id)
     return dc_render_404('Design!') unless @design
   end
+  dc_set_options @design.params if @design
+  dc_set_options @page.params
+  dc_add_json_ld(@page.get_json_ld)
 # Add edit menu
   if session[:edit_mode] > 0
     session[:site_id]         = @site.id
-    session[:site_page_table] = @site.page_table
+    session[:site_page_class] = @site.page_class
     session[:page_id]         = @page.id
   else 
 # Log only visits from non-editors
@@ -529,11 +536,11 @@ def dc_render_ajax(opts)
     end
     key << "_#{opts[:div]}#{opts[:class]}"
   else
-    p 'Error: dc_render_ajax. Operation is not set!' if opts[:operation].nil?
+    logger.error 'Error: dc_render_ajax. Operation is not set!' if opts[:operation].nil?
     key = "#{opts[:operation]}_"
   end
   result[key] = opts[:value] || opts[:url] || ''
-  render inline: result.to_json, formats: 'js'
+  render json: result
 end
 
 ########################################################################
@@ -654,4 +661,58 @@ def dc_check_user_still_valid(repeat_after=1.day)
   end  
 end
 
+##########################################################################
+# Evaluates Class.method in more predictable context then just calling eval
+# 
+# @param [String] class_method defined as MyClass.method_name
+# @param [Object] optional parameters send to class_method
+##########################################################################
+def dc_eval_class_method(class_method, params=nil)
+  klass, method = class_method.split('.')
+  # check if class exists
+  klass = klass.classify.constantize rescue nil
+  if klass.nil?
+    logger.error " Class in #{class_method} not defined!"
+    return nil
+  end
+  # call method
+  if klass.respond_to?(method)
+    klass.send(method, params)
+  else
+    logger.error "Method in #{class_method} not defined!"
+    nil
+  end
+end
+
+##########################################################################
+# Will add new element to json_ld structure
+# 
+# Parameters:
+# [element] Hash or Array of hashes: 
+##########################################################################
+def dc_add_json_ld(element)
+  @json_ld ||= []
+  if element.class == Array
+    @json_ld += element
+  else
+    @json_ld << element
+  end
+end
+
+########################################################################
+# Will add a meta tag to internal hash structure. If meta tag already exists it
+# will be overwritten.
+# 
+# Parameters:
+# [name] String: meta name
+# [content] String: meta content
+# 
+########################################################################
+def dc_add_meta_tag(type, name, content)
+  return if content.blank?
+  @meta_tags ||= {}
+  key = "#{type}=\"#{name}\""
+  @meta_tags[key] = content
+end
+
 end