Skip to content
Snippets Groups Projects
Commit 668ee735 authored by Alex Arnaud's avatar Alex Arnaud
Browse files

Merge branch 'hotline_#16956_fix_popup_position' into 'hotline_6.58'

Hotline #16956 fix popup position

See merge request !584
parents 1c086482 7473ee8a
Branches
Tags
4 merge requests!628Master,!600Master,!593Master,!592Hotline 6.58
- ticket: hotline #16956
- popups
- le html dans le titre des popups est pris en compte ( mon <br> titre va s'afficher avec un retour à la ligne)
- les popups s'affichent centrées dans la fenêtre
- Lien reserver:
- la popup de réservation est maintenant modal
......@@ -13,12 +13,14 @@
$.ajax({url:noticeAjax})
.done(function(data) {
var dialog_reserver = $('<div id="dialog_reserver"></div>');
var dataTable={title: titre, content: data};
var dataTable={title: titre,
content: data,
show_modal : 'true'};
var modal = opacDialog(dialog_reserver,
dataTable,
'reservation-exemplaires',
function() { $('div.ui-widget-overlay').click(closeDialogExemplaires); }
,710,300);
,'auto','auto');
$reserver_links = dialog_reserver.find('td.exemplaires:last-child img');
$.each($reserver_links, function(index, link) {
link = $(link);
......
......@@ -148,25 +148,26 @@
var position = (data['position'] != undefined) ?
data['position'] :
{ my: "center top", at: "center top", of: window };
{ my: "center bottom",
at: "center center",
of: window };
//pour que le dialogue soit en dessous de la notification
if ($("#info_message").size())
position = {my: "center top",
at: "center bottom",
position = {my: "center bottom",
at: "center center",
of: "#info_message",
collision: "flip"};
var titre = titre;
var modal = container.dialog({
width:modal_size['width'],
height:modal_size['height'],
modal:show_modal,
title: titre,
dialogClass: dialogClass,
dialogClass: dialogClass,
close:onClose,
open:onOpen,
position: position
});
}).closest('.ui-dialog').find('.ui-dialog-title').html(titre);
return modal;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment