admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FCLT#57137 Kruisje bij modals nu ook Font Awesome

Browse Source 
svn path=/Website/branches/v2019.1/; revision=41838
This commit is contained in:
Koen Reefman
2019-03-28 10:52:30 +00:00
parent ccebd9ad05
commit 613e81ec27
2 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
APPL/Localscripts/FcltMgr.js
View File

@@ -708,14 +708,14 @@ var FcltMgr =
// titel parameter mag weggelaten. Voorkeur is params.title zetten!
openModalDetail: function(url, titel, params)
{
// Als titel een object is is het eigenlijk params
if ( typeof titel === "object" ) {
params = titel;
titel = params.titel;
}
var detailMgr = FcltMgr.detailManager();
if (!detailMgr.window.$.fn.dialog)
detailMgr = FcltMgr; // Hopen dat we hem zelf hebben
// Als titel een object is is het eigenlijk params
if ( typeof titel === "object" ) {
params = titel;
titel = params.titel;
}
var detailMgr = FcltMgr.detailManager();
if (!detailMgr.window.$.fn.dialog)
detailMgr = FcltMgr; // Hopen dat we hem zelf hebben
if (!detailMgr.window.$.fn.dialog)
FcltMgr.alert("Internal error: jQuery-ui mist mogelijk in " + window.location.href);
@@ -725,7 +725,7 @@ var FcltMgr =
_openModalDetail: function(url, titel, params)
{
// niet nog hoger zoeken
// Niet nog hoger zoeken
this._modalCount++;
params = params || {};
this._modalCallback[FcltMgr._modalCount] = params.callback;
@@ -744,6 +744,16 @@ var FcltMgr =
params.closeOnEscape = false;
params.open = function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
}
else
{
params.open = function(event, ui)
{
$(".ui-dialog-titlebar-close").hide();
$(".ui-dialog-titlebar").append("<div class=\"fclt-icon-close\"><i class=\"fa fa-lg fa-times\">&nbsp;</i></div>")
.addClass("has-fclt-icon-close");
$(".fclt-icon-close").on("click", function () { FcltMgr.closeDetail(window, { cancel: true }); });
}
}
params.close = this.dialogClose; // Omdat we het vanuit een Iframe willen doen.
if (!("width" in params))
@@ -759,22 +769,22 @@ var FcltMgr =
var css_scroll = "overflow: visible;";
params.position = { my: "center", at: "center", of: window };
}
var html = "<iframe class='fcltmodal'"
+ " frameborder='0' onload='FcltMgr._resizeModal(this)'"
+ " id='fcltmodal"+FcltMgr._modalCount+"' name='fcltmodal"+FcltMgr._modalCount+"' style='padding: 0px; "+ css_scroll +"'"
+ " src='" + url + "'>"
+ "</iframe>";
var html = '<iframe class="fcltmodal"'
+' frameborder="0" onload="FcltMgr._resizeModal(this)"'
+' id="fcltmodal'+FcltMgr._modalCount+'" name="fcltmodal'+FcltMgr._modalCount+'" style="padding: 0px; '+ css_scroll +'"'
+' src="' + url + '">'
+'</iframe>';
$(html).dialog(params).dialog('open');
// when a modal dialog starts from show mode, the tab is made hot.
// when the dialog initiated the tab to be hot and the dialog closes, the tab is made cool again (AlexT)
$(html).dialog(params).dialog("open");
// When a modal dialog starts from show mode, the tab is made hot.
// When the dialog initiated the tab to be hot and the dialog closes, the tab is made cool again.
if (!FcltMgr.detailManager()._editactive)
{
$('#fcltmodal'+FcltMgr._modalCount).on('dialogclose', function(event) {
$("#fcltmodal"+FcltMgr._modalCount).on("dialogclose", function(event) {
if (FcltMgr.detailManager()._editactive && FcltMgr._panelModalHot)
{
FcltMgr._panelModalHot = false;
FcltMgr.stopEdit(window);
FcltMgr._panelModalHot = false;
FcltMgr.stopEdit(window);
}
});
FcltMgr._panelModalHot = true;
@@ -802,7 +812,7 @@ var FcltMgr =
if (this._modalCount)
{
$('.ui-dialog-titlebar-close:last').trigger('click'); // doet indirect dialogClose
$(".ui-dialog-titlebar-close:last").trigger("click"); // doet indirect dialogClose
var orgParams = this._modalParams[FcltMgr._modalCount+1];
if (params.cancel && !orgParams.alwaysCallback)
return;

22
APPL/Shared/default.csx
View File

@@ -186,8 +186,17 @@ select {
background-position: right 6px center;
}
select[multiple] {
background-image: none;
select[multiple] { background-image: none; }
.fclt-icon-close
{
float: right;
color: ==frameheadercolor==;
}
.fclt-icon-close:hover
{
color: red;
-webkit-transition: color 0.2s;
}
select::-ms-expand { display: none;}
@@ -371,6 +380,7 @@ span.removetag:hover,
.tabclose:hover,
.tabcloseall:hover {
color: red;
-webkit-transition: color 0.2s;
}
.pincurrenttab:hover {
color: #555;
@@ -817,6 +827,9 @@ div.filtermenukop {
color: ==frameheadercolor==!important;
border: none;
}
.ui-widget-header.ui-dialog-titlebar.has-fclt-icon-close {
padding-right: 0.4em;
}
.ui-dialog .ui-dialog-buttonpane {
}
.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:2px; border-top-left-radius:2px;}
@@ -1360,7 +1373,8 @@ span.button:hover {
.blockbuttoncontainer #buttons ul li.hasIcon:hover,
.blockbuttoncontainer #buttons ul li.hasIcon:hover i,
.blockbuttoncontainer #buttons ul li.hasIcon:hover span,
#showbody #buttons ul li.hasIcon:hover {
#showbody #buttons ul li.hasIcon:hover,
#mldHistorie button:hover i.fa {
color: ==iconhovercolor==;
background-color: ==buttonhoverbackgroundcolor==;
}
@@ -1464,7 +1478,7 @@ div.buttoncontainer {
#buttons ul li.hasIcon.noHover:hover {
cursor: default;
color: ==buttoncolor==;
background-color:==iconbackgroundcolor==;
background-color: ==iconbackgroundcolor==;
}
.btn_disabled