Skip to content
Snippets Groups Projects
Commit 3f2b31af authored by srosse's avatar srosse
Browse files

OO-1357: use the modal backdrop the same way as bootstrap for modal dialog and wizard

parent 1f30c108
No related branches found
No related tags found
No related merge requests found
<div class="modal show in $!windowCssClass" id='$r.getId("o_closablewapper_")'><div class="modal-dialog modal-lg"><div class="modal-content">
<div class="modal show in $!windowCssClass" id='$r.getId("o_closablewapper_")' role="dialog">
<div class="modal-backdrop in"></div><div class="modal-dialog modal-lg"><div class="modal-content">
<div class="modal-header">
#if ($r.available("closeIcon"))
$r.render("closeIcon")
......@@ -11,13 +12,14 @@
#if ($off_chelp_package) $r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") #end
$r.render("guimessage")
$r.render("modalContent")
</div>
</div>
</div></div></div>
<div class="modal-backdrop in"></div>
## always show top of modal dialog when on long pages
<script type="text/javascript">
/* <![CDATA[ */
jQuery(function() {
jQuery('#$r.getId("o_closablewapper_") > .modal-backdrop')
.css('height', 0).css('height', jQuery('#$r.getId("o_closablewapper_")')[0].scrollHeight);
o_scrollToElement('#$r.getId("o_closablewapper_")');
});
/* ]]> */
......
<div class="o_wizard modal show in"><div class="modal-dialog modal-lg o_modal_fullwidth #if($elementCssClass) $elementCssClass #end"><div class="modal-content">
<div class="o_wizard modal show in"><div class="modal-backdrop in"></div><div class="modal-dialog modal-lg o_modal_fullwidth #if($elementCssClass) $elementCssClass #end"><div class="modal-content">
<div class="modal-header">
<div class="pull-right">$r.render("closeIcon")</div>
<h4>$wizardTitle</h4>
......@@ -33,11 +33,13 @@
$r.render("finish")
$r.render("cancel")
</div>
</div></div></div><div class="modal-backdrop in"></div>
</div></div></div>
## always show top of modal dialog when on long pages
<script type="text/javascript">
/* <![CDATA[ */
jQuery(function() {
jQuery('.o_wizard.modal.show.in > .modal-backdrop')
.css('height', 0).css('height', jQuery('.o_wizard.modal.show.in')[0].scrollHeight);
o_scrollToElement('.o_wizard.modal.show.in');
});
/* ]]> */
......
......@@ -50,7 +50,7 @@ doCompile () {
UPDATE=$UPDATECMD
if [ $1 = "." ];
then
TARGET="light"
TARGET="openolat"
if [[ "--watch" == $UPDATECMD && ! -z $THEMES ]]; then UPDATE="--update"; fi
fi
echo "Compiling SASS: $TARGET $STYLE"
......
......@@ -80,7 +80,7 @@ body .progress {
}
/* make our statically created popup and our spinner works with Bootstrap 3.3.1 */
.o_layered_panel .modal-backdrop, #o_ajax_busy_backdrop {
#o_ajax_busy_backdrop {
bottom: 0;
z-index:1020;
}
......
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment