From d319122eda8bbe0d17072b797cda5b467eb98f91 Mon Sep 17 00:00:00 2001 From: Koen Reefman Date: Tue, 14 Feb 2017 12:52:26 +0000 Subject: [PATCH] AKZA#38532 nu iconen klikbaar met behouden opmaak svn path=/Website/trunk/; revision=32813 --- APPL/FAC/Facilitor.asp | 10 +++++----- APPL/FAC/fac_menu.inc | 28 ++++++++-------------------- APPL/FAC/fac_portal_menu.asp | 12 +++++++----- 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/APPL/FAC/Facilitor.asp b/APPL/FAC/Facilitor.asp index 4795df4b6a..42ce2f8d2d 100644 --- a/APPL/FAC/Facilitor.asp +++ b/APPL/FAC/Facilitor.asp @@ -323,12 +323,12 @@ if (device.test(device.isTouch)) { %> } ); // voegt onClick toe aan portaal iconen - $("span.menuimg").has("ul").each(function() { - if ($(this).find("li.mi").attr("onClick")) + $("div.portalmenukop").each(function() { + if ($(this).find("ul").children("li").length == 1) { - $(this).find("ul").siblings(".mklogo").on("click", function() { - $(this).siblings("ul").find("li").trigger("click"); - }); + $(this).siblings("span.menuimg").find(".mklogo").on("click", function() { + $(this).parent().siblings("div.portalmenukop").find("ul li").trigger("click"); + }).css("cursor", "pointer"); } }); diff --git a/APPL/FAC/fac_menu.inc b/APPL/FAC/fac_menu.inc index 260f005240..18f87d9ca2 100644 --- a/APPL/FAC/fac_menu.inc +++ b/APPL/FAC/fac_menu.inc @@ -201,27 +201,15 @@ function generatePortalmenu(koppen) var ttl = ""; if (menuKop.info) ttl=" title='"+safe.htmlattr(menuKop.info)+"'"; - - if (menuKop.Items.length == 1 && menuKop.image) - { %>> - <%=showImage(menuKop.image, 'mklogo fa-4x')%> - <% CreateItems(menuKop.Items, 3, false, S("portalmenulines")); - %><% - } - else - { - %>> - <%=showImage(menuKop.image, 'mklogo fa-4x')%> - -
- > - <%=safe.html(menuKop.label)%> - - <% CreateItems(menuKop.Items, 3, false, S("portalmenulines")); - %>
<% - } - + <%=showImage(menuKop.image, 'mklogo fa-4x')%> + +
+ > + <%=safe.html(menuKop.label)%> + + <% CreateItems(menuKop.Items, 3, false, S("portalmenulines")); + %>
<% Response.Write(""); col ++; diff --git a/APPL/FAC/fac_portal_menu.asp b/APPL/FAC/fac_portal_menu.asp index 437eb5a5f4..c15d88e0d4 100644 --- a/APPL/FAC/fac_portal_menu.asp +++ b/APPL/FAC/fac_portal_menu.asp @@ -38,15 +38,17 @@ var cls = getQParam("class", ""); // Voor als je hem in widget versie anders wil jQuery(document).ready(function() { - $("span.menuimg").has("ul").each(function() { - if ($(this).find("li.mi").attr("onClick")) + // voegt onClick toe aan portaal iconen + $("div.portalmenukop").each(function() { + if ($(this).find("ul").children("li").length == 1) { - $(this).find("ul").siblings(".mklogo").on("click", function() { - $(this).siblings("ul").find("li").trigger("click"); - }); + $(this).siblings("span.menuimg").find(".mklogo").on("click", function() { + $(this).parent().siblings("div.portalmenukop").find("ul li").trigger("click"); + }).css("cursor", "pointer"); } }); }); + <%