Merge branch 'remdex_dev'

lhc_web/cron.php

@@ -48,6 +48,14 @@ function __autoload( $className )
 )
 );
 
+$cronjobPathOption = $input->registerOption(
+    new ezcConsoleOption(
+        'p',
+        'path',
+        ezcConsoleInput::TYPE_STRING
+    )
+);
+
 $extensionPartOption = $input->registerOption(
 new ezcConsoleOption(
     'e',

lhc_web/design/defaulttheme/css/app.css

@@ -18,6 +18,11 @@ body {
     outline: 0;
 }
 
+#myModal,
+.modal-open{
+	padding-right:0px !important;
+}
+
 .btrad-reset{
 	border-top-right-radius: 0px;
 	border-top-left-radius: 0px;
@@ -55,6 +60,7 @@ img{max-height:100%}
 
 #widget-layout .alert{
 	margin-bottom:10px;
+	font-size:12px;
 }
 
 #widget-layout textarea,

lhc_web/design/defaulttheme/js/lh/lh-modules/reveal-modal.js

@@ -6,7 +6,14 @@ var revealM = {
 		initializeModal : function(selector) {		
 			var modelSelector = selector != undefined ? selector : 'myModal';
 			if ($('#'+modelSelector).size() == 0) {
-				$('body').prepend('<div id="'+modelSelector+'" class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true"></div>');		
+
+				var prependTo = null;
+				if ($('#widget-layout').size() == 0) {
+					prependTo = $('body');
+				} else {
+					prependTo = $('#widget-layout');
+				};
+				prependTo.prepend('<div id="'+modelSelector+'" style="padding-right:0px !important;" class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true"></div>');		
 			};	
 		},
 
@@ -18,11 +25,29 @@ var revealM = {
 
 			revealM.initializeModal('myModal');
 			if (typeof params['iframe'] === 'undefined') {				
-				jQuery.get(params['url'], function(data){				
+				jQuery.get(params['url'], function(data){
+
+					if (typeof params['showcallback'] !== 'undefined') {
+						$('#myModal').on('shown.bs.modal',params['showcallback']);
+					}
+
+					if (typeof params['hidecallback'] !== 'undefined') {
+						$('#myModal').on('hide.bs.modal',params['hidecallback']);
+					}
+
 					$('#myModal').html(data).modal('show')	
 				});
 			} else {
-				$('#myModal').html('<div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button><h4 class="modal-title" id="myModalLabel"><span class="glyphicon glyphicon-info-sign"></span></h4></div><div class="modal-body"><iframe src="'+params['url']+'" frameborder="0" style="width:100%" height="'+params['height']+'" /></div></div></div>').modal('show')	;
+				var header = '';
+				var prependeBody = '';
+				if (typeof params['hideheader'] === 'undefined') {	
+					header = '<div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button><h4 class="modal-title" id="myModalLabel"><span class="glyphicon glyphicon-info-sign"></span>&nbsp;'+(typeof params['title'] === 'undefined' ? '' : params['title'])+'</h4></div>';
+				} else {
+					prependeBody = (typeof params['title'] === 'undefined' ? '' : '<b>'+params['title']+'</b>') + '<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>';
+				}
+				var additionalModalBody = typeof params['modalbodyclass'] === 'undefined' ? '' : ' '+params['modalbodyclass'];
+
+				$('#myModal').html('<div class="modal-dialog modal-lg"><div class="modal-content">'+header+'<div class="modal-body'+additionalModalBody+'">'+prependeBody+'<iframe src="'+params['url']+'" frameborder="0" style="width:100%" height="'+params['height']+'" /></div></div></div>').modal('show')	;
 			}
 		}		
 };