FSN#35141 Styling en presentatie finetunes
svn path=/Website/trunk/; revision=28767
This commit is contained in:
@@ -84,6 +84,7 @@ var afgehandeld = (mld_info.mld_status == 1 || mld_info.mld_status == 5 || mld_i
|
||||
<%
|
||||
function fnPerslidNaamFull(oRs)
|
||||
{
|
||||
if (!oRs("prs_perslid_key").Value) return "";
|
||||
if (outputmode != 0)
|
||||
return safe.html(oRs("prs_perslid_naam_friendly").Value);
|
||||
|
||||
@@ -147,12 +148,21 @@ var afgehandeld = (mld_info.mld_status == 1 || mld_info.mld_status == 5 || mld_i
|
||||
var note_zichtbaar = oRs("mld_melding_note_flag").value == 1;
|
||||
oRs.MoveNext();
|
||||
var LastIsSelfNote = oRs.Eof && user.isCollega(prs_key) && !srtnoti;
|
||||
if (lastuser != thisuser || !lasttime || thistime.midnight() > lasttime.midnight()) // Bij user of dag switch altijd kopje
|
||||
|
||||
// Bij user of dag switch altijd kopje. Ik zou graag systeemmeldingen niet als user-switch zien,
|
||||
// dus die bij het voorgaande kopje laten horen door die te skippen bij lastuser
|
||||
if ((lastuser != thisuser || !lasttime || thistime.midnight() > lasttime.midnight()) && thisuser != null )
|
||||
{
|
||||
Response.Write("<tr><td colspan='2'>");
|
||||
Response.Write("<div class='mldhandlinghead'>"+L("lcl_status_behandelheader").format(toTimeString(thistime),
|
||||
toDateString(thistime, false, true),
|
||||
fullname)+"</div>");
|
||||
if (fullname != "") {
|
||||
Response.Write("<div class='mldhandlinghead'>"+L("lcl_status_behandelheader").format(toTimeString(thistime),
|
||||
toDateString(thistime, false, true),
|
||||
fullname)+"</div>");
|
||||
} else {
|
||||
// zal maar sporadisch voorkomen
|
||||
Response.Write("<div class='mldhandlinghead'>"+L("lcl_status_behandelheaderanonym").format(toTimeString(thistime),
|
||||
toDateString(thistime, false, true))+"</div>");
|
||||
}
|
||||
Response.Write("</td></tr>");
|
||||
}
|
||||
else
|
||||
@@ -163,7 +173,8 @@ var afgehandeld = (mld_info.mld_status == 1 || mld_info.mld_status == 5 || mld_i
|
||||
if (LastIsSelfNote && last_note_key == note_key)
|
||||
break; // uit de while-loop
|
||||
lasttime = thistime;
|
||||
lastuser = thisuser;
|
||||
if (thisuser != null)
|
||||
lastuser = thisuser; // de laatste echte user
|
||||
|
||||
var safehtml = "";
|
||||
if (note_oms) // Notitie of tracking met opgeslagen tekst
|
||||
@@ -185,7 +196,7 @@ var afgehandeld = (mld_info.mld_status == 1 || mld_info.mld_status == 5 || mld_i
|
||||
}
|
||||
safehtml = arr.join("<br>");
|
||||
}
|
||||
Response.Write("<tr class='mldhandlingdiv'><td class='mldhtime'>{0}</td><td>{1}</td></tr>".format(timestr, safehtml));
|
||||
Response.Write(("<tr class='mldhandlingdiv'><td class='mldhtime'>{0}</td><td"+(thisuser == null ? " class='system'" : "")+">{1}</td></tr>").format(timestr, safehtml));
|
||||
}
|
||||
else // notitie
|
||||
{
|
||||
@@ -196,7 +207,7 @@ var afgehandeld = (mld_info.mld_status == 1 || mld_info.mld_status == 5 || mld_i
|
||||
edittm = "<img src='../pictures/wijzigen.png' onclick='mld_notechange(" + last_note_key + ")' class='details' title='" + L("lcl_change") + "'></img>";
|
||||
var cls = " mldnoteedit";
|
||||
}
|
||||
Response.Write("<tr class='mldhandlingdiv'><td class='mldhtime " + cls + "'>{0}</td><td class='mldhandlingnote {1}'>{2}</td></tr>".format(edittm, (note_zichtbaar?" note_fe_hidden":""), safehtml));
|
||||
Response.Write("<tr class='mldhandlingdiv'><td class='mldhtime " + cls + "'>{0}</td><td class='mldhandlingnote {1}'>{2}</td></tr>".format(edittm, (note_zichtbaar?"note_fe_visible":"note_fe_hidden"), safehtml));
|
||||
}
|
||||
}
|
||||
oRs.Close()
|
||||
|
||||
BIN
APPL/Pictures/info.png
Normal file
BIN
APPL/Pictures/info.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 234 B |
Reference in New Issue
Block a user