FSN#35094 Opfrissen icon-set font-awesome

svn path=/Website/trunk/; revision=31324

APPL/Shared/iface.inc

@@ -5,6 +5,7 @@
      File:          iface.inc
      Description:   generic interface functions for buttons and maybe more
 */ %>
+<!-- #include file="../img/icons.inc" -->
 
 <%
 if (JSON_Result)
@@ -29,7 +30,8 @@ function CreateButton(tekst, onClick, btn, params) //akey, id, params)
   fcltClick="<%=onClick%>"
   <%= btn.id != null ?'id="' + btn.id + '"' : '' %>><%
   if (hasIcon) {
-      Response.Write(I(btn.icon));
+      Response.Write(I(btn.icon) + "&nbsp;");
+      Response.write("<span class='icontxt'>"+safe.html(tekst)+"</span>");
       if (params.isDialog && btn.tooltip)
       {
           %><div class="dialogtext"><%= btn.tooltip %></div><%
@@ -471,4 +473,14 @@ IFACE =
         protectRequest.inputToken();
     }
 }
+
+function I(icon)
+{
+    if (icon in ICONS)
+        icon = ICONS[icon];
+    if (icon.match(/^fa-/))
+        return "<i class='fa {0}'></i>".format(icon);
+    else
+        return "<img alt='' src='{0}/appl/pictures/{1}'>".format(rooturl, icon);
+}
 %>