Fossil SCM

some ticket pages html validated

wolfgang 2010-09-12 17:12 UTC wolfgangFormat2CSS
Commit b9f38e16d06b505ba7974c12039b72c9d84bec6f
Parent 642f4dcfa24f1f9…
6 files changed +1 -1 +19 +1 -1 +8 -6 +49 -49 +21 -22
~ src/report.c ~ src/style.c ~ src/th_main.c ~ src/tkt.c ~ src/tktsetup.c ~ src/wiki.c
M src/report.c
+1 -1
--- src/report.c
+++ src/report.c
@@ -907,11 +907,11 @@
907907
 if( !tabs ){
908908
 struct GenerateHTML sState;
909909
910910
 db_multi_exec("PRAGMA empty_result_callbacks=ON");
911911
 style_submenu_element("Raw", "Raw",
912
- "rptview?tablist=1&%s", PD("QUERY_STRING",""));
912
+ "rptview?tablist=1&%s", PD("QUERY_STRING",""));
913913
 if( g.okAdmin
914914
 || (g.okTktFmt && g.zLogin && zOwner && strcmp(g.zLogin,zOwner)==0) ){
915915
 style_submenu_element("Edit", "Edit", "rptedit?rn=%d", rn);
916916
 }
917917
 if( g.okTktFmt ){
918918
--- src/report.c
+++ src/report.c
@@ -907,11 +907,11 @@
907 if( !tabs ){
908 struct GenerateHTML sState;
909
910 db_multi_exec("PRAGMA empty_result_callbacks=ON");
911 style_submenu_element("Raw", "Raw",
912 "rptview?tablist=1&%s", PD("QUERY_STRING",""));
913 if( g.okAdmin
914 || (g.okTktFmt && g.zLogin && zOwner && strcmp(g.zLogin,zOwner)==0) ){
915 style_submenu_element("Edit", "Edit", "rptedit?rn=%d", rn);
916 }
917 if( g.okTktFmt ){
918
--- src/report.c
+++ src/report.c
@@ -907,11 +907,11 @@
907 if( !tabs ){
908 struct GenerateHTML sState;
909
910 db_multi_exec("PRAGMA empty_result_callbacks=ON");
911 style_submenu_element("Raw", "Raw",
912 "rptview?tablist=1&%s", PD("QUERY_STRING",""));
913 if( g.okAdmin
914 || (g.okTktFmt && g.zLogin && zOwner && strcmp(g.zLogin,zOwner)==0) ){
915 style_submenu_element("Edit", "Edit", "rptedit?rn=%d", rn);
916 }
917 if( g.okTktFmt ){
918
M src/style.c
+19
--- src/style.c
+++ src/style.c
@@ -622,10 +622,29 @@
622622
 },
623623
 { "span.usertype:after",
624624
 "trailing text for user types, mentioned on the user edit page",
625625
 @ content:"'";
626626
 },
627
+ { "span.wikiruleHead",
628
+ "format for leading text in wikirules definitions",
629
+ @ font-weight: bold;
630
+ },
631
+ { "td.tktDspLabel",
632
+ "format for labels on ticket display page",
633
+ @ text-align: right;
634
+ },
635
+ { "td.tktDspValue",
636
+ "format for values on ticket display page",
637
+ @ text-align: left;
638
+ @ vertical-align: top;
639
+ @ background-color: #d0d0d0;
640
+ },
641
+ { "span.tktError",
642
+ "format for ticket error messages",
643
+ @ color: red;
644
+ @ font-weight: bold;
645
+ },
627646
 { 0,
628647
 0,
629648
 0
630649
 }
631650
 };
632651
--- src/style.c
+++ src/style.c
@@ -622,10 +622,29 @@
622 },
623 { "span.usertype:after",
624 "trailing text for user types, mentioned on the user edit page",
625 @ content:"'";
626 },
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
627 { 0,
628 0,
629 0
630 }
631 };
632
--- src/style.c
+++ src/style.c
@@ -622,10 +622,29 @@
622 },
623 { "span.usertype:after",
624 "trailing text for user types, mentioned on the user edit page",
625 @ content:"'";
626 },
627 { "span.wikiruleHead",
628 "format for leading text in wikirules definitions",
629 @ font-weight: bold;
630 },
631 { "td.tktDspLabel",
632 "format for labels on ticket display page",
633 @ text-align: right;
634 },
635 { "td.tktDspValue",
636 "format for values on ticket display page",
637 @ text-align: left;
638 @ vertical-align: top;
639 @ background-color: #d0d0d0;
640 },
641 { "span.tktError",
642 "format for ticket error messages",
643 @ color: red;
644 @ font-weight: bold;
645 },
646 { 0,
647 0,
648 0
649 }
650 };
651
M src/th_main.c
+1 -1
--- src/th_main.c
+++ src/th_main.c
@@ -278,11 +278,11 @@
278278
 blob_reset(&name);
279279
 for(i=0; i<nElem; i++){
280280
 zH = htmlize((char*)azElem[i], aszElem[i]);
281281
 if( zValue && aszElem[i]==nValue
282282
 && memcmp(zValue, azElem[i], nValue)==0 ){
283
- z = mprintf("<option value=\"%s\" selected>%s</option>", zH, zH);
283
+ z = mprintf("<option value=\"%s\" selected=\"selected\">%s</option>", zH, zH);
284284
 }else{
285285
 z = mprintf("<option value=\"%s\">%s</option>", zH, zH);
286286
 }
287287
 free(zH);
288288
 sendText(z, -1, 0);
289289
--- src/th_main.c
+++ src/th_main.c
@@ -278,11 +278,11 @@
278 blob_reset(&name);
279 for(i=0; i<nElem; i++){
280 zH = htmlize((char*)azElem[i], aszElem[i]);
281 if( zValue && aszElem[i]==nValue
282 && memcmp(zValue, azElem[i], nValue)==0 ){
283 z = mprintf("<option value=\"%s\" selected>%s</option>", zH, zH);
284 }else{
285 z = mprintf("<option value=\"%s\">%s</option>", zH, zH);
286 }
287 free(zH);
288 sendText(z, -1, 0);
289
--- src/th_main.c
+++ src/th_main.c
@@ -278,11 +278,11 @@
278 blob_reset(&name);
279 for(i=0; i<nElem; i++){
280 zH = htmlize((char*)azElem[i], aszElem[i]);
281 if( zValue && aszElem[i]==nValue
282 && memcmp(zValue, azElem[i], nValue)==0 ){
283 z = mprintf("<option value=\"%s\" selected=\"selected\">%s</option>", zH, zH);
284 }else{
285 z = mprintf("<option value=\"%s\">%s</option>", zH, zH);
286 }
287 free(zH);
288 sendText(z, -1, 0);
289
M src/tkt.c
+8 -6
--- src/tkt.c
+++ src/tkt.c
@@ -511,12 +511,13 @@
511511
 if( g.thTrace ) Th_Trace("BEGIN_TKTNEW<br />\n", -1);
512512
 ticket_init();
513513
 getAllTicketFields();
514514
 initializeVariablesFromDb();
515515
 initializeVariablesFromCGI();
516
- @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
516
+ @ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><p>
517517
 login_insert_csrf_secret();
518
+ @ </p>
518519
 zScript = ticket_newpage_code();
519520
 Th_Store("login", g.zLogin);
520521
 Th_Store("date", db_text(0, "SELECT datetime('now')"));
521522
 Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd,
522523
 (void*)&zNewUuid, 0);
@@ -554,34 +555,35 @@
554555
 cgi_redirectf("tktview?name=%T", zName);
555556
 }
556557
 style_header("Edit Ticket");
557558
 if( zName==0 || (nName = strlen(zName))<4 || nName>UUID_SIZE
558559
 || !validate16(zName,nName) ){
559
- @ <font color="red"><b>Not a valid ticket id: \"%h(zName)\"</b></font>
560
+ @ <span class="tktError">Not a valid ticket id: \"%h(zName)\"</span>
560561
 style_footer();
561562
 return;
562563
 }
563564
 nRec = db_int(0, "SELECT count(*) FROM ticket WHERE tkt_uuid GLOB '%q*'",
564565
 zName);
565566
 if( nRec==0 ){
566
- @ <font color="red"><b>No such ticket: \"%h(zName)\"</b></font>
567
+ @ <span class="tktError">No such ticket: \"%h(zName)\"</span>
567568
 style_footer();
568569
 return;
569570
 }
570571
 if( nRec>1 ){
571
- @ <font color="red"><b>%d(nRec) tickets begin with: \"%h(zName)\"</b></font>
572
+ @ <span class="tktError"><b>%d(nRec) tickets begin with: \"%h(zName)\"</span>
572573
 style_footer();
573574
 return;
574575
 }
575576
 if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
576577
 ticket_init();
577578
 getAllTicketFields();
578579
 initializeVariablesFromCGI();
579580
 initializeVariablesFromDb();
580
- @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
581
- @ <input type="hidden" name="name" value="%s(zName)">
581
+ @ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><p>
582
+ @ <input type="hidden" name="name" value="%s(zName)" />
582583
 login_insert_csrf_secret();
584
+ @ </p>
583585
 zScript = ticket_editpage_code();
584586
 Th_Store("login", g.zLogin);
585587
 Th_Store("date", db_text(0, "SELECT datetime('now')"));
586588
 Th_CreateCommand(g.interp, "append_field", appendRemarkCmd, 0, 0);
587589
 Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd, (void*)&zName,0);
588590
--- src/tkt.c
+++ src/tkt.c
@@ -511,12 +511,13 @@
511 if( g.thTrace ) Th_Trace("BEGIN_TKTNEW<br />\n", -1);
512 ticket_init();
513 getAllTicketFields();
514 initializeVariablesFromDb();
515 initializeVariablesFromCGI();
516 @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
517 login_insert_csrf_secret();
 
518 zScript = ticket_newpage_code();
519 Th_Store("login", g.zLogin);
520 Th_Store("date", db_text(0, "SELECT datetime('now')"));
521 Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd,
522 (void*)&zNewUuid, 0);
@@ -554,34 +555,35 @@
554 cgi_redirectf("tktview?name=%T", zName);
555 }
556 style_header("Edit Ticket");
557 if( zName==0 || (nName = strlen(zName))<4 || nName>UUID_SIZE
558 || !validate16(zName,nName) ){
559 @ <font color="red"><b>Not a valid ticket id: \"%h(zName)\"</b></font>
560 style_footer();
561 return;
562 }
563 nRec = db_int(0, "SELECT count(*) FROM ticket WHERE tkt_uuid GLOB '%q*'",
564 zName);
565 if( nRec==0 ){
566 @ <font color="red"><b>No such ticket: \"%h(zName)\"</b></font>
567 style_footer();
568 return;
569 }
570 if( nRec>1 ){
571 @ <font color="red"><b>%d(nRec) tickets begin with: \"%h(zName)\"</b></font>
572 style_footer();
573 return;
574 }
575 if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
576 ticket_init();
577 getAllTicketFields();
578 initializeVariablesFromCGI();
579 initializeVariablesFromDb();
580 @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
581 @ <input type="hidden" name="name" value="%s(zName)">
582 login_insert_csrf_secret();
 
583 zScript = ticket_editpage_code();
584 Th_Store("login", g.zLogin);
585 Th_Store("date", db_text(0, "SELECT datetime('now')"));
586 Th_CreateCommand(g.interp, "append_field", appendRemarkCmd, 0, 0);
587 Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd, (void*)&zName,0);
588
--- src/tkt.c
+++ src/tkt.c
@@ -511,12 +511,13 @@
511 if( g.thTrace ) Th_Trace("BEGIN_TKTNEW<br />\n", -1);
512 ticket_init();
513 getAllTicketFields();
514 initializeVariablesFromDb();
515 initializeVariablesFromCGI();
516 @ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><p>
517 login_insert_csrf_secret();
518 @ </p>
519 zScript = ticket_newpage_code();
520 Th_Store("login", g.zLogin);
521 Th_Store("date", db_text(0, "SELECT datetime('now')"));
522 Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd,
523 (void*)&zNewUuid, 0);
@@ -554,34 +555,35 @@
555 cgi_redirectf("tktview?name=%T", zName);
556 }
557 style_header("Edit Ticket");
558 if( zName==0 || (nName = strlen(zName))<4 || nName>UUID_SIZE
559 || !validate16(zName,nName) ){
560 @ <span class="tktError">Not a valid ticket id: \"%h(zName)\"</span>
561 style_footer();
562 return;
563 }
564 nRec = db_int(0, "SELECT count(*) FROM ticket WHERE tkt_uuid GLOB '%q*'",
565 zName);
566 if( nRec==0 ){
567 @ <span class="tktError">No such ticket: \"%h(zName)\"</span>
568 style_footer();
569 return;
570 }
571 if( nRec>1 ){
572 @ <span class="tktError"><b>%d(nRec) tickets begin with: \"%h(zName)\"</span>
573 style_footer();
574 return;
575 }
576 if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
577 ticket_init();
578 getAllTicketFields();
579 initializeVariablesFromCGI();
580 initializeVariablesFromDb();
581 @ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><p>
582 @ <input type="hidden" name="name" value="%s(zName)" />
583 login_insert_csrf_secret();
584 @ </p>
585 zScript = ticket_editpage_code();
586 Th_Store("login", g.zLogin);
587 Th_Store("date", db_text(0, "SELECT datetime('now')"));
588 Th_CreateCommand(g.interp, "append_field", appendRemarkCmd, 0, 0);
589 Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd, (void*)&zName,0);
590
M src/tktsetup.c
+49 -49
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -250,46 +250,46 @@
250250
 @ if {[info exists submit]} {
251251
 @ set status Open
252252
 @ submit_ticket
253253
 @ }
254254
 @ </th1>
255
-@ <h1 align="center">Enter A New Ticket</h1>
255
+@ <h1 style="text-align: center;">Enter A New Ticket</h1>
256256
 @ <table cellpadding="5">
257257
 @ <tr>
258258
 @ <td colspan="2">
259259
 @ Enter a one-line summary of the ticket:<br />
260
-@ <input type="text" name="title" size="60" value="$<title>">
260
+@ <input type="text" name="title" size="60" value="$<title>" />
261261
 @ </td>
262262
 @ </tr>
263263
 @
264264
 @ <tr>
265
-@ <td align="right">Type:
265
+@ <td style="text-align: center;">Type:
266266
 @ <th1>combobox type $type_choices 1</th1>
267267
 @ </td>
268268
 @ <td>What type of ticket is this?</td>
269269
 @ </tr>
270270
 @
271271
 @ <tr>
272
-@ <td align="right">Version:
273
-@ <input type="text" name="foundin" size="20" value="$<foundin>">
272
+@ <td style="text-align: center;">Version:
273
+@ <input type="text" name="foundin" size="20" value="$<foundin>" />
274274
 @ </td>
275275
 @ <td>In what version or build number do you observe the problem?</td>
276276
 @ </tr>
277277
 @
278278
 @ <tr>
279
-@ <td align="right">Severity:
279
+@ <td style="text-align: center;">Severity:
280280
 @ <th1>combobox severity $severity_choices 1</th1>
281281
 @ </td>
282282
 @ <td>How debilitating is the problem? How badly does the problem
283283
 @ affect the operation of the product?</td>
284284
 @ </tr>
285285
 @
286286
 @ <tr>
287
-@ <td align="right">EMail:
288
-@ <input type="text" name="private_contact" value="$<private_contact>" size="30">
287
+@ <td style="text-align: center;">EMail:
288
+@ <input type="text" name="private_contact" value="$<private_contact>" size="30" />
289289
 @ </td>
290
-@ <td><u>Not publicly visible</u>. Used by developers to contact you with
290
+@ <td><span style="text-decoration: underline;">Not publicly visible</span>. Used by developers to contact you with
291291
 @ questions.</td>
292292
 @ </tr>
293293
 @
294294
 @ <tr>
295295
 @ <td colspan="2">
@@ -299,11 +299,11 @@
299299
 @ possible.
300300
 @ <br />
301301
 @ <th1>set nline [linecount $comment 50 10]</th1>
302302
 @ <textarea name="comment" cols="80" rows="$nline"
303303
 @ wrap="virtual" class="wikiedit">$<comment></textarea><br />
304
-@ <input type="submit" name="preview" value="Preview">
304
+@ <input type="submit" name="preview" value="Preview" /></td>
305305
 @ </tr>
306306
 @
307307
 @ <th1>enable_output [info exists preview]</th1>
308308
 @ <tr><td colspan="2">
309309
 @ Description Preview:<br /><hr />
@@ -311,19 +311,19 @@
311311
 @ <hr />
312312
 @ </td></tr>
313313
 @ <th1>enable_output 1</th1>
314314
 @
315315
 @ <tr>
316
-@ <td align="right">
317
-@ <input type="submit" name="submit" value="Submit">
316
+@ <td style="text-align: center;">
317
+@ <input type="submit" name="submit" value="Submit" />
318318
 @ </td>
319319
 @ <td>After filling in the information above, press this button to create
320320
 @ the new ticket</td>
321321
 @ </tr>
322322
 @ <tr>
323
-@ <td align="right">
324
-@ <input type="submit" name="cancel" value="Cancel">
323
+@ <td style="text-align: center;">
324
+@ <input type="submit" name="cancel" value="Cancel" />
325325
 @ </td>
326326
 @ <td>Abandon and forget this ticket</td>
327327
 @ </tr>
328328
 @ </table>
329329
 ;
@@ -353,51 +353,51 @@
353353
 );
354354
 }
355355
356356
 static const char zDefaultView[] =
357357
 @ <table cellpadding="5">
358
-@ <tr><td align="right">Ticket&nbsp;UUID:</td><td style="background-color: #d0d0d0;" colspan="3">
358
+@ <tr><td class="tktDspLabel">Ticket&nbsp;UUID:</td><td class="tktDspValue" colspan="3">
359359
 @ $<tkt_uuid>
360360
 @ </td></tr>
361
-@ <tr><td align="right">Title:</td>
362
-@ <td bgcolor="#d0d0d0" colspan="3" valign="top">
361
+@ <tr><td class="tktDspLabel">Title:</td>
362
+@ <td class="tktDspValue" colspan="3">
363363
 @ <th1>wiki $title</th1>
364364
 @ </td></tr>
365
-@ <tr><td align="right">Status:</td><td bgcolor="#d0d0d0">
365
+@ <tr><td class="tktDspLabel">Status:</td><td class="tktDspValue">
366366
 @ $<status>
367367
 @ </td>
368
-@ <td align="right">Type:</td><td bgcolor="#d0d0d0">
368
+@ <td class="tktDspLabel">Type:</td><td class="tktDspValue">
369369
 @ $<type>
370370
 @ </td></tr>
371
-@ <tr><td align="right">Severity:</td><td bgcolor="#d0d0d0">
371
+@ <tr><td class="tktDspLabel">Severity:</td><td class="tktDspValue">
372372
 @ $<severity>
373373
 @ </td>
374
-@ <td align="right">Priority:</td><td bgcolor="#d0d0d0">
374
+@ <td class="tktDspLabel">Priority:</td><td class="tktDspValue">
375375
 @ $<priority>
376376
 @ </td></tr>
377
-@ <tr><td align="right">Subsystem:</td><td bgcolor="#d0d0d0">
377
+@ <tr><td class="tktDspLabel">Subsystem:</td><td class="tktDspValue">
378378
 @ $<subsystem>
379379
 @ </td>
380
-@ <td align="right">Resolution:</td><td bgcolor="#d0d0d0">
380
+@ <td class="tktDspLabel">Resolution:</td><td class="tktDspValue">
381381
 @ $<resolution>
382382
 @ </td></tr>
383
-@ <tr><td align="right">Last&nbsp;Modified:</td><td bgcolor="#d0d0d0">
383
+@ <tr><td class="tktDspLabel">Last&nbsp;Modified:</td><td class="tktDspValue">
384384
 @ $<tkt_datetime>
385385
 @ </td>
386386
 @ <th1>enable_output [hascap e]</th1>
387
-@ <td align="right">Contact:</td><td bgcolor="#d0d0d0">
387
+@ <td class="tktDspLabel">Contact:</td><td class="tktDspValue">
388388
 @ $<private_contact>
389389
 @ </td>
390390
 @ <th1>enable_output 1</th1>
391391
 @ </tr>
392
-@ <tr><td align="right">Version&nbsp;Found&nbsp;In:</td>
393
-@ <td colspan="3" valign="top" bgcolor="#d0d0d0">
392
+@ <tr><td class="tktDspLabel">Version&nbsp;Found&nbsp;In:</td>
393
+@ <td colspan="3" valign="top" class="tktDspValue">
394394
 @ $<foundin>
395395
 @ </td></tr>
396396
 @ <tr><td>Description &amp; Comments:</td></tr>
397
-@ <tr><td colspan="4" bgcolor="#d0d0d0">
398
-@ <span bgcolor="#d0d0d0"><th1>wiki $comment</th1></span>
397
+@ <tr><td colspan="4" class="tktDspValue">
398
+@ <th1>wiki $comment</th1>
399399
 @ </td></tr>
400400
 @ </table>
401401
 ;
402402
403403
@@ -442,39 +442,39 @@
442442
 @ }
443443
 @ submit_ticket
444444
 @ }
445445
 @ </th1>
446446
 @ <table cellpadding="5">
447
-@ <tr><td align="right">Title:</td><td>
448
-@ <input type="text" name="title" value="$<title>" size="60">
447
+@ <tr><td class="tktDspLabel">Title:</td><td>
448
+@ <input type="text" name="title" value="$<title>" size="60" />
449449
 @ </td></tr>
450
-@ <tr><td align="right">Status:</td><td>
450
+@ <tr><td class="tktDspLabel">Status:</td><td>
451451
 @ <th1>combobox status $status_choices 1</th1>
452452
 @ </td></tr>
453
-@ <tr><td align="right">Type:</td><td>
453
+@ <tr><td class="tktDspLabel">Type:</td><td>
454454
 @ <th1>combobox type $type_choices 1</th1>
455455
 @ </td></tr>
456
-@ <tr><td align="right">Severity:</td><td>
456
+@ <tr><td class="tktDspLabel">Severity:</td><td>
457457
 @ <th1>combobox severity $severity_choices 1</th1>
458458
 @ </td></tr>
459
-@ <tr><td align="right">Priority:</td><td>
459
+@ <tr><td class="tktDspLabel">Priority:</td><td>
460460
 @ <th1>combobox priority $priority_choices 1</th1>
461461
 @ </td></tr>
462
-@ <tr><td align="right">Resolution:</td><td>
462
+@ <tr><td class="tktDspLabel">Resolution:</td><td>
463463
 @ <th1>combobox resolution $resolution_choices 1</th1>
464464
 @ </td></tr>
465
-@ <tr><td align="right">Subsystem:</td><td>
465
+@ <tr><td class="tktDspLabel">Subsystem:</td><td>
466466
 @ <th1>combobox subsystem $subsystem_choices 1</th1>
467467
 @ </td></tr>
468468
 @ <th1>enable_output [hascap e]</th1>
469
-@ <tr><td align="right">Contact:</td><td>
469
+@ <tr><td class="tktDspLabel">Contact:</td><td>
470470
 @ <input type="text" name="private_contact" size="40"
471
-@ value="$<private_contact>">
471
+@ value="$<private_contact>" />
472472
 @ </td></tr>
473473
 @ <th1>enable_output 1</th1>
474
-@ <tr><td align="right">Version&nbsp;Found&nbsp;In:</td><td>
475
-@ <input type="text" name="foundin" size="50" value="$<foundin>">
474
+@ <tr><td class="tktDspLabel">Version&nbsp;Found&nbsp;In:</td><td>
475
+@ <input type="text" name="foundin" size="50" value="$<foundin>" />
476476
 @ </td></tr>
477477
 @ <tr><td colspan="2">
478478
 @ <th1>
479479
 @ if {![info exists eall]} {set eall 0}
480480
 @ if {[info exists aonlybtn]} {set eall 0}
@@ -485,22 +485,22 @@
485485
 @ enable_output $eall
486486
 @ </th1>
487487
 @ Description And Comments:<br />
488488
 @ <textarea name="comment" cols="80" rows="$nline"
489489
 @ wrap="virtual" class="wikiedit">$<comment></textarea><br />
490
-@ <input type="hidden" name="eall" value="1">
491
-@ <input type="submit" name="aonlybtn" value="Append Remark">
492
-@ <input type="submit" name="preview1btn" value="Preview">
490
+@ <input type="hidden" name="eall" value="1" />
491
+@ <input type="submit" name="aonlybtn" value="Append Remark" />
492
+@ <input type="submit" name="preview1btn" value="Preview" />
493493
 @ <th1>enable_output [expr {!$eall}]</th1>
494494
 @ Append Remark from
495
-@ <input type="text" name="username" value="$<username>" size="30">:<br />
495
+@ <input type="text" name="username" value="$<username>" size="30" />:<br />
496496
 @ <textarea name="cmappnd" cols="80" rows="15"
497497
 @ wrap="virtual" class="wikiedit">$<cmappnd></textarea><br />
498498
 @ <th1>enable_output [expr {[hascap w] && !$eall}]</th1>
499
-@ <input type="submit" name="eallbtn" value="Edit All">
499
+@ <input type="submit" name="eallbtn" value="Edit All" />
500500
 @ <th1>enable_output [expr {!$eall}]</th1>
501
-@ <input type="submit" name="preview2btn" value="Preview">
501
+@ <input type="submit" name="preview2btn" value="Preview" />
502502
 @ <th1>enable_output 1</th1>
503503
 @ </td></tr>
504504
 @
505505
 @ <th1>enable_output [info exists preview1btn]</th1>
506506
 @ <tr><td colspan="2">
@@ -515,12 +515,12 @@
515515
 @ <hr />
516516
 @ </td></tr>
517517
 @ <th1>enable_output 1</th1>
518518
 @
519519
 @ <tr><td align="right"></td><td>
520
-@ <input type="submit" name="submit" value="Submit Changes">
521
-@ <input type="submit" name="cancel" value="Cancel">
520
+@ <input type="submit" name="submit" value="Submit Changes" />
521
+@ <input type="submit" name="cancel" value="Cancel" />
522522
 @ </td></tr>
523523
 @ </table>
524524
 ;
525525
526526
 /*
527527
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -250,46 +250,46 @@
250 @ if {[info exists submit]} {
251 @ set status Open
252 @ submit_ticket
253 @ }
254 @ </th1>
255 @ <h1 align="center">Enter A New Ticket</h1>
256 @ <table cellpadding="5">
257 @ <tr>
258 @ <td colspan="2">
259 @ Enter a one-line summary of the ticket:<br />
260 @ <input type="text" name="title" size="60" value="$<title>">
261 @ </td>
262 @ </tr>
263 @
264 @ <tr>
265 @ <td align="right">Type:
266 @ <th1>combobox type $type_choices 1</th1>
267 @ </td>
268 @ <td>What type of ticket is this?</td>
269 @ </tr>
270 @
271 @ <tr>
272 @ <td align="right">Version:
273 @ <input type="text" name="foundin" size="20" value="$<foundin>">
274 @ </td>
275 @ <td>In what version or build number do you observe the problem?</td>
276 @ </tr>
277 @
278 @ <tr>
279 @ <td align="right">Severity:
280 @ <th1>combobox severity $severity_choices 1</th1>
281 @ </td>
282 @ <td>How debilitating is the problem? How badly does the problem
283 @ affect the operation of the product?</td>
284 @ </tr>
285 @
286 @ <tr>
287 @ <td align="right">EMail:
288 @ <input type="text" name="private_contact" value="$<private_contact>" size="30">
289 @ </td>
290 @ <td><u>Not publicly visible</u>. Used by developers to contact you with
291 @ questions.</td>
292 @ </tr>
293 @
294 @ <tr>
295 @ <td colspan="2">
@@ -299,11 +299,11 @@
299 @ possible.
300 @ <br />
301 @ <th1>set nline [linecount $comment 50 10]</th1>
302 @ <textarea name="comment" cols="80" rows="$nline"
303 @ wrap="virtual" class="wikiedit">$<comment></textarea><br />
304 @ <input type="submit" name="preview" value="Preview">
305 @ </tr>
306 @
307 @ <th1>enable_output [info exists preview]</th1>
308 @ <tr><td colspan="2">
309 @ Description Preview:<br /><hr />
@@ -311,19 +311,19 @@
311 @ <hr />
312 @ </td></tr>
313 @ <th1>enable_output 1</th1>
314 @
315 @ <tr>
316 @ <td align="right">
317 @ <input type="submit" name="submit" value="Submit">
318 @ </td>
319 @ <td>After filling in the information above, press this button to create
320 @ the new ticket</td>
321 @ </tr>
322 @ <tr>
323 @ <td align="right">
324 @ <input type="submit" name="cancel" value="Cancel">
325 @ </td>
326 @ <td>Abandon and forget this ticket</td>
327 @ </tr>
328 @ </table>
329 ;
@@ -353,51 +353,51 @@
353 );
354 }
355
356 static const char zDefaultView[] =
357 @ <table cellpadding="5">
358 @ <tr><td align="right">Ticket&nbsp;UUID:</td><td style="background-color: #d0d0d0;" colspan="3">
359 @ $<tkt_uuid>
360 @ </td></tr>
361 @ <tr><td align="right">Title:</td>
362 @ <td bgcolor="#d0d0d0" colspan="3" valign="top">
363 @ <th1>wiki $title</th1>
364 @ </td></tr>
365 @ <tr><td align="right">Status:</td><td bgcolor="#d0d0d0">
366 @ $<status>
367 @ </td>
368 @ <td align="right">Type:</td><td bgcolor="#d0d0d0">
369 @ $<type>
370 @ </td></tr>
371 @ <tr><td align="right">Severity:</td><td bgcolor="#d0d0d0">
372 @ $<severity>
373 @ </td>
374 @ <td align="right">Priority:</td><td bgcolor="#d0d0d0">
375 @ $<priority>
376 @ </td></tr>
377 @ <tr><td align="right">Subsystem:</td><td bgcolor="#d0d0d0">
378 @ $<subsystem>
379 @ </td>
380 @ <td align="right">Resolution:</td><td bgcolor="#d0d0d0">
381 @ $<resolution>
382 @ </td></tr>
383 @ <tr><td align="right">Last&nbsp;Modified:</td><td bgcolor="#d0d0d0">
384 @ $<tkt_datetime>
385 @ </td>
386 @ <th1>enable_output [hascap e]</th1>
387 @ <td align="right">Contact:</td><td bgcolor="#d0d0d0">
388 @ $<private_contact>
389 @ </td>
390 @ <th1>enable_output 1</th1>
391 @ </tr>
392 @ <tr><td align="right">Version&nbsp;Found&nbsp;In:</td>
393 @ <td colspan="3" valign="top" bgcolor="#d0d0d0">
394 @ $<foundin>
395 @ </td></tr>
396 @ <tr><td>Description &amp; Comments:</td></tr>
397 @ <tr><td colspan="4" bgcolor="#d0d0d0">
398 @ <span bgcolor="#d0d0d0"><th1>wiki $comment</th1></span>
399 @ </td></tr>
400 @ </table>
401 ;
402
403
@@ -442,39 +442,39 @@
442 @ }
443 @ submit_ticket
444 @ }
445 @ </th1>
446 @ <table cellpadding="5">
447 @ <tr><td align="right">Title:</td><td>
448 @ <input type="text" name="title" value="$<title>" size="60">
449 @ </td></tr>
450 @ <tr><td align="right">Status:</td><td>
451 @ <th1>combobox status $status_choices 1</th1>
452 @ </td></tr>
453 @ <tr><td align="right">Type:</td><td>
454 @ <th1>combobox type $type_choices 1</th1>
455 @ </td></tr>
456 @ <tr><td align="right">Severity:</td><td>
457 @ <th1>combobox severity $severity_choices 1</th1>
458 @ </td></tr>
459 @ <tr><td align="right">Priority:</td><td>
460 @ <th1>combobox priority $priority_choices 1</th1>
461 @ </td></tr>
462 @ <tr><td align="right">Resolution:</td><td>
463 @ <th1>combobox resolution $resolution_choices 1</th1>
464 @ </td></tr>
465 @ <tr><td align="right">Subsystem:</td><td>
466 @ <th1>combobox subsystem $subsystem_choices 1</th1>
467 @ </td></tr>
468 @ <th1>enable_output [hascap e]</th1>
469 @ <tr><td align="right">Contact:</td><td>
470 @ <input type="text" name="private_contact" size="40"
471 @ value="$<private_contact>">
472 @ </td></tr>
473 @ <th1>enable_output 1</th1>
474 @ <tr><td align="right">Version&nbsp;Found&nbsp;In:</td><td>
475 @ <input type="text" name="foundin" size="50" value="$<foundin>">
476 @ </td></tr>
477 @ <tr><td colspan="2">
478 @ <th1>
479 @ if {![info exists eall]} {set eall 0}
480 @ if {[info exists aonlybtn]} {set eall 0}
@@ -485,22 +485,22 @@
485 @ enable_output $eall
486 @ </th1>
487 @ Description And Comments:<br />
488 @ <textarea name="comment" cols="80" rows="$nline"
489 @ wrap="virtual" class="wikiedit">$<comment></textarea><br />
490 @ <input type="hidden" name="eall" value="1">
491 @ <input type="submit" name="aonlybtn" value="Append Remark">
492 @ <input type="submit" name="preview1btn" value="Preview">
493 @ <th1>enable_output [expr {!$eall}]</th1>
494 @ Append Remark from
495 @ <input type="text" name="username" value="$<username>" size="30">:<br />
496 @ <textarea name="cmappnd" cols="80" rows="15"
497 @ wrap="virtual" class="wikiedit">$<cmappnd></textarea><br />
498 @ <th1>enable_output [expr {[hascap w] && !$eall}]</th1>
499 @ <input type="submit" name="eallbtn" value="Edit All">
500 @ <th1>enable_output [expr {!$eall}]</th1>
501 @ <input type="submit" name="preview2btn" value="Preview">
502 @ <th1>enable_output 1</th1>
503 @ </td></tr>
504 @
505 @ <th1>enable_output [info exists preview1btn]</th1>
506 @ <tr><td colspan="2">
@@ -515,12 +515,12 @@
515 @ <hr />
516 @ </td></tr>
517 @ <th1>enable_output 1</th1>
518 @
519 @ <tr><td align="right"></td><td>
520 @ <input type="submit" name="submit" value="Submit Changes">
521 @ <input type="submit" name="cancel" value="Cancel">
522 @ </td></tr>
523 @ </table>
524 ;
525
526 /*
527
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -250,46 +250,46 @@
250 @ if {[info exists submit]} {
251 @ set status Open
252 @ submit_ticket
253 @ }
254 @ </th1>
255 @ <h1 style="text-align: center;">Enter A New Ticket</h1>
256 @ <table cellpadding="5">
257 @ <tr>
258 @ <td colspan="2">
259 @ Enter a one-line summary of the ticket:<br />
260 @ <input type="text" name="title" size="60" value="$<title>" />
261 @ </td>
262 @ </tr>
263 @
264 @ <tr>
265 @ <td style="text-align: center;">Type:
266 @ <th1>combobox type $type_choices 1</th1>
267 @ </td>
268 @ <td>What type of ticket is this?</td>
269 @ </tr>
270 @
271 @ <tr>
272 @ <td style="text-align: center;">Version:
273 @ <input type="text" name="foundin" size="20" value="$<foundin>" />
274 @ </td>
275 @ <td>In what version or build number do you observe the problem?</td>
276 @ </tr>
277 @
278 @ <tr>
279 @ <td style="text-align: center;">Severity:
280 @ <th1>combobox severity $severity_choices 1</th1>
281 @ </td>
282 @ <td>How debilitating is the problem? How badly does the problem
283 @ affect the operation of the product?</td>
284 @ </tr>
285 @
286 @ <tr>
287 @ <td style="text-align: center;">EMail:
288 @ <input type="text" name="private_contact" value="$<private_contact>" size="30" />
289 @ </td>
290 @ <td><span style="text-decoration: underline;">Not publicly visible</span>. Used by developers to contact you with
291 @ questions.</td>
292 @ </tr>
293 @
294 @ <tr>
295 @ <td colspan="2">
@@ -299,11 +299,11 @@
299 @ possible.
300 @ <br />
301 @ <th1>set nline [linecount $comment 50 10]</th1>
302 @ <textarea name="comment" cols="80" rows="$nline"
303 @ wrap="virtual" class="wikiedit">$<comment></textarea><br />
304 @ <input type="submit" name="preview" value="Preview" /></td>
305 @ </tr>
306 @
307 @ <th1>enable_output [info exists preview]</th1>
308 @ <tr><td colspan="2">
309 @ Description Preview:<br /><hr />
@@ -311,19 +311,19 @@
311 @ <hr />
312 @ </td></tr>
313 @ <th1>enable_output 1</th1>
314 @
315 @ <tr>
316 @ <td style="text-align: center;">
317 @ <input type="submit" name="submit" value="Submit" />
318 @ </td>
319 @ <td>After filling in the information above, press this button to create
320 @ the new ticket</td>
321 @ </tr>
322 @ <tr>
323 @ <td style="text-align: center;">
324 @ <input type="submit" name="cancel" value="Cancel" />
325 @ </td>
326 @ <td>Abandon and forget this ticket</td>
327 @ </tr>
328 @ </table>
329 ;
@@ -353,51 +353,51 @@
353 );
354 }
355
356 static const char zDefaultView[] =
357 @ <table cellpadding="5">
358 @ <tr><td class="tktDspLabel">Ticket&nbsp;UUID:</td><td class="tktDspValue" colspan="3">
359 @ $<tkt_uuid>
360 @ </td></tr>
361 @ <tr><td class="tktDspLabel">Title:</td>
362 @ <td class="tktDspValue" colspan="3">
363 @ <th1>wiki $title</th1>
364 @ </td></tr>
365 @ <tr><td class="tktDspLabel">Status:</td><td class="tktDspValue">
366 @ $<status>
367 @ </td>
368 @ <td class="tktDspLabel">Type:</td><td class="tktDspValue">
369 @ $<type>
370 @ </td></tr>
371 @ <tr><td class="tktDspLabel">Severity:</td><td class="tktDspValue">
372 @ $<severity>
373 @ </td>
374 @ <td class="tktDspLabel">Priority:</td><td class="tktDspValue">
375 @ $<priority>
376 @ </td></tr>
377 @ <tr><td class="tktDspLabel">Subsystem:</td><td class="tktDspValue">
378 @ $<subsystem>
379 @ </td>
380 @ <td class="tktDspLabel">Resolution:</td><td class="tktDspValue">
381 @ $<resolution>
382 @ </td></tr>
383 @ <tr><td class="tktDspLabel">Last&nbsp;Modified:</td><td class="tktDspValue">
384 @ $<tkt_datetime>
385 @ </td>
386 @ <th1>enable_output [hascap e]</th1>
387 @ <td class="tktDspLabel">Contact:</td><td class="tktDspValue">
388 @ $<private_contact>
389 @ </td>
390 @ <th1>enable_output 1</th1>
391 @ </tr>
392 @ <tr><td class="tktDspLabel">Version&nbsp;Found&nbsp;In:</td>
393 @ <td colspan="3" valign="top" class="tktDspValue">
394 @ $<foundin>
395 @ </td></tr>
396 @ <tr><td>Description &amp; Comments:</td></tr>
397 @ <tr><td colspan="4" class="tktDspValue">
398 @ <th1>wiki $comment</th1>
399 @ </td></tr>
400 @ </table>
401 ;
402
403
@@ -442,39 +442,39 @@
442 @ }
443 @ submit_ticket
444 @ }
445 @ </th1>
446 @ <table cellpadding="5">
447 @ <tr><td class="tktDspLabel">Title:</td><td>
448 @ <input type="text" name="title" value="$<title>" size="60" />
449 @ </td></tr>
450 @ <tr><td class="tktDspLabel">Status:</td><td>
451 @ <th1>combobox status $status_choices 1</th1>
452 @ </td></tr>
453 @ <tr><td class="tktDspLabel">Type:</td><td>
454 @ <th1>combobox type $type_choices 1</th1>
455 @ </td></tr>
456 @ <tr><td class="tktDspLabel">Severity:</td><td>
457 @ <th1>combobox severity $severity_choices 1</th1>
458 @ </td></tr>
459 @ <tr><td class="tktDspLabel">Priority:</td><td>
460 @ <th1>combobox priority $priority_choices 1</th1>
461 @ </td></tr>
462 @ <tr><td class="tktDspLabel">Resolution:</td><td>
463 @ <th1>combobox resolution $resolution_choices 1</th1>
464 @ </td></tr>
465 @ <tr><td class="tktDspLabel">Subsystem:</td><td>
466 @ <th1>combobox subsystem $subsystem_choices 1</th1>
467 @ </td></tr>
468 @ <th1>enable_output [hascap e]</th1>
469 @ <tr><td class="tktDspLabel">Contact:</td><td>
470 @ <input type="text" name="private_contact" size="40"
471 @ value="$<private_contact>" />
472 @ </td></tr>
473 @ <th1>enable_output 1</th1>
474 @ <tr><td class="tktDspLabel">Version&nbsp;Found&nbsp;In:</td><td>
475 @ <input type="text" name="foundin" size="50" value="$<foundin>" />
476 @ </td></tr>
477 @ <tr><td colspan="2">
478 @ <th1>
479 @ if {![info exists eall]} {set eall 0}
480 @ if {[info exists aonlybtn]} {set eall 0}
@@ -485,22 +485,22 @@
485 @ enable_output $eall
486 @ </th1>
487 @ Description And Comments:<br />
488 @ <textarea name="comment" cols="80" rows="$nline"
489 @ wrap="virtual" class="wikiedit">$<comment></textarea><br />
490 @ <input type="hidden" name="eall" value="1" />
491 @ <input type="submit" name="aonlybtn" value="Append Remark" />
492 @ <input type="submit" name="preview1btn" value="Preview" />
493 @ <th1>enable_output [expr {!$eall}]</th1>
494 @ Append Remark from
495 @ <input type="text" name="username" value="$<username>" size="30" />:<br />
496 @ <textarea name="cmappnd" cols="80" rows="15"
497 @ wrap="virtual" class="wikiedit">$<cmappnd></textarea><br />
498 @ <th1>enable_output [expr {[hascap w] && !$eall}]</th1>
499 @ <input type="submit" name="eallbtn" value="Edit All" />
500 @ <th1>enable_output [expr {!$eall}]</th1>
501 @ <input type="submit" name="preview2btn" value="Preview" />
502 @ <th1>enable_output 1</th1>
503 @ </td></tr>
504 @
505 @ <th1>enable_output [info exists preview1btn]</th1>
506 @ <tr><td colspan="2">
@@ -515,12 +515,12 @@
515 @ <hr />
516 @ </td></tr>
517 @ <th1>enable_output 1</th1>
518 @
519 @ <tr><td align="right"></td><td>
520 @ <input type="submit" name="submit" value="Submit Changes" />
521 @ <input type="submit" name="cancel" value="Cancel" />
522 @ </td></tr>
523 @ </table>
524 ;
525
526 /*
527
M src/wiki.c
+21 -22
--- src/wiki.c
+++ src/wiki.c
@@ -48,15 +48,15 @@
4848
 /*
4949
 ** Output rules for well-formed wiki pages
5050
 */
5151
 static void well_formed_wiki_name_rules(void){
5252
 @ <ul>
53
- @ <li> Must not begin or end with a space.
53
+ @ <li> Must not begin or end with a space.</li>
5454
 @ <li> Must not contain any control characters, including tab or
55
- @ newline.
56
- @ <li> Must not have two or more spaces in a row internally.
57
- @ <li> Must be between 3 and 100 characters in length.
55
+ @ newline.</li>
56
+ @ <li> Must not have two or more spaces in a row internally.</li>
57
+ @ <li> Must be between 3 and 100 characters in length.</li>
5858
 @ </ul>
5959
 }
6060
6161
 /*
6262
 ** Check a wiki name. If it is not well-formed, then issue an error
@@ -396,17 +396,16 @@
396396
 zName = PD("name","");
397397
 if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){
398398
 cgi_redirectf("wikiedit?name=%T", zName);
399399
 }
400400
 style_header("Create A New Wiki Page");
401
- @ <p>Rules for wiki page names:
401
+ @ <p>Rules for wiki page names:</p>
402402
 well_formed_wiki_name_rules();
403
- @ </p>
404
- @ <form method="POST" action="%s(g.zBaseURL)/wikinew">
403
+ @ <form method="post" action="%s(g.zBaseURL)/wikinew">
405404
 @ <p>Name of new wiki page:
406
- @ <input type="text" width="35" name="name" value="%h(zName)">
407
- @ <input type="submit" value="Create">
405
+ @ <input style="width: 35;" type="text" name="name" value="%h(zName)" />
406
+ @ <input type="submit" value="Create" />
408407
 @ </p></form>
409408
 if( zName[0] ){
410409
 @ <p><span class="wikiError">
411410
 @ "%h(zName)" is not a valid wiki page name!</span></p>
412411
 }
@@ -740,39 +739,39 @@
740739
 @ </ol>
741740
 @ <p>We call the first five rules above "wiki" formatting rules. The
742741
 @ last two rules are the HTML formatting rule.</p>
743742
 @ <h2>Formatting Rule Details</h2>
744743
 @ <ol>
745
- @ <li> <p><b>Paragraphs</b>. Any sequence of one or more blank lines forms
744
+ @ <li> <p><span class="wikiruleHead">Paragraphs</span>. Any sequence of one or more blank lines forms
746745
 @ a paragraph break. Centered or right-justified paragraphs are not
747746
 @ supported by wiki markup, but you can do these things if you need them
748
- @ using HTML.</p>
749
- @ <li> <p><b>Bullet Lists</b>.
747
+ @ using HTML.</p></li>
748
+ @ <li> <p><span class="wikiruleHead">Bullet Lists</span>.
750749
 @ A bullet list item is a line that begins with a single "*" character
751750
 @ surrounded on
752751
 @ both sides by two or more spaces or by a tab. Only a single level
753
- @ of bullet list is supported by wiki. For nested lists, use HTML.</p>
754
- @ <li> <p><b>Enumeration Lists</b>.
752
+ @ of bullet list is supported by wiki. For nested lists, use HTML.</p></li>
753
+ @ <li> <p><span class="wikiruleHead">Enumeration Lists</span>.
755754
 @ An enumeration list item is a line that begins with a single "#" character
756755
 @ surrounded on both sides by two or more spaces or by a tab. Only a single
757756
 @ level of enumeration list is supported by wiki. For nested lists or for
758
- @ enumerations that count using letters or roman numerials, use HTML.</p>
759
- @ <li> <p><b>Indented Paragraphs</b>.
757
+ @ enumerations that count using letters or roman numerials, use HTML.</p></li>
758
+ @ <li> <p><span class="wikiruleHead">Indented Paragraphs</span>.
760759
 @ Any paragraph that begins with two or more spaces or a tab and
761760
 @ which is not a bullet or enumeration list item is rendered
762761
 @ indented. Only a single level of indentation is supported by wiki; use
763
- @ HTML for deeper indentation.</p>
764
- @ <li> <p><b>Hyperlinks</b>.
762
+ @ HTML for deeper indentation.</p></li>
763
+ @ <li> <p><span class="wikiruleHead">Hyperlinks</span>.
765764
 @ Text within square brackets ("[...]") becomes a hyperlink. The
766765
 @ target can be a wiki page name, the artifact ID of a check-in or ticket,
767766
 @ the name of an image, or a URL. By default, the target is displayed
768767
 @ as the text of the hyperlink. But you can specify alternative text
769768
 @ after the target name separated by a "|" character.</p>
770769
 @ <p>You can also link to internal anchor names using [#anchor-name], providing
771770
 @ you have added the necessary "&lt;a name="anchor-name"&gt;&lt;/a&gt;"
772
- @ tag to your wiki page.</p>
773
- @ <li> <p><b>HTML</b>.
771
+ @ tag to your wiki page.</p></li>
772
+ @ <li> <p><span class="wikiruleHead">HTML</span>.
774773
 @ The following standard HTML elements may be used:
775774
 @ &lt;a&gt;
776775
 @ &lt;address&gt;
777776
 @ &lt;b&gt;
778777
 @ &lt;big&gt;
@@ -822,16 +821,16 @@
822821
 @ &lt;verbatim&gt; and &lt;nowiki&gt;.
823822
 @ No other elements are allowed. All attributes are checked and
824823
 @ only a few benign attributes are allowed on each element.
825824
 @ In particular, any attributes that specify javascript or CSS
826825
 @ are elided.</p></li>
827
- @ <li><p><b>Special Markup.</b>
826
+ @ <li><p><span class="wikiruleHead">Special Markup.</span>
828827
 @ The &lt;nowiki&gt; tag disables all wiki formatting rules
829828
 @ through the matching &lt;/nowiki&gt; element.
830829
 @ The &lt;verbatim&gt; tag works like &lt;pre&gt; with the addition
831830
 @ that it also disables all wiki and HTML markup
832
- @ through the matching &lt;/verbatim&gt;.
831
+ @ through the matching &lt;/verbatim&gt;.</p></li>
833832
 @ </ol>
834833
 style_footer();
835834
 }
836835
837836
 /*
838837
--- src/wiki.c
+++ src/wiki.c
@@ -48,15 +48,15 @@
48 /*
49 ** Output rules for well-formed wiki pages
50 */
51 static void well_formed_wiki_name_rules(void){
52 @ <ul>
53 @ <li> Must not begin or end with a space.
54 @ <li> Must not contain any control characters, including tab or
55 @ newline.
56 @ <li> Must not have two or more spaces in a row internally.
57 @ <li> Must be between 3 and 100 characters in length.
58 @ </ul>
59 }
60
61 /*
62 ** Check a wiki name. If it is not well-formed, then issue an error
@@ -396,17 +396,16 @@
396 zName = PD("name","");
397 if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){
398 cgi_redirectf("wikiedit?name=%T", zName);
399 }
400 style_header("Create A New Wiki Page");
401 @ <p>Rules for wiki page names:
402 well_formed_wiki_name_rules();
403 @ </p>
404 @ <form method="POST" action="%s(g.zBaseURL)/wikinew">
405 @ <p>Name of new wiki page:
406 @ <input type="text" width="35" name="name" value="%h(zName)">
407 @ <input type="submit" value="Create">
408 @ </p></form>
409 if( zName[0] ){
410 @ <p><span class="wikiError">
411 @ "%h(zName)" is not a valid wiki page name!</span></p>
412 }
@@ -740,39 +739,39 @@
740 @ </ol>
741 @ <p>We call the first five rules above "wiki" formatting rules. The
742 @ last two rules are the HTML formatting rule.</p>
743 @ <h2>Formatting Rule Details</h2>
744 @ <ol>
745 @ <li> <p><b>Paragraphs</b>. Any sequence of one or more blank lines forms
746 @ a paragraph break. Centered or right-justified paragraphs are not
747 @ supported by wiki markup, but you can do these things if you need them
748 @ using HTML.</p>
749 @ <li> <p><b>Bullet Lists</b>.
750 @ A bullet list item is a line that begins with a single "*" character
751 @ surrounded on
752 @ both sides by two or more spaces or by a tab. Only a single level
753 @ of bullet list is supported by wiki. For nested lists, use HTML.</p>
754 @ <li> <p><b>Enumeration Lists</b>.
755 @ An enumeration list item is a line that begins with a single "#" character
756 @ surrounded on both sides by two or more spaces or by a tab. Only a single
757 @ level of enumeration list is supported by wiki. For nested lists or for
758 @ enumerations that count using letters or roman numerials, use HTML.</p>
759 @ <li> <p><b>Indented Paragraphs</b>.
760 @ Any paragraph that begins with two or more spaces or a tab and
761 @ which is not a bullet or enumeration list item is rendered
762 @ indented. Only a single level of indentation is supported by wiki; use
763 @ HTML for deeper indentation.</p>
764 @ <li> <p><b>Hyperlinks</b>.
765 @ Text within square brackets ("[...]") becomes a hyperlink. The
766 @ target can be a wiki page name, the artifact ID of a check-in or ticket,
767 @ the name of an image, or a URL. By default, the target is displayed
768 @ as the text of the hyperlink. But you can specify alternative text
769 @ after the target name separated by a "|" character.</p>
770 @ <p>You can also link to internal anchor names using [#anchor-name], providing
771 @ you have added the necessary "&lt;a name="anchor-name"&gt;&lt;/a&gt;"
772 @ tag to your wiki page.</p>
773 @ <li> <p><b>HTML</b>.
774 @ The following standard HTML elements may be used:
775 @ &lt;a&gt;
776 @ &lt;address&gt;
777 @ &lt;b&gt;
778 @ &lt;big&gt;
@@ -822,16 +821,16 @@
822 @ &lt;verbatim&gt; and &lt;nowiki&gt;.
823 @ No other elements are allowed. All attributes are checked and
824 @ only a few benign attributes are allowed on each element.
825 @ In particular, any attributes that specify javascript or CSS
826 @ are elided.</p></li>
827 @ <li><p><b>Special Markup.</b>
828 @ The &lt;nowiki&gt; tag disables all wiki formatting rules
829 @ through the matching &lt;/nowiki&gt; element.
830 @ The &lt;verbatim&gt; tag works like &lt;pre&gt; with the addition
831 @ that it also disables all wiki and HTML markup
832 @ through the matching &lt;/verbatim&gt;.
833 @ </ol>
834 style_footer();
835 }
836
837 /*
838
--- src/wiki.c
+++ src/wiki.c
@@ -48,15 +48,15 @@
48 /*
49 ** Output rules for well-formed wiki pages
50 */
51 static void well_formed_wiki_name_rules(void){
52 @ <ul>
53 @ <li> Must not begin or end with a space.</li>
54 @ <li> Must not contain any control characters, including tab or
55 @ newline.</li>
56 @ <li> Must not have two or more spaces in a row internally.</li>
57 @ <li> Must be between 3 and 100 characters in length.</li>
58 @ </ul>
59 }
60
61 /*
62 ** Check a wiki name. If it is not well-formed, then issue an error
@@ -396,17 +396,16 @@
396 zName = PD("name","");
397 if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){
398 cgi_redirectf("wikiedit?name=%T", zName);
399 }
400 style_header("Create A New Wiki Page");
401 @ <p>Rules for wiki page names:</p>
402 well_formed_wiki_name_rules();
403 @ <form method="post" action="%s(g.zBaseURL)/wikinew">
 
404 @ <p>Name of new wiki page:
405 @ <input style="width: 35;" type="text" name="name" value="%h(zName)" />
406 @ <input type="submit" value="Create" />
407 @ </p></form>
408 if( zName[0] ){
409 @ <p><span class="wikiError">
410 @ "%h(zName)" is not a valid wiki page name!</span></p>
411 }
@@ -740,39 +739,39 @@
739 @ </ol>
740 @ <p>We call the first five rules above "wiki" formatting rules. The
741 @ last two rules are the HTML formatting rule.</p>
742 @ <h2>Formatting Rule Details</h2>
743 @ <ol>
744 @ <li> <p><span class="wikiruleHead">Paragraphs</span>. Any sequence of one or more blank lines forms
745 @ a paragraph break. Centered or right-justified paragraphs are not
746 @ supported by wiki markup, but you can do these things if you need them
747 @ using HTML.</p></li>
748 @ <li> <p><span class="wikiruleHead">Bullet Lists</span>.
749 @ A bullet list item is a line that begins with a single "*" character
750 @ surrounded on
751 @ both sides by two or more spaces or by a tab. Only a single level
752 @ of bullet list is supported by wiki. For nested lists, use HTML.</p></li>
753 @ <li> <p><span class="wikiruleHead">Enumeration Lists</span>.
754 @ An enumeration list item is a line that begins with a single "#" character
755 @ surrounded on both sides by two or more spaces or by a tab. Only a single
756 @ level of enumeration list is supported by wiki. For nested lists or for
757 @ enumerations that count using letters or roman numerials, use HTML.</p></li>
758 @ <li> <p><span class="wikiruleHead">Indented Paragraphs</span>.
759 @ Any paragraph that begins with two or more spaces or a tab and
760 @ which is not a bullet or enumeration list item is rendered
761 @ indented. Only a single level of indentation is supported by wiki; use
762 @ HTML for deeper indentation.</p></li>
763 @ <li> <p><span class="wikiruleHead">Hyperlinks</span>.
764 @ Text within square brackets ("[...]") becomes a hyperlink. The
765 @ target can be a wiki page name, the artifact ID of a check-in or ticket,
766 @ the name of an image, or a URL. By default, the target is displayed
767 @ as the text of the hyperlink. But you can specify alternative text
768 @ after the target name separated by a "|" character.</p>
769 @ <p>You can also link to internal anchor names using [#anchor-name], providing
770 @ you have added the necessary "&lt;a name="anchor-name"&gt;&lt;/a&gt;"
771 @ tag to your wiki page.</p></li>
772 @ <li> <p><span class="wikiruleHead">HTML</span>.
773 @ The following standard HTML elements may be used:
774 @ &lt;a&gt;
775 @ &lt;address&gt;
776 @ &lt;b&gt;
777 @ &lt;big&gt;
@@ -822,16 +821,16 @@
821 @ &lt;verbatim&gt; and &lt;nowiki&gt;.
822 @ No other elements are allowed. All attributes are checked and
823 @ only a few benign attributes are allowed on each element.
824 @ In particular, any attributes that specify javascript or CSS
825 @ are elided.</p></li>
826 @ <li><p><span class="wikiruleHead">Special Markup.</span>
827 @ The &lt;nowiki&gt; tag disables all wiki formatting rules
828 @ through the matching &lt;/nowiki&gt; element.
829 @ The &lt;verbatim&gt; tag works like &lt;pre&gt; with the addition
830 @ that it also disables all wiki and HTML markup
831 @ through the matching &lt;/verbatim&gt;.</p></li>
832 @ </ol>
833 style_footer();
834 }
835
836 /*
837

Keyboard Shortcuts

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