drg_cms 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b502e1b45d6003b1da74942284939b4e930bb7c
-  data.tar.gz: 845ee2831d322d102bbba5c81728e0022dae83ca
+  metadata.gz: 731ea3ef7879ed33a901605b0a9dddb861d1ec31
+  data.tar.gz: 8760d04c45460f00c4083babcb75470d7bdd5b5b
 SHA512:
-  metadata.gz: 0fa721bb626e09db7b61c6bff893ad3e020e97a1947dcb5b3c1b6e8f217af1c3851dc8dd4267c2bc37db8061cc37d51de6ed19c586c8376862aee959ad4462aa
-  data.tar.gz: cb6ece0fb52a4c83b30af7724d7e86e2c2c420ecbbe6446ebdfe1116ec3bbd988dc6b5391d091cb74d047a3d71fad958469a823b1c2c0b92d209fc065043a3c9
+  metadata.gz: 46394f7291cc085caf7957769d8f91bbf6ad3e1e282b6a83f49d7c32a7910c00e66b60855bb8cc3ee01259ef93c946158b93eed46d84cf585ba262d55b68b7f7
+  data.tar.gz: dd46dc3424bb88f5053f1d2e9d313f12f71553127754147ea4de7719645d57c6cd3b7c2f1c57baebaef489a05347efee310c85ab97d3dadeaf99aebd6aab418e

data/History.log

@@ -1,4 +1,17 @@
 
+New features for DRG CMS version 0.5.10
+
+    jQuery javascript library forced to jQuery2
+    Choices for select fields are now UTF-8 sorted since MongoDB does not provide utf sorting.
+    Placeholder text added for text_autocomplete field. It can also be defined in form field html options.
+    
+Bugs resolved for DRG CMS version 0.5.10
+
+    jQuery migrate udated to version 1.3. This was required by jquery-rails gem which included latest version of jQuery which resulted in an runtime error.
+    Call before_new callback only when new empty record has been created.
+
+--
+
 New features for DRG CMS version 0.5.9
 
     Main CMS menu was becoming to large and was divided into two menus.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012+ Damjan Rems
+Copyright 2012-2016 Damjan Rems
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -27,7 +27,7 @@ Please see the DRG CMS website for up-to-date documentation:
 License (MIT LICENCE)
 ---------------------
 
-Copyright (c) 2012-2015 Damjan Rems
+Copyright (c) 2012-2016 Damjan Rems
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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

@@ -140,6 +140,9 @@ process_json_result = function(json) {
       case 'url':
         window.location.href = val;
         break;
+      case 'alert':
+        alert(val);
+        break;
       case 'window':
         w = window.open(val, what);
         w.focus();        
@@ -311,10 +314,14 @@ $(document).ready( function() {
       type: req,
       dataType: "json",
       data: data,
+//      success: function(files,data,xhr) { 
+//        document.getElementById('if_priponkas').contentDocument.location.reload(true); 
+//      }
       success: function(data) {
         process_json_result(data);
         $('#dc-spinner').toggleClass('div-hidden');
       }
+      
     });  
   });  
 

data/app/assets/javascripts/drg_cms/jquery-migrate.js

@@ -1,13 +1,15 @@
 /*!
- * jQuery Migrate - v1.1.1 - 2013-02-16
- * https://github.com/jquery/jquery-migrate
- * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
+ * jQuery Migrate - v1.3.0 - 2016-01-13
+ * Copyright jQuery Foundation and other contributors
  */
 (function( jQuery, window, undefined ) {
 // See http://bugs.jquery.com/ticket/13335
 // "use strict";
 
 
+jQuery.migrateVersion = "1.3.0";
+
+
 var warnedAbout = {};
 
 // List of warnings already given; public read only
@@ -17,8 +19,8 @@ jQuery.migrateWarnings = [];
 // jQuery.migrateMute = false;
 
 // Show a message on the console so devs know we're active
-if ( !jQuery.migrateMute && window.console && console.log ) {
-	console.log("JQMIGRATE: Logging is active");
+if ( !jQuery.migrateMute && window.console && window.console.log ) {
+	window.console.log("JQMIGRATE: Logging is active");
 }
 
 // Set to false to disable traces that appear with warnings
@@ -33,10 +35,11 @@ jQuery.migrateReset = function() {
 };
 
 function migrateWarn( msg) {
+	var console = window.console;
 	if ( !warnedAbout[ msg ] ) {
 		warnedAbout[ msg ] = true;
 		jQuery.migrateWarnings.push( msg );
-		if ( window.console && console.warn && !jQuery.migrateMute ) {
+		if ( console && console.warn && !jQuery.migrateMute ) {
 			console.warn( "JQMIGRATE: " + msg );
 			if ( jQuery.migrateTrace && console.trace ) {
 				console.trace();
@@ -151,7 +154,7 @@ jQuery.attr = function( elem, name, value, pass ) {
 
 		// Warn only for attributes that can remain distinct from their properties post-1.9
 		if ( ruseDefault.test( lowerName ) ) {
-			migrateWarn( "jQuery.fn.attr('" + lowerName + "') may use property instead of attribute" );
+			migrateWarn( "jQuery.fn.attr('" + lowerName + "') might use property instead of attribute" );
 		}
 	}
 
@@ -189,36 +192,70 @@ jQuery.attrHooks.value = {
 var matched, browser,
 	oldInit = jQuery.fn.init,
 	oldParseJSON = jQuery.parseJSON,
-	// Note this does NOT include the #9521 XSS fix from 1.7!
-	rquickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*|#([\w\-]*))$/;
+	rspaceAngle = /^\s*</,
+	// Note: XSS check is done below after string is trimmed
+	rquickExpr = /^([^<]*)(<[\w\W]+>)([^>]*)$/;
 
 // $(html) "looks like html" rule change
 jQuery.fn.init = function( selector, context, rootjQuery ) {
-	var match;
+	var match, ret;
 
 	if ( selector && typeof selector === "string" && !jQuery.isPlainObject( context ) &&
-			(match = rquickExpr.exec( selector )) && match[1] ) {
+			(match = rquickExpr.exec( jQuery.trim( selector ) )) && match[ 0 ] ) {
 		// This is an HTML string according to the "old" rules; is it still?
-		if ( selector.charAt( 0 ) !== "<" ) {
+		if ( !rspaceAngle.test( selector ) ) {
 			migrateWarn("$(html) HTML strings must start with '<' character");
 		}
+		if ( match[ 3 ] ) {
+			migrateWarn("$(html) HTML text after last tag is ignored");
+		}
+
+		// Consistently reject any HTML-like string starting with a hash (#9521)
+		// Note that this may break jQuery 1.6.x code that otherwise would work.
+		if ( match[ 0 ].charAt( 0 ) === "#" ) {
+			migrateWarn("HTML string cannot start with a '#' character");
+			jQuery.error("JQMIGRATE: Invalid selector string (XSS)");
+		}
 		// Now process using loose rules; let pre-1.8 play too
 		if ( context && context.context ) {
 			// jQuery object as context; parseHTML expects a DOM object
 			context = context.context;
 		}
 		if ( jQuery.parseHTML ) {
-			return oldInit.call( this, jQuery.parseHTML( jQuery.trim(selector), context, true ),
-					context, rootjQuery );
+			return oldInit.call( this,
+					jQuery.parseHTML( match[ 2 ], context && context.ownerDocument ||
+						context || document, true ), context, rootjQuery );
+		}
+	}
+
+	// jQuery( "#" ) is a bogus ID selector, but it returned an empty set before jQuery 3.0
+	if ( selector === "#" ) {
+		migrateWarn( "jQuery( '#' ) is not a valid selector" );
+		selector = [];
+	}
+
+	ret = oldInit.apply( this, arguments );
+
+	// Fill in selector and context properties so .live() works
+	if ( selector && selector.selector !== undefined ) {
+		// A jQuery object, copy its properties
+		ret.selector = selector.selector;
+		ret.context = selector.context;
+
+	} else {
+		ret.selector = typeof selector === "string" ? selector : "";
+		if ( selector ) {
+			ret.context = selector.nodeType? selector : context || document;
 		}
 	}
-	return oldInit.apply( this, arguments );
+
+	return ret;
 };
 jQuery.fn.init.prototype = jQuery.fn;
 
 // Let $.parseJSON(falsy_value) return null
 jQuery.parseJSON = function( json ) {
-	if ( !json && json !== null ) {
+	if ( !json ) {
 		migrateWarn("jQuery.parseJSON requires a valid JSON string");
 		return null;
 	}
@@ -264,6 +301,11 @@ if ( !jQuery.browser ) {
 // Warn if the code tries to get jQuery.browser
 migrateWarnProp( jQuery, "browser", jQuery.browser, "jQuery.browser is deprecated" );
 
+// jQuery.boxModel deprecated in 1.3, jQuery.support.boxModel deprecated in 1.7
+jQuery.boxModel = jQuery.support.boxModel = (document.compatMode === "CSS1Compat");
+migrateWarnProp( jQuery, "boxModel", jQuery.boxModel, "jQuery.boxModel is deprecated" );
+migrateWarnProp( jQuery.support, "boxModel", jQuery.support.boxModel, "jQuery.support.boxModel is deprecated" );
+
 jQuery.sub = function() {
 	function jQuerySub( selector, context ) {
 		return new jQuerySub.fn.init( selector, context );
@@ -274,11 +316,10 @@ jQuery.sub = function() {
 	jQuerySub.fn.constructor = jQuerySub;
 	jQuerySub.sub = this.sub;
 	jQuerySub.fn.init = function init( selector, context ) {
-		if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
-			context = jQuerySub( context );
-		}
-
-		return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+		var instance = jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+		return instance instanceof jQuerySub ?
+			instance :
+			jQuerySub( instance );
 	};
 	jQuerySub.fn.init.prototype = jQuerySub.fn;
 	var rootjQuerySub = jQuerySub(document);
@@ -286,6 +327,57 @@ jQuery.sub = function() {
 	return jQuerySub;
 };
 
+// The number of elements contained in the matched element set
+jQuery.fn.size = function() {
+	migrateWarn( "jQuery.fn.size() is deprecated; use the .length property" );
+	return this.length;
+};
+
+
+var internalSwapCall = false;
+
+// If this version of jQuery has .swap(), don't false-alarm on internal uses
+if ( jQuery.swap ) {
+	jQuery.each( [ "height", "width", "reliableMarginRight" ], function( _, name ) {
+		var oldHook = jQuery.cssHooks[ name ] && jQuery.cssHooks[ name ].get;
+
+		if ( oldHook ) {
+			jQuery.cssHooks[ name ].get = function() {
+				var ret;
+
+				internalSwapCall = true;
+				ret = oldHook.apply( this, arguments );
+				internalSwapCall = false;
+				return ret;
+			};
+		}
+	});
+}
+
+jQuery.swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	if ( !internalSwapCall ) {
+		migrateWarn( "jQuery.swap() is undocumented and deprecated" );
+	}
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
 
 // Ensure that $.ajax gets the new parseJSON defined in core.js
 jQuery.ajaxSetup({
@@ -314,13 +406,7 @@ jQuery.fn.data = function( name ) {
 };
 
 
-var rscriptType = /\/(java|ecma)script/i,
-	oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack;
-
-jQuery.fn.andSelf = function() {
-	migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");
-	return oldSelf.apply( this, arguments );
-};
+var rscriptType = /\/(java|ecma)script/i;
 
 // Since jQuery.clean is used internally on older versions, we only shim if it's missing
 if ( !jQuery.clean ) {
@@ -378,6 +464,7 @@ var eventAdd = jQuery.event.add,
 	oldToggle = jQuery.fn.toggle,
 	oldLive = jQuery.fn.live,
 	oldDie = jQuery.fn.die,
+	oldLoad = jQuery.fn.load,
 	ajaxEvents = "ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",
 	rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ),
 	rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
@@ -412,17 +499,34 @@ jQuery.event.remove = function( elem, types, handler, selector, mappedTypes ){
 	eventRemove.call( this, elem, hoverHack( types ) || "", handler, selector, mappedTypes );
 };
 
-jQuery.fn.error = function() {
-	var args = Array.prototype.slice.call( arguments, 0);
-	migrateWarn("jQuery.fn.error() is deprecated");
-	args.splice( 0, 0, "error" );
-	if ( arguments.length ) {
-		return this.bind.apply( this, args );
-	}
-	// error event should not bubble to window, although it does pre-1.7
-	this.triggerHandler.apply( this, args );
-	return this;
-};
+jQuery.each( [ "load", "unload", "error" ], function( _, name ) {
+
+	jQuery.fn[ name ] = function() {
+		var args = Array.prototype.slice.call( arguments, 0 );
+		migrateWarn( "jQuery.fn." + name + "() is deprecated" );
+
+		// If this is an ajax load() the first arg should be the string URL;
+		// technically this could also be the "Anything" arg of the event .load()
+		// which just goes to show why this dumb signature has been deprecated!
+		// jQuery custom builds that exclude the Ajax module justifiably die here.
+		if ( name === "load" && typeof arguments[ 0 ] === "string" ) {
+			return oldLoad.apply( this, arguments );
+		}
+
+		args.splice( 0, 0, name );
+		if ( arguments.length ) {
+			return this.bind.apply( this, args );
+		}
+
+		// Use .triggerHandler here because:
+		// - load and unload events don't need to bubble, only applied to window or image
+		// - error event should not bubble to window, although it does pre-1.7
+		// See http://bugs.jquery.com/ticket/11820
+		this.triggerHandler.apply( this, args );
+		return this;
+	};
+
+});
 
 jQuery.fn.toggle = function( fn, fn2 ) {
 
@@ -491,7 +595,7 @@ jQuery.each( ajaxEvents.split("|"),
 				// The document needs no shimming; must be !== for oldIE
 				if ( elem !== document ) {
 					jQuery.event.add( document, name + "." + jQuery.guid, function() {
-						jQuery.event.trigger( name, null, elem, true );
+						jQuery.event.trigger( name, Array.prototype.slice.call( arguments, 1 ), elem, true );
 					});
 					jQuery._data( this, name, jQuery.guid++ );
 				}
@@ -507,5 +611,92 @@ jQuery.each( ajaxEvents.split("|"),
 	}
 );
 
+jQuery.event.special.ready = {
+	setup: function() { migrateWarn( "'ready' event is deprecated" ); }
+};
+
+var oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack,
+	oldFind = jQuery.fn.find;
+
+jQuery.fn.andSelf = function() {
+	migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");
+	return oldSelf.apply( this, arguments );
+};
+
+jQuery.fn.find = function( selector ) {
+	var ret = oldFind.apply( this, arguments );
+	ret.context = this.context;
+	ret.selector = this.selector ? this.selector + " " + selector : selector;
+	return ret;
+};
+
+
+// jQuery 1.6 did not support Callbacks, do not warn there
+if ( jQuery.Callbacks ) {
+
+	var oldDeferred = jQuery.Deferred,
+		tuples = [
+			// action, add listener, callbacks, .then handlers, final state
+			[ "resolve", "done", jQuery.Callbacks("once memory"),
+				jQuery.Callbacks("once memory"), "resolved" ],
+			[ "reject", "fail", jQuery.Callbacks("once memory"),
+				jQuery.Callbacks("once memory"), "rejected" ],
+			[ "notify", "progress", jQuery.Callbacks("memory"),
+				jQuery.Callbacks("memory") ]
+		];
+
+	jQuery.Deferred = function( func ) {
+		var deferred = oldDeferred(),
+			promise = deferred.promise();
+
+		deferred.pipe = promise.pipe = function( /* fnDone, fnFail, fnProgress */ ) {
+			var fns = arguments;
+
+			migrateWarn( "deferred.pipe() is deprecated" );
+
+			return jQuery.Deferred(function( newDefer ) {
+				jQuery.each( tuples, function( i, tuple ) {
+					var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+					// deferred.done(function() { bind to newDefer or newDefer.resolve })
+					// deferred.fail(function() { bind to newDefer or newDefer.reject })
+					// deferred.progress(function() { bind to newDefer or newDefer.notify })
+					deferred[ tuple[1] ](function() {
+						var returned = fn && fn.apply( this, arguments );
+						if ( returned && jQuery.isFunction( returned.promise ) ) {
+							returned.promise()
+								.done( newDefer.resolve )
+								.fail( newDefer.reject )
+								.progress( newDefer.notify );
+						} else {
+							newDefer[ tuple[ 0 ] + "With" ](
+								this === promise ? newDefer.promise() : this,
+								fn ? [ returned ] : arguments
+							);
+						}
+					});
+				});
+				fns = null;
+			}).promise();
+
+		};
+
+		deferred.isResolved = function() {
+			migrateWarn( "deferred.isResolved is deprecated" );
+			return deferred.state() === "resolved";
+		};
+
+		deferred.isRejected = function() {
+			migrateWarn( "deferred.isRejected is deprecated" );
+			return deferred.state() === "rejected";
+		};
+
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+
+		return deferred;
+	};
+
+}
 
 })( jQuery, window );

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 jquery
+//= require jquery2
 //= 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 jquery
+//= require jquery2
 //= require drg_cms/jquery-migrate.js
 //= require jquery_ujs
 

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

@@ -42,9 +42,9 @@ article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup, 
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
+	margin: 0px;
+	padding: 0px;
+	border: 0px;
 	font-size: 100%;
 	font: inherit;
 	vertical-align: baseline;
@@ -74,6 +74,11 @@ table {
 }
 /* END */
 
+/* Firefox only
+@-moz-document url-prefix() { 
+}
+*/
+
 body {
 font-family: helvetica;
 font-size: 12px;
@@ -89,6 +94,10 @@ border: solid 1px #bbb;
 border-radius: 2px;
 }
 
+input.file {
+border: none;
+}
+
 select {
 padding: 4px 0px;
 background: #fff;  
@@ -237,6 +246,14 @@ transition: 0.3s;
   background-color: #eee; 
 }
 
+.dc-link-icon {
+padding: 3px;
+border-radius: 3px;
+background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
+border: 1px solid #ddd;
+}
+
+
 .dc-link-selected {
   text-align: center;
   border:1px solid #888;
@@ -329,23 +346,26 @@ background: transparent linear-gradient(to bottom, #ddd 0%, #FFF 100%) repeat sc
   color: #fff;
   background-color: #888; 
 }
-/*
-.dc-img-link {
-  border: 0px;
-  padding-top: 1px
+/* Pagination */
+.pagination span {
+  border: 1px solid #ddd;
+  padding: 4px 4px 3px 6px;
+  margin-left: 1px;
+  background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;  
+  border-radius: 1px;
 }
 
-.dc-img-link:hover {
-  text-decoration: none;
-  background-color: #c43;
+.pagination .current {
+  background: #888;
+  color: #fff;
+  border: 1px solid #888;
 }
-*/
 
 .dc-title {
   font-weight: bold;
   color: #333;
   font-size: 1.2em;
-  padding: 4px;
+  padding: 5px 1px;
   border-spacing: 0px;
   width: 100%;
   margin: 0px;
@@ -799,10 +819,10 @@ color: #222;
 
 .dc-action-menu ul {
 margin-top: 1px;
-background:#fff; 
+/*background:#fff; */
 position:absolute;
 left:-9999px; 
-border-radius: 4px;
+border-radius: 2px;
 }
 
 .dc-action-menu ul li {
@@ -826,8 +846,8 @@ white-space:nowrap;
 left:0; 
 margin-top:3px;
 background-color: #fff;
-border: 1px solid #aaa;
-box-shadow: 1px 1px 2px #ccc;
+border: 1px solid #ccc;
+/*box-shadow: 1px 1px 2px #ccc;*/
 }
 
 .dc-action-menu li:hover ul li a { 
@@ -839,8 +859,8 @@ color: #222;
 }
 .dc-action-menu li:hover ul li:hover {
 border: 0px;
-background: #ddd;
-border-radius: 0px;
+background: #eee;
+border-radius: 2px;
 }
 
 .menu-filter {

data/app/controllers/cmsedit_controller.rb

@@ -195,7 +195,6 @@ def check_filter_options() #:nodoc:
       model
     end
   end
-  
 # pagination if required
   per_page = (@form['result_set']['per_page'] || 30).to_i
   if per_page > 0
@@ -211,7 +210,7 @@ def index
   if @form['result_set'].nil?
     return process_return_to(params[:return_to] || 'reload') 
   end
-# for now enable only filtering of main tables
+# for now enable only filtering of top level documents
   if @tables.size == 1 
     check_filter_options()
     check_sort_options()
@@ -225,8 +224,8 @@ def index
         @records = []
         return render(action: :index)
       end
-# pagination
-      unless @form['table'] == 'dc_dummy'
+# pagination but only if not already set
+      unless (@form['table'] == 'dc_dummy' or @records.options[:limit])
         per_page = (@form['result_set']['per_page'] || 30).to_i
         @records = @records.page(params[:page]).per(per_page) if per_page > 0
       end
@@ -302,14 +301,14 @@ end
 # New action.
 ########################################################################
 def new
+# clear flash messages.
+  flash[:error] = flash[:warning] = flash[:info] = nil 
+  create_new_empty_record
   if (m = callback_method('before_new') )
     ret = call_callback_method(m)
 # Don't do anything if return is false
     return index if ret.class == FalseClass
   end  
-# clear flash messages.
-  flash[:error] = flash[:warning] = flash[:info] = nil 
-  create_new_empty_record
   table = @tables.last[1] + '.'
 # initial values set on page
   if cookies[:record] and cookies[:record].size > 0
@@ -763,7 +762,7 @@ end
 ########################################################################
 def save_data
   fields = fields_on_form()
-  return true unless fields.size > 0
+  return true if fields.size == 0
 #
   fields.each do |v|
     next if v['type'].nil?

data/app/helpers/cmsedit_helper.rb

@@ -40,7 +40,7 @@ def dc_actions_for_index()
   return '' if actions.nil? or actions.size == 0
 # Simulate standard actions  
   actions = {'standard' => true} if actions.class == String && actions == 'standard'
-  std_actions = {' 2' => 'new', ' 3' => 'sort', ' 4' => 'filter' }
+  std_actions = {2 => 'new', 3 => 'sort', 4 => 'filter' }
   if actions['standard']
     actions.merge!(std_actions)
     actions['standard'] = nil
@@ -51,8 +51,12 @@ def dc_actions_for_index()
   <span id="dc-spinner" class="div-hidden">#{fa_icon('spinner lg spin')}</span>
   <ul class="dc-action-menu">
 EOT
-#
-  actions.each do |k,v|
+# Remove actions settings and sort
+  only_actions = []
+  actions.each { |key, value| only_actions << [key, value] if key.class == Fixnum }
+  only_actions.sort_by!(&:first)
+  only_actions.each do |element|
+    k,v = element
     session[:form_processing] = "index:actions: #{k}=#{v}"
     next if v.nil? # must be
     url = @parms.clone
@@ -96,8 +100,8 @@ EOT
 # add filter OFF link
       s = session[@form['table']]
       if s and s[:filter]
-        caption << '&nbsp;&nbsp;' + dc_link_to(nil,'remove lg', controller: 'cmsedit', 
-                   filter: 'off', table: @form['table'], title: 'drgcms.filter_off') 
+        caption << '&nbsp;&nbsp;' + dc_link_to(nil,'remove lg', {controller: 'cmsedit', 
+                   filter: 'off', table: @form['table']}, { title: t('drgcms.filter_off')+s[:filter]}) 
       end
       caption
 # new
@@ -131,6 +135,12 @@ def dc_div_filter()
   filter.split(',').each do |f| 
     f.strip!
     name = f.match(' as ') ? f.split(' ').first : f
+# like another field on the form
+    if f.match(' like ')
+      a = f.split(' ')
+      name = a.first
+      f    = a.last
+    end
     choices << [ t("helpers.label.#{@form['table']}.#{name}", name), f ] 
   end
   choices4_operators = t('drgcms.choices4_filter_operators').chomp.split(',').inject([]) {|r,v| r << (v.match(':') ? v.split(':') : v )}
@@ -178,14 +188,16 @@ def dc_link_or_ajax(yaml, parms) #:nodoc:
   rest = {}
   rest['method']  = yaml['method'] || yaml['request'] || 'get'
   rest['caption'] = yaml['caption'] || yaml['text']
-  rest['class']   =  rest['class'].to_s + ' dc-animate'
+  rest['class']   = (yaml['type'] == 'link' ? 'dc-link' : 'dc-link-ajax') + ' dc-animate'
   rest['title']   = yaml['title']
   
   dc_deprecate "Form: result_set:action:text directive will be deprecated. Use caption instead of text." if yaml['text']
   if yaml['type'] == 'link'
     dc_link_to(yaml['caption'], yaml['icon'], parms, rest ) 
   else
-    ''
+    rest['data-url'] = url_for(parms)
+    rest['class'] << " fa fa-#{yaml['icon']}"
+    fa_icon(yaml['icon'], rest ) 
   end
 end
 
@@ -269,13 +281,15 @@ def dc_header_for_result()
       th = '<th '
       v = {'name' => v} if v.class == String      
       caption = v['caption'] || t("helpers.label.#{@form['table']}.#{v['name']}")
-# no sorting when embedded field or custom filter is active
-      if @tables.size == 1 and @form['result_set']['filter'].nil?
+# no sorting when embedded documents or custom filter is active 
+      sort_ok = @form['result_set'].nil? || (@form['result_set'] && @form['result_set']['filter'].nil?)
+      sort_ok = sort_ok || (@form['index'] && @form['index']['sort'])
+      if @tables.size == 1 and sort_ok
         icon = 'sort lg'
         if v['name'] == sort_field
           icon = sort_direction == '1' ? 'sort-alpha-asc lg' : 'sort-alpha-desc lg'
         end        
-        th << ">#{dc_link_to(caption, icon, sort: v['name'], table: @tables[0][1], action: :index )}</th>"
+        th << ">#{dc_link_to(caption, icon, sort: v['name'], table: params[:table], formname: params[:formname], action: :index )}</th>"
       else
         th << ">#{caption}</th>"
       end
@@ -286,7 +300,7 @@ def dc_header_for_result()
 end
 
 ############################################################################
-# Creates div with documents of current result set.
+# Creates link for single or double click on result column
 ############################################################################
 def dc_clicks_for_result(document)
   html = ''

data/app/helpers/dc_application_helper.rb

@@ -21,7 +21,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
-
+require 'sort_alphabetical'
 
 ###########################################################################
 # 
@@ -147,7 +147,7 @@ end
 # String. HTML code for title.
 ############################################################################
 def dc_table_title(text, result_set=nil)
-  c = "<table width='100%' cellspacing='0' cellpadding='1' class='dc-title'><tr><td>#{text}</td>"
+  c = "<table width='100%' class='dc-title'><tr><td>#{text}</td>"
   if result_set and result_set.respond_to?(:current_page)
     c << "<td align='right' style='font-size: 0.8em;'> #{paginate(result_set, :params => {:action => 'index'})}</td>" 
   end
@@ -813,11 +813,11 @@ def dc_choices4(model, name, id='_id', options = {})
   qry   = model.only(id, name)
   qry   = qry.and(dc_site_id: dc_get_site()) if options[:site_only]
   qry   = qry.and(active: true) if model.method_defined?(:active)
-  qry   = qry.sort(name: 1) 
-#  
-  choices = []
-  qry.each {|v| choices << [ v[name], v[id] ] }
-  choices
+#  qry   = qry.sort(name => 1) 
+#  choices = []
+#  qry.each {|v| choices << [ v[name], v[id] ] }
+  choices = qry.inject([]) {|result,e| result << [ e[name], e[id] ]}
+  choices.sort_alphabetical_by(&:first) # use UTF-8 sort
 end
 
 ############################################################################

data/app/models/dc_filter.rb

@@ -138,7 +138,7 @@ def self.get_filter_field(parent)
   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 dc-link dc-animate') <<
+    parent.fa_icon('filter lg', class: 'record_filter_field_icon dc-link-icon dc-animate') <<
     (js.size > 2 ? parent.javascript_tag(js) : '') << '</span>'
 end
 

data/app/models/drgcms_form_fields.rb

@@ -957,7 +957,7 @@ class DatePicker < DrgcmsField
 # Render date_picker field html code
 ###########################################################################
 def render
-  value = @record[@yaml['name']] ? I18n.localize(@record[@yaml['name']].localtime.to_date) : nil
+  value = (@record and @record[@yaml['name']]) ? I18n.localize(@record[@yaml['name']].localtime.to_date) : nil
   return ro_standard( @parent.dc_format_value(value)) if @readonly
 #
   @yaml['options'] ||= {}
@@ -1020,7 +1020,7 @@ class DatetimePicker < DrgcmsField
 # Render date_time_picker field html code
 ###########################################################################
 def render
-  value = @record[@yaml['name']] ? I18n.localize(@record[@yaml['name']].localtime) : nil
+  value = (@record and @record[@yaml['name']]) ? I18n.localize(@record[@yaml['name']].localtime) : nil
   return ro_standard( @parent.dc_format_value(value)) if @readonly
 #
   @yaml['options'] ||= {}
@@ -1125,12 +1125,14 @@ def render
   ret_name = "#{ret_name}.#{method}" if method
   @yaml['html'] ||= {}
   @yaml['html']['value'] = value_displayed
+  @yaml['html']['placeholder'] ||= t('drgcms.two_chars') || nil
 #    
   _name = '_' + @yaml['name']
   record = record_text_for(@yaml['name'])  
   @html << @parent.text_field(record, _name, @yaml['html'])
   if @yaml['with_new']
-    @html << @parent.image_tag('drg_cms/add.png', class: 'in-edit-add', title: t('drgcms.new'), 
+    @html << ' ' + 
+             @parent.fa_icon('plus-square lg', class: 'in-edit-add', title: t('drgcms.new'), 
              style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )    
   end
   @html << @parent.hidden_field(record, @yaml['name'], value: value)        # actual value will be in hidden field

data/config/locales/datetimepicker.yml

@@ -3,8 +3,8 @@
 en:
   datetimepicker: 
     formats:
-      date: 'Y/m/d'
-      datetime: 'Y/m/d H:i'
+      date: 'd/m/Y'
+      datetime: 'd/m/Y H:i'
 
 sl:
   datetimepicker: 

data/config/locales/drgcms_en.yml

@@ -76,6 +76,7 @@ en:
     reload: Reload
     error: Error!
     errors_no: 'No. of errors:'
+    two_chars: type in at least two chars
 
     created_by: Created by
     updated_by: Updated by

data/config/locales/drgcms_sl.yml

@@ -76,6 +76,7 @@ sl:
     reload: Osveži    
     error: Napaka!
     errors_no: 'Število napak:' 
+    two_chars: vpišite vsaj dva znaka
 
     created_by: Ustvaril
     updated_by: Spremenil

data/config/locales/en.yml

@@ -2,6 +2,12 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-  hello: "Hello world"
- 
+  date:
+    formats:
+      default: "%d/%m/%Y"
+  time:
+    formats:
+      default: "%d/%m/%Y %H:%M"
+
+
    

data/drg_cms.gemspec

@@ -1,3 +1,5 @@
+# Copyright 2012-2016 Damjan Rems
+
 $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
@@ -25,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'mongoid'
   s.add_dependency 'kaminari'
   s.add_dependency 'font-awesome-rails'
+  s.add_dependency 'sort_alphabetical'
 end

data/lib/drg_cms/version.rb

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

data/test/test_helper.rb

@@ -1,4 +1,6 @@
+# Copyright 2012-2016 Damjan Rems
 # Configure Rails Environment
+
 ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sort_alphabetical
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !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 in-house private cloud applications.
 email: