Fossil SCM

Change default ticket viewer format to display ticket title as wiki. Show event summaries as wiki on the timeline. Allow <nowiki> markup in "NOBLOCK" wiki renderings. Ticket [218153bb7c3].

drh 2009-09-23 13:08 trunk
Commit d6bfe8d9a8ea9c417b1594c968f37f0af2ab9de8
Parent f969b6cddeb0510…
3 files changed +2 -2 +1 -1 +6 -6
~ src/manifest.c ~ src/tktsetup.c ~ src/wikiformat.c
M src/manifest.c
+2 -2
--- src/manifest.c
+++ src/manifest.c
@@ -952,11 +952,11 @@
952952
 if( strcmp(pManifest->aField[i].zName, zStatusColumn)==0 ){
953953
 zNewStatus = pManifest->aField[i].zValue;
954954
 }
955955
 }
956956
 if( zNewStatus ){
957
- blob_appendf(&comment, "%h ticket [%.10s]: <i>%h</i>",
957
+ blob_appendf(&comment, "%h ticket [%.10s]: <i>%s</i>",
958958
 zNewStatus, pManifest->zTicketUuid, zTitle
959959
 );
960960
 if( pManifest->nField>1 ){
961961
 blob_appendf(&comment, " plus %d other change%s",
962962
 pManifest->nField-1, pManifest->nField==2 ? "" : "s");
@@ -966,11 +966,11 @@
966966
 }else{
967967
 zNewStatus = db_text("unknown",
968968
 "SELECT %s FROM ticket WHERE tkt_uuid='%s'",
969969
 zStatusColumn, pManifest->zTicketUuid
970970
 );
971
- blob_appendf(&comment, "Ticket [%.10s] <i>%h</i> status still %h with "
971
+ blob_appendf(&comment, "Ticket [%.10s] <i>%s</i> status still %h with "
972972
 "%d other change%s",
973973
 pManifest->zTicketUuid, zTitle, zNewStatus, pManifest->nField,
974974
 pManifest->nField==1 ? "" : "s"
975975
 );
976976
 free(zNewStatus);
977977
--- src/manifest.c
+++ src/manifest.c
@@ -952,11 +952,11 @@
952 if( strcmp(pManifest->aField[i].zName, zStatusColumn)==0 ){
953 zNewStatus = pManifest->aField[i].zValue;
954 }
955 }
956 if( zNewStatus ){
957 blob_appendf(&comment, "%h ticket [%.10s]: <i>%h</i>",
958 zNewStatus, pManifest->zTicketUuid, zTitle
959 );
960 if( pManifest->nField>1 ){
961 blob_appendf(&comment, " plus %d other change%s",
962 pManifest->nField-1, pManifest->nField==2 ? "" : "s");
@@ -966,11 +966,11 @@
966 }else{
967 zNewStatus = db_text("unknown",
968 "SELECT %s FROM ticket WHERE tkt_uuid='%s'",
969 zStatusColumn, pManifest->zTicketUuid
970 );
971 blob_appendf(&comment, "Ticket [%.10s] <i>%h</i> status still %h with "
972 "%d other change%s",
973 pManifest->zTicketUuid, zTitle, zNewStatus, pManifest->nField,
974 pManifest->nField==1 ? "" : "s"
975 );
976 free(zNewStatus);
977
--- src/manifest.c
+++ src/manifest.c
@@ -952,11 +952,11 @@
952 if( strcmp(pManifest->aField[i].zName, zStatusColumn)==0 ){
953 zNewStatus = pManifest->aField[i].zValue;
954 }
955 }
956 if( zNewStatus ){
957 blob_appendf(&comment, "%h ticket [%.10s]: <i>%s</i>",
958 zNewStatus, pManifest->zTicketUuid, zTitle
959 );
960 if( pManifest->nField>1 ){
961 blob_appendf(&comment, " plus %d other change%s",
962 pManifest->nField-1, pManifest->nField==2 ? "" : "s");
@@ -966,11 +966,11 @@
966 }else{
967 zNewStatus = db_text("unknown",
968 "SELECT %s FROM ticket WHERE tkt_uuid='%s'",
969 zStatusColumn, pManifest->zTicketUuid
970 );
971 blob_appendf(&comment, "Ticket [%.10s] <i>%s</i> status still %h with "
972 "%d other change%s",
973 pManifest->zTicketUuid, zTitle, zNewStatus, pManifest->nField,
974 pManifest->nField==1 ? "" : "s"
975 );
976 free(zNewStatus);
977
M src/tktsetup.c
+1 -1
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -363,11 +363,11 @@
363363
 @ <tr><td align="right">Ticket&nbsp;UUID:</td><td bgcolor="#d0d0d0" colspan="3">
364364
 @ $<tkt_uuid>
365365
 @ </td></tr>
366366
 @ <tr><td align="right">Title:</td>
367367
 @ <td bgcolor="#d0d0d0" colspan="3" valign="top">
368
-@ $<title>
368
+@ <th1>wiki $title</th1>
369369
 @ </td></tr>
370370
 @ <tr><td align="right">Status:</td><td bgcolor="#d0d0d0">
371371
 @ $<status>
372372
 @ </td>
373373
 @ <td align="right">Type:</td><td bgcolor="#d0d0d0">
374374
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -363,11 +363,11 @@
363 @ <tr><td align="right">Ticket&nbsp;UUID:</td><td bgcolor="#d0d0d0" colspan="3">
364 @ $<tkt_uuid>
365 @ </td></tr>
366 @ <tr><td align="right">Title:</td>
367 @ <td bgcolor="#d0d0d0" colspan="3" valign="top">
368 @ $<title>
369 @ </td></tr>
370 @ <tr><td align="right">Status:</td><td bgcolor="#d0d0d0">
371 @ $<status>
372 @ </td>
373 @ <td align="right">Type:</td><td bgcolor="#d0d0d0">
374
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -363,11 +363,11 @@
363 @ <tr><td align="right">Ticket&nbsp;UUID:</td><td bgcolor="#d0d0d0" colspan="3">
364 @ $<tkt_uuid>
365 @ </td></tr>
366 @ <tr><td align="right">Title:</td>
367 @ <td bgcolor="#d0d0d0" colspan="3" valign="top">
368 @ <th1>wiki $title</th1>
369 @ </td></tr>
370 @ <tr><td align="right">Status:</td><td bgcolor="#d0d0d0">
371 @ $<status>
372 @ </td>
373 @ <td align="right">Type:</td><td bgcolor="#d0d0d0">
374
M src/wikiformat.c
+6 -6
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1212,23 +1212,23 @@
12121212
 */
12131213
 if( (markup.iType&MUTYPE_FONT)==0 && (p->state & FONT_MARKUP_ONLY)!=0 ){
12141214
 /* Do nothing */
12151215
 }else
12161216
1217
- /* Ignore block markup for in-line rendering.
1218
- */
1219
- if( inlineOnly && (markup.iType&MUTYPE_INLINE)==0 ){
1220
- /* Do nothing */
1221
- }else
1222
-
12231217
 if( markup.iCode==MARKUP_NOWIKI ){
12241218
 if( markup.endTag ){
12251219
 p->state |= ALLOW_WIKI;
12261220
 }else{
12271221
 p->state &= ~ALLOW_WIKI;
12281222
 }
12291223
 }else
1224
+
1225
+ /* Ignore block markup for in-line rendering.
1226
+ */
1227
+ if( inlineOnly && (markup.iType&MUTYPE_INLINE)==0 ){
1228
+ /* Do nothing */
1229
+ }else
12301230
12311231
 /* Generate end-tags */
12321232
 if( markup.endTag ){
12331233
 popStackToTag(p, markup.iCode);
12341234
 }else
12351235
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1212,23 +1212,23 @@
1212 */
1213 if( (markup.iType&MUTYPE_FONT)==0 && (p->state & FONT_MARKUP_ONLY)!=0 ){
1214 /* Do nothing */
1215 }else
1216
1217 /* Ignore block markup for in-line rendering.
1218 */
1219 if( inlineOnly && (markup.iType&MUTYPE_INLINE)==0 ){
1220 /* Do nothing */
1221 }else
1222
1223 if( markup.iCode==MARKUP_NOWIKI ){
1224 if( markup.endTag ){
1225 p->state |= ALLOW_WIKI;
1226 }else{
1227 p->state &= ~ALLOW_WIKI;
1228 }
1229 }else
 
 
 
 
 
 
1230
1231 /* Generate end-tags */
1232 if( markup.endTag ){
1233 popStackToTag(p, markup.iCode);
1234 }else
1235
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1212,23 +1212,23 @@
1212 */
1213 if( (markup.iType&MUTYPE_FONT)==0 && (p->state & FONT_MARKUP_ONLY)!=0 ){
1214 /* Do nothing */
1215 }else
1216
 
 
 
 
 
 
1217 if( markup.iCode==MARKUP_NOWIKI ){
1218 if( markup.endTag ){
1219 p->state |= ALLOW_WIKI;
1220 }else{
1221 p->state &= ~ALLOW_WIKI;
1222 }
1223 }else
1224
1225 /* Ignore block markup for in-line rendering.
1226 */
1227 if( inlineOnly && (markup.iType&MUTYPE_INLINE)==0 ){
1228 /* Do nothing */
1229 }else
1230
1231 /* Generate end-tags */
1232 if( markup.endTag ){
1233 popStackToTag(p, markup.iCode);
1234 }else
1235

Keyboard Shortcuts

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