diff --git a/APPL/FAC/fac_edit_template_save.asp b/APPL/FAC/fac_edit_template_save.asp
index 7ed7abc499..6343f2908b 100644
--- a/APPL/FAC/fac_edit_template_save.asp
+++ b/APPL/FAC/fac_edit_template_save.asp
@@ -84,8 +84,8 @@ if (previewmode == 2)
<%
buttons = [];
- buttons.push ({title: L("lcl_submit"), icon: "opslaan.png", action: "sample()" });
- buttons.push( {title: L("lcl_cancel"), icon: "undo.png", action: "sample()" } );
+ buttons.push ({title: L("lcl_submit"), icon: "fa-save", action: "sample()" });
+ buttons.push( {title: L("lcl_cancel"), icon: "fa-undo", action: "sample()" } );
IFRAMER_HEADER("Voorbeeld header", buttons);
%>
diff --git a/APPL/SCF/scaffolding_edit.inc b/APPL/SCF/scaffolding_edit.inc
index 55ae009789..423552c5ca 100644
--- a/APPL/SCF/scaffolding_edit.inc
+++ b/APPL/SCF/scaffolding_edit.inc
@@ -245,10 +245,10 @@ function scaffolding_edit(model, scf_params)
}
}
if (model.REST_PUT || key < 0)
- buttons.push({title: L("lcl_submit"), action:"scf_submit()", icon: "opslaan.png", singlepress: true, id: "btn_scf_submit" });
+ buttons.push({title: L("lcl_submit"), action:"scf_submit()", icon: "fa-save", singlepress: true, id: "btn_scf_submit" });
if (modal && model.REST_DELETE && key > 0)
- buttons.push({title: L("lcl_delete"), action:"scf_delete()", icon: "delete.png", singlepress: true, id: "btn_scf_delete" });
- buttons.push({title: L("lcl_cancel"), action:"scf_cancel()", icon: "undo.png", id: "btn_scf_cancel" });
+ buttons.push({title: L("lcl_delete"), action:"scf_delete()", icon: "fa-trash", singlepress: true, id: "btn_scf_delete" });
+ buttons.push({title: L("lcl_cancel"), action:"scf_cancel()", icon: "fa-undo", id: "btn_scf_cancel" });
if (model.hashints)
buttons.splice(0, 0, {title: L("lcl_hint"), action:"scf_enablehint()", icon: "lightbulb.png", id: "btn_scf_enablehint" });
if (!modal)
diff --git a/APPL/SCF/scaffolding_list.inc b/APPL/SCF/scaffolding_list.inc
index 868f51bfaa..392a693510 100644
--- a/APPL/SCF/scaffolding_list.inc
+++ b/APPL/SCF/scaffolding_list.inc
@@ -136,11 +136,11 @@ function scaffolding_list(model, scf_params)
// en we kunnen geen 500-status meer doen? busyLoading(); // via ResultsetTable is te laat (na REST_GET) dus maar zelf
buttons = [];
if (!nobuttons)
- buttons.push({ icon: "page_refresh.png", title: L("lcl_refresh"), action: "FcltMgr.reload()", id: "btn_scf_refresh" });
+ buttons.push({ icon: "fa-refresh", title: L("lcl_refresh"), action: "FcltMgr.reload()", id: "btn_scf_refresh" });
if (model["REST_POST"] && authparams.PRSwritelevel < 9 && authparams.ALGwritelevel < 9)
{
var addurl = scf_params.this_path + "?mode=wrap" + transit;
- buttons.push({ icon: "plus.png", title: L("lcl_add"), action: "scf_add()", id: "btn_scf_add" });
+ buttons.push({ icon: "fa-plus", title: L("lcl_add"), action: "scf_add()", id: "btn_scf_add" });
}
var xxx_params = { filter : scf_params.filter || shared.qs2json(model),
diff --git a/APPL/SCF/scaffolding_show.inc b/APPL/SCF/scaffolding_show.inc
index 88df138c9a..0fb08280c0 100644
--- a/APPL/SCF/scaffolding_show.inc
+++ b/APPL/SCF/scaffolding_show.inc
@@ -81,9 +81,9 @@ function scaffolding_show(model, scf_params)
if (model["REST_PUT"]) // TODO: Eventueel autfunction testen?
{
- buttons.push({title: L("lcl_change"), action: "xxx_change()", icon: "wijzigen.png" });
+ buttons.push({title: L("lcl_change"), action: "xxx_change()", icon: "fa-edit" });
if (model["REST_DELETE"])
- buttons.push({title: L("lcl_delete"), action: "xxx_delete()", icon: "delete.png" });
+ buttons.push({title: L("lcl_delete"), action: "xxx_delete()", icon: "fa-trash" });
}
// if stylesheet gevonden
var fso = Server.CreateObject("Scripting.FileSystemObject");
diff --git a/APPL/Shared/Shared.inc b/APPL/Shared/Shared.inc
index 1898f24dfa..b425c81a45 100644
--- a/APPL/Shared/Shared.inc
+++ b/APPL/Shared/Shared.inc
@@ -1628,4 +1628,12 @@ IP =
}
}
+
+function I(icon)
+{
+ if (icon.match(/^fa-/))
+ return "
".format(icon);
+ else
+ return "

".format(rooturl, icon);
+}
%>
diff --git a/APPL/Shared/default.csx b/APPL/Shared/default.csx
index 7ca2150a85..f74d50226f 100644
--- a/APPL/Shared/default.csx
+++ b/APPL/Shared/default.csx
@@ -1081,7 +1081,11 @@ span.button:hover {
/* Met icons een lichtere achtergrond */
#buttons ul li.hasIcon,
#buttons ul li.hasIcon a {
- background-color: rgba(255,255,255,0.5);
+ background-color: ==iconbackgroundcolor==;
+}
+
+#buttons ul li.hasIcon a:hoover {
+ background-color: ==iconhoverbackgroundcolor==;
padding: 7px 10px 0px 11px;
}
@@ -3937,10 +3941,23 @@ body.floorscreen3d {
#buttons ul li.hasIcon,
#buttons ul li.hasIcon a {
- padding: 9px 10px 5px 12px; /* is vierkant weer bon-ton? */
+ padding: ==iconpadding==; /* is vierkant weer bon-ton? */
border-radius: 2px!important;
}
+li.hasIcon i.fa {
+ color:==iconcolor==;
+ font-size: ==iconsize==;
+}
+
+li.hasIcon i.fa:hover {
+ font-size: ==iconhoversize==;
+}
+#buttons ul li.hasIcon:hover,
+#buttons ul li.hasIcon a:hover {
+ padding: ==iconhoverpadding==;
+}
+
.ui-widget-content{
border:0px;
}
diff --git a/APPL/Shared/header.inc b/APPL/Shared/header.inc
index d77fd27b81..e262133cc9 100644
--- a/APPL/Shared/header.inc
+++ b/APPL/Shared/header.inc
@@ -179,7 +179,8 @@ FCLTHeader =
%>
<%=S("http_meta_head")%>
-<%
+
+ <%
// FSN#14103 Voorkom back-button problemen
// user_lang en rooturl resp. voor date.js en FcltMgr.js
%>