FSN#39258 Nog missende plaatjes in 2016.3

svn path=/Website/branches/v2016.3/; revision=32674
This commit is contained in:
Erik Groener
2017-02-02 13:02:36 +00:00
parent 92932bc516
commit 1ca2e1cfec
4 changed files with 35 additions and 23 deletions

View File

@@ -95,10 +95,7 @@ IFRAMER_HEADER("Facilitor Vinder", buttons);
<div style='position:relative;z-index:1'><img id='photo' src="<%=thisUser.photopath %>">
<% if (S("prs_use_edit_photo") && canChange)
{%><br>
<img src='../../appl/Pictures/wijzigen.png'
class='details'
title='<%=L("lcl_change")%>'
onclick='edit_photo(this)'>
<span class='fa fa-edit fa-lg button' title='<%=L("lcl_change")%>' onclick='edit_photo(this)'></span>
<% } %></div>
</td>
</tr>
@@ -120,11 +117,10 @@ IFRAMER_HEADER("Facilitor Vinder", buttons);
%><tr><td class="label">
<label class="selector"><%=(wp == 0? L("lcl_prs_workplace") : null)%></label>
<span class='labelextra'>
<img class='details' src='../../appl/Pictures/wijzigen.png'
title='<%=L("lcl_change")%>'
onclick='edit_werkplek(this, <%=wpi.prs_perslidwerkplek_key%>)'>
</span></td>
<td><%ROFIELD('fldroom', null, wpi.prs_werkplek_aanduiding,{ infoPointer: infoPointer }); %></td>
<span class='fa fa-edit fa-lg button' title='<%=L("lcl_change")%>' onclick='edit_werkplek(this, <%=wpi.prs_perslidwerkplek_key%>)'></span>
</span>
</td>
<td><%ROFIELD('fldroom', null, wpi.prs_werkplek_aanduiding,{ infoPointer: infoPointer }); %></td>
</tr><%
}
else
@@ -137,11 +133,10 @@ IFRAMER_HEADER("Facilitor Vinder", buttons);
%><tr><td class="label">
<label class="selector"><%=L("lcl_prs_work_location")%></label>
<span class='labelextra'>
<img class='details' src='../../appl/Pictures/wijzigen.png'
title='<%=L("lcl_change")%>'
onclick='edit_werklocatie(this, <%=user_key%>)'>
</span></td>
<td><%ROFIELD('fldworklocation', null, wl); %></td>
<span class='fa fa-edit fa-lg button' title='<%=L("lcl_change")%>' onclick='edit_werklocatie(this, <%=user_key%>)'></span>
</span>
</td>
<td><%ROFIELD('fldworklocation', null, wl); %></td>
</tr><%
}
else

View File

@@ -146,12 +146,12 @@ IFACE.FORM_END();
<%
var buttons = [];
if (!isExpired && (theUser == user_key || xfunc.canWrite("WEB_PRSSYS") || xfunc.canWrite("WEB_FACMGT")))
buttons.push({title: L("lcl_delete_sessions"), icon:"../Pictures/reject.png", action:"doClearSessions()"});
buttons.push({title: L("lcl_delete_sessions"), icon:"reject.png", action:"doClearSessions()"});
if (!isExpired && (xfunc.canWrite("WEB_PRSSYS") || xfunc.canWrite("WEB_FACMGT")))
buttons.push({title: L("lcl_delete_password"), icon:"../Pictures/undo.png", action:"doClearPassword()"});
buttons.push({title: L("lcl_delete_password"), icon:"undo.png", action:"doClearPassword()"});
buttons.push({title: L("lcl_submit"), icon:"../Pictures/opslaan.png", action:"doOK()"});
buttons.push({title: L("lcl_cancel"), icon:"../Pictures/undo.png", action:"doCancel()"});
buttons.push({title: L("lcl_submit"), icon:"opslaan.png", action:"doOK()"});
buttons.push({title: L("lcl_cancel"), icon:"undo.png", action:"doCancel()"});
CreateButtons(buttons)
%>

View File

@@ -242,6 +242,8 @@ function Suggest(inParams)
// Anders krijg je ook het verschijnsel dat je 2 keer moet klikken voordat je de lijst krijgt.
params.queryField.removeAttribute("checkExist");
$(params.queryField).focus(); // zodat anderen door onblur verbergen
if (!isAutocompleteDivVisible())
{
autoOpen();
@@ -250,10 +252,13 @@ function Suggest(inParams)
{
setValue(params.queryField.getAttribute("sgKey"),
params.queryField.getAttribute("sgCurrentValue"), false, false,
params.queryField.getAttribute("sgExtraParam"));
hideAutocompleteDiv();
}
params.queryField.getAttribute("sgExtraParam"));
hideAutocompleteDiv();
}
return;
}
});
params.queryField.onmousemove = function (evt)
@@ -1029,9 +1034,21 @@ function Suggest(inParams)
doRequest(params.queryField.value, false);
if (params.queryField.createTextRange)
{
// Alleen IE komt hier, FF niet!
// alert(JSON.stringify(params));
// var el = document.getElementById("sgRoom");
// var range = el.createTextRange();
// range.move("character", 1);
// range.select();
var oRange = params.queryField.createTextRange();
// alert(JSON.stringify(params.queryField)); // = {"jQuery{blablabla": 103}
// alert(JSON.stringify(oRange)); // oRange = {}
// oRange.collapse(true);
// oRange.moveEnd('character', 1);
// oRange.moveStart('character', 1);
oRange.move("character", 1);
oRange.select();
// oRange.setSelectionRange(1,1);
}
// TODO: else wat voor FireFox?
//set focus back to the textbox (when field is not disabled)

View File

@@ -933,7 +933,7 @@ Voor vragen kunt u ook gebruik maken van dit e-mailadres.
<xsl:if test="$p_view ='skaf_v_rap_mld_status'">
<xsl:if test="$p_aantal != 0">
<br/>
<span onclick="mld_show_mld_2_close()" class="fa fa-exclamation" style="cursor: pointer; font-size:12px; color:blue"><b><u>Hier afmelden</u></b><img src="../../appl/pictures/priohigh.png"/></span>
<span onclick="mld_show_mld_2_close()" class="fa fa-exclamation" style="cursor: pointer; font-size:12px; color:blue"><b><u>Hier afmelden</u></b></span>
</xsl:if>
</xsl:if>
<hr/>
@@ -1014,7 +1014,7 @@ Voor vragen kunt u ook gebruik maken van dit e-mailadres.
openstaande bestelling<xsl:if test="$l_aant_bes_2close != 1">en</xsl:if>
<xsl:if test="$l_aant_bes_2close != 0">
<br/>
<span onclick="bes_show_bes_2_close()" style="cursor: pointer; font-size:12px; color:blue"><b><u>Hier afmelden</u></b><img src="../../appl/pictures/priohigh.png"/></span>
<span onclick="bes_show_bes_2_close()" class="fa fa-exclamation" style="cursor: pointer; font-size:12px; color:blue"><b><u>Hier afmelden</u></b></span>
</xsl:if>
<hr/>