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

Merge 2016.3 Gold D patches

Browse Source 
svn path=/Website/trunk/; revision=32956
This commit is contained in:
Jos Groot Lipman
2017-02-24 20:08:28 +00:00
parent bfcefb9f6f
commit f27004605c
6 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
APPL/FAC/Facilitor.asp
View File

@@ -397,16 +397,18 @@ if (device.test(device.isTouch)) { %>
if (selectedTabId === null)
selectedTabId = ($("#PersFAC").length && $("#ProfFAC").length) ? 1 : 0;
$("#menutabs").tabs('option', 'active', selectedTabId);
<% if (!noTabs && S("menu_tab_toggles_portalmenu")==1) {
var menuitems = fillMenuArray(true); // portalOnly
%>
$("#menutabs").tabs({
$("#menutabs").tabs({
beforeActivate:
function ( event, ui )
{
if ($("#menufilter").val()) // reset filter bij tabwissel
$("#menufilter").val("").trigger("keyup");
},
}
});
<% if (!noTabs && S("menu_tab_toggles_portalmenu")==1) {
var menuitems = fillMenuArray(true); // portalOnly
%>
$("#menutabs").tabs({
activate:
function(event, ui)
{

8
APPL/Localscripts/resultset_table_v2.js
View File

@@ -32,8 +32,12 @@ function doFilter(deze)
$('table.rstable>tbody>tr').each(function(){
var text = $(this).text().toLowerCase();
var moretext = ($(this).find("span.rsTruncmore").attr('resttxt')||"").toLowerCase();
$(this).toggle(text.indexOf(valThis) > -1 || moretext.indexOf(valThis) > -1);
var found = text.indexOf(valThis) > -1 || moretext.indexOf(valThis) > -1;
$(this).toggle(found);
if (!found)
$(this).find("input.multiselect").prop('checked', false);
});
toggleFooter.apply($("table.rstable")[0].id);
if (typeof updateTableHeaders == 'function')
updateTableHeaders();
}
@@ -545,7 +549,7 @@ function doMulti(thisID, func, tekst, onceMulti)
function checkAll(thisID, zelf)
{
$("#"+thisID+" .multiselect").each(function()
$("#"+thisID+" .multiselect").not(":hidden").each(function()
{
this.checked = zelf.checked;
});

9
APPL/Localscripts/sorttable.js
View File

@@ -258,13 +258,16 @@ var sorttable = {
return node.getAttribute("sorttable_customkey");
}
else if (typeof node.textContent != 'undefined' && !hasInputs) {
return prefix + node.textContent.replace(/^\s+|\s+$/g, '') + postfix;
return (hasFontAwesome ? (prefix + node.textContent.replace(/^\s+|\s+$/g, '') + postfix)
: node.textContent.replace(/^\s+|\s+$/g, ''));
}
else if (typeof node.innerText != 'undefined' && !hasInputs) {
return prefix + node.innerText.replace(/^\s+|\s+$/g, '') + postfix;
return (hasFontAwesome ? (prefix + node.innerText.replace(/^\s+|\s+$/g, '') + postfix)
: node.innerText.replace(/^\s+|\s+$/g, ''));
}
else if (typeof node.text != 'undefined' && !hasInputs) {
return prefix + node.text.replace(/^\s+|\s+$/g, '') + postfix;
return (hasFontAwesome ? (prefix + node.text.replace(/^\s+|\s+$/g, '') + postfix)
: node.text.replace(/^\s+|\s+$/g, ''));
}
else {
switch (node.nodeType) {

4
APPL/PDA/fac_list.asp
View File

@@ -360,9 +360,9 @@ function fncolHeader(oRs)
var displ = "";
switch (oRs("web_user_mess_prioriteit").value)
{
case 1: displ = L("lcl_mld_urg_hoog1"); break;
case 1: displ = "<i class='fa fa-fw fa-lg fa-exclamation-triangle' id='urg_hoog1'>&nbsp;</i>"; break;
case 2: displ = ""; break;
case 3: displ = L("lcl_mld_urg_laag1"); break;
case 3: displ = "<i class='fa fa-fw fa-lg fa-arrow-circle-o-down' id='urg_laag1'>&nbsp;</i>"; break;
}
return displ;
}

4
APPL/PDA/message_list.asp
View File

@@ -60,9 +60,9 @@ if (user_key != -1)
var displ = "";
switch (oRs("web_user_mess_prioriteit").value)
{
case 1: displ = L("lcl_mld_urg_hoog1"); break;
case 1: displ = "<i class='fa fa-fw fa-lg fa-exclamation-triangle' id='urg_hoog1'>&nbsp;</i>"; break;
case 2: displ = ""; break;
case 3: displ = L("lcl_mld_urg_laag1"); break;
case 3: displ = "<i class='fa fa-fw fa-lg fa-arrow-circle-o-down' id='urg_laag1'>&nbsp;</i>"; break;
}
return displ;
}

10
APPL/PDA/mld_list.asp
View File

@@ -266,11 +266,11 @@ var authparams = user.checkAutorisation(autfunction);
var displ = "";
switch (oRs("mld_melding_spoed").Value)
{
case 1 : displ = L("lcl_mld_urg_kritiek1"); break;
case 2: displ = L("lcl_mld_urg_hoog1"); break;
//case 3: displ = L("lcl_mld_urg_normaal1"); break; // Heeft geen plaatje.
case 4: displ = L("lcl_mld_urg_laag1"); break;
case 5: displ = L("lcl_mld_urg_hold1"); break;
case 1 : displ = "<i class='fa fa-fw fa-lg fa-exclamation-triangle' id='urg_kritiek1'>&nbsp;</i>"; break;
case 2: displ = "<i class='fa fa-fw fa-lg fa-exclamation-triangle' id='urg_hoog1'>&nbsp;</i>"; break;
//case 3: Normaal heeft geen plaatje.
case 4: displ = "<i class='fa fa-fw fa-lg fa-arrow-circle-o-down' id='urg_laag1'>&nbsp;</i>"; break;
case 5: displ = "<i class='fa fa-fw fa-lg fa-pause-circle-o' id='urg_hold1'>&nbsp;</i>"; break;
}
displ = (oRs("mld_melding_status").Value == 2? L("lcl_new") : "") + displ;
return displ;