Fossil SCM

Add more hyperlinks on dates and userids.

drh 2009-08-29 22:39 trunk
Commit 58903a0fec89e085dfefad82466d8e9fcd8b5b25
Parent 579cba4a1aededa…
3 files changed +9 -3 +8 -3 +4 -4
~ src/info.c ~ src/timeline.c ~ src/tkt.c
M src/info.c
+9 -3
--- src/info.c
+++ src/info.c
@@ -418,21 +418,25 @@
418418
 );
419419
 if( db_step(&q)==SQLITE_ROW ){
420420
 const char *zName = db_column_text(&q, 0);
421421
 const char *zUuid = db_column_text(&q, 1);
422422
 char *zTitle = mprintf("Wiki Page %s", zName);
423
+ const char *zDate = db_column_text(&q,2);
424
+ const char *zUser = db_column_text(&q,3);
423425
 style_header(zTitle);
424426
 free(zTitle);
425427
 login_anonymous_available();
426428
 @ <div class="section">Overview</div>
427429
 @ <p><table class="label-value">
428430
 @ <tr><th>Version:</th><td>%s(zUuid)</td></tr>
429
- @ <tr><th>Date:</th><td>%s(db_column_text(&q, 2))</td></tr>
431
+ @ <tr><th>Date:</th><td>
432
+ hyperlink_to_date(zDate, "</td></tr>");
430433
 if( g.okSetup ){
431434
 @ <tr><th>Record ID:</th><td>%d(rid)</td></tr>
432435
 }
433
- @ <tr><th>Original&nbsp;User:</th><td>%s(db_column_text(&q, 3))</td></tr>
436
+ @ <tr><th>Original&nbsp;User:</th><td>
437
+ hyperlink_to_user(zUser, zDate, "</td></tr>");
434438
 if( g.okHistory ){
435439
 @ <tr><th>Commands:</th>
436440
 @ <td>
437441
 /* @ <a href="%s(g.zBaseURL)/wdiff/%d(rid)">diff</a> | */
438442
 @ <a href="%s(g.zBaseURL)/whistory?name=%t(zName)">history</a>
@@ -526,11 +530,13 @@
526530
 if( g.okHistory ){
527531
 @ <a href="%s(g.zTop)/artifact/%s(zUuid)">[%s(zShort)]</a>
528532
 }else{
529533
 @ [%s(zShort)]
530534
 }
531
- @ %h(zCom) (By: %h(zUser))
535
+ @ %h(zCom) (By:
536
+ hyperlink_to_user(zUser, zDate, " on");
537
+ hyperlink_to_date(zDate, ")");
532538
 if( g.okHistory ){
533539
 if( fpid ){
534540
 @ <a href="%s(g.zBaseURL)/fdiff?v1=%d(fpid)&amp;v2=%d(frid)">[diff]</a>
535541
 }
536542
 @ <a href="%s(g.zBaseURL)/annotate?mid=%d(mid)&amp;fnid=%d(fnid)">
537543
--- src/info.c
+++ src/info.c
@@ -418,21 +418,25 @@
418 );
419 if( db_step(&q)==SQLITE_ROW ){
420 const char *zName = db_column_text(&q, 0);
421 const char *zUuid = db_column_text(&q, 1);
422 char *zTitle = mprintf("Wiki Page %s", zName);
 
 
423 style_header(zTitle);
424 free(zTitle);
425 login_anonymous_available();
426 @ <div class="section">Overview</div>
427 @ <p><table class="label-value">
428 @ <tr><th>Version:</th><td>%s(zUuid)</td></tr>
429 @ <tr><th>Date:</th><td>%s(db_column_text(&q, 2))</td></tr>
 
430 if( g.okSetup ){
431 @ <tr><th>Record ID:</th><td>%d(rid)</td></tr>
432 }
433 @ <tr><th>Original&nbsp;User:</th><td>%s(db_column_text(&q, 3))</td></tr>
 
434 if( g.okHistory ){
435 @ <tr><th>Commands:</th>
436 @ <td>
437 /* @ <a href="%s(g.zBaseURL)/wdiff/%d(rid)">diff</a> | */
438 @ <a href="%s(g.zBaseURL)/whistory?name=%t(zName)">history</a>
@@ -526,11 +530,13 @@
526 if( g.okHistory ){
527 @ <a href="%s(g.zTop)/artifact/%s(zUuid)">[%s(zShort)]</a>
528 }else{
529 @ [%s(zShort)]
530 }
531 @ %h(zCom) (By: %h(zUser))
 
 
532 if( g.okHistory ){
533 if( fpid ){
534 @ <a href="%s(g.zBaseURL)/fdiff?v1=%d(fpid)&amp;v2=%d(frid)">[diff]</a>
535 }
536 @ <a href="%s(g.zBaseURL)/annotate?mid=%d(mid)&amp;fnid=%d(fnid)">
537
--- src/info.c
+++ src/info.c
@@ -418,21 +418,25 @@
418 );
419 if( db_step(&q)==SQLITE_ROW ){
420 const char *zName = db_column_text(&q, 0);
421 const char *zUuid = db_column_text(&q, 1);
422 char *zTitle = mprintf("Wiki Page %s", zName);
423 const char *zDate = db_column_text(&q,2);
424 const char *zUser = db_column_text(&q,3);
425 style_header(zTitle);
426 free(zTitle);
427 login_anonymous_available();
428 @ <div class="section">Overview</div>
429 @ <p><table class="label-value">
430 @ <tr><th>Version:</th><td>%s(zUuid)</td></tr>
431 @ <tr><th>Date:</th><td>
432 hyperlink_to_date(zDate, "</td></tr>");
433 if( g.okSetup ){
434 @ <tr><th>Record ID:</th><td>%d(rid)</td></tr>
435 }
436 @ <tr><th>Original&nbsp;User:</th><td>
437 hyperlink_to_user(zUser, zDate, "</td></tr>");
438 if( g.okHistory ){
439 @ <tr><th>Commands:</th>
440 @ <td>
441 /* @ <a href="%s(g.zBaseURL)/wdiff/%d(rid)">diff</a> | */
442 @ <a href="%s(g.zBaseURL)/whistory?name=%t(zName)">history</a>
@@ -526,11 +530,13 @@
530 if( g.okHistory ){
531 @ <a href="%s(g.zTop)/artifact/%s(zUuid)">[%s(zShort)]</a>
532 }else{
533 @ [%s(zShort)]
534 }
535 @ %h(zCom) (By:
536 hyperlink_to_user(zUser, zDate, " on");
537 hyperlink_to_date(zDate, ")");
538 if( g.okHistory ){
539 if( fpid ){
540 @ <a href="%s(g.zBaseURL)/fdiff?v1=%d(fpid)&amp;v2=%d(frid)">[diff]</a>
541 }
542 @ <a href="%s(g.zBaseURL)/annotate?mid=%d(mid)&amp;fnid=%d(fnid)">
543
M src/timeline.c
+8 -3
--- src/timeline.c
+++ src/timeline.c
@@ -496,13 +496,18 @@
496496
 " AND event.mtime>=%f ORDER BY event.mtime ASC",
497497
 rCirca
498498
 );
499499
 nEntry -= (nEntry+1)/2;
500500
 db_multi_exec(
501
- "INSERT OR IGNORE INTO timeline(timestamp,etype)"
502
- "VALUES(datetime(%f,'localtime'),'div')",
503
- rCirca
501
+ "INSERT INTO timeline(rid,timestamp,etype)"
502
+ "VALUES(-1,datetime(%Q,'-1 second') || '.9','div')",
503
+ zCirca
504
+ );
505
+ db_multi_exec(
506
+ "INSERT INTO timeline(rid,timestamp,etype)"
507
+ "VALUES(-2,datetime(%Q) || '.1','div')",
508
+ zCirca
504509
 );
505510
 url_add_parameter(&url, "c", zCirca);
506511
 }else{
507512
 zCirca = 0;
508513
 }
509514
--- src/timeline.c
+++ src/timeline.c
@@ -496,13 +496,18 @@
496 " AND event.mtime>=%f ORDER BY event.mtime ASC",
497 rCirca
498 );
499 nEntry -= (nEntry+1)/2;
500 db_multi_exec(
501 "INSERT OR IGNORE INTO timeline(timestamp,etype)"
502 "VALUES(datetime(%f,'localtime'),'div')",
503 rCirca
 
 
 
 
 
504 );
505 url_add_parameter(&url, "c", zCirca);
506 }else{
507 zCirca = 0;
508 }
509
--- src/timeline.c
+++ src/timeline.c
@@ -496,13 +496,18 @@
496 " AND event.mtime>=%f ORDER BY event.mtime ASC",
497 rCirca
498 );
499 nEntry -= (nEntry+1)/2;
500 db_multi_exec(
501 "INSERT INTO timeline(rid,timestamp,etype)"
502 "VALUES(-1,datetime(%Q,'-1 second') || '.9','div')",
503 zCirca
504 );
505 db_multi_exec(
506 "INSERT INTO timeline(rid,timestamp,etype)"
507 "VALUES(-2,datetime(%Q) || '.1','div')",
508 zCirca
509 );
510 url_add_parameter(&url, "c", zCirca);
511 }else{
512 zCirca = 0;
513 }
514
M src/tkt.c
+4 -4
--- src/tkt.c
+++ src/tkt.c
@@ -689,14 +689,14 @@
689689
 char *zDate = db_text(0, "SELECT datetime(%.12f)", m.rDate);
690690
 char zUuid[12];
691691
 memcpy(zUuid, zChngUuid, 10);
692692
 zUuid[10] = 0;
693693
 @
694
- @ <p>%s(zDate)
695
- @ [<a href="%s(g.zTop)/artifact/%T(zChngUuid)">%s(zUuid)</a>]</a>
696
- @ by %h(m.zUser):</p>
697
- @
694
+ @ Ticket change
695
+ @ [<a href="%s(g.zTop)/artifact/%T(zChngUuid)">%s(zUuid)</a>]</a> by
696
+ hyperlink_to_user(m.zUser,zDate," on");
697
+ hyperlink_to_date(zDate, ":");
698698
 free(zDate);
699699
 ticket_output_change_artifact(&m);
700700
 }
701701
 manifest_clear(&m);
702702
 }
703703
--- src/tkt.c
+++ src/tkt.c
@@ -689,14 +689,14 @@
689 char *zDate = db_text(0, "SELECT datetime(%.12f)", m.rDate);
690 char zUuid[12];
691 memcpy(zUuid, zChngUuid, 10);
692 zUuid[10] = 0;
693 @
694 @ <p>%s(zDate)
695 @ [<a href="%s(g.zTop)/artifact/%T(zChngUuid)">%s(zUuid)</a>]</a>
696 @ by %h(m.zUser):</p>
697 @
698 free(zDate);
699 ticket_output_change_artifact(&m);
700 }
701 manifest_clear(&m);
702 }
703
--- src/tkt.c
+++ src/tkt.c
@@ -689,14 +689,14 @@
689 char *zDate = db_text(0, "SELECT datetime(%.12f)", m.rDate);
690 char zUuid[12];
691 memcpy(zUuid, zChngUuid, 10);
692 zUuid[10] = 0;
693 @
694 @ Ticket change
695 @ [<a href="%s(g.zTop)/artifact/%T(zChngUuid)">%s(zUuid)</a>]</a> by
696 hyperlink_to_user(m.zUser,zDate," on");
697 hyperlink_to_date(zDate, ":");
698 free(zDate);
699 ticket_output_change_artifact(&m);
700 }
701 manifest_clear(&m);
702 }
703

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button