drg_cms 0.5.8 → 0.5.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3281dd3aef7554c89150fcf948a4ffdbd253da8d
-  data.tar.gz: dc53e3cd616e1baf33b15d8b60a30251fa4ecc8d
+  metadata.gz: 1bff00bdc426d2a63b7206a17daf68c34e30f5c7
+  data.tar.gz: 1f9cb263ff44cdd17051d4579d0229848991804f
 SHA512:
-  metadata.gz: e19a6cfa74140520e97be7a23b2e2c3091514f72b7c404c4b1b5af75dffa0f7f1a42fefd6c93998c326456d9730d3d80c74d875c40429d454ee6386494fe72e8
-  data.tar.gz: 489cc0194a151b6f3f13cea9d3841ae3b4b833f19440e9ca8577f6c95128c0463f1d1ddca2e6fbe1d6ab679e7956a6323ef60e31184a57f741ff9636b15d550a
+  metadata.gz: 8dc173b2078147bf66b4e173227999cc72d330b853d70bf4ae66d4195b59a45a54cc7606baa2db0aa2eeac3b9862ac11f4806028d687536e8e1ea94ff7d7c641
+  data.tar.gz: 4d0f3ebd3069c6f49b560a3224255619ac8875d3190664eadffc67c67c8644aa7d91c999db697e3f00ccf80b7c5f5ef042abb13384cdf93c419de68beee5813d

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

@@ -501,7 +501,60 @@ element = $(this).find(':first').attr('id');
     } 
   });
 
+ $('#1menu-filter').on('click', function(e) {
+    var target = e.target;
+//    if (e.target.src !== undefined) {
+//      target = e.target.parent(); // picture
+//    };
+//    dumpAttributes(target);
+    req = target.getAttribute("data-request");
+    $('.menu-filter').toggle(300);
+    
+  });
+  
+ /*******************************************************************
+  * This will fire cmsedit index action and pass value enterred into 
+  * filter field and thus refresh browsed result set.
+  *******************************************************************/
+  $('#record_filter_field').keydown( function(e) {
+    if (e.which == '13' || e.which == '9') {
+      url = $(this).parents('span').attr("data-url");
+      url = url + "&filter_value=" + this.value;
+      location.href = url;
+      return false;      
+    }
+  });
 
+  /*******************************************************************
+  * Same as above, but when clicked on filter icon. enter and tab don't 
+  * work on all field types.
+  *******************************************************************/
+  $('.record_filter_field_icon').on('click', function(e) {
+    field = $('#record_filter_field');
+    url = $(this).parents('span').attr("data-url");
+    url = url + "&filter_value=" + field.val();
+    location.href = url;
+  });
+
+ /*******************************************************************
+  * Click on show filter form
+  *******************************************************************/
+  $('#open_drgcms_filter').on('click', function(e) {
+    $('#drgcms_filter').modal().open();   
+  });
+  
+ /*******************************************************************
+  * 
+  *******************************************************************/
+  $('.drgcms_popup_submit').on('click', function(e) {
+    //e.preventDefault();  
+    url = $(this).attr( 'data-url' );
+    field = $('select#_filter_field').val();
+    oper  = $('select#_filter_oper').val();
+    location.href = url + '&filter_field=' + field + '&filter_oper=' + oper
+//    $('#drgcms_filter').modal().close();
+  });
+  
 });
 
 /*******************************************************************

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

@@ -0,0 +1,260 @@
+/**
+ * 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);

data/app/assets/javascripts/drg_cms_cms.js

@@ -26,3 +26,6 @@
 //= #require drg_cms/elfinder/js/elfinder.min.js
 //= #require drg_cms/elfinder/js/proxy/elFinderSupportVer1.js
 
+//= require drg_cms/jquery.the-modal.js
+
+

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

@@ -84,20 +84,11 @@ color: #222;
 
 textarea, input, select {
 color: #222;
-padding: 4px;
-border: solid 1px #aaa;
+padding: 5px 3px;
+border: solid 1px #bbb;
 border-radius: 2px;
 }
 
-/*
-select#record_select { 
-padding: 1px;
-max-width: 300px;
-height: 26px;
-background: #fff;
-}
-*/
-
 select {
 padding: 4px 0px;
 background: #fff;  
@@ -375,10 +366,11 @@ background: transparent linear-gradient(to bottom, #ddd 0%, #FFF 100%) repeat sc
 
 .dc-form-table {
   width: 100%;
-  border-spacing: 0px;
   padding: 0px;
+  padding-top: 4px;
   border: 1px solid #ddd;
-  border-top: 0px;
+  border-radius: 2px; 
+  background-color: #f8f8f8
 }
 
 .dc-form-info {
@@ -448,12 +440,14 @@ background: transparent linear-gradient(to bottom, #ddd 0%, #FFF 100%) repeat sc
   border-bottom: 1px solid #eee;
 */
 }
-.dc-readonly { font-weight: normal }
 
 .dc-readonly {
-  margin-left: 2px;
-  margin-top: 2px;
-  padding: 2px;
+  font-weight: normal;
+  padding: 5px 3px;
+  border: 1px solid #ccc;
+  background-color: #eee;
+  border-radius: 2px;
+  color: #444;
 }
 
 .dc-color-odd {
@@ -466,10 +460,13 @@ background: transparent linear-gradient(to bottom, #ddd 0%, #FFF 100%) repeat sc
 }
 
 .dc-form-ul {
-margin-top: 6px;
-/*margin-bottom: 3px;*/
 padding: 2px;
+margin-top: 6px;
+/*
+margin-bottom: 3px;
 border-bottom: 1px solid #eee;
+*/
+
 }
 
 .dc-spinner {
@@ -618,7 +615,7 @@ box-shadow: 2px 2px 4px #ccc;
 min-width:300px;
 }
 
-.cmsedit-menu ul li ul a { color: white; }
+/*.cmsedit-menu ul li ul a { color: white; }*/
 
 .cmsedit-menu ul li:hover > ul {
 display:block;
@@ -630,7 +627,7 @@ float:none;
 }
 
 #result {
-background-color: #eee;
+/*background-color: #eee;*/
 }
 
 /*********************/
@@ -753,10 +750,12 @@ overflow-x:hidden;
 .clear-both { clear: both;}
 
 /******************* action-menu *********************/
+
 #dc-action-menu {
 padding: 2px 0px 2px 0px;
 font-weight: bold;
 color: #888;
+display: flex;
 }
 
 #dc-action-menu ul {
@@ -767,7 +766,6 @@ margin: 6px 2px 4px 2px;
 
 .dc-action-menu  {
 list-style:none;
-/*font-size: 12px;*/
 }
 
 .dc-action-menu li {
@@ -776,7 +774,6 @@ position:relative;
 list-style:none;
 padding: 5px 8px;
 margin-right: 4px;
-max-width: 200px;
 background: #eee;
 border-radius:5px;
 z-index: 1;
@@ -785,11 +782,11 @@ background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat
 border: 1px solid #ddd;
 }
 
+
 .dc-action-menu li:hover {
 border: 1px solid #aaa;
 color: #222;
 transition: 0.3s;  
-/*background: linear-gradient(#fff 5%, #eee 100%);  */
 }
 
 .dc-action-menu li:hover a {
@@ -801,19 +798,20 @@ margin-top: 1px;
 background:#fff; 
 position:absolute;
 left:-9999px; 
-
-/*box-shadow: 2px 2px 4px #aaa;*/
-
+border-radius: 4px;
 }
 
 .dc-action-menu ul li {
-display:block; 
-float:none;
+display: block; 
+float: none;
 padding: 4px 10px;
-border-radius: 0px;
+
 margin-right: 0px;
-white-space:nowrap;
-background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
+white-space: nowrap;
+background: #FFF;
+border: 0px;
+color: #888;
+/*background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;*/
 }
 
 .dc-action-menu ul a {
@@ -824,14 +822,38 @@ white-space:nowrap;
 left:0; 
 margin-top:3px;
 background-color: #fff;
+border: 1px solid #aaa;
+box-shadow: 1px 1px 2px #ccc;
 }
 
 .dc-action-menu li:hover ul li a { 
-color: #888;
+/*color: #eee;*/
 }
 
 .dc-action-menu li:hover ul li a:hover {
 color: #222;
+}
+.dc-action-menu li:hover ul li:hover {
+border: 0px;
+background: #ddd;
+border-radius: 0px;
+}
+
+.menu-filter {
+min-width: 200px;
+max-width: 400px;
+}
+
+.menu-filter a {
+color: #888 !important;
+}
+.menu-filter a:hover {
+color: #222 !important;
+}
+
+.menu-filter hr {margin: 0px;}
+.filter_field {
+
 }
 
 /************************** info popup *************************/
@@ -855,3 +877,16 @@ background-color: #f8f8f8;
 border: 1px solid #ddd;
 border-radius: 2px;
 }
+
+/************************** info popup *************************/
+#drgcms_filter {
+    z-index:100;
+    position:fixed;
+    top: 50px;
+    left: 200px;
+    width: 500px;
+    background: #fff;
+    display: none;
+    padding: 20px;
+    border: 2px solid #222;    
+}