admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#38203 Favorieten menu kunnen aanleggen

Browse Source 
svn path=/Website/trunk/; revision=31400
This commit is contained in:
Erik Groener
2016-11-09 15:34:17 +00:00
parent 9fb47c3fe2
commit b9f28e1f00
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
APPL/FAC/fac_current_tab_save.asp
View File

@@ -18,6 +18,7 @@ var JSON_Result = true;
<%
var autoopenurl = getFParam("autoopenurl");
var autoopenttl = getFParam("autoopenttl");
var taboption = getFParam("taboption");
var filters = getFParam("filters", "");
protectRequest.validateToken();
@@ -54,7 +55,7 @@ var sql = "SELECT fac_menu_key"
+ " , fac_menu_alturl"
+ " , fac_menu_filter"
+ " FROM fac_menu"
+ " WHERE fac_menu_altgroep = 5"
+ " WHERE fac_menu_altgroep = " + (taboption == "T" ? "5" : "6")
+ " AND fac_menu_altlabel = " + safe.quoted_sql(autoopenttl)
+ " AND prs_perslid_key = " + user_key;
var oRs = Oracle.Execute(sql);
@@ -80,17 +81,18 @@ else
+ " ) VALUES"
+ " (" + safe.quoted_sql(autoopenttl)
+ " ," + safe.quoted_sql(autoopenurl)
+ " ,5"
+ " ," + (taboption == "T" ? "5" : "6") // zet favoriet in tabs of menu
+ " ," + safe.quoted_sql(filters)
+ " ," + user_key
+ " ,(SELECT 10 + COALESCE(MAX(fac_menu_volgnr), 0)"
+ " FROM fac_menu"
+ " WHERE prs_perslid_key = " + user_key
+ " WHERE fac_menu_altgroep = " + (taboption == "T" ? "5" : "6")
+ " AND prs_perslid_key = " + user_key
+ ")"
+ " )";
Oracle.Execute(sql_i, true);
result.saved = true;
result.toaster = L("lcl_current_tab_saved");
result.toaster = (taboption == "T" ? L("lcl_current_tab_saved") : L("lcl_current_fav_saved"));
}
oRs.Close();

33
APPL/FAC/fac_menu.inc
View File

@@ -50,6 +50,14 @@ function CreateItems(menuItems, start_collapsed, max_lines)
showtxt = "<img class='mimg' src='"+safe.htmlattr(findImage(itm.image))+"'>";
}
showtxt += (itm.level < 1? itm.name : safe.html(itm.name));
var unpin = (itm.group == 6
? "<span class='menupinned' title='" + L("lcl_current_fav_unsave") + "'"
+ " onclick='FcltMgr.stopPropagation(event);favMgr.saveFavMenu(this);'"
+ " fav_ttl='" + safe.htmlattr(itm.name) + "'>"
+ "<img src='../Pictures/pin.png'>&nbsp"
+ "</span>"
: ""
);
var action = "";
if (itm.href)
{ // '*' voor een reguliere menuoptie forceert nieuw window
@@ -69,7 +77,9 @@ function CreateItems(menuItems, start_collapsed, max_lines)
}
%>
<li class="mi<%=itm.level>0?" mi"+itm.level:""%>"<%=ttl%> <%=j>=max_lines&&max_lines!=menuItems.length-1?"style='display:none'":""%><%= action %>>
<%=showtxt%></li><%
<%=unpin%><%=showtxt%>
</li>
<%
}
if (j > max_lines&&max_lines!=menuItems.length-1)
{
@@ -177,7 +187,7 @@ function generatePortalmenu(koppen)
}
function fillMenuArray(portalOnly, mobileOnly) {
// Levert een tweedimensionaal menu-array op met alle opties, in de juiste volgorde,
// waarbij 0=personal, 1=professional, 2=management, 3=mobile
// waarbij 0=personal, 1=professional, 2=management, 3=mobile, 4=?, 5=pinned tab, 6=favoriten menu
// als er nog niet is ingelogd, wordt null opgeleverd.
var tmp = fac.myfunctionssqlstring(user_key);
@@ -549,8 +559,9 @@ function generatePortalmenu(koppen)
{
if (!grp.Koppen.length)
{ // Deze eerste is geen kop; verzin er zelf eentje bij.
var kop_label = (loRs("groep").value == 6 ? L("lcl_current_fav") : "<!--auto menukop-->");
grp.Koppen.push({ Items: [],
label: "<!--auto menukop-->",
label: kop_label,
startopen: true,
info: null,
image: null,
@@ -569,7 +580,8 @@ function generatePortalmenu(koppen)
info: loRs("fac_menu_info").value,
depth: loRs("depth").value,
img: loRs("image").value,
menu_key: loRs("fac_menu_key").Value
menu_key: loRs("fac_menu_key").Value,
group: loRs("groep").value
})
}
}
@@ -598,7 +610,8 @@ function generatePortalmenu(koppen)
info: loRs("fac_menu_info").value,
href: murl,
img: mimg,
menu_key: loRs("fac_menu_key").Value
menu_key: loRs("fac_menu_key").Value,
group: loRs("groep").value
});
}
}
@@ -630,7 +643,6 @@ function generatePortalmenu(koppen)
// 4 = mobile style
function generateMenu (pmode, groep) //groep alleen voor mode 3
{
if (pmode == 1) {
var menuitems = fillMenuArray();
@@ -639,7 +651,7 @@ function generateMenu (pmode, groep) //groep alleen voor mode 3
// CONN#19264 Door het alvast zelf te doen wordt een reproduceerbare crash voorkomen!
%>
<ul class="ui-tabs-nav ui-helper-clearfix"><%
if (menuitems[0].Koppen.length > 0) {
if (menuitems[0].Koppen.length > 0 || menuitems[6].Koppen.length > 0) {
%><li><a href="#PersFAC"><span class="menutab"><%=L("lcl_menu_pers")%></span></a></li><%
}
if (menuitems[1].Koppen.length > 0) {
@@ -651,10 +663,13 @@ function generateMenu (pmode, groep) //groep alleen voor mode 3
%></ul>
<div class="ui-layout-content">
<%
if (menuitems[0].Koppen.length > 0) {
if (menuitems[0].Koppen.length > 0 || menuitems[6].Koppen.length > 0) {
%><div id="PersFAC" class="ui-tabs-panel ui-tabs-hide"><%
Response.Write("<div class='filtermenukop'>" + L("lcl_menu_pers") + "</div>");
CreateMenuGroep(menuitems[0].Koppen);
if (menuitems[6] && menuitems[6].Koppen.length > 0)
CreateMenuGroep(menuitems[6].Koppen); // favorieten menu
if (menuitems[0].Koppen.length > 0)
CreateMenuGroep(menuitems[0].Koppen); // zelfservice
%></div><%
}
if (menuitems[1].Koppen.length > 0) {