Fossil SCM

fix lines >80 chars

jkosche 2025-04-12 13:41 tkt-improvements
Commit 7b41c73e678ca0c17cd013dcfb71e4ec1047d8abbf820d443b24bc2a1abe1263
Parent 8b48a054edda1a1…
3 files changed +2 -1 +4 -2 +5 -3
~ src/report.c ~ src/tkt.c ~ src/tktsetup.c
M src/report.c
+2 -1
--- src/report.c
+++ src/report.c
@@ -894,11 +894,12 @@
894894
895895
 /* Output the separator above each entry in a table which has multiple lines
896896
 ** per database entry.
897897
 */
898898
 if( pState->iNewRow>=0 ){
899
- @ <tr><td colspan="%d(pState->nCol)" style="padding:0px"><hr style="margin:0px"></td></tr>
899
+ @ <tr><td colspan="%d(pState->nCol)" style="padding:0px">
900
+ @ <hr style="margin:0px"></td></tr>
900901
 }
901902
902903
 /* Output the data for this entry from the database
903904
 */
904905
 zBg = pState->iBg>=0 ? azArg[pState->iBg] : 0;
905906
--- src/report.c
+++ src/report.c
@@ -894,11 +894,12 @@
894
895 /* Output the separator above each entry in a table which has multiple lines
896 ** per database entry.
897 */
898 if( pState->iNewRow>=0 ){
899 @ <tr><td colspan="%d(pState->nCol)" style="padding:0px"><hr style="margin:0px"></td></tr>
 
900 }
901
902 /* Output the data for this entry from the database
903 */
904 zBg = pState->iBg>=0 ? azArg[pState->iBg] : 0;
905
--- src/report.c
+++ src/report.c
@@ -894,11 +894,12 @@
894
895 /* Output the separator above each entry in a table which has multiple lines
896 ** per database entry.
897 */
898 if( pState->iNewRow>=0 ){
899 @ <tr><td colspan="%d(pState->nCol)" style="padding:0px">
900 @ <hr style="margin:0px"></td></tr>
901 }
902
903 /* Output the data for this entry from the database
904 */
905 zBg = pState->iBg>=0 ? azArg[pState->iBg] : 0;
906
M src/tkt.c
+4 -2
--- src/tkt.c
+++ src/tkt.c
@@ -192,11 +192,12 @@
192192
 int i, n, size, j;
193193
194194
 zName = PD("name","-none-");
195195
 db_prepare(&q, "SELECT datetime(tkt_mtime,toLocal()) AS tkt_datetime, "
196196
 "datetime(tkt_ctime,toLocal()) AS tkt_datetime_creation, "
197
- "julianday('now') - tkt_mtime, julianday('now') - tkt_ctime, *"
197
+ "julianday('now') - tkt_mtime, "
198
+ "julianday('now') - tkt_ctime, *"
198199
 " FROM ticket WHERE tkt_uuid GLOB '%q*'",
199200
 zName);
200201
 if( db_step(&q)==SQLITE_ROW ){
201202
 n = db_column_count(&q);
202203
 for(i=0; i<n; i++){
@@ -773,11 +774,12 @@
773774
 }
774775
 zFullName = db_text(0,
775776
 "SELECT tkt_uuid FROM ticket"
776777
 " WHERE tkt_uuid GLOB '%q*'", zUuid);
777778
 if( g.perm.WrWiki && g.perm.WrTkt ){
778
- style_submenu_element("Edit Description", "%R/wikiedit?name=ticket/%T", zFullName);
779
+ style_submenu_element("Edit Description",
780
+ "%R/wikiedit?name=ticket/%T", zFullName);
779781
 }
780782
 if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br>\n", -1);
781783
 ticket_init();
782784
 initializeVariablesFromCGI();
783785
 getAllTicketFields();
784786
--- src/tkt.c
+++ src/tkt.c
@@ -192,11 +192,12 @@
192 int i, n, size, j;
193
194 zName = PD("name","-none-");
195 db_prepare(&q, "SELECT datetime(tkt_mtime,toLocal()) AS tkt_datetime, "
196 "datetime(tkt_ctime,toLocal()) AS tkt_datetime_creation, "
197 "julianday('now') - tkt_mtime, julianday('now') - tkt_ctime, *"
 
198 " FROM ticket WHERE tkt_uuid GLOB '%q*'",
199 zName);
200 if( db_step(&q)==SQLITE_ROW ){
201 n = db_column_count(&q);
202 for(i=0; i<n; i++){
@@ -773,11 +774,12 @@
773 }
774 zFullName = db_text(0,
775 "SELECT tkt_uuid FROM ticket"
776 " WHERE tkt_uuid GLOB '%q*'", zUuid);
777 if( g.perm.WrWiki && g.perm.WrTkt ){
778 style_submenu_element("Edit Description", "%R/wikiedit?name=ticket/%T", zFullName);
 
779 }
780 if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br>\n", -1);
781 ticket_init();
782 initializeVariablesFromCGI();
783 getAllTicketFields();
784
--- src/tkt.c
+++ src/tkt.c
@@ -192,11 +192,12 @@
192 int i, n, size, j;
193
194 zName = PD("name","-none-");
195 db_prepare(&q, "SELECT datetime(tkt_mtime,toLocal()) AS tkt_datetime, "
196 "datetime(tkt_ctime,toLocal()) AS tkt_datetime_creation, "
197 "julianday('now') - tkt_mtime, "
198 "julianday('now') - tkt_ctime, *"
199 " FROM ticket WHERE tkt_uuid GLOB '%q*'",
200 zName);
201 if( db_step(&q)==SQLITE_ROW ){
202 n = db_column_count(&q);
203 for(i=0; i<n; i++){
@@ -773,11 +774,12 @@
774 }
775 zFullName = db_text(0,
776 "SELECT tkt_uuid FROM ticket"
777 " WHERE tkt_uuid GLOB '%q*'", zUuid);
778 if( g.perm.WrWiki && g.perm.WrTkt ){
779 style_submenu_element("Edit Description",
780 "%R/wikiedit?name=ticket/%T", zFullName);
781 }
782 if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br>\n", -1);
783 ticket_init();
784 initializeVariablesFromCGI();
785 getAllTicketFields();
786
M src/tktsetup.c
+5 -3
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -563,11 +563,12 @@
563563
 @ FROM ticketchng
564564
 @ WHERE tkt_id=$tkt_id AND length(icomment)>0} {
565565
 @ if {$seenRow} {
566566
 @ html "<hr>\n"
567567
 @ } else {
568
-@ html "<tr><td class='tktDspLabel' style='text-align:left'>User Comments:</td></tr>\n"
568
+@ html "<tr><td class='tktDspLabel' style='text-align:left'>\n"
569
+@ html "User Comments:</td></tr>\n"
569570
 @ html "<tr><td colspan='5' class='tktDspValue'>\n"
570571
 @ set seenRow 1
571572
 @ }
572573
 @ html "<span class='tktDspCommenter'>"
573574
 @ html "[htmlize $xlogin]"
@@ -748,12 +749,13 @@
748749
 @ FROM ticketchng
749750
 @ WHERE tkt_id=$tkt_id AND length(icomment)>0} {
750751
 @ if {$seenRow} {
751752
 @ html "<hr>\n"
752753
 @ } else {
753
-@ html "<tr><td colspan='2'><hr></td></tr>"
754
-@ html "<tr><td colspan='2' class='tktDspLabel' style='text-align:left'>Previous User Comments:</td></tr>\n"
754
+@ html "<tr><td colspan='2'><hr></td></tr>\n"
755
+@ html "<tr><td colspan='2' class='tktDspLabel' style='text-align:left'>\n"
756
+@ html "Previous User Comments:</td></tr>\n"
755757
 @ html "<tr><td colspan='2' class='tktDspValue'>\n"
756758
 @ set seenRow 1
757759
 @ }
758760
 @ html "<span class='tktDspCommenter'>"
759761
 @ html "[htmlize $xlogin]"
760762
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -563,11 +563,12 @@
563 @ FROM ticketchng
564 @ WHERE tkt_id=$tkt_id AND length(icomment)>0} {
565 @ if {$seenRow} {
566 @ html "<hr>\n"
567 @ } else {
568 @ html "<tr><td class='tktDspLabel' style='text-align:left'>User Comments:</td></tr>\n"
 
569 @ html "<tr><td colspan='5' class='tktDspValue'>\n"
570 @ set seenRow 1
571 @ }
572 @ html "<span class='tktDspCommenter'>"
573 @ html "[htmlize $xlogin]"
@@ -748,12 +749,13 @@
748 @ FROM ticketchng
749 @ WHERE tkt_id=$tkt_id AND length(icomment)>0} {
750 @ if {$seenRow} {
751 @ html "<hr>\n"
752 @ } else {
753 @ html "<tr><td colspan='2'><hr></td></tr>"
754 @ html "<tr><td colspan='2' class='tktDspLabel' style='text-align:left'>Previous User Comments:</td></tr>\n"
 
755 @ html "<tr><td colspan='2' class='tktDspValue'>\n"
756 @ set seenRow 1
757 @ }
758 @ html "<span class='tktDspCommenter'>"
759 @ html "[htmlize $xlogin]"
760
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -563,11 +563,12 @@
563 @ FROM ticketchng
564 @ WHERE tkt_id=$tkt_id AND length(icomment)>0} {
565 @ if {$seenRow} {
566 @ html "<hr>\n"
567 @ } else {
568 @ html "<tr><td class='tktDspLabel' style='text-align:left'>\n"
569 @ html "User Comments:</td></tr>\n"
570 @ html "<tr><td colspan='5' class='tktDspValue'>\n"
571 @ set seenRow 1
572 @ }
573 @ html "<span class='tktDspCommenter'>"
574 @ html "[htmlize $xlogin]"
@@ -748,12 +749,13 @@
749 @ FROM ticketchng
750 @ WHERE tkt_id=$tkt_id AND length(icomment)>0} {
751 @ if {$seenRow} {
752 @ html "<hr>\n"
753 @ } else {
754 @ html "<tr><td colspan='2'><hr></td></tr>\n"
755 @ html "<tr><td colspan='2' class='tktDspLabel' style='text-align:left'>\n"
756 @ html "Previous User Comments:</td></tr>\n"
757 @ html "<tr><td colspan='2' class='tktDspValue'>\n"
758 @ set seenRow 1
759 @ }
760 @ html "<span class='tktDspCommenter'>"
761 @ html "[htmlize $xlogin]"
762

Keyboard Shortcuts

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