drg_cms 0.5.8.2 → 0.5.9

data/app/models/dc_filter.rb

@@ -68,7 +68,6 @@ def self.get_filter(filter)
     value = BSON::ObjectId.from_string(value) rescue nil
   end
 #
-p yaml,'***************'
   if ['eq','like'].include?(yaml['operation'])
     model.where(field => value)
 # TODO in operator    
@@ -84,13 +83,13 @@ end
 def self.get_field_form_definition(name, parent) #:nodoc:
   form = parent.form
   form['form']['tabs'].each do |tab|
-    tab.each do |field|
-      next if field.class == String # tab name
-      field.each {|k,v| return v if v['name'] == name }
-    end
+# 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) }
   end if form['form']['tabs'] #  I know. But nice. 
 #
   form['form']['fields'].each do |field|
+    next unless field.first.class == Fixnum # options
     return field.last if field.last['name'] == name
   end if form['form']['fields']
   nil
@@ -106,33 +105,40 @@ def self.get_filter_field(parent)
 #
   filter = YAML.load(filter) rescue nil 
   return '' if filter.nil?
-#  return '' if filter['input'].nil?
 #
-  p filter
   field = get_field_form_definition(filter['field'], parent)
   return '' if field.nil? and filter['input'].nil?
   field = {} if field.nil?
-# field redefined with input keyword
-  field['name'] = 'filter_field'
-  field['type'] = filter['input'] if filter['input'].size > 5
-  field['html'] = {} if field['html'].nil?
+# If field has choices available in labels, use them. This is most likely select input field.
+  if field['name']
+    choices = parent.t('helpers.label.' + parent.form['table'] + '.choices4_' + field['name'] )
+    unless choices.match( 'translation missing' ) or choices.match('helpers.label')
+      field['choices'] = choices
+    end
+  end
+# field redefined with input keyword. Name must start with _
+  field['name'] = '_filter_field'
+  field['type'] = filter['input'] if filter['input'].to_s.size > 5
+  field['type'] ||= 'text_field'
+  field['html'] ||= {} 
   field['html']['size']  = 20
+# Start with last entered value
   field['html']['value'] = filter['value'] unless filter['value'] == '#NIL'
-                      
+  field['html']['selected'] = field['html']['value'] # for select field
+# url for filter ON action
   field['html']['data-url'] = parent.url_for(
     controller: 'cmsedit',action: :index, filter: 'on',
     table: parent.form['table'], formname: parent.form['formname'])
   url = field['html']['data-url']
-#
-  field_type  = filter['input'].size > 5 ? filter['input'] : field['type']
-  klas_string = field_type.camelize
+# create input field object
+  klas_string = field['type'].camelize
   klas = DrgcmsFormFields::const_get(klas_string) rescue nil
   return '' if klas.nil?
-#  
+# return data from object and create html code to display field
   object = klas.new(parent, nil, field).render
   js     = object.js
   "<span class=\"filter_field\" data-url=\"#{url}\">#{object.html} " <<
-    parent.fa_icon('filter lg dc-green', class: 'record_filter_field_icon') <<
+    parent.fa_icon('filter lg dc-green', class: 'record_filter_field_icon dc-link dc-animate') <<
     (js.size > 2 ? parent.javascript_tag(js) : '') << '</span>'
 end
 

data/app/models/drgcms_form_fields.rb

@@ -80,6 +80,10 @@ def initialize( parent, record, yaml )
   @yaml   = yaml
   @form   = parent.form
   @readonly = (@yaml and @yaml['readonly']) || (@form and @form['readonly'])
+  if @yaml['size'] # move size to html element if not already there
+    @yaml['html'] ||= {}
+    @yaml['html']['size'] ||= @yaml['size']
+  end
   @html   = ''  
   @js     = ''
   self
@@ -123,11 +127,21 @@ end
 # 
 # Example: Form has field named picture. Field can be initialized by 
 # setting value of param p_picture.
+#    params['p_picture'] = '/path/to_picture'
+#    
+# When multiple initial values are assigned it is more convinient to assign them 
+# through flash method.
+#    flash[:record] = {}
+#    flash[:record]['picture'] = '/path/to_picture'
 ####################################################################
 def set_initial_value(opt1='html', opt2='value')
   @yaml['html'] ||= {}
   value_send_as = 'p_' + @yaml['name']
-  @yaml[opt1][opt2] = @parent.params[value_send_as] if @parent.params[value_send_as]
+  if @parent.params[value_send_as]
+    @yaml[opt1][opt2] = @parent.params[value_send_as] 
+  elsif @parent.flash[:record] and @parent.flash[:record][@yaml['name']]
+    @yaml[opt1][opt2] = @parent.flash[:record][@yaml['name']]
+  end
 end
 
 ####################################################################
@@ -1187,10 +1201,11 @@ end
 ###########################################################################
 def render
   return ro_standard if @readonly
+  set_initial_value
 #
-  @yaml['html'] ||= {}
-  value_send_as = 'p_' + @yaml['name']
-  @yaml['html']['value'] = @parent.params[value_send_as] if @parent.params[value_send_as]
+#  @yaml['html'] ||= {}
+#  value_send_as = 'p_' + @yaml['name']
+#  @yaml['html']['value'] = @parent.params[value_send_as] if @parent.params[value_send_as]
 
   record = record_text_for(@yaml['name'])
   @html << @parent.text_area(record, @yaml['name'], @yaml['html'])

data/drg_cms.gemspec

@@ -10,10 +10,10 @@ Gem::Specification.new do |s|
   s.authors     = ["Damjan Rems"]
   s.email       = ["damjan.rems@gmail.com"]
   s.homepage    = "http://www.drgcms.org"
-  s.summary     = "DRG CMS: Content management system for Ruby, Rails and MongoDB"
-  s.description = "DRG CMS can be used for rapid building of complex, data-entry intensive web sites as well as building your private Intranet applications."
+  s.summary     = "DRG CMS: Rapid web application development tool for Ruby, Rails and MongoDB"
+  s.description = "DRG CMS can be used for rapid building of complex, data-entry intensive web sites as well as building your in-house private cloud applications."
   s.license     = "MIT-LICENSE"
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md", "drg_cms.gemspec"]
+  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' #, '~> 3.2.16'

data/lib/drg_cms/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.8.2
+  version: 0.5.9
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,13 +123,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: DRG CMS can be used for rapid building of complex, data-entry intensive
-  web sites as well as building your private Intranet applications.
+  web sites as well as building your in-house private cloud applications.
 email:
 - damjan.rems@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- History.log
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -155,8 +156,8 @@ files:
 - app/assets/images/drg_cms/x.png
 - app/assets/javascripts/drg_cms/drg_cms.js
 - app/assets/javascripts/drg_cms/jquery-migrate.js
+- app/assets/javascripts/drg_cms/jquery.bpopup.min.js
 - app/assets/javascripts/drg_cms/jquery.datetimepicker.js
-- app/assets/javascripts/drg_cms/jquery.the-modal.js
 - app/assets/javascripts/drg_cms/some_scripts.js
 - app/assets/javascripts/drg_cms_application.js
 - app/assets/javascripts/drg_cms_cms.js
@@ -164,7 +165,6 @@ files:
 - app/assets/stylesheets/drg_cms/jquery-ui.css
 - app/assets/stylesheets/drg_cms/jquery.datetimepicker.css
 - app/assets/stylesheets/drg_cms/th-bg.png
-- app/assets/stylesheets/drg_cms/the-modal.css
 - app/assets/stylesheets/drg_cms/theme.css
 - app/assets/stylesheets/drg_cms_application.css
 - app/assets/stylesheets/drg_cms_cms.css
@@ -354,7 +354,7 @@ rubyforge_project:
 rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
-summary: 'DRG CMS: Content management system for Ruby, Rails and MongoDB'
+summary: 'DRG CMS: Rapid web application development tool for Ruby, Rails and MongoDB'
 test_files:
 - test/test_helper.rb
 - test/lib/generators/new_drg_form_generator_test.rb

data/app/assets/javascripts/drg_cms/jquery.the-modal.js

@@ -1,260 +0,0 @@
-/**
- * The Modal jQuery plugin
- *
- * @author Alexander Makarov <sam@rmcreative.ru>
- * @link https://github.com/samdark/the-modal
- * @version 0.0.14
- */
-;(function($, window, document, undefined) {
-	"use strict";
-	/*jshint smarttabs:true*/
-
-	// :focusable expression, needed for tabindexes in modal
-	$.extend($.expr[':'],{
-		focusable: function(element){
-			var map, mapName, img,
-				nodeName = element.nodeName.toLowerCase(),
-				isTabIndexNotNaN = !isNaN($.attr(element,'tabindex'));
-			if ('area' === nodeName) {
-				map = element.parentNode;
-				mapName = map.name;
-				if (!element.href || !mapName || map.nodeName.toLowerCase() !== 'map') {
-					return false;
-				}
-				img = $('img[usemap=#' + mapName + ']')[0];
-				return !!img && visible(img);
-			}
-
-			var result = isTabIndexNotNaN;
-			if (/input|select|textarea|button|object/.test(nodeName)) {
-				result = !element.disabled;
-			} else if ('a' === nodeName) {
-				result = element.href || isTabIndexNotNaN;
-			}
-
-			return result && visible(element);
-
-			function visible(element) {
-				return $.expr.filters.visible(element) &&
-					!$(element).parents().addBack().filter(function() {
-						return $.css(this,'visibility') === 'hidden';
-					}).length;
-			}
-		}
-	});
-
-	var pluginNamespace = 'the-modal',
-		// global defaults
-		defaults = {
-			lockClass: 'themodal-lock',
-			overlayClass: 'themodal-overlay',
-
-			closeOnEsc: true,
-			closeOnOverlayClick: true,
-
-			onBeforeClose: null,
-			onClose: null,
-			onOpen: null,
-
-			cloning: true
-		};
-	var oMargin = {};
-	var ieBodyTopMargin = 0;
-
-	function isIE() {
-		return ((navigator.appName == 'Microsoft Internet Explorer') ||
-			(navigator.userAgent.match(/MSIE\s+\d+\.\d+/)) ||
-			(navigator.userAgent.match(/Trident\/\d+\.\d+/)));
-	}
-
-	function lockContainer(options, overlay) {
-		var body = $('body');
-		var oWidth = body.outerWidth(true);
-		body.addClass(options.lockClass);
-		var sbWidth = body.outerWidth(true) - oWidth;
-		if (isIE()) {
-			ieBodyTopMargin = body.css('margin-top');
-			body.css('margin-top', 0);
-		}
-
-		if (sbWidth != 0) {
-			var tags = $('html, body');
-			tags.each(function () {
-				var $this = $(this);
-				oMargin[$this.prop('tagName').toLowerCase()] = parseInt($this.css('margin-right'));
-			});
-			$('html').css('margin-right', oMargin['html'] + sbWidth);
-			overlay.css('left', 0 - sbWidth);
-		}
-	}
-
-	function unlockContainer(options) {
-		if (isIE()) {
-			$('body').css('margin-top', ieBodyTopMargin);
-		}
-
-		var body = $('body');
-		var oWidth = body.outerWidth(true);
-		body.removeClass(options.lockClass);
-		var sbWidth = body.outerWidth(true) - oWidth;
-
-		if (sbWidth != 0) {
-			$('html, body').each(function () {
-				var $this = $(this);
-				$this.css('margin-right', oMargin[$this.prop('tagName').toLowerCase()])
-			});
-		}
-	}
-
-	function init(els, options) {
-		var modalOptions = options;
-
-		if(els.length) {
-			els.each(function(){
-				$(this).data(pluginNamespace+'.options', modalOptions);
-			});
-		} else {
-			$.extend(defaults, modalOptions);
-		}
-
-		// on Ctrl+A click fire `onSelectAll` event
-		$(window).bind('keydown',function(e){
-			if (!(e.ctrlKey && e.keyCode == 65)) {
-				return true;
-			}
-
-			if ( $('input:focus, textarea:focus').length > 0 ) {
-			    return true;
-			}
-
-			var selectAllEvent = new $.Event('onSelectAll');
-			selectAllEvent.parentEvent = e;
-			$(window).trigger(selectAllEvent);
-			return true;
-		});
-
-		els.bind('keydown',function(e){
-			var modalFocusableElements = $(':focusable',$(this));
-			if(modalFocusableElements.filter(':last').is(':focus') && (e.which || e.keyCode) == 9){
-				e.preventDefault();
-				modalFocusableElements.filter(':first').focus();
-			}
-		});
-
-		return {
-			open: function(options) {
-				var el = els.get(0),
-					localOptions = $.extend({}, defaults, $(el).data(pluginNamespace+'.options'), options);
-
-				// close modal if opened
-				if($('.'+localOptions.overlayClass).length) {
-					$.modal().close();
-				}
-
-				var overlay = $('<div/>').addClass(localOptions.overlayClass).prependTo('body');
-				overlay.data(pluginNamespace+'.options', localOptions);
-
-				lockContainer(localOptions, overlay);
-
-				if(el) {
-					var openedModalElement = null;
-					if (!localOptions.cloning) {
-						overlay.data(pluginNamespace+'.el', el);
-						$(el).data(pluginNamespace+'.parent', $(el).parent());
-						openedModalElement = $(el).appendTo(overlay).show();
-					} else {
-						openedModalElement = $(el).clone(true).appendTo(overlay).show();
-					}
-				}
-
-				if(localOptions.closeOnEsc) {
-					$(document).bind('keyup.'+pluginNamespace, function(e){
-						if(e.keyCode === 27) {
-							$.modal().close(localOptions);
-						}
-					});
-				}
-
-				if(localOptions.closeOnOverlayClick) {
-					overlay.children().on('click.' + pluginNamespace, function(e){
-						e.stopPropagation();
-					});
-					$('.' + localOptions.overlayClass).on('click.' + pluginNamespace, function(e){
-						$.modal().close(localOptions);
-					});
-				}
-
-				$(document).bind('touchmove.'+pluginNamespace,function(e){
-					if(!$(e).parents('.' + localOptions.overlayClass)) {
-						e.preventDefault();
-					}
-				});
-
-				if(el) {
-					$(window).bind('onSelectAll',function(e){
-						e.parentEvent.preventDefault();
-
-						var range = null,
-							selection = null,
-							selectionElement = openedModalElement.get(0);
-						if (document.body.createTextRange) { //ms
-							range = document.body.createTextRange();
-							range.moveToElementText(selectionElement);
-							range.select();
-						} else if (window.getSelection) { //all others
-							selection = window.getSelection();
-							range = document.createRange();
-							range.selectNodeContents(selectionElement);
-							selection.removeAllRanges();
-							selection.addRange(range);
-						}
-					});
-				}
-
-				if(localOptions.onOpen) {
-					localOptions.onOpen(overlay, localOptions);
-				}
-			},
-			close: function(options) {
-				var el = els.get(0),
-				  localOptions = $.extend({}, defaults, $(el).data(pluginNamespace+'.options'), options);
-				var overlay = $('.' + localOptions.overlayClass);
-
-				if ($.isFunction(localOptions.onBeforeClose)) {
-					if (localOptions.onBeforeClose(overlay, localOptions) === false) {
-						return;
-					}
-				}
-
-				if (!localOptions.cloning) {
-					if (!el) {
-						el = overlay.data(pluginNamespace+'.el');
-					}
-					$(el).hide().appendTo($(el).data(pluginNamespace+'.parent'));
-				}
-
-				overlay.remove();
-				unlockContainer(localOptions);
-
-				if(localOptions.closeOnEsc) {
-					$(document).unbind('keyup.'+pluginNamespace);
-				}
-
-				$(window).unbind('onSelectAll');
-
-				if(localOptions.onClose) {
-					localOptions.onClose(overlay, localOptions);
-				}
-			}
-		};
-	}
-
-	$.modal = function(options){
-		return init($(), options);
-	};
-
-	$.fn.modal = function(options) {
-		return init(this, options);
-	};
-
-})(jQuery, window, document);