Overview
SHA1 Hash: | 58903a0fec89e085dfefad82466d8e9fcd8b5b25 |
---|---|
Date: | 2009-08-29 22:39:44 |
User: | drh |
Comment: | Add more hyperlinks on dates and userids. |
Timelines: | ancestors | descendants | both | trunk |
Other Links: | files | ZIP archive | manifest |
Tags And Properties
- branch=trunk inherited from [a28c83647d]
- sym-trunk inherited from [a28c83647d]
Changes
[hide diffs]Modified src/info.c from [3f3e3d13b1] to [9956b9b09c].
@@ -418,21 +418,25 @@ ); if( db_step(&q)==SQLITE_ROW ){ const char *zName = db_column_text(&q, 0); const char *zUuid = db_column_text(&q, 1); char *zTitle = mprintf("Wiki Page %s", zName); + const char *zDate = db_column_text(&q,2); + const char *zUser = db_column_text(&q,3); style_header(zTitle); free(zTitle); login_anonymous_available(); @ <div class="section">Overview</div> @ <p><table class="label-value"> @ <tr><th>Version:</th><td>%s(zUuid)</td></tr> - @ <tr><th>Date:</th><td>%s(db_column_text(&q, 2))</td></tr> + @ <tr><th>Date:</th><td> + hyperlink_to_date(zDate, "</td></tr>"); if( g.okSetup ){ @ <tr><th>Record ID:</th><td>%d(rid)</td></tr> } - @ <tr><th>Original User:</th><td>%s(db_column_text(&q, 3))</td></tr> + @ <tr><th>Original User:</th><td> + hyperlink_to_user(zUser, zDate, "</td></tr>"); if( g.okHistory ){ @ <tr><th>Commands:</th> @ <td> /* @ <a href="%s(g.zBaseURL)/wdiff/%d(rid)">diff</a> | */ @ <a href="%s(g.zBaseURL)/whistory?name=%t(zName)">history</a> @@ -526,11 +530,13 @@ if( g.okHistory ){ @ <a href="%s(g.zTop)/artifact/%s(zUuid)">[%s(zShort)]</a> }else{ @ [%s(zShort)] } - @ %h(zCom) (By: %h(zUser)) + @ %h(zCom) (By: + hyperlink_to_user(zUser, zDate, " on"); + hyperlink_to_date(zDate, ")"); if( g.okHistory ){ if( fpid ){ @ <a href="%s(g.zBaseURL)/fdiff?v1=%d(fpid)&v2=%d(frid)">[diff]</a> } @ <a href="%s(g.zBaseURL)/annotate?mid=%d(mid)&fnid=%d(fnid)">
Modified src/timeline.c from [03b554d5e6] to [0ecd2849ac].
@@ -496,13 +496,18 @@ " AND event.mtime>=%f ORDER BY event.mtime ASC", rCirca ); nEntry -= (nEntry+1)/2; db_multi_exec( - "INSERT OR IGNORE INTO timeline(timestamp,etype)" - "VALUES(datetime(%f,'localtime'),'div')", - rCirca + "INSERT INTO timeline(rid,timestamp,etype)" + "VALUES(-1,datetime(%Q,'-1 second') || '.9','div')", + zCirca + ); + db_multi_exec( + "INSERT INTO timeline(rid,timestamp,etype)" + "VALUES(-2,datetime(%Q) || '.1','div')", + zCirca ); url_add_parameter(&url, "c", zCirca); }else{ zCirca = 0; }
Modified src/tkt.c from [a24e654e39] to [53e4b94cc8].
@@ -689,14 +689,14 @@ char *zDate = db_text(0, "SELECT datetime(%.12f)", m.rDate); char zUuid[12]; memcpy(zUuid, zChngUuid, 10); zUuid[10] = 0; @ - @ <p>%s(zDate) - @ [<a href="%s(g.zTop)/artifact/%T(zChngUuid)">%s(zUuid)</a>]</a> - @ by %h(m.zUser):</p> - @ + @ Ticket change + @ [<a href="%s(g.zTop)/artifact/%T(zChngUuid)">%s(zUuid)</a>]</a> by + hyperlink_to_user(m.zUser,zDate," on"); + hyperlink_to_date(zDate, ":"); free(zDate); ticket_output_change_artifact(&m); } manifest_clear(&m); }