FSN#35094 Opfrissen icon-set font-awesome IE8. email.png niet naar hamburger in modal popupjes

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

APPL/Localscripts/FcltMgr.js

@@ -1174,7 +1174,7 @@ var FcltMgr =
                 fncallback();
                 return;
             }
-            if (!$.fn.dialog) // fallback als jQuery-ui niet is geladen
+            if (window.fcltmobile || !$.fn.dialog) // fallback als jQuery-ui niet is geladen
             {
                 if (confirm(tekst))
                 {
@@ -1203,7 +1203,7 @@ var FcltMgr =
         alert: function (tekst, params)
         {
             params = params || {};
-            if (!$.fn.dialog) // fallback als jQuery-ui niet is geladen
+            if (window.fcltmobile || !$.fn.dialog) // fallback als jQuery-ui niet is geladen
             {
                 alert(tekst);
                 return;

APPL/PDA/mobile.js

@@ -6,6 +6,8 @@
      Description:   clientside functions for pda/*
 */
 
+window.fcltmobile = 1;
+
 $(document).bind("mobileinit", function(){
  // Enhancement to use history.replaceState in supported browsers,
  // to convert the hash-based Ajax URL into the full document path.

APPL/PDA/token2mail.asp

@@ -54,7 +54,7 @@ if (S("fac_emailtoken_auth_expire") == 0)
         BLOCK_END();
         var buttons =  [ {title: L("lcl_noti_send"), icon: "email.png", action: "pass_submit()" },
                          {title: L("lcl_cancel"), icon: "undo.png", action: "FcltMgr.closeDetail( window )" }];
-        CreateButtons(buttons);
+        CreateButtons(buttons, { isModal: true });
 IFACE.FORM_END();
 %>
       </form>

APPL/PRS/self_register.asp

@@ -45,7 +45,7 @@ if (S("self_register") != 1)
         BLOCK_END();
         var buttons =  [ {title: L("lcl_submit"), icon: "email.png", action: "self_submit()" },
                          {title: L("lcl_cancel"), icon: "undo.png", action: "FcltMgr.closeDetail( window )" }];
-        CreateButtons(buttons);
+        CreateButtons(buttons, { isModal: true });
 IFACE.FORM_END();
 %>
       </form>

APPL/Shared/calendar.inc

@@ -163,7 +163,7 @@ function _FCLTcalendar (fieldID, params)
 
   %>
   <input class="flddate<%=!params.readonly&&params.required?" required":""%><%=params.addClass? " " + params.addClass : ""%>" type="<%=params.hidden?"hidden":"text"%>" <%=readotag%> <%=hiddentag%> id="show_<%=fieldID%>" value="<%=iniDate%>" nofollow="<%=params.nofollow? 1 : 0%>">
-<% if (!params.hidden) { %>
+<% if (!params.hidden && !params.readonly) { %>
   <i class='fa fa-calendar fa-fw dateklikker' onclick='$("#show_<%=fieldID%>").datepicker("show")'></i>
 <% } %>
 <%
@@ -172,7 +172,10 @@ function _FCLTcalendar (fieldID, params)
     <input type="text" step='<%=60*(params.timeStep||15)%>'
            class="fldtime<%=!params.readonly&&params.required?" required":"" + " " + (params.timeClass||"")%><%=params.addClass? " " + params.addClass : ""%>"
            id="time_from_<%=fieldID%>" <%=readotag%> size="5" value="<%=iniTime%>">
-<% }
+<%   if (!params.hidden && !params.readonly) { %>
+             <i class='fa fa-clock-o fa-fw timeklikker' onclick='$("#time_from_<%=fieldID%>").timepicker("show")'></i>
+<%   }
+   }
 
 
   if (!params.readonly || (params.readonly && params.saveValue))

APPL/Shared/iface.inc

@@ -85,12 +85,12 @@ function CreateButtons(buttons, params)
       {
           var btn = buttons[i];
           if (!params.autoshowOnly || btn.autoshow)
-          if (inArray(btn.icon, HAMBUTTONS))
+          if (!params.isModal && inArray(btn.icon, HAMBUTTONS))
             hambuttons.push(i)
           else
             CreateButton(btn.title, btn.action, btn, params);
       }
-      if (hambuttons.length && !params.isDialog)
+      if (hambuttons.length)
       {
         var btn = { icon: "fa-bars", tooltip: L("lcl_more"), id: "printhamburger",
                     action: "$('li.byHamburger').toggleClass('hidden');FcltMgr.resized();" }

APPL/Shared/pass2mail.asp

@@ -69,7 +69,7 @@ if (device.test(device.isMobile))
         BLOCK_END();
         var buttons =  [ {title: L("lcl_noti_send"), icon: "email.png", action: "pass_submit()" },
                          {title: L("lcl_cancel"), icon: "undo.png", action: "FcltMgr.closeDetail( window )" }];
-        CreateButtons(buttons);
+        CreateButtons(buttons, { isModal: true });
 IFACE.FORM_END();
 %>
       </form>

APPL/Shared/queuemail.asp

@@ -409,9 +409,7 @@ function bestandenlijstALL(pmodule, pniveau, pkey)
           BLOCK_END();
           var buttons =  [ {title: L("lcl_noti_send"), id: "btn_send", icon: "email.png", action: "queueSubmit()", singlepress: true },
                            {title: L("lcl_cancel"), id: "btn_cancel", icon: "undo.png", action: "queueCancel()" }];
-          CreateButtons(buttons);
-          var buttons =  [ {title: L("lcl_accept"), icon: "accept.png", action: "mld_accept()", singlepress: true, id: "btn_accept_submit"  },
-                       {title: L("lcl_cancel"), icon: "cancel.png", action: "mld_cancel()" } ];
+          CreateButtons(buttons, { isModal: true });
 
 IFACE.FORM_END();
 %>