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

FSN#35094 Opfrissen icon-set enzo: notities met bubbles

Browse Source 
svn path=/Website/trunk/; revision=31800
This commit is contained in:
Peter Feij
2016-12-02 16:21:24 +00:00
parent df12b11b57
commit d43b194ff4
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
APPL/MLD/mld_show_note2.asp
View File

@@ -256,7 +256,8 @@ var timestamp_notes = new Date();
clsself = ' mldhandlingself'
// 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 )
/* if ((lastuser != thisuser || !lasttime || thistime.midnight() > lasttime.midnight()) && thisuser != null )
{
Response.Write("<tr class='mldhandlinghead'><td colspan='2'>");
if (fullname != "") {
@@ -275,13 +276,16 @@ var timestamp_notes = new Date();
if (lasttime && (thistime.getTime() - lasttime.getTime()) < 1000 * 60 * 1)
timestr = ""; // Binnen 1 minuut onderdrukken
}
*/
if (LastIsSelfNote && last_note_key == note_key)
break; // uit de while-loop
var dedatum = (lasttime== null || thistime.midnight() > lasttime.midnight() ? toDateString(thistime, false, true) : "");
lasttime = thistime;
if (thisuser != null)
lastuser = thisuser; // de laatste echte user
var safehtml = "";
if (note_oms) // Notitie of tracking met opgeslagen tekst
{
safehtml = safe.fclthtml(note_oms, true);
@@ -291,7 +295,7 @@ var timestamp_notes = new Date();
var note_zichtbaar_class = (note_zichtbaar?"note_fe_visible":(srtnoti?"" :"note_fe_hidden"));
if (LastIsSelfNote)
{
edittm = "<i class='fa fa-edit fa-fw fa-lg details' onclick='mld_notechange(" + last_note_key + ")' title='" + L("lcl_change") + "'></i>";
edittm = "<i class='fa fa-pencil fa-fw fa-lg details' onclick='mld_notechange(" + last_note_key + ")' title='" + L("lcl_change") + "'></i>";
var cls = " mldnoteedit";
}
if (!note_zichtbaar && !srtnoti)
@@ -302,7 +306,10 @@ var timestamp_notes = new Date();
safehtml = "<div class='notetoggler'>{0}</div>".format(safehtml)
+ "<span class='notetoggler'>" + L("lcl_rs_truncated") + "</span>";
}
Response.Write("<tr class='mldhandlingdiv"+clsself+cls_tr+"'><td class='" + cls + "'>{0}</td><td class='mldhandlingnote {1}'>{2}</td></tr>".format(edittm, note_zichtbaar_class, safehtml));
Response.Write("<tr class='mldhandlingdiv"+clsself+cls_tr+"'><td class='" + cls
+ ("'><span class='noter'>{5}</span><br>{4}&nbsp;{0}</td><td class='mldhandlingnote "+"{1}'><div class='"+(srtnoti ? "": " bubble ")+"'>{2}</div></td></tr>").format(edittm, note_zichtbaar_class, safehtml,toTimeString(thistime),
dedatum,
fullname));
}
else if (srtnoti)
@@ -318,7 +325,7 @@ var timestamp_notes = new Date();
}
safehtml = arr.join("<br>");
}
Response.Write(("<tr class='mldhandlingdiv"+clsself+" trtrack'><td class='mldhtime'>{0}</td><td"+(thisuser == null ? " class='system'" : "")+">{1}</td></tr>").format(timestr, safehtml));
Response.Write(("<tr class='mldhandlingdiv"+clsself+" trtrack'><td class='mldhtime'><span class='noter'>{3}</span><br>{2}&nbsp;{0}</td><td"+(thisuser == null ? " class='system'" : "")+">{1}</td></tr>").format(timestr, safehtml, dedatum, fullname));
}
// De MoveNext hebben we al eerder gehad
}