Skip to content

Commit

Permalink
Enhancements
Browse files Browse the repository at this point in the history
  • Loading branch information
remdex committed Mar 13, 2015
1 parent 3404e9d commit 8397c6a
Show file tree
Hide file tree
Showing 25 changed files with 207 additions and 12 deletions.
8 changes: 8 additions & 0 deletions lhc_web/cron.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ function __autoload( $className )
)
);

$cronjobPathOption = $input->registerOption(
new ezcConsoleOption(
'p',
'path',
ezcConsoleInput::TYPE_STRING
)
);

$extensionPartOption = $input->registerOption(
new ezcConsoleOption(
'e',
Expand Down
6 changes: 6 additions & 0 deletions lhc_web/design/defaulttheme/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -55,6 +60,7 @@ img{max-height:100%}

#widget-layout .alert{
margin-bottom:10px;
font-size:12px;
}

#widget-layout textarea,
Expand Down

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lhc_web/design/defaulttheme/js/lh/dist/bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 28 additions & 3 deletions lhc_web/design/defaulttheme/js/lh/lh-modules/reveal-modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -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>');
};
},

Expand All @@ -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') ;
}
}
};
Expand Down
Loading

0 comments on commit 8397c6a

Please sign in to comment.