drg_cms 0.7.0.2 → 0.7.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02d39a65170a68812cc184efecaa6e53f0b0360c4133311e463a1e213005bda1
-  data.tar.gz: 334d0446b894f7063a503fbb1dcb8fb69b54c128ea7ac8f21da941205a808da4
+  metadata.gz: f2d3e3ad52492c5dccf2b91cd7c9c1ea203b7a60c21b0e3d4f7947a3b298bd8b
+  data.tar.gz: a9b23d36c053d8770a661827a211e88172ccadf10eb0c0f17419e0069799f402
 SHA512:
-  metadata.gz: 613591551d270da4a2ac32e6b9215d1985b50f209231a9c6d00ddedae95775a08386c7d89fffe5fd536d440b58e69d53659a653925c486e5e5c0c273902e3644
-  data.tar.gz: 979c3b634d3a1ed71e7e0dab7f1aff20bc4ccd34df5f2695f05855beb833c3f716b342893ac638096d2fb5419dc87649751ebb85b8ca1905fe53c053af104284
+  metadata.gz: f745ccb1e0902369746c51da513b1487eca95b1bc02f1bd427ccca2403fc2fd54341cccf8359ab301206fcc5ae4e61d13f03ee30d42b5d3ce0e14a3d357b7d54
+  data.tar.gz: e61ee50affe2a0aa4a2ea5fd5a386cad6b3a0f614c2fd3233cab5a5ae47e553eeab290ab527678265153d76352b37dac95867a1ff558b4a4c29dcafbb080fcaf

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

@@ -87,13 +87,33 @@ confirmation_is_cancled = function(object) {
  *******************************************************************/
 update_select_depend = function(select_name, depend_name, method) {
   let select_field = $('#' + select_name);
-  let depend_field = $('#' + depend_name);
-  
+  let depend_value= ''
+  let depend_field= null;
+  let field_value= null;
+
+  depend_name.split(",").forEach( function(depend) {
+    if ( $('#record_' + depend.trim()).length ) {
+      depend_field = $('#record_' + depend.trim());
+    } else {
+      depend_field = $('#_record_' + depend.trim()); // virtual field
+    }
+
+    // checkbox
+    if (depend_field.is(':checkbox'))  {
+      field_value = depend_field.is(":checked");
+    } else {
+      field_value = depend_field.val();
+    }
+
+    if (depend_value.length > 0) depend_value = depend_value + ',';
+    depend_value = depend_value + field_value;
+  });
+
   $.ajax({
     url: "/dc_common/autocomplete",
     type: "POST",
     dataType: "json",
-    data: { input: depend_field.val(), search: method},
+    data: { input: depend_value, search: method},
     success: function(data) {
 
       select_field.empty();
@@ -478,11 +498,38 @@ function dc_url_add_params(form, url) {
  *******************************************************************/
 function dc_copy_to_clipboard(div) {
   let copyText = document.getElementById(div).innerText;
-  console.log(copyText);
+  //console.log(copyText);
   /* Copy the text inside the text field */
   navigator.clipboard.writeText(copyText);
 }
 
+/*******************************************************************
+ * Image preview called in images manager. Preview image in bPopup window.
+ *******************************************************************/
+dc_image_preview = function(img) {
+  $('#dc-image-preview').bPopup({
+    content: 'image',
+    contentContainer: '#dc-image-preview',
+    loadUrl: img,
+    opacity: 0
+  });
+};
+
+/*******************************************************************
+ * Image selected in images manager. Return selected image file name to caller.
+ *******************************************************************/
+dc_image_select = function(img) {
+  let ck_func_name = $.getUrlParam('CKEditorFuncNum');
+  let field_name = $.getUrlParam('field_name');
+  if (ck_func_name !== '') {
+    window.opener.CKEDITOR.tools.callFunction(ck_func_name, img);
+  } else {
+    window.opener.document.getElementById(field_name).value = img;
+  }
+  window.close();
+};
+
+
 /*******************************************************************
  * Events start here
  *******************************************************************/
@@ -546,11 +593,12 @@ $(document).ready( function() {
   /*******************************************************************
   * Popup CMS edit menu option clicked
   *******************************************************************/
-  $('.drgcms_popmenu_item').on('click',function(e) {
+  $('.drgcms_popmenu_item').on('click', function(e) {
     let url = e.target.getAttribute("data-url");
+    if (url === null) { url = e.target.parentNode.getAttribute("data-url") };
+
     $('#iframe_cms').attr('src', url);
-//    $('#iframe_cms').width(1000).height(1000);
-// scroll to top of page and hide menu    
+    // scroll to top of page and hide menu
     window.scrollTo(0,0);
     $(e.target).parents('dl:first').find('ul').toggleClass('div-hidden');
   });
@@ -563,7 +611,6 @@ $(document).ready( function() {
     let form  = e.target.getAttribute("data-form");
     if (form === null) form = table;
     let sort = e.target.value;
-//    e.target.value = null;
     let url = "/cmsedit/run?control=cmsedit.sort&sort=" + sort + "&table=" + table +  "&form_name=" + form;
     simple_ajax_call(url);
   });
@@ -1019,9 +1066,7 @@ $(document).ready( function() {
   *******************************************************************/
   $('#_record__filter_field').keydown( function(e) {
     if (e.which == '13' || e.which == '9') {
-//      let url = $(this).parents('span').attr("data-url");
-//      url = url + "&filter_value=" + this.value;
-//      simple_ajax_call(url);
+      e.preventDefault();
       $('.record_filter_field_icon').trigger("click")
     };
   });
@@ -1045,7 +1090,7 @@ $(document).ready( function() {
   });
 
  /*******************************************************************
-  * Click on show filter form
+  * on click => show filter form
   *******************************************************************/
   $('#open_drgcms_filter').on('click', function(e) {
     $('#drgcms_filter').bPopup({
@@ -1056,9 +1101,9 @@ $(document).ready( function() {
       position: ['auto', 20],
       closeClass: 'dc-link' });
   });
-  
+
   /*******************************************************************
-  * Click on preview selected image
+  * on click => Preview image in popup window
   *******************************************************************/
   $('.dc-image-preview').on('click', function(e) {
     let img = $(this).children(":first").attr('src');
@@ -1069,9 +1114,9 @@ $(document).ready( function() {
           opacity: 0
     });
   });
-  
+
  /*******************************************************************
-  * Set new filter
+  * on click => set new filter
   *******************************************************************/
   $('.dc-filter-set').on('click', function(e) {
     let url = $(this).attr( 'data-url' );
@@ -1082,7 +1127,7 @@ $(document).ready( function() {
    });
 
   /*******************************************************************
-   * Toggle one cmsedit menu level
+   * on click => toggle one cmsedit menu level
    *******************************************************************/
   $('.cmsedit-top-level-menu div').on('click', function(e) {
     $(e.target).siblings('ul').toggle('fast');
@@ -1090,7 +1135,7 @@ $(document).ready( function() {
   });
 
   /*******************************************************************
-   * Toggle result set record menu
+   * on click => toggle result set record menu
    *
    * This and additional two event hadlers provide expected behavior of submenus popup and close.
    *******************************************************************/

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

@@ -7,4 +7,4 @@
 //= require jquery3
 //= require jquery_ujs
 //= require drg_cms/drg_cms
-//= require drg_cms/jquery.bpopup.min
+//= require drg_cms/jquery.bpopup

data/app/assets/javascripts/drg_cms_cms.js

@@ -17,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;