Fossil SCM

Fix some HTML markup irregularities. Improvements to the default ticket viewer.

drh 2012-11-27 15:32 UTC ticket-enhancements
Commit 7575b52e15cd84fb09987b9aca076b11bbd9dd4e
Parent 3c8195c876ff63a…
3 files changed +1 -1 -2 +11 -5
~ src/info.c ~ src/tkt.c ~ src/tktsetup.c
M src/info.c
+1 -1
--- src/info.c
+++ src/info.c
@@ -1111,11 +1111,11 @@
11111111
 cnt++;
11121112
 if( pDownloadName && blob_size(pDownloadName)==0 ){
11131113
 blob_append(pDownloadName, zName, -1);
11141114
 }
11151115
 }
1116
- @ </ul></ul>
1116
+ @ </ul>
11171117
 free(prevName);
11181118
 db_finalize(&q);
11191119
 db_prepare(&q,
11201120
 "SELECT substr(tagname, 6, 10000), datetime(event.mtime),"
11211121
 " coalesce(event.euser, event.user)"
11221122
--- src/info.c
+++ src/info.c
@@ -1111,11 +1111,11 @@
1111 cnt++;
1112 if( pDownloadName && blob_size(pDownloadName)==0 ){
1113 blob_append(pDownloadName, zName, -1);
1114 }
1115 }
1116 @ </ul></ul>
1117 free(prevName);
1118 db_finalize(&q);
1119 db_prepare(&q,
1120 "SELECT substr(tagname, 6, 10000), datetime(event.mtime),"
1121 " coalesce(event.euser, event.user)"
1122
--- src/info.c
+++ src/info.c
@@ -1111,11 +1111,11 @@
1111 cnt++;
1112 if( pDownloadName && blob_size(pDownloadName)==0 ){
1113 blob_append(pDownloadName, zName, -1);
1114 }
1115 }
1116 @ </ul>
1117 free(prevName);
1118 db_finalize(&q);
1119 db_prepare(&q,
1120 "SELECT substr(tagname, 6, 10000), datetime(event.mtime),"
1121 " coalesce(event.euser, event.user)"
1122
M src/tkt.c
-2
--- src/tkt.c
+++ src/tkt.c
@@ -605,11 +605,10 @@
605605
 form_begin(0, "%R/%s", g.zPath);
606606
 login_insert_csrf_secret();
607607
 if( P("date_override") && g.perm.Setup ){
608608
 @ <input type="hidden" name="date_override" value="%h(P("date_override"))">
609609
 }
610
- @ </p>
611610
 zScript = ticket_newpage_code();
612611
 Th_Store("login", g.zLogin ? g.zLogin : "nobody");
613612
 Th_Store("date", db_text(0, "SELECT datetime('now')"));
614613
 Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd,
615614
 (void*)&zNewUuid, 0);
@@ -674,11 +673,10 @@
674673
 initializeVariablesFromDb();
675674
 if( g.zPath[0]=='d' ) showAllFields();
676675
 form_begin(0, "%R/%s", g.zPath);
677676
 @ <input type="hidden" name="name" value="%s(zName)" />
678677
 login_insert_csrf_secret();
679
- @ </p>
680678
 zScript = ticket_editpage_code();
681679
 Th_Store("login", g.zLogin ? g.zLogin : "nobody");
682680
 Th_Store("date", db_text(0, "SELECT datetime('now')"));
683681
 Th_CreateCommand(g.interp, "append_field", appendRemarkCmd, 0, 0);
684682
 Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd, (void*)&zName,0);
685683
--- src/tkt.c
+++ src/tkt.c
@@ -605,11 +605,10 @@
605 form_begin(0, "%R/%s", g.zPath);
606 login_insert_csrf_secret();
607 if( P("date_override") && g.perm.Setup ){
608 @ <input type="hidden" name="date_override" value="%h(P("date_override"))">
609 }
610 @ </p>
611 zScript = ticket_newpage_code();
612 Th_Store("login", g.zLogin ? g.zLogin : "nobody");
613 Th_Store("date", db_text(0, "SELECT datetime('now')"));
614 Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd,
615 (void*)&zNewUuid, 0);
@@ -674,11 +673,10 @@
674 initializeVariablesFromDb();
675 if( g.zPath[0]=='d' ) showAllFields();
676 form_begin(0, "%R/%s", g.zPath);
677 @ <input type="hidden" name="name" value="%s(zName)" />
678 login_insert_csrf_secret();
679 @ </p>
680 zScript = ticket_editpage_code();
681 Th_Store("login", g.zLogin ? g.zLogin : "nobody");
682 Th_Store("date", db_text(0, "SELECT datetime('now')"));
683 Th_CreateCommand(g.interp, "append_field", appendRemarkCmd, 0, 0);
684 Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd, (void*)&zName,0);
685
--- src/tkt.c
+++ src/tkt.c
@@ -605,11 +605,10 @@
605 form_begin(0, "%R/%s", g.zPath);
606 login_insert_csrf_secret();
607 if( P("date_override") && g.perm.Setup ){
608 @ <input type="hidden" name="date_override" value="%h(P("date_override"))">
609 }
 
610 zScript = ticket_newpage_code();
611 Th_Store("login", g.zLogin ? g.zLogin : "nobody");
612 Th_Store("date", db_text(0, "SELECT datetime('now')"));
613 Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd,
614 (void*)&zNewUuid, 0);
@@ -674,11 +673,10 @@
673 initializeVariablesFromDb();
674 if( g.zPath[0]=='d' ) showAllFields();
675 form_begin(0, "%R/%s", g.zPath);
676 @ <input type="hidden" name="name" value="%s(zName)" />
677 login_insert_csrf_secret();
 
678 zScript = ticket_editpage_code();
679 Th_Store("login", g.zLogin ? g.zLogin : "nobody");
680 Th_Store("date", db_text(0, "SELECT datetime('now')"));
681 Th_CreateCommand(g.interp, "append_field", appendRemarkCmd, 0, 0);
682 Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd, (void*)&zName,0);
683
M src/tktsetup.c
+11 -5
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -478,11 +478,11 @@
478478
 @ </td></tr>
479479
 @
480480
 @ <th1>
481481
 @ if {[info exists comment] && [string length $comment]>10} {
482482
 @ html {
483
-@ <tr><td colspan="5">Legacy Description &amp; Comments:</td></tr>
483
+@ <tr><td class="tktDspLabel">Description:</td></tr>
484484
 @ <tr><td colspan="5" class="tktDspValue">
485485
 @ }
486486
 @ if {[info exists plaintext]} {
487487
 @ set r [randhex]
488488
 @ wiki "<verbatim-$r links>\n$comment\n</verbatim-$r>"
@@ -491,23 +491,29 @@
491491
 @ }
492492
 @ }
493493
 @ set seenRow 0
494494
 @ set alwaysPlaintext [info exists plaintext]
495495
 @ query {SELECT datetime(tkt_mtime) AS xdate, login AS xlogin,
496
-@ mimetype as xmimetype, icomment AS xcomment
496
+@ mimetype as xmimetype, icomment AS xcomment,
497
+@ username AS xusername
497498
 @ FROM ticketchng
498499
 @ WHERE tkt_id=$tkt_id} {
499500
 @ if {$seenRow} {
500501
 @ html "<hr>\n"
501502
 @ } else {
502
-@ html "<tr><th>User Comments:</td></tr>\n"
503
+@ html "<tr><td class='tktDspLabel'>User Comments:</td></tr>\n"
503504
 @ html "<tr><td colspan='5' class='tktDspValue'>\n"
504505
 @ set seenRow 1
505506
 @ }
506
-@ html "[htmlize $xlogin] added on $xdate:\n"
507
+@ html "[htmlize $xlogin]"
508
+@ if {$xlogin ne $xusername && [string length $xusername]>0} {
509
+@ html " (claiming to be [htmlize $xusername])"
510
+@ }
511
+@ html " added on $xdate:\n"
507512
 @ if {$alwaysPlaintext || $xmimetype eq "text/plain"} {
508513
 @ set r [randhex]
514
+@ if {$xmimetype ne "text/plain"} {html "([htmlize $xmimetype])\n"}
509515
 @ wiki "<verbatim-$r>[string trimright $xcomment]</verbatim-$r>\n"
510516
 @ } elseif {$xmimetype eq "text/x-fossil-wiki"} {
511517
 @ wiki "<p>\n[string trimright $xcomment]\n</p>\n"
512518
 @ } elseif {$xmimetype eq "text/html"} {
513519
 @ wiki "<p><nowiki>\n[string trimright $xcomment]\n</nowiki>\n"
@@ -514,12 +520,12 @@
514520
 @ } else {
515521
 @ set r [randhex]
516522
 @ wiki "<verbatim-$r links>[string trimright $xcomment]</verbatim-$r>\n"
517523
 @ }
518524
 @ }
525
+@ if {$seenRow} {html "</td></tr>\n"}
519526
 @ </th1>
520
-@ </td></tr>
521527
 @ </table>
522528
 ;
523529
524530
525531
 /*
526532
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -478,11 +478,11 @@
478 @ </td></tr>
479 @
480 @ <th1>
481 @ if {[info exists comment] && [string length $comment]>10} {
482 @ html {
483 @ <tr><td colspan="5">Legacy Description &amp; Comments:</td></tr>
484 @ <tr><td colspan="5" class="tktDspValue">
485 @ }
486 @ if {[info exists plaintext]} {
487 @ set r [randhex]
488 @ wiki "<verbatim-$r links>\n$comment\n</verbatim-$r>"
@@ -491,23 +491,29 @@
491 @ }
492 @ }
493 @ set seenRow 0
494 @ set alwaysPlaintext [info exists plaintext]
495 @ query {SELECT datetime(tkt_mtime) AS xdate, login AS xlogin,
496 @ mimetype as xmimetype, icomment AS xcomment
 
497 @ FROM ticketchng
498 @ WHERE tkt_id=$tkt_id} {
499 @ if {$seenRow} {
500 @ html "<hr>\n"
501 @ } else {
502 @ html "<tr><th>User Comments:</td></tr>\n"
503 @ html "<tr><td colspan='5' class='tktDspValue'>\n"
504 @ set seenRow 1
505 @ }
506 @ html "[htmlize $xlogin] added on $xdate:\n"
 
 
 
 
507 @ if {$alwaysPlaintext || $xmimetype eq "text/plain"} {
508 @ set r [randhex]
 
509 @ wiki "<verbatim-$r>[string trimright $xcomment]</verbatim-$r>\n"
510 @ } elseif {$xmimetype eq "text/x-fossil-wiki"} {
511 @ wiki "<p>\n[string trimright $xcomment]\n</p>\n"
512 @ } elseif {$xmimetype eq "text/html"} {
513 @ wiki "<p><nowiki>\n[string trimright $xcomment]\n</nowiki>\n"
@@ -514,12 +520,12 @@
514 @ } else {
515 @ set r [randhex]
516 @ wiki "<verbatim-$r links>[string trimright $xcomment]</verbatim-$r>\n"
517 @ }
518 @ }
 
519 @ </th1>
520 @ </td></tr>
521 @ </table>
522 ;
523
524
525 /*
526
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -478,11 +478,11 @@
478 @ </td></tr>
479 @
480 @ <th1>
481 @ if {[info exists comment] && [string length $comment]>10} {
482 @ html {
483 @ <tr><td class="tktDspLabel">Description:</td></tr>
484 @ <tr><td colspan="5" class="tktDspValue">
485 @ }
486 @ if {[info exists plaintext]} {
487 @ set r [randhex]
488 @ wiki "<verbatim-$r links>\n$comment\n</verbatim-$r>"
@@ -491,23 +491,29 @@
491 @ }
492 @ }
493 @ set seenRow 0
494 @ set alwaysPlaintext [info exists plaintext]
495 @ query {SELECT datetime(tkt_mtime) AS xdate, login AS xlogin,
496 @ mimetype as xmimetype, icomment AS xcomment,
497 @ username AS xusername
498 @ FROM ticketchng
499 @ WHERE tkt_id=$tkt_id} {
500 @ if {$seenRow} {
501 @ html "<hr>\n"
502 @ } else {
503 @ html "<tr><td class='tktDspLabel'>User Comments:</td></tr>\n"
504 @ html "<tr><td colspan='5' class='tktDspValue'>\n"
505 @ set seenRow 1
506 @ }
507 @ html "[htmlize $xlogin]"
508 @ if {$xlogin ne $xusername && [string length $xusername]>0} {
509 @ html " (claiming to be [htmlize $xusername])"
510 @ }
511 @ html " added on $xdate:\n"
512 @ if {$alwaysPlaintext || $xmimetype eq "text/plain"} {
513 @ set r [randhex]
514 @ if {$xmimetype ne "text/plain"} {html "([htmlize $xmimetype])\n"}
515 @ wiki "<verbatim-$r>[string trimright $xcomment]</verbatim-$r>\n"
516 @ } elseif {$xmimetype eq "text/x-fossil-wiki"} {
517 @ wiki "<p>\n[string trimright $xcomment]\n</p>\n"
518 @ } elseif {$xmimetype eq "text/html"} {
519 @ wiki "<p><nowiki>\n[string trimright $xcomment]\n</nowiki>\n"
@@ -514,12 +520,12 @@
520 @ } else {
521 @ set r [randhex]
522 @ wiki "<verbatim-$r links>[string trimright $xcomment]</verbatim-$r>\n"
523 @ }
524 @ }
525 @ if {$seenRow} {html "</td></tr>\n"}
526 @ </th1>
 
527 @ </table>
528 ;
529
530
531 /*
532

Keyboard Shortcuts

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