692b67bdcc1… — Fossil SCM

M src/attach.c

+6 -6

		--- src/attach.c
		+++ src/attach.c
		@@ -81,14 +81,14 @@
81	81	}else{
82	82	zUrlTail = mprintf("page=%t&file=%t", zTarget, zFilename);
83	83	}
84	84	@
85	85	@ <p><a href="/attachview?%s(zUrlTail)">%h(zFilename)</a>
86		- @ [<a href="/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br>
	86	+ @ [<a href="/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br />
87	87	if( zComment ) while( isspace(zComment[0]) ) zComment++;
88	88	if( zComment && zComment[0] ){
89		- @ %w(zComment)<br>
	89	+ @ %w(zComment)<br />
90	90	}
91	91	if( zPage==0 && zTkt==0 ){
92	92	if( zSrc==0 \|\| zSrc[0]==0 ){
93	93	zSrc = "Deleted from";
94	94	}else {
		@@ -273,13 +273,13 @@
273	273	style_header("Add Attachment");
274	274	@ <h2>Add Attachment To %s(zTargetType)</h2>
275	275	@ <form action="%s(g.zBaseURL)/attachadd" method="POST"
276	276	@ enctype="multipart/form-data">
277	277	@ File to Attach:
278		- @ <input type="file" name="f" size="60"><br>
279		- @ Description:<br>
280		- @ <textarea name="comment" cols=80 rows=5 wrap="virtual"></textarea><br>
	278	+ @ <input type="file" name="f" size="60"><br />
	279	+ @ Description:<br />
	280	+ @ <textarea name="comment" cols=80 rows=5 wrap="virtual"></textarea><br />
281	281	if( zTkt ){
282	282	@ <input type="hidden" name="tkt" value="%h(zTkt)">
283	283	}else{
284	284	@ <input type="hidden" name="page" value="%h(zPage)">
285	285	}
		@@ -351,11 +351,11 @@
351	351	cgi_redirect(zFrom);
352	352	}
353	353	style_header("Delete Attachment");
354	354	@ <form action="%s(g.zBaseURL)/attachdelete" method="POST">
355	355	@ <p>Confirm that you want to delete the attachment named
356		- @ "%h(zFile)" on %s(zTkt?"ticket":"wiki page") %h(zTarget):<br>
	356	+ @ "%h(zFile)" on %s(zTkt?"ticket":"wiki page") %h(zTarget):<br />
357	357	if( zTkt ){
358	358	@ <input type="hidden" name="tkt" value="%h(zTkt)">
359	359	}else{
360	360	@ <input type="hidden" name="page" value="%h(zPage)">
361	361	}
362	362

	--- src/attach.c
	+++ src/attach.c
	@@ -81,14 +81,14 @@
81	}else{
82	zUrlTail = mprintf("page=%t&file=%t", zTarget, zFilename);
83	}
84	@
85	@ <p><a href="/attachview?%s(zUrlTail)">%h(zFilename)</a>
86	@ [<a href="/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br>
87	if( zComment ) while( isspace(zComment[0]) ) zComment++;
88	if( zComment && zComment[0] ){
89	@ %w(zComment)<br>
90	}
91	if( zPage==0 && zTkt==0 ){
92	if( zSrc==0 \|\| zSrc[0]==0 ){
93	zSrc = "Deleted from";
94	}else {
	@@ -273,13 +273,13 @@
273	style_header("Add Attachment");
274	@ <h2>Add Attachment To %s(zTargetType)</h2>
275	@ <form action="%s(g.zBaseURL)/attachadd" method="POST"
276	@ enctype="multipart/form-data">
277	@ File to Attach:
278	@ <input type="file" name="f" size="60"><br>
279	@ Description:<br>
280	@ <textarea name="comment" cols=80 rows=5 wrap="virtual"></textarea><br>
281	if( zTkt ){
282	@ <input type="hidden" name="tkt" value="%h(zTkt)">
283	}else{
284	@ <input type="hidden" name="page" value="%h(zPage)">
285	}
	@@ -351,11 +351,11 @@
351	cgi_redirect(zFrom);
352	}
353	style_header("Delete Attachment");
354	@ <form action="%s(g.zBaseURL)/attachdelete" method="POST">
355	@ <p>Confirm that you want to delete the attachment named
356	@ "%h(zFile)" on %s(zTkt?"ticket":"wiki page") %h(zTarget):<br>
357	if( zTkt ){
358	@ <input type="hidden" name="tkt" value="%h(zTkt)">
359	}else{
360	@ <input type="hidden" name="page" value="%h(zPage)">
361	}
362

	--- src/attach.c
	+++ src/attach.c
	@@ -81,14 +81,14 @@
81	}else{
82	zUrlTail = mprintf("page=%t&file=%t", zTarget, zFilename);
83	}
84	@
85	@ <p><a href="/attachview?%s(zUrlTail)">%h(zFilename)</a>
86	@ [<a href="/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br />
87	if( zComment ) while( isspace(zComment[0]) ) zComment++;
88	if( zComment && zComment[0] ){
89	@ %w(zComment)<br />
90	}
91	if( zPage==0 && zTkt==0 ){
92	if( zSrc==0 \|\| zSrc[0]==0 ){
93	zSrc = "Deleted from";
94	}else {
	@@ -273,13 +273,13 @@
273	style_header("Add Attachment");
274	@ <h2>Add Attachment To %s(zTargetType)</h2>
275	@ <form action="%s(g.zBaseURL)/attachadd" method="POST"
276	@ enctype="multipart/form-data">
277	@ File to Attach:
278	@ <input type="file" name="f" size="60"><br />
279	@ Description:<br />
280	@ <textarea name="comment" cols=80 rows=5 wrap="virtual"></textarea><br />
281	if( zTkt ){
282	@ <input type="hidden" name="tkt" value="%h(zTkt)">
283	}else{
284	@ <input type="hidden" name="page" value="%h(zPage)">
285	}
	@@ -351,11 +351,11 @@
351	cgi_redirect(zFrom);
352	}
353	style_header("Delete Attachment");
354	@ <form action="%s(g.zBaseURL)/attachdelete" method="POST">
355	@ <p>Confirm that you want to delete the attachment named
356	@ "%h(zFile)" on %s(zTkt?"ticket":"wiki page") %h(zTarget):<br />
357	if( zTkt ){
358	@ <input type="hidden" name="tkt" value="%h(zTkt)">
359	}else{
360	@ <input type="hidden" name="page" value="%h(zPage)">
361	}
362

M src/info.c

+7 -7

		--- src/info.c
		+++ src/info.c
		@@ -638,11 +638,11 @@
638	638	style_header("Check-in Differences");
639	639	@ <h2>Difference From:</h2><blockquote>
640	640	checkin_description(ridFrom);
641	641	@ </blockquote><h2>To:</h2><blockquote>
642	642	checkin_description(ridTo);
643		- @ </blockquote><hr><p>
	643	+ @ </blockquote><hr /><p>
644	644
645	645	iFrom = iTo = 0;
646	646	while( iFrom<mFrom.nFile && iTo<mTo.nFile ){
647	647	int cmp;
648	648	if( iFrom>=mFrom.nFile ){
		@@ -887,11 +887,11 @@
887	887	@ </blockquote>
888	888	@ <h2>To:</h2>
889	889	@ <blockquote>
890	890	object_description(v2, 1, 0);
891	891	@ </blockquote>
892		- @ <hr>
	892	+ @ <hr />
893	893	@ <blockquote><pre>
894	894	content_get(v1, &c1);
895	895	content_get(v2, &c2);
896	896	blob_zero(&diff);
897	897	text_diff(&c1, &c2, &diff, 4, 1);
		@@ -1010,11 +1010,11 @@
1010	1010	blob_zero(&downloadName);
1011	1011	object_description(rid, 0, &downloadName);
1012	1012	style_submenu_element("Download", "Download",
1013	1013	"%s/raw/%T?name=%s", g.zTop, blob_str(&downloadName), zUuid);
1014	1014	@ </blockquote>
1015		- @ <hr>
	1015	+ @ <hr />
1016	1016	content_get(rid, &content);
1017	1017	@ <blockquote><pre>
1018	1018	hexdump(&content);
1019	1019	@ </pre></blockquote>
1020	1020	style_footer();
		@@ -1114,11 +1114,11 @@
1114	1114	"%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1115	1115	}
1116	1116	}
1117	1117	}
1118	1118	@ </blockquote>
1119		- @ <hr>
	1119	+ @ <hr />
1120	1120	content_get(rid, &content);
1121	1121	if( renderAsWiki ){
1122	1122	wiki_convert(&content, 0, 0);
1123	1123	}else if( renderAsHtml ){
1124	1124	@ <div>
		@@ -1467,11 +1467,11 @@
1467	1467	db_finalize(&q);
1468	1468	blob_appendf(&suffix, ")");
1469	1469	@ %s(blob_str(&suffix))
1470	1470	@ </td></tr></table>
1471	1471	@ </blockquote>
1472		- @ <hr>
	1472	+ @ <hr />
1473	1473	blob_reset(&suffix);
1474	1474	}
1475	1475	@ <p>Make changes to attributes of check-in
1476	1476	@ [<a href="ci?name=%s(zUuid)">%s(zUuid)</a>]:</p>
1477	1477	@ <form action="%s(g.zBaseURL)/ci_edit" method="POST">
		@@ -1541,13 +1541,13 @@
1541	1541	int tagid = db_column_int(&q, 0);
1542	1542	const char *zTagName = db_column_text(&q, 1);
1543	1543	char zLabel[30];
1544	1544	sprintf(zLabel, "c%d", tagid);
1545	1545	if( P(zLabel) ){
1546		- @ <br><input type="checkbox" name="c%d(tagid)" checked>
	1546	+ @ <br /><input type="checkbox" name="c%d(tagid)" checked>
1547	1547	}else{
1548		- @ <br><input type="checkbox" name="c%d(tagid)">
	1548	+ @ <br /><input type="checkbox" name="c%d(tagid)">
1549	1549	}
1550	1550	if( strncmp(zTagName, "sym-", 4)==0 ){
1551	1551	@ Cancel tag <b>%h(&zTagName[4])</b>
1552	1552	}else{
1553	1553	@ Cancel special tag <b>%h(zTagName)</b>
1554	1554

	--- src/info.c
	+++ src/info.c
	@@ -638,11 +638,11 @@
638	style_header("Check-in Differences");
639	@ <h2>Difference From:</h2><blockquote>
640	checkin_description(ridFrom);
641	@ </blockquote><h2>To:</h2><blockquote>
642	checkin_description(ridTo);
643	@ </blockquote><hr><p>
644
645	iFrom = iTo = 0;
646	while( iFrom<mFrom.nFile && iTo<mTo.nFile ){
647	int cmp;
648	if( iFrom>=mFrom.nFile ){
	@@ -887,11 +887,11 @@
887	@ </blockquote>
888	@ <h2>To:</h2>
889	@ <blockquote>
890	object_description(v2, 1, 0);
891	@ </blockquote>
892	@ <hr>
893	@ <blockquote><pre>
894	content_get(v1, &c1);
895	content_get(v2, &c2);
896	blob_zero(&diff);
897	text_diff(&c1, &c2, &diff, 4, 1);
	@@ -1010,11 +1010,11 @@
1010	blob_zero(&downloadName);
1011	object_description(rid, 0, &downloadName);
1012	style_submenu_element("Download", "Download",
1013	"%s/raw/%T?name=%s", g.zTop, blob_str(&downloadName), zUuid);
1014	@ </blockquote>
1015	@ <hr>
1016	content_get(rid, &content);
1017	@ <blockquote><pre>
1018	hexdump(&content);
1019	@ </pre></blockquote>
1020	style_footer();
	@@ -1114,11 +1114,11 @@
1114	"%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1115	}
1116	}
1117	}
1118	@ </blockquote>
1119	@ <hr>
1120	content_get(rid, &content);
1121	if( renderAsWiki ){
1122	wiki_convert(&content, 0, 0);
1123	}else if( renderAsHtml ){
1124	@ <div>
	@@ -1467,11 +1467,11 @@
1467	db_finalize(&q);
1468	blob_appendf(&suffix, ")");
1469	@ %s(blob_str(&suffix))
1470	@ </td></tr></table>
1471	@ </blockquote>
1472	@ <hr>
1473	blob_reset(&suffix);
1474	}
1475	@ <p>Make changes to attributes of check-in
1476	@ [<a href="ci?name=%s(zUuid)">%s(zUuid)</a>]:</p>
1477	@ <form action="%s(g.zBaseURL)/ci_edit" method="POST">
	@@ -1541,13 +1541,13 @@
1541	int tagid = db_column_int(&q, 0);
1542	const char *zTagName = db_column_text(&q, 1);
1543	char zLabel[30];
1544	sprintf(zLabel, "c%d", tagid);
1545	if( P(zLabel) ){
1546	@ <br><input type="checkbox" name="c%d(tagid)" checked>
1547	}else{
1548	@ <br><input type="checkbox" name="c%d(tagid)">
1549	}
1550	if( strncmp(zTagName, "sym-", 4)==0 ){
1551	@ Cancel tag <b>%h(&zTagName[4])</b>
1552	}else{
1553	@ Cancel special tag <b>%h(zTagName)</b>
1554

	--- src/info.c
	+++ src/info.c
	@@ -638,11 +638,11 @@
638	style_header("Check-in Differences");
639	@ <h2>Difference From:</h2><blockquote>
640	checkin_description(ridFrom);
641	@ </blockquote><h2>To:</h2><blockquote>
642	checkin_description(ridTo);
643	@ </blockquote><hr /><p>
644
645	iFrom = iTo = 0;
646	while( iFrom<mFrom.nFile && iTo<mTo.nFile ){
647	int cmp;
648	if( iFrom>=mFrom.nFile ){
	@@ -887,11 +887,11 @@
887	@ </blockquote>
888	@ <h2>To:</h2>
889	@ <blockquote>
890	object_description(v2, 1, 0);
891	@ </blockquote>
892	@ <hr />
893	@ <blockquote><pre>
894	content_get(v1, &c1);
895	content_get(v2, &c2);
896	blob_zero(&diff);
897	text_diff(&c1, &c2, &diff, 4, 1);
	@@ -1010,11 +1010,11 @@
1010	blob_zero(&downloadName);
1011	object_description(rid, 0, &downloadName);
1012	style_submenu_element("Download", "Download",
1013	"%s/raw/%T?name=%s", g.zTop, blob_str(&downloadName), zUuid);
1014	@ </blockquote>
1015	@ <hr />
1016	content_get(rid, &content);
1017	@ <blockquote><pre>
1018	hexdump(&content);
1019	@ </pre></blockquote>
1020	style_footer();
	@@ -1114,11 +1114,11 @@
1114	"%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1115	}
1116	}
1117	}
1118	@ </blockquote>
1119	@ <hr />
1120	content_get(rid, &content);
1121	if( renderAsWiki ){
1122	wiki_convert(&content, 0, 0);
1123	}else if( renderAsHtml ){
1124	@ <div>
	@@ -1467,11 +1467,11 @@
1467	db_finalize(&q);
1468	blob_appendf(&suffix, ")");
1469	@ %s(blob_str(&suffix))
1470	@ </td></tr></table>
1471	@ </blockquote>
1472	@ <hr />
1473	blob_reset(&suffix);
1474	}
1475	@ <p>Make changes to attributes of check-in
1476	@ [<a href="ci?name=%s(zUuid)">%s(zUuid)</a>]:</p>
1477	@ <form action="%s(g.zBaseURL)/ci_edit" method="POST">
	@@ -1541,13 +1541,13 @@
1541	int tagid = db_column_int(&q, 0);
1542	const char *zTagName = db_column_text(&q, 1);
1543	char zLabel[30];
1544	sprintf(zLabel, "c%d", tagid);
1545	if( P(zLabel) ){
1546	@ <br /><input type="checkbox" name="c%d(tagid)" checked>
1547	}else{
1548	@ <br /><input type="checkbox" name="c%d(tagid)">
1549	}
1550	if( strncmp(zTagName, "sym-", 4)==0 ){
1551	@ Cancel tag <b>%h(&zTagName[4])</b>
1552	}else{
1553	@ Cancel special tag <b>%h(zTagName)</b>
1554

M src/report.c

+4 -4

		--- src/report.c
		+++ src/report.c
		@@ -401,13 +401,13 @@
401	401	if( zErr ){
402	402	@ <blockquote><font color="#ff0000"><b>%h(zErr)</b></font></blockquote>
403	403	}
404	404	@ <form action="rptedit" method="POST">
405	405	@ <input type="hidden" name="rn" value="%d(rn)">
406		- @ <p>Report Title:<br>
	406	+ @ <p>Report Title:<br />
407	407	@ <input type="text" name="t" value="%h(zTitle)" size="60"></p>
408		- @ <p>Enter a complete SQL query statement against the "TICKET" table:<br>
	408	+ @ <p>Enter a complete SQL query statement against the "TICKET" table:<br />
409	409	@ <textarea name="s" rows="20" cols="80">%h(zSQL)</textarea>
410	410	@ </p>
411	411	login_insert_csrf_secret();
412	412	if( g.okAdmin ){
413	413	@ <p>Report owner:
		@@ -417,11 +417,11 @@
417	417	@ <input type="hidden" name="w" value="%h(zOwner)">
418	418	}
419	419	@ <p>Enter an optional color key in the following box. (If blank, no
420	420	@ color key is displayed.) Each line contains the text for a single
421	421	@ entry in the key. The first token of each line is the background
422		- @ color for that line.<br>
	422	+ @ color for that line.<br />
423	423	@ <textarea name="k" rows="8" cols="50">%h(zClrKey)</textarea>
424	424	@ </p>
425	425	if( !g.okAdmin && strcmp(zOwner,g.zLogin)!=0 ){
426	426	@ <p>This report format is owned by %h(zOwner). You are not allowed
427	427	@ to change it.</p>
		@@ -448,11 +448,11 @@
448	448	zSchema = db_text(0,"SELECT sql FROM sqlite_master WHERE name='ticket'");
449	449	if( zSchema==0 ){
450	450	zSchema = db_text(0,"SELECT sql FROM repository.sqlite_master"
451	451	" WHERE name='ticket'");
452	452	}
453		- @ <hr><h3>TICKET Schema</h3>
	453	+ @ <hr /><h3>TICKET Schema</h3>
454	454	@ <blockquote><pre>
455	455	@ %h(zSchema)
456	456	@ </pre></blockquote>
457	457	@ <h3>Notes</h3>
458	458	@ <ul>
459	459

	--- src/report.c
	+++ src/report.c
	@@ -401,13 +401,13 @@
401	if( zErr ){
402	@ <blockquote><font color="#ff0000"><b>%h(zErr)</b></font></blockquote>
403	}
404	@ <form action="rptedit" method="POST">
405	@ <input type="hidden" name="rn" value="%d(rn)">
406	@ <p>Report Title:<br>
407	@ <input type="text" name="t" value="%h(zTitle)" size="60"></p>
408	@ <p>Enter a complete SQL query statement against the "TICKET" table:<br>
409	@ <textarea name="s" rows="20" cols="80">%h(zSQL)</textarea>
410	@ </p>
411	login_insert_csrf_secret();
412	if( g.okAdmin ){
413	@ <p>Report owner:
	@@ -417,11 +417,11 @@
417	@ <input type="hidden" name="w" value="%h(zOwner)">
418	}
419	@ <p>Enter an optional color key in the following box. (If blank, no
420	@ color key is displayed.) Each line contains the text for a single
421	@ entry in the key. The first token of each line is the background
422	@ color for that line.<br>
423	@ <textarea name="k" rows="8" cols="50">%h(zClrKey)</textarea>
424	@ </p>
425	if( !g.okAdmin && strcmp(zOwner,g.zLogin)!=0 ){
426	@ <p>This report format is owned by %h(zOwner). You are not allowed
427	@ to change it.</p>
	@@ -448,11 +448,11 @@
448	zSchema = db_text(0,"SELECT sql FROM sqlite_master WHERE name='ticket'");
449	if( zSchema==0 ){
450	zSchema = db_text(0,"SELECT sql FROM repository.sqlite_master"
451	" WHERE name='ticket'");
452	}
453	@ <hr><h3>TICKET Schema</h3>
454	@ <blockquote><pre>
455	@ %h(zSchema)
456	@ </pre></blockquote>
457	@ <h3>Notes</h3>
458	@ <ul>
459

	--- src/report.c
	+++ src/report.c
	@@ -401,13 +401,13 @@
401	if( zErr ){
402	@ <blockquote><font color="#ff0000"><b>%h(zErr)</b></font></blockquote>
403	}
404	@ <form action="rptedit" method="POST">
405	@ <input type="hidden" name="rn" value="%d(rn)">
406	@ <p>Report Title:<br />
407	@ <input type="text" name="t" value="%h(zTitle)" size="60"></p>
408	@ <p>Enter a complete SQL query statement against the "TICKET" table:<br />
409	@ <textarea name="s" rows="20" cols="80">%h(zSQL)</textarea>
410	@ </p>
411	login_insert_csrf_secret();
412	if( g.okAdmin ){
413	@ <p>Report owner:
	@@ -417,11 +417,11 @@
417	@ <input type="hidden" name="w" value="%h(zOwner)">
418	}
419	@ <p>Enter an optional color key in the following box. (If blank, no
420	@ color key is displayed.) Each line contains the text for a single
421	@ entry in the key. The first token of each line is the background
422	@ color for that line.<br />
423	@ <textarea name="k" rows="8" cols="50">%h(zClrKey)</textarea>
424	@ </p>
425	if( !g.okAdmin && strcmp(zOwner,g.zLogin)!=0 ){
426	@ <p>This report format is owned by %h(zOwner). You are not allowed
427	@ to change it.</p>
	@@ -448,11 +448,11 @@
448	zSchema = db_text(0,"SELECT sql FROM sqlite_master WHERE name='ticket'");
449	if( zSchema==0 ){
450	zSchema = db_text(0,"SELECT sql FROM repository.sqlite_master"
451	" WHERE name='ticket'");
452	}
453	@ <hr /><h3>TICKET Schema</h3>
454	@ <blockquote><pre>
455	@ %h(zSchema)
456	@ </pre></blockquote>
457	@ <h3>Notes</h3>
458	@ <ul>
459

M src/skins.c

+2 -2

		--- src/skins.c
		+++ src/skins.c
		@@ -165,11 +165,11 @@
165	165	@ <body>
166	166	@ <div class="header">
167	167	@ <div class="logo">
168	168	@ <img src="$baseurl/logo" alt="logo">
169	169	@ </div>
170		-@ <div class="title"><small>$<project_name></small><br>$<title></div>
	170	+@ <div class="title"><small>$<project_name></small><br />$<title></div>
171	171	@ <div class="status"><nobr><th1>
172	172	@ if {[info exists login]} {
173	173	@ puts "Logged in as $login"
174	174	@ } else {
175	175	@ puts "Not logged in"
		@@ -600,11 +600,11 @@
600	600	@ </head>
601	601	@ <body>
602	602	@ <div class="header">
603	603	@ <div class="logo">
604	604	@ <!-- <img src="$baseurl/logo" alt="logo"> -->
605		-@ <br><nobr>$<project_name></nobr>
	605	+@ <br /><nobr>$<project_name></nobr>
606	606	@ </div>
607	607	@ <div class="title">$<title></div>
608	608	@ <div class="status"><nobr><th1>
609	609	@ if {[info exists login]} {
610	610	@ puts "Logged in as $login"
611	611

	--- src/skins.c
	+++ src/skins.c
	@@ -165,11 +165,11 @@
165	@ <body>
166	@ <div class="header">
167	@ <div class="logo">
168	@ <img src="$baseurl/logo" alt="logo">
169	@ </div>
170	@ <div class="title"><small>$<project_name></small><br>$<title></div>
171	@ <div class="status"><nobr><th1>
172	@ if {[info exists login]} {
173	@ puts "Logged in as $login"
174	@ } else {
175	@ puts "Not logged in"
	@@ -600,11 +600,11 @@
600	@ </head>
601	@ <body>
602	@ <div class="header">
603	@ <div class="logo">
604	@ <!-- <img src="$baseurl/logo" alt="logo"> -->
605	@ <br><nobr>$<project_name></nobr>
606	@ </div>
607	@ <div class="title">$<title></div>
608	@ <div class="status"><nobr><th1>
609	@ if {[info exists login]} {
610	@ puts "Logged in as $login"
611

	--- src/skins.c
	+++ src/skins.c
	@@ -165,11 +165,11 @@
165	@ <body>
166	@ <div class="header">
167	@ <div class="logo">
168	@ <img src="$baseurl/logo" alt="logo">
169	@ </div>
170	@ <div class="title"><small>$<project_name></small><br />$<title></div>
171	@ <div class="status"><nobr><th1>
172	@ if {[info exists login]} {
173	@ puts "Logged in as $login"
174	@ } else {
175	@ puts "Not logged in"
	@@ -600,11 +600,11 @@
600	@ </head>
601	@ <body>
602	@ <div class="header">
603	@ <div class="logo">
604	@ <!-- <img src="$baseurl/logo" alt="logo"> -->
605	@ <br /><nobr>$<project_name></nobr>
606	@ </div>
607	@ <div class="title">$<title></div>
608	@ <div class="status"><nobr><th1>
609	@ if {[info exists login]} {
610	@ puts "Logged in as $login"
611

M src/style.c

+4 -4

		--- src/style.c
		+++ src/style.c
		@@ -151,11 +151,11 @@
151	151	Th_Render(zFooter);
152	152	if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1);
153	153
154	154	/* Render trace log if TH1 tracing is enabled. */
155	155	if( g.thTrace ){
156		- cgi_append_content("<font color=\"red\"><hr>\n", -1);
	156	+ cgi_append_content("<font color=\"red\"><hr />\n", -1);
157	157	cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog));
158	158	cgi_append_content("</font>\n", -1);
159	159	}
160	160	}
161	161
		@@ -670,12 +670,12 @@
670	670	** WEBPAGE: test_env
671	671	*/
672	672	void page_test_env(void){
673	673	style_header("Environment Test");
674	674	#if !defined(_WIN32)
675		- @ uid=%d(getuid()), gid=%d(getgid())<br>
	675	+ @ uid=%d(getuid()), gid=%d(getgid())<br />
676	676	#endif
677		- @ g.zBaseURL = %h(g.zBaseURL)<br>
678		- @ g.zTop = %h(g.zTop)<br>
	677	+ @ g.zBaseURL = %h(g.zBaseURL)<br />
	678	+ @ g.zTop = %h(g.zTop)<br />
679	679	cgi_print_all();
680	680	style_footer();
681	681	}
682	682

	--- src/style.c
	+++ src/style.c
	@@ -151,11 +151,11 @@
151	Th_Render(zFooter);
152	if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1);
153
154	/* Render trace log if TH1 tracing is enabled. */
155	if( g.thTrace ){
156	cgi_append_content("<font color=\"red\"><hr>\n", -1);
157	cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog));
158	cgi_append_content("</font>\n", -1);
159	}
160	}
161
	@@ -670,12 +670,12 @@
670	** WEBPAGE: test_env
671	*/
672	void page_test_env(void){
673	style_header("Environment Test");
674	#if !defined(_WIN32)
675	@ uid=%d(getuid()), gid=%d(getgid())<br>
676	#endif
677	@ g.zBaseURL = %h(g.zBaseURL)<br>
678	@ g.zTop = %h(g.zTop)<br>
679	cgi_print_all();
680	style_footer();
681	}
682

	--- src/style.c
	+++ src/style.c
	@@ -151,11 +151,11 @@
151	Th_Render(zFooter);
152	if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1);
153
154	/* Render trace log if TH1 tracing is enabled. */
155	if( g.thTrace ){
156	cgi_append_content("<font color=\"red\"><hr />\n", -1);
157	cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog));
158	cgi_append_content("</font>\n", -1);
159	}
160	}
161
	@@ -670,12 +670,12 @@
670	** WEBPAGE: test_env
671	*/
672	void page_test_env(void){
673	style_header("Environment Test");
674	#if !defined(_WIN32)
675	@ uid=%d(getuid()), gid=%d(getgid())<br />
676	#endif
677	@ g.zBaseURL = %h(g.zBaseURL)<br />
678	@ g.zTop = %h(g.zTop)<br />
679	cgi_print_all();
680	style_footer();
681	}
682

M src/timeline.c

+4 -4

		--- src/timeline.c
		+++ src/timeline.c
		@@ -227,11 +227,11 @@
227	227	@ <span class="timelineDisabled">... %d(suppressCnt) similar
228	228	@ event%s(suppressCnt>1?"s":"") omitted.</span></td></tr>
229	229	suppressCnt = 0;
230	230	}
231	231	if( strcmp(zType,"div")==0 ){
232		- @ <tr><td colspan=3><hr></td></tr>
	232	+ @ <tr><td colspan=3><hr /></td></tr>
233	233	continue;
234	234	}
235	235	if( memcmp(zDate, zPrevDate, 10) ){
236	236	sprintf(zPrevDate, "%.10s", zDate);
237	237	@ <tr><td>
		@@ -891,15 +891,15 @@
891	891	}else if( zBrName ){
892	892	blob_appendf(&desc, " related to \"%h\"", zBrName);
893	893	tmFlags \|= TIMELINE_DISJOINT;
894	894	}
895	895	if( zAfter ){
896		- blob_appendf(&desc, " occurring on or after %h.<br>", zAfter);
	896	+ blob_appendf(&desc, " occurring on or after %h.<br />", zAfter);
897	897	}else if( zBefore ){
898		- blob_appendf(&desc, " occurring on or before %h.<br>", zBefore);
	898	+ blob_appendf(&desc, " occurring on or before %h.<br />", zBefore);
899	899	}else if( zCirca ){
900		- blob_appendf(&desc, " occurring around %h.<br>", zCirca);
	900	+ blob_appendf(&desc, " occurring around %h.<br />", zCirca);
901	901	}
902	902	if( zSearch ){
903	903	blob_appendf(&desc, " matching \"%h\"", zSearch);
904	904	}
905	905	if( g.okHistory ){
906	906

	--- src/timeline.c
	+++ src/timeline.c
	@@ -227,11 +227,11 @@
227	@ <span class="timelineDisabled">... %d(suppressCnt) similar
228	@ event%s(suppressCnt>1?"s":"") omitted.</span></td></tr>
229	suppressCnt = 0;
230	}
231	if( strcmp(zType,"div")==0 ){
232	@ <tr><td colspan=3><hr></td></tr>
233	continue;
234	}
235	if( memcmp(zDate, zPrevDate, 10) ){
236	sprintf(zPrevDate, "%.10s", zDate);
237	@ <tr><td>
	@@ -891,15 +891,15 @@
891	}else if( zBrName ){
892	blob_appendf(&desc, " related to \"%h\"", zBrName);
893	tmFlags \|= TIMELINE_DISJOINT;
894	}
895	if( zAfter ){
896	blob_appendf(&desc, " occurring on or after %h.<br>", zAfter);
897	}else if( zBefore ){
898	blob_appendf(&desc, " occurring on or before %h.<br>", zBefore);
899	}else if( zCirca ){
900	blob_appendf(&desc, " occurring around %h.<br>", zCirca);
901	}
902	if( zSearch ){
903	blob_appendf(&desc, " matching \"%h\"", zSearch);
904	}
905	if( g.okHistory ){
906

	--- src/timeline.c
	+++ src/timeline.c
	@@ -227,11 +227,11 @@
227	@ <span class="timelineDisabled">... %d(suppressCnt) similar
228	@ event%s(suppressCnt>1?"s":"") omitted.</span></td></tr>
229	suppressCnt = 0;
230	}
231	if( strcmp(zType,"div")==0 ){
232	@ <tr><td colspan=3><hr /></td></tr>
233	continue;
234	}
235	if( memcmp(zDate, zPrevDate, 10) ){
236	sprintf(zPrevDate, "%.10s", zDate);
237	@ <tr><td>
	@@ -891,15 +891,15 @@
891	}else if( zBrName ){
892	blob_appendf(&desc, " related to \"%h\"", zBrName);
893	tmFlags \|= TIMELINE_DISJOINT;
894	}
895	if( zAfter ){
896	blob_appendf(&desc, " occurring on or after %h.<br />", zAfter);
897	}else if( zBefore ){
898	blob_appendf(&desc, " occurring on or before %h.<br />", zBefore);
899	}else if( zCirca ){
900	blob_appendf(&desc, " occurring around %h.<br />", zCirca);
901	}
902	if( zSearch ){
903	blob_appendf(&desc, " matching \"%h\"", zSearch);
904	}
905	if( g.okHistory ){
906

M src/tkt.c

+1 -1

		--- src/tkt.c
		+++ src/tkt.c
		@@ -342,11 +342,11 @@
342	342	while( db_step(&q)==SQLITE_ROW ){
343	343	const char *zDate = db_column_text(&q, 0);
344	344	const char *zFile = db_column_text(&q, 1);
345	345	const char *zUser = db_column_text(&q, 2);
346	346	if( cnt==0 ){
347		- @ <hr><h2>Attachments:</h2>
	347	+ @ <hr /><h2>Attachments:</h2>
348	348	@ <ul>
349	349	}
350	350	cnt++;
351	351	if( g.okRead && g.okHistory ){
352	352	@ <li><a href="%s(g.zTop)/attachview?tkt=%s(zFullName)&file=%t(zFile)">
353	353

	--- src/tkt.c
	+++ src/tkt.c
	@@ -342,11 +342,11 @@
342	while( db_step(&q)==SQLITE_ROW ){
343	const char *zDate = db_column_text(&q, 0);
344	const char *zFile = db_column_text(&q, 1);
345	const char *zUser = db_column_text(&q, 2);
346	if( cnt==0 ){
347	@ <hr><h2>Attachments:</h2>
348	@ <ul>
349	}
350	cnt++;
351	if( g.okRead && g.okHistory ){
352	@ <li><a href="%s(g.zTop)/attachview?tkt=%s(zFullName)&file=%t(zFile)">
353

	--- src/tkt.c
	+++ src/tkt.c
	@@ -342,11 +342,11 @@
342	while( db_step(&q)==SQLITE_ROW ){
343	const char *zDate = db_column_text(&q, 0);
344	const char *zFile = db_column_text(&q, 1);
345	const char *zUser = db_column_text(&q, 2);
346	if( cnt==0 ){
347	@ <hr /><h2>Attachments:</h2>
348	@ <ul>
349	}
350	cnt++;
351	if( g.okRead && g.okHistory ){
352	@ <li><a href="%s(g.zTop)/attachview?tkt=%s(zFullName)&file=%t(zFile)">
353

M src/tktsetup.c

+15 -15

		--- src/tktsetup.c
		+++ src/tktsetup.c
		@@ -254,11 +254,11 @@
254	254	@ </th1>
255	255	@ <h1 align="center">Enter A New Ticket</h1>
256	256	@ <table cellpadding="5">
257	257	@ <tr>
258	258	@ <td colspan="2">
259		-@ Enter a one-line summary of the ticket:<br>
	259	+@ Enter a one-line summary of the ticket:<br />
260	260	@ <input type="text" name="title" size="60" value="$<title>">
261	261	@ </td>
262	262	@ </tr>
263	263	@
264	264	@ <tr>
		@@ -295,22 +295,22 @@
295	295	@ <td colspan="2">
296	296	@ Enter a detailed description of the problem.
297	297	@ For code defects, be sure to provide details on exactly how
298	298	@ the problem can be reproduced. Provide as much detail as
299	299	@ possible.
300		-@ <br>
	300	+@ <br />
301	301	@ <th1>set nline [linecount $comment 50 10]</th1>
302	302	@ <textarea name="comment" cols="80" rows="$nline"
303		-@ wrap="virtual" class="wikiedit">$<comment></textarea><br>
	303	+@ wrap="virtual" class="wikiedit">$<comment></textarea><br />
304	304	@ <input type="submit" name="preview" value="Preview">
305	305	@ </tr>
306	306	@
307	307	@ <th1>enable_output [info exists preview]</th1>
308	308	@ <tr><td colspan="2">
309		-@ Description Preview:<br><hr>
	309	+@ Description Preview:<br /><hr />
310	310	@ <th1>wiki $comment</th1>
311		-@ <hr>
	311	+@ <hr />
312	312	@ </td></tr>
313	313	@ <th1>enable_output 1</th1>
314	314	@
315	315	@ <tr>
316	316	@ <td align="right">
		@@ -430,15 +430,15 @@
430	430	@ <th1>
431	431	@ if {![info exists username]} {set username $login}
432	432	@ if {[info exists submit]} {
433	433	@ if {[info exists cmappnd]} {
434	434	@ if {[string length $cmappnd]>0} {
435		-@ set ctxt "\n\n<hr><i>[htmlize $login]"
	435	+@ set ctxt "\n\n<hr /><i>[htmlize $login]"
436	436	@ if {$username ne $login} {
437	437	@ set ctxt "$ctxt claiming to be [htmlize $username]"
438	438	@ }
439		-@ set ctxt "$ctxt added on [date]:</i><br>\n$cmappnd"
	439	+@ set ctxt "$ctxt added on [date]:</i><br />\n$cmappnd"
440	440	@ append_field comment $ctxt
441	441	@ }
442	442	@ }
443	443	@ submit_ticket
444	444	@ }
		@@ -482,39 +482,39 @@
482	482	@ if {![hascap w]} {set eall 0}
483	483	@ if {![info exists cmappnd]} {set cmappnd {}}
484	484	@ set nline [linecount $comment 15 10]
485	485	@ enable_output $eall
486	486	@ </th1>
487		-@ Description And Comments:<br>
	487	+@ Description And Comments:<br />
488	488	@ <textarea name="comment" cols="80" rows="$nline"
489		-@ wrap="virtual" class="wikiedit">$<comment></textarea><br>
	489	+@ wrap="virtual" class="wikiedit">$<comment></textarea><br />
490	490	@ <input type="hidden" name="eall" value="1">
491	491	@ <input type="submit" name="aonlybtn" value="Append Remark">
492	492	@ <input type="submit" name="preview1btn" value="Preview">
493	493	@ <th1>enable_output [expr {!$eall}]</th1>
494	494	@ 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 />
496	496	@ <textarea name="cmappnd" cols="80" rows="15"
497		-@ wrap="virtual" class="wikiedit">$<cmappnd></textarea><br>
	497	+@ wrap="virtual" class="wikiedit">$<cmappnd></textarea><br />
498	498	@ <th1>enable_output [expr {[hascap w] && !$eall}]</th1>
499	499	@ <input type="submit" name="eallbtn" value="Edit All">
500	500	@ <th1>enable_output [expr {!$eall}]</th1>
501	501	@ <input type="submit" name="preview2btn" value="Preview">
502	502	@ <th1>enable_output 1</th1>
503	503	@ </td></tr>
504	504	@
505	505	@ <th1>enable_output [info exists preview1btn]</th1>
506	506	@ <tr><td colspan="2">
507		-@ Description Preview:<br><hr>
	507	+@ Description Preview:<br /><hr />
508	508	@ <th1>wiki $comment</th1>
509		-@ <hr>
	509	+@ <hr />
510	510	@ </td></tr>
511	511	@ <th1>enable_output [info exists preview2btn]</th1>
512	512	@ <tr><td colspan="2">
513		-@ Description Preview:<br><hr>
	513	+@ Description Preview:<br /><hr />
514	514	@ <th1>wiki $cmappnd</th1>
515		-@ <hr>
	515	+@ <hr />
516	516	@ </td></tr>
517	517	@ <th1>enable_output 1</th1>
518	518	@
519	519	@ <tr><td align="right"></td><td>
520	520	@ <input type="submit" name="submit" value="Submit Changes">
521	521

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -254,11 +254,11 @@
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>
	@@ -295,22 +295,22 @@
295	@ <td colspan="2">
296	@ Enter a detailed description of the problem.
297	@ For code defects, be sure to provide details on exactly how
298	@ the problem can be reproduced. Provide as much detail as
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>
310	@ <th1>wiki $comment</th1>
311	@ <hr>
312	@ </td></tr>
313	@ <th1>enable_output 1</th1>
314	@
315	@ <tr>
316	@ <td align="right">
	@@ -430,15 +430,15 @@
430	@ <th1>
431	@ if {![info exists username]} {set username $login}
432	@ if {[info exists submit]} {
433	@ if {[info exists cmappnd]} {
434	@ if {[string length $cmappnd]>0} {
435	@ set ctxt "\n\n<hr><i>[htmlize $login]"
436	@ if {$username ne $login} {
437	@ set ctxt "$ctxt claiming to be [htmlize $username]"
438	@ }
439	@ set ctxt "$ctxt added on [date]:</i><br>\n$cmappnd"
440	@ append_field comment $ctxt
441	@ }
442	@ }
443	@ submit_ticket
444	@ }
	@@ -482,39 +482,39 @@
482	@ if {![hascap w]} {set eall 0}
483	@ if {![info exists cmappnd]} {set cmappnd {}}
484	@ set nline [linecount $comment 15 10]
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">
507	@ Description Preview:<br><hr>
508	@ <th1>wiki $comment</th1>
509	@ <hr>
510	@ </td></tr>
511	@ <th1>enable_output [info exists preview2btn]</th1>
512	@ <tr><td colspan="2">
513	@ Description Preview:<br><hr>
514	@ <th1>wiki $cmappnd</th1>
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

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -254,11 +254,11 @@
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>
	@@ -295,22 +295,22 @@
295	@ <td colspan="2">
296	@ Enter a detailed description of the problem.
297	@ For code defects, be sure to provide details on exactly how
298	@ the problem can be reproduced. Provide as much detail as
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 />
310	@ <th1>wiki $comment</th1>
311	@ <hr />
312	@ </td></tr>
313	@ <th1>enable_output 1</th1>
314	@
315	@ <tr>
316	@ <td align="right">
	@@ -430,15 +430,15 @@
430	@ <th1>
431	@ if {![info exists username]} {set username $login}
432	@ if {[info exists submit]} {
433	@ if {[info exists cmappnd]} {
434	@ if {[string length $cmappnd]>0} {
435	@ set ctxt "\n\n<hr /><i>[htmlize $login]"
436	@ if {$username ne $login} {
437	@ set ctxt "$ctxt claiming to be [htmlize $username]"
438	@ }
439	@ set ctxt "$ctxt added on [date]:</i><br />\n$cmappnd"
440	@ append_field comment $ctxt
441	@ }
442	@ }
443	@ submit_ticket
444	@ }
	@@ -482,39 +482,39 @@
482	@ if {![hascap w]} {set eall 0}
483	@ if {![info exists cmappnd]} {set cmappnd {}}
484	@ set nline [linecount $comment 15 10]
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">
507	@ Description Preview:<br /><hr />
508	@ <th1>wiki $comment</th1>
509	@ <hr />
510	@ </td></tr>
511	@ <th1>enable_output [info exists preview2btn]</th1>
512	@ <tr><td colspan="2">
513	@ Description Preview:<br /><hr />
514	@ <th1>wiki $cmappnd</th1>
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

M src/wiki.c

+6 -6

		--- src/wiki.c
		+++ src/wiki.c
		@@ -351,13 +351,13 @@
351	351	zHtmlPageName = mprintf("Edit: %s", zPageName);
352	352	style_header(zHtmlPageName);
353	353	if( P("preview")!=0 ){
354	354	blob_zero(&wiki);
355	355	blob_append(&wiki, zBody, -1);
356		- @ Preview:<hr>
	356	+ @ Preview:<hr />
357	357	wiki_convert(&wiki, 0, 0);
358		- @ <hr>
	358	+ @ <hr />
359	359	blob_reset(&wiki);
360	360	}
361	361	for(n=2, z=zBody; z[0]; z++){
362	362	if( z[0]=='\n' ) n++;
363	363	}
		@@ -366,11 +366,11 @@
366	366	@ <form method="post" action="%s(g.zBaseURL)/wikiedit"><div>
367	367	login_insert_csrf_secret();
368	368	@ <input type="hidden" name="name" value="%h(zPageName)" />
369	369	@ <textarea name="w" class="wikiedit" cols="80"
370	370	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
371		- @ <br>
	371	+ @ <br />
372	372	@ <input type="submit" name="preview" value="Preview Your Changes" />
373	373	@ <input type="submit" name="submit" value="Apply These Changes" />
374	374	@ <input type="submit" name="cancel" value="Cancel" />
375	375	@ </div></form>
376	376	if( !isSandbox ){
		@@ -537,15 +537,15 @@
537	537	zUser = PD("u", g.zLogin);
538	538	@ <form method="POST" action="%s(g.zBaseURL)/wikiappend">
539	539	login_insert_csrf_secret();
540	540	@ <input type="hidden" name="name" value="%h(zPageName)">
541	541	@ Your Name:
542		- @ <input type="text" name="u" size="20" value="%h(zUser)"><br>
543		- @ Comment to append:<br>
	542	+ @ <input type="text" name="u" size="20" value="%h(zUser)"><br />
	543	+ @ Comment to append:<br />
544	544	@ <textarea name="r" class="wikiedit" cols="80"
545	545	@ rows="10" wrap="virtual">%h(PD("r",""))</textarea>
546		- @ <br>
	546	+ @ <br />
547	547	@ <input type="submit" name="preview" value="Preview Your Comment">
548	548	@ <input type="submit" name="submit" value="Append Your Changes">
549	549	@ <input type="submit" name="cancel" value="Cancel">
550	550	@ </form>
551	551	style_footer();
552	552

	--- src/wiki.c
	+++ src/wiki.c
	@@ -351,13 +351,13 @@
351	zHtmlPageName = mprintf("Edit: %s", zPageName);
352	style_header(zHtmlPageName);
353	if( P("preview")!=0 ){
354	blob_zero(&wiki);
355	blob_append(&wiki, zBody, -1);
356	@ Preview:<hr>
357	wiki_convert(&wiki, 0, 0);
358	@ <hr>
359	blob_reset(&wiki);
360	}
361	for(n=2, z=zBody; z[0]; z++){
362	if( z[0]=='\n' ) n++;
363	}
	@@ -366,11 +366,11 @@
366	@ <form method="post" action="%s(g.zBaseURL)/wikiedit"><div>
367	login_insert_csrf_secret();
368	@ <input type="hidden" name="name" value="%h(zPageName)" />
369	@ <textarea name="w" class="wikiedit" cols="80"
370	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
371	@ <br>
372	@ <input type="submit" name="preview" value="Preview Your Changes" />
373	@ <input type="submit" name="submit" value="Apply These Changes" />
374	@ <input type="submit" name="cancel" value="Cancel" />
375	@ </div></form>
376	if( !isSandbox ){
	@@ -537,15 +537,15 @@
537	zUser = PD("u", g.zLogin);
538	@ <form method="POST" action="%s(g.zBaseURL)/wikiappend">
539	login_insert_csrf_secret();
540	@ <input type="hidden" name="name" value="%h(zPageName)">
541	@ Your Name:
542	@ <input type="text" name="u" size="20" value="%h(zUser)"><br>
543	@ Comment to append:<br>
544	@ <textarea name="r" class="wikiedit" cols="80"
545	@ rows="10" wrap="virtual">%h(PD("r",""))</textarea>
546	@ <br>
547	@ <input type="submit" name="preview" value="Preview Your Comment">
548	@ <input type="submit" name="submit" value="Append Your Changes">
549	@ <input type="submit" name="cancel" value="Cancel">
550	@ </form>
551	style_footer();
552

	--- src/wiki.c
	+++ src/wiki.c
	@@ -351,13 +351,13 @@
351	zHtmlPageName = mprintf("Edit: %s", zPageName);
352	style_header(zHtmlPageName);
353	if( P("preview")!=0 ){
354	blob_zero(&wiki);
355	blob_append(&wiki, zBody, -1);
356	@ Preview:<hr />
357	wiki_convert(&wiki, 0, 0);
358	@ <hr />
359	blob_reset(&wiki);
360	}
361	for(n=2, z=zBody; z[0]; z++){
362	if( z[0]=='\n' ) n++;
363	}
	@@ -366,11 +366,11 @@
366	@ <form method="post" action="%s(g.zBaseURL)/wikiedit"><div>
367	login_insert_csrf_secret();
368	@ <input type="hidden" name="name" value="%h(zPageName)" />
369	@ <textarea name="w" class="wikiedit" cols="80"
370	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
371	@ <br />
372	@ <input type="submit" name="preview" value="Preview Your Changes" />
373	@ <input type="submit" name="submit" value="Apply These Changes" />
374	@ <input type="submit" name="cancel" value="Cancel" />
375	@ </div></form>
376	if( !isSandbox ){
	@@ -537,15 +537,15 @@
537	zUser = PD("u", g.zLogin);
538	@ <form method="POST" action="%s(g.zBaseURL)/wikiappend">
539	login_insert_csrf_secret();
540	@ <input type="hidden" name="name" value="%h(zPageName)">
541	@ Your Name:
542	@ <input type="text" name="u" size="20" value="%h(zUser)"><br />
543	@ Comment to append:<br />
544	@ <textarea name="r" class="wikiedit" cols="80"
545	@ rows="10" wrap="virtual">%h(PD("r",""))</textarea>
546	@ <br />
547	@ <input type="submit" name="preview" value="Preview Your Comment">
548	@ <input type="submit" name="submit" value="Append Your Changes">
549	@ <input type="submit" name="cancel" value="Cancel">
550	@ </form>
551	style_footer();
552

Fossil SCM

Keyboard Shortcuts