drg_cms 0.6.1.11 → 0.7.0.8

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

@@ -0,0 +1,372 @@
+/*===================================================================================================================
+ * @name: bPopupy
+ * @type: jQuery
+ * @author: (c) Bjoern Klinggaard - @bklinggaard
+ * @demo: http://dinbror.dk/bpopup
+ * @version: 0.11.0
+ * @requires jQuery 1.4.3
+ *==================================================================================================================*/
+;(function($) {
+ 'use strict';
+
+ $.fn.bPopup = function(options, callback) {
+
+  if ($.isFunction(options)) {
+   callback 		= options;
+   options 		= null;
+  }
+
+  // OPTIONS
+  var o 				= $.extend({}, $.fn.bPopup.defaults, options);
+
+  // HIDE SCROLLBAR?
+  if (!o.scrollBar)
+   $('html').css('overflow', 'hidden');
+
+  // VARIABLES
+  var $popup 			= this
+      , d 				= $(document)
+      , w 				= window
+      , $w				= $(w)
+      , wH				= windowHeight()
+      , wW				= windowWidth()
+      , prefix			= '__b-popup'
+      , isIOS6X			= (/OS 6(_\d)+/i).test(navigator.userAgent) // Used for a temporary fix for ios6 timer bug when using zoom/scroll
+      , buffer			= 200
+      , popups			= 0
+      , id
+      , inside
+      , fixedVPos
+      , fixedHPos
+      , fixedPosStyle
+      , vPos
+      , hPos
+      , height
+      , width
+      , debounce
+      , autoCloseTO
+  ;
+
+  ////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  // PUBLIC FUNCTION - call it: $(element).bPopup().close();
+  ////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  $popup.close = function() {
+   close();
+  };
+
+  $popup.reposition = function(animateSpeed) {
+   reposition(animateSpeed);
+  };
+
+  return $popup.each(function() {
+   if ($(this).data('bPopup')) return; //POPUP already exists?
+   init();
+  });
+
+  ////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  // HELPER FUNCTIONS - PRIVATE
+  ////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  function init() {
+   triggerCall(o.onOpen);
+   popups = ($w.data('bPopup') || 0) + 1, id = prefix + popups + '__',fixedVPos = o.position[1] !== 'auto', fixedHPos = o.position[0] !== 'auto', fixedPosStyle = o.positionStyle === 'fixed', height = $popup.outerHeight(true), width = $popup.outerWidth(true);
+   o.loadUrl ? createContent() : open();
+  };
+
+  function createContent() {
+   o.contentContainer = $(o.contentContainer || $popup);
+   switch (o.content) {
+    case ('iframe'):
+     var iframe = $('<iframe class="b-iframe" ' + o.iframeAttr +'></iframe>');
+     iframe.appendTo(o.contentContainer);
+     height = $popup.outerHeight(true);
+     width = $popup.outerWidth(true);
+     open();
+     iframe.attr('src', o.loadUrl); // setting iframe src after open due IE9 bug
+     triggerCall(o.loadCallback);
+     break;
+    case ('image'):
+     open();
+     $('<img />')
+         .on('load',function() {
+          triggerCall(o.loadCallback);
+          recenter($(this));
+         }).attr('src', o.loadUrl).hide().appendTo(o.contentContainer);
+     break;
+    default:
+     open();
+     $('<div class="b-ajax-wrapper"></div>')
+         .load(o.loadUrl, o.loadData, function(response, status, xhr) {
+          triggerCall(o.loadCallback, status);
+          recenter($(this));
+         }).hide().appendTo(o.contentContainer);
+     break;
+   }
+  };
+
+  function open(){
+   // MODAL OVERLAY
+   if (o.modal) {
+    $('<div class="b-modal '+id+'"></div>')
+        .css({backgroundColor: o.modalColor, position: 'fixed', top: 0, right:0, bottom:0, left: 0, opacity: 0, zIndex: o.zIndex + popups})
+        .appendTo(o.appendTo)
+        .fadeTo(o.speed, o.opacity);
+   }
+
+   // POPUP
+   calcPosition();
+   $popup
+       .data('bPopup', o).data('id',id)
+       .css({
+        'left': o.transition == 'slideIn' || o.transition == 'slideBack' ? (o.transition == 'slideBack' ? d.scrollLeft() + wW : (hPos + width) *-1) : getLeftPos(!(!o.follow[0] && fixedHPos || fixedPosStyle))
+        , 'position': o.positionStyle || 'absolute'
+        , 'top': o.transition == 'slideDown' || o.transition == 'slideUp' ? (o.transition == 'slideUp' ? d.scrollTop() + wH : vPos + height * -1) : getTopPos(!(!o.follow[1] && fixedVPos || fixedPosStyle))
+        , 'z-index': o.zIndex + popups + 1
+       }).each(function() {
+    if(o.appending) {
+     $(this).appendTo(o.appendTo);
+    }
+   });
+   doTransition(true);
+  };
+
+  function close() {
+   if (o.modal) {
+    $('.b-modal.'+$popup.data('id'))
+        .fadeTo(o.speed, 0, function() {
+         $(this).remove();
+        });
+   }
+   // Clean up
+   unbindEvents();
+   clearTimeout(autoCloseTO);
+   // Close trasition
+   doTransition();
+
+   return false; // Prevent default
+  };
+
+  function reposition(animateSpeed){
+   wH = windowHeight();
+   wW = windowWidth();
+   inside = insideWindow();
+   if(inside.x || inside.y){
+    clearTimeout(debounce);
+    debounce = setTimeout(function(){
+     calcPosition();
+     animateSpeed = animateSpeed || o.followSpeed;
+     var css = {};
+     if(inside.x)
+      css.left = o.follow[0] ? getLeftPos(true) : 'auto';
+     if(inside.y)
+      css.top = o.follow[1] ? getTopPos(true) : 'auto';
+     $popup
+         .dequeue()
+         .each(function() {
+          if(fixedPosStyle) {
+           $(this).css({ 'left': hPos, 'top': vPos });
+          }
+          else {
+           $(this).animate(css, animateSpeed, o.followEasing);
+          }
+         });
+    }, 50);
+   }
+  };
+
+  //Eksperimental
+  function recenter(content){
+   var _width = content.width(), _height = content.height(), css = {};
+   o.contentContainer.css({height:_height,width:_width});
+
+   if (_height >= $popup.height()){
+    css.height = $popup.height();
+   }
+   if(_width >= $popup.width()){
+    css.width = $popup.width();
+   }
+   height = $popup.outerHeight(true)
+       , width = $popup.outerWidth(true);
+
+   calcPosition();
+   o.contentContainer.css({height:'auto',width:'auto'});
+
+   css.left = getLeftPos(!(!o.follow[0] && fixedHPos || fixedPosStyle)),
+       css.top = getTopPos(!(!o.follow[1] && fixedVPos || fixedPosStyle));
+
+   $popup
+       .animate(
+           css
+           , 250
+           , function() {
+            content.show();
+            inside = insideWindow();
+           }
+       );
+  };
+
+  function bindEvents() {
+   $w.data('bPopup', popups);
+   $popup.delegate('.bClose, .' + o.closeClass, 'click.'+id, close); // legacy, still supporting the close class bClose
+
+   if (o.modalClose) {
+    $('.b-modal.'+id).css('cursor', 'pointer').bind('click', close);
+   }
+
+   // Temporary disabling scroll/resize events on devices with IOS6+
+   // due to a bug where events are dropped after pinch to zoom
+   if (!isIOS6X && (o.follow[0] || o.follow[1])) {
+    $w.bind('scroll.'+id, function() {
+     if(inside.x || inside.y){
+      var css = {};
+      if(inside.x)
+       css.left =  o.follow[0] ? getLeftPos(!fixedPosStyle) : 'auto';
+      if(inside.y)
+       css.top = o.follow[1] ? getTopPos(!fixedPosStyle) : 'auto';
+      $popup
+          .dequeue()
+          .animate(css, o.followSpeed, o.followEasing);
+     }
+    }).bind('resize.'+id, function() {
+     reposition();
+    });
+   }
+   if (o.escClose) {
+    d.bind('keydown.'+id, function(e) {
+     if (e.which == 27) {  //escape
+      close();
+     }
+    });
+   }
+  };
+
+  function unbindEvents() {
+   if (!o.scrollBar) {
+    $('html').css('overflow', 'auto');
+   }
+   $('.b-modal.'+id).unbind('click');
+   d.unbind('keydown.'+id);
+   $w.unbind('.'+id).data('bPopup', ($w.data('bPopup')-1 > 0) ? $w.data('bPopup')-1 : null);
+   $popup.undelegate('.bClose, .' + o.closeClass, 'click.'+id, close).data('bPopup', null);
+  };
+
+  function doTransition(open) {
+   switch (open ? o.transition : o.transitionClose || o.transition) {
+    case "slideIn":
+     animate({
+      left: open ? getLeftPos(!(!o.follow[0] && fixedHPos || fixedPosStyle)) : d.scrollLeft() - (width || $popup.outerWidth(true)) - buffer
+     });
+     break;
+    case "slideBack":
+     animate({
+      left: open ? getLeftPos(!(!o.follow[0] && fixedHPos || fixedPosStyle)) : d.scrollLeft() + wW + buffer
+     });
+     break;
+    case "slideDown":
+     animate({
+      top: open ? getTopPos(!(!o.follow[1] && fixedVPos || fixedPosStyle)) : d.scrollTop() - (height || $popup.outerHeight(true)) - buffer
+     });
+     break;
+    case "slideUp":
+     animate({
+      top: open ? getTopPos(!(!o.follow[1] && fixedVPos || fixedPosStyle)) : d.scrollTop() + wH + buffer
+     });
+     break;
+    default:
+     //Hardtyping 1 and 0 to ensure opacity 1 and not 0.9999998
+     $popup.stop().fadeTo(o.speed, open ? 1 : 0, function(){onCompleteCallback(open);});
+   }
+
+   function animate(css){
+    $popup
+        .css({display: 'block',opacity: 1})
+        .animate(css, o.speed, o.easing, function(){ onCompleteCallback(open); });
+   };
+  };
+
+
+  function onCompleteCallback(open){
+   if(open){
+    bindEvents();
+    triggerCall(callback);
+    if(o.autoClose){
+     autoCloseTO = setTimeout(close, o.autoClose);
+    }
+   } else {
+    $popup.hide();
+    triggerCall(o.onClose);
+    if (o.loadUrl) {
+     o.contentContainer.empty();
+     $popup.css({height: 'auto', width: 'auto'});
+    }
+   }
+  };
+
+  function getLeftPos(includeScroll){
+   return includeScroll ? hPos + d.scrollLeft() : hPos;
+  };
+
+  function getTopPos(includeScroll){
+   return includeScroll ? vPos + d.scrollTop() : vPos;
+  };
+
+  function triggerCall(func, arg) {
+   $.isFunction(func) && func.call($popup, arg);
+  };
+
+  function calcPosition(){
+   vPos 		= fixedVPos ? o.position[1] : Math.max(0, ((wH- $popup.outerHeight(true)) / 2) - o.amsl)
+       , hPos 		= fixedHPos ? o.position[0] : (wW - $popup.outerWidth(true)) / 2
+       , inside 	= insideWindow();
+  };
+
+  function insideWindow(){
+   return {
+    x: wW > $popup.outerWidth(true),
+    y: wH > $popup.outerHeight(true)
+   }
+  };
+
+  function windowHeight(){
+   return $w.height();
+  };
+
+  function windowWidth(){
+   return $w.width();
+  };
+ };
+
+ ////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // DEFAULT VALUES
+ ////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ $.fn.bPopup.defaults = {
+  amsl: 			50
+  , appending: 		true
+  , appendTo: 		'body'
+  , autoClose:		false
+  , closeClass: 		'b-close'
+  , content: 			'ajax' // ajax, iframe or image
+  , contentContainer: false
+  , easing: 			'swing'
+  , escClose: 		true
+  , follow: 			[true, true] // x, y
+  , followEasing: 	'swing'
+  , followSpeed: 		500
+  , iframeAttr: 		'scrolling="no" frameborder="0"'
+  , loadCallback: 	false
+  , loadData: 		false
+  , loadUrl: 			false
+  , modal: 			true
+  , modalClose: 		true
+  , modalColor: 		'#000'
+  , onClose: 			false
+  , onOpen: 			false
+  , opacity: 			0.7
+  , position: 		['auto', 'auto'] // x, y,
+  , positionStyle: 	'absolute'// absolute or fixed
+  , scrollBar: 		true
+  , speed: 			250 // open & close speed
+  , transition:		'fadeIn' //transitions: fadeIn, slideDown, slideIn, slideBack
+  , transitionClose:	false
+  , zIndex: 			9997 // popup gets z-index 9999, modal overlay 9998
+ };
+})(jQuery);

data/app/assets/javascripts/drg_cms_application.js

@@ -5,8 +5,6 @@
 // the compiled file.
 //
 //= require jquery3
-//= require drg_cms/jquery-migrate
 //= require jquery_ujs
 //= require drg_cms/drg_cms
-//= require drg_cms/jquery.bpopup.min
-//= #require_tree .
+//= require drg_cms/jquery.bpopup

data/app/assets/javascripts/drg_cms_cms.js

@@ -4,9 +4,8 @@
 // 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_self
-//= require jquery2
-//= require drg_cms/jquery-migrate.js
+//= require_self
+//= require jquery3
 //= require jquery_ujs
 
 //= require jquery-ui/widgets/tooltip
@@ -18,7 +17,7 @@
 //= require drg_cms/drg_cms
 //= require drg_cms/jquery.datetimepicker
 
-//= require drg_cms/jquery.bpopup.min
+//= require drg_cms/jquery.bpopup
 //= require drg_cms/select-multiple
 //= require drg_cms/jstree.min
 

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

@@ -212,6 +212,13 @@ img { vertical-align:bottom; }
 .dc-image-preview img { max-height: 2rem; padding-left: 0.5rem;}
 .dc-image-preview img:hover { cursor: zoom-in;}
 
+#dc-image-preview {
+  padding: 2px;
+  background-color: #fff;
+  filter: drop-shadow(0 0 1rem #000);
+  display: none;
+}
+
 .text-with-select { width: 20px; }
 
 .no-borders {
@@ -396,7 +403,7 @@ border-radius: 1px;
 .dc-result-data.footer {
   border-top: 2px solid #222;
   color: #000;
-  font-weight: bold;
+  font-weight: 600;
   background-color: #eee;
 }
 
@@ -548,6 +555,12 @@ display: inline-table;
   background-color: #444;
 }
 
+.dc-inline-link.dc-link-ajax {
+  padding: initial;
+  border: none;
+  background: initial;
+}
+
 .skip-next {
   text-align: center;
   border:1px solid #888;
@@ -721,7 +734,6 @@ display: inline-table;
 }
 
 .dc-form-label.dc-color-odd, .dc-form-label.dc-color-even {background-color: transparent;}
-.dc-form-field.dc-color-odd, .dc-form-field.dc-color-even {background-color: transparent;}
 
 .dc-align-left {
   text-align: left;
@@ -734,6 +746,8 @@ display: inline-table;
   text-align: left;
   padding: 4px 2px;
   z-index: 10;
+  white-space: nowrap;
+  text-overflow: fade;
 }
 
 .dc-form-field .action li {
@@ -878,6 +892,10 @@ display: flex;
   color: rgba(44, 142, 255, 1);
 }
 
+.dc-popup-open:hover {
+  color: rgba(44, 142, 255, 1);
+}
+
 /*** CMS toggle button */
 .cms-toggle {
   z-index: 1000000;
@@ -1166,16 +1184,18 @@ color: #000;
   border-radius: 2px;
   z-index: 100;
   list-style-type: none;
-  filter: drop-shadow(1px 1px 4px #eee);
+  filter: drop-shadow(1px 1px 6px #ccc);
 }
 
 .drgcms_popmenu_class i {
   vertical-align: sub;
   color: rgba(44, 142, 255, 1);
+  font-size: 22px;
 }
 
 .drgcms_popmenu_item {
   padding: 4px;
+  font-size: 1.1em;
 }
 
 .drgcms_popmenu_item:hover {
@@ -1193,7 +1213,7 @@ color: #000;
 }
 
 #iframe_edit, #iframe_cms {
-  height: 1px;
+/*  height: 1px;*/
   width: 100%;
   border:  0;
   margin-bottom:  0;
@@ -1576,13 +1596,25 @@ cursor: pointer;
   margin: 6px 4px 0 0;
 }
 
+.dc-image-preview-1 {
+  right: 1rem;
+  position: absolute;
+  top: 5rem;
+  max-height: 150px;
+  max-width: 200px;
+}
+
+#dc_image .dc-image-preview img {
+  max-height: 150px;
+  max-width: 200px;
+}
+
 /****** MOBILE DEVICE *****/
 @media only screen and (max-device-width: 600px) {
   #body-cms {font-size: 11px;}
   #site-top div:nth-of-type(2) {padding-top: 0 !important;}
   .dc-title { font-size: 1.5em;}
 
-
   .dc-form {
     border: none;
     border-top: 2px solid #888;

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

@@ -117,11 +117,9 @@
 .vakata-context,
 .vakata-context ul {
   margin: 0;
-  padding: 2px;
   position: absolute;
-  background: #f5f5f5;
-  border: 1px solid #979797;
-  box-shadow: 2px 2px 2px #999999;
+  background: #fff;
+  filter: drop-shadow(1px 1px 6px #ddd);
 }
 .vakata-context ul {
   list-style: none;
@@ -140,19 +138,20 @@
 }
 .vakata-context li > a {
   display: block;
-  padding: 0 2em 0 2em;
+  padding: 4px;
   text-decoration: none;
   width: auto;
   color: black;
   white-space: nowrap;
-  line-height: 2.4em;
-  text-shadow: 1px 1px 0 white;
   border-radius: 1px;
 }
 .vakata-context li > a:hover {
   position: relative;
-  background-color: #e8eff7;
-  box-shadow: 0 0 2px #0a6aa1;
+  background-color: rgba(44, 142, 255, 1);
+  color: #fff;
+}
+.vakata-context li > a:hover > i {
+  color: #fff;
 }
 .vakata-context li > a.vakata-context-parent {
   background-image: url("data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==");
@@ -164,8 +163,6 @@
 }
 .vakata-context .vakata-context-hover > a {
   position: relative;
-  background-color: #e8eff7;
-  box-shadow: 0 0 2px #0a6aa1;
 }
 .vakata-context .vakata-context-separator > a,
 .vakata-context .vakata-context-separator > a:hover {
@@ -177,7 +174,6 @@
   max-height: 1px;
   padding: 0;
   margin: 0 0 0 2.4em;
-  border-left: 1px solid #e0e0e0;
   text-shadow: 0 0 0 transparent;
   box-shadow: 0 0 0 transparent;
   border-radius: 0;
@@ -195,25 +191,15 @@
 .vakata-context li > a > i {
   text-decoration: none;
   display: inline-block;
-  width: 2.4em;
-  height: 2.4em;
   background: transparent;
-  margin: 0 0 0 -2em;
-  vertical-align: top;
+  vertical-align: bottom;
   text-align: center;
-  line-height: 2.4em;
+  color: rgba(44, 142, 255, 1);
 }
 .vakata-context li > a > i:empty {
-  width: 2.4em;
-  line-height: 2.4em;
 }
 .vakata-context li > a .vakata-contextmenu-sep {
   display: inline-block;
-  width: 1px;
-  height: 2.4em;
-  background: white;
-  margin: 0 0.5em 0 0;
-  border-left: 1px solid #e2e3e3;
 }
 .vakata-context .vakata-contextmenu-shortcut {
   font-size: 0.8em;
@@ -233,9 +219,7 @@
   background-repeat: no-repeat;
 }
 .vakata-context-rtl .vakata-context-separator > a {
-  margin: 0 2.4em 0 0;
   border-left: 0;
-  border-right: 1px solid #e2e3e3;
 }
 .vakata-context-rtl .vakata-context-left ul {
   right: auto;
@@ -954,7 +938,8 @@
     margin-top: -10px;
   }
 }
-@media (max-width: 768px) {
+
+@media (max-width: 600px) {
   .jstree-default-responsive {
     /*
 	.jstree-open > .jstree-ocl,
@@ -1099,4 +1084,24 @@
     margin-left: 0;
     margin-right: 0;
   }
+}
+
+/* edit categorise as tree */
+#catagories-as-tree {
+  margin: 8px 4px;
+  border-top: 2px solid #bbb;
+  padding: 8px;
+  background-color: #f8f8f8;
+}
+
+#catagories-as-tree .jstree-anchor {
+  padding: 2px 4px;
+  font-weight: 400;
+}
+
+#catagories-as-tree .mi-o {
+  font-size: 22px;
+  color: #666;
+  padding-right: 4px;
+  vertical-align: top;
 }

data/app/assets/stylesheets/drg_cms/select-multiple.css

@@ -1,5 +1,6 @@
 .ms-container{
-  max-width: 200px;
+  width: fit-content;
+  max-width: 600px;
 }
 
 .ms-container:after{
@@ -33,7 +34,7 @@
   -moz-border-radius: 1px;
   border-radius: 1px;
   position: relative;
-  height: 200px;
+  max-height: 200px;
   padding: 0;
   overflow-y: auto;
 }
@@ -62,9 +63,9 @@
 }
 
 .ms-container .ms-selectable li.ms-elem-selectable{
-  padding: 2px 10px;
+  padding: 3px 10px;
   color: #444;
-  font-size: 14px;
+/*  font-size: 14px;*/
 }
 
 .ms-container .ms-selectable li:nth-child(odd) {
@@ -96,4 +97,5 @@
 .pull-right.ms-elem-selected{
   float: right;
   font-size: smaller;
+  padding-left: 4px;
 }