FSN#35094 Opfrissen icon-set enzo: mobile menu ook met fa- icons mogelijk

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

APPL/FAC/fac_menu.inc

@@ -27,11 +27,13 @@ function findImage(filename)
 {
     if (!filename)
         return null;
+    if (filename.match(/^fa-/))
+        return filename; /* it's an icon*/
     if (fso.FileExists(Server.MapPath(S("menu_image_path") + filename)))
         return S("menu_image_path") + filename;
     if (fso.FileExists(Server.MapPath("../Pictures/" + filename)))
         return "../Pictures/" + filename;
-    return "../pictures/portalnoimage.png";
+    return "fa-question fa-spin";
 }
 
 function showImage (img, cls)
@@ -220,11 +222,15 @@ function generatePortalmenu(koppen)
     // Voor de functies MET disciplines-autorisaties kunnen we beter direct bijjoinen, vond ik.
     // TODO: (in menufunctions.inc): de diepere levels beter/anders supporten (openklapbaar)
 
-    var selectImage = (mobileOnly
+/*    var selectImage = (mobileOnly
                       ? ", fac_menuitems_image"    // evt image
                        +", fac_menu_image"         // evt overrule
                       : ", COALESCE (fac_menu_image, fac_menuitems_image) image"
                       );
+*/
+    // waarom bovenstaand verschil? Dit moet toch gewoon kunnen?
+    var selectImage = ", COALESCE (fac_menu_image, fac_menuitems_image) image";
+
 
     var lsql = "SELECT * FROM ("
              + " SELECT fac_menu_key"
@@ -638,7 +644,9 @@ function generatePortalmenu(koppen)
         {
           var mlabel = fac.localstring(loRs("label").value);
           var murl = loRs("url").value;
-          var mimg = findImage(loRs("fac_menu_image").value || loRs("fac_menuitems_image").value || 'portalnoimagemob.png');
+          //var mimg = findImage(loRs("fac_menu_image").value || loRs("fac_menuitems_image").value || 'portalnoimagemob.png');
+          var mimg = findImage(loRs("image").value);
+
           // Alleen de eerste keer een groep aanmaken voor mobile menu.
           if (!Groepen[groepnr])
             Groepen[groepnr] = {Koppen: []};
@@ -839,7 +847,9 @@ function generateMenu (pmode, groep) //groep alleen voor mode 3
         }
 
         actions += "\n<div class='ui-block-" + colnr + " micon'>"
-                 + "<a href='" + safe.htmlattr(itm.href) + "' data-ajax='false'><img class='miconimg' src='"+ safe.htmlattr(itm.img) +"'></a>"
+                 + "<a href='" + safe.htmlattr(itm.href) + "' data-ajax='false'>"
+                 + showImage(itm.img, "miconimg")
+                 +"</a>"
                  + "<div class='imgCaption'>" + safe.html(itm.name) + "</div>"
                  + "</div>";
       }