FCLT#63749: Upgrade naar fontawesome 6

svn path=/Website/trunk/; revision=48939
This commit is contained in:
Gijs Wassink
2020-11-25 09:14:58 +00:00
parent 26de46339c
commit 412fab74d7
4 changed files with 10 additions and 4 deletions

View File

@@ -1011,7 +1011,7 @@ oRs.close();
// Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan
displ = "<div " + ((urole == "bo" || urole == "fo") ? "class='clickParent' onclick='toggleMldFlag(event, "+ mldkey +");'":"")
+ " title='"+safe.htmlattr(ttl)+"'>"
+ "<i id='mldflagimg"+mldkey+"' flagkey='"+flagkey+"' class='fa "+flagIcon+" mldflag"+flagkey+"'></i>"
+ "<i id='mldflagimg"+mldkey+"' flagkey='"+flagkey+"' class='fa mldflag"+flagkey+"'>"+flagIcon+"</i>"
+ "<span style='display:none'>"+(flagkey||999)+"</span></div>";
}
return displ;

View File

@@ -209,7 +209,7 @@ if (mld_key > 0)
if (hasTracking || hasNoteToggle || hasHiddenNotes) // Anders valt er niets te togglen
{
if (hasTracking)
$(".btn-group").append("<button id='0' class='selected' title='<%=L("fac_tracking")%>'><i class='<%=I("fa-history")%>'>&nbsp;</i></button>");
$(".btn-group").append("<button id='0' class='selected' title='<%=L("fac_tracking")%>'><%=I("fa-history")%></button>");
if (hasNoteToggle)
{

View File

@@ -9,7 +9,9 @@
Note:
data-theme configureerbaar maken
*/
*/ %>
<!-- #include file="../img/icons.inc" -->
<%
FCLTHeader.Requires({ plugins: ["jQuery"], js: ["iface.js"]})
jQDataTheme = "b";
@@ -492,6 +494,10 @@ function I(icon, params)
{
var params = params||{};
// For compatibility: convert old names to new names
if (icon in ICONS)
icon = ICONS[icon];
if (icon.match(/^fa-/))
{
// a fontawesome icon

View File

@@ -92,7 +92,7 @@ function AUDIT_HISTORY_BUTTON(pbuttons, params)
if (cnt > 0)
pbuttons.push({title: L("lcl_history") + " ({0})".format(cnt + (allshowed? "" : "+")), // Een "+" geeft aan dat er meer audit tracking regels zijn dan is weergegeven.
action:"audit_history()",
icon: I("fa-history"),
icon: "fa-history",
id: "btn_audit_history",
importance: 3 });
}