</div> +@ <div class="title"><small>$<project_name></small><br />$<title></div> @ <div class="status"><nobr><th1> @ if {[info exists login]} { @ puts "Logged in as $login" @ } else { @ puts "Not logged in" @@ -600,11 +600,11 @@ @ </head> @ <body> @ <div class="header"> @ <div class="logo"> @  -@ <br><nobr>$<project_name></nobr> +@ <br /><nobr>$<project_name></nobr> @ </div> @ <div class="title">$<title></div> @ <div class="status"><nobr><th1> @ if {[info exists login]} { @ puts "Logged in as $login" @@ -731,18 +731,18 @@ db_begin_transaction(); /* Process requests to delete a user-defined skin */ if( P("del1") && (zName = skinVarName(P("sn"), 1))!=0 ){ style_header("Confirm Custom Skin Delete"); - @ <form action="%s(g.zBaseURL)/setup_skin" method="POST"> + @ <form action="%s(g.zBaseURL)/setup_skin" method="post"><div> @ <p>Deletion of a custom skin is a permanent action that cannot @ be undone. Please confirm that this is what you want to do:</p> - @ <input type="hidden" name="sn" value="%h(P("sn"))"> - @ <input type="submit" name="del2" value="Confirm - Delete The Skin"> - @ <input type="submit" name="cancel" value="Cancel - Do Not Delete"> + @ <input type="hidden" name="sn" value="%h(P("sn"))" /> + @ <input type="submit" name="del2" value="Confirm - Delete The Skin" /> + @ <input type="submit" name="cancel" value="Cancel - Do Not Delete" /> login_insert_csrf_secret(); - @ </form> + @ </div></form> style_footer(); return; } if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){ db_multi_exec("DELETE FROM config WHERE name=%Q", zName); @@ -812,15 +812,15 @@ for(i=0; i<sizeof(aBuiltinSkin)/sizeof(aBuiltinSkin[0]); i++){ z = aBuiltinSkin[i].zName; if( strcmp(aBuiltinSkin[i].zValue, zCurrent)==0 ){ @ <li><p>%h(z). <b>Currently In Use</b></p> }else{ - @ <li><form action="%s(g.zBaseURL)/setup_skin" method="POST"> + @ <li><form action="%s(g.zBaseURL)/setup_skin" method="post"><div> @ %h(z). - @ <input type="hidden" name="sn" value="%h(z)"> - @ <input type="submit" name="load" value="Use This Skin"> - @ </form></li> + @ <input type="hidden" name="sn" value="%h(z)" /> + @ <input type="submit" name="load" value="Use This Skin" /> + @ </div></form></li> } } db_prepare(&q, "SELECT substr(name, 6), value FROM config" " WHERE name GLOB 'skin:*'" Index: src/stat.c ================================================================== --- src/stat.c +++ src/stat.c @@ -28,15 +28,17 @@ ** Show statistics and global information about the repository. */ void stat_page(void){ i64 t; int n, m, fsize; + int szMax, szAvg; char zBuf[100]; + login_check_credentials(); if( !g.okRead ){ login_needed(); return; } style_header("Repository Statistics"); - @ <p><table class="label-value"> + @ <table class="label-value"> @ <tr><th>Repository Size:</th><td> fsize = file_size(g.zRepositoryName); @ %d(fsize) bytes @ </td></tr> @ <tr><th>Number Of Artifacts:</th><td> @@ -44,14 +46,21 @@ m = db_int(0, "SELECT count(*) FROM delta"); @ %d(n) (stored as %d(n-m) full text and %d(m) delta blobs) @ </td></tr> if( n>0 ){ int a, b; + Stmt q; @ <tr><th>Uncompressed Artifact Size:</th><td> - t = db_int64(0, "SELECT total(size) FROM blob WHERE size>0"); + db_prepare(&q, "SELECT total(size), avg(size), max(size)" + " FROM blob WHERE size>0"); + db_step(&q); + t = db_column_int64(&q, 0); + szAvg = db_column_int(&q, 1); + szMax = db_column_int(&q, 2); + db_finalize(&q); sqlite3_snprintf(sizeof(zBuf), zBuf, "%lld", t); - @ %d((int)(((double)t)/(double)n)) bytes average, %s(zBuf) bytes total + @ %d(szAvg) bytes average, %d(szMax) bytes max, %s(zBuf) bytes total @ </td></tr> @ <tr><th>Compression Ratio:</th><td> if( t/fsize < 5 ){ b = 10; fsize /= 10; @@ -82,10 +91,12 @@ @ </td></tr> @ <tr><th>Duration Of Project:</th><td> n = db_int(0, "SELECT julianday('now') - (SELECT min(mtime) FROM event)" " + 0.99"); @ %d(n) days + sqlite3_snprintf(sizeof(zBuf), zBuf, "%.2f", n/365.24); + @ or approximately %s(zBuf) years @ </td></tr> @ <tr><th>Project ID:</th><td> @ %h(db_get("project-code","")) @ </td></tr> @ <tr><th>Server ID:</th><td> @@ -94,19 +105,20 @@ @ <tr><th>Fossil Version:</th><td> @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION) @ </td></tr> @ <tr><th>SQLite Version:</th><td> - @ %h(db_text(0, "SELECT substr(sqlite_source_id(),1,30)")) - @ (%h(SQLITE_VERSION)) + sqlite3_snprintf(sizeof(zBuf), zBuf, "%.19s [%.10s] (%s)", + SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION); + @ %s(zBuf) @ </td></tr> @ <tr><th>Database Stats:</th><td> @ %d(db_int(0, "PRAGMA %s.page_count", g.zRepoDb)) pages, @ %d(db_int(0, "PRAGMA %s.page_size", g.zRepoDb)) bytes/page, @ %d(db_int(0, "PRAGMA %s.freelist_count", g.zRepoDb)) free pages, @ %s(db_text(0, "PRAGMA %s.encoding", g.zRepoDb)), @ %s(db_text(0, "PRAGMA %s.journal_mode", g.zRepoDb)) mode @ </td></tr> - @ </table></p> + @ </table> style_footer(); } Index: src/style.c ================================================================== --- src/style.c +++ src/style.c @@ -139,20 +139,23 @@ } @ <div class="content"> cgi_destination(CGI_BODY); /* Put the footer at the bottom of the page. + ** the additional clear/both is needed to extend the content + ** part to the end of an optional sidebox. */ - @ </div><br clear="both"/> + @ <div style="clear: both;"></div> + @ </div> zFooter = db_get("footer", (char*)zDefaultFooter); if( g.thTrace ) Th_Trace("BEGIN_FOOTER<br />\n", -1); Th_Render(zFooter); if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1); /* Render trace log if TH1 tracing is enabled. */ if( g.thTrace ){ - cgi_append_content("<font color=\"red\"><hr>\n", -1); + cgi_append_content("<font color=\"red\"><hr />\n", -1); cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog)); cgi_append_content("</font>\n", -1); } } @@ -179,27 +182,27 @@ const char zDefaultHeader[] = @ <html> @ <head> @ <title>$<project

Add Attachment To %s(zTargetType)

Files of check-in [%s(zShort)] @ %s(blob_str(&dirname))

The union of all files from all check-ins @ %s(blob_str(&dirname))

%b(&title)

Difference From:

To:

Differences From:

To:

Artifact %s(zUuid):

Artifact %s(zUuid)

Privileges And Capabilities:

Special Logins

TICKET Schema

TICKET Schema

Notes

SHA1 Hash:	%s(zUuid) if( g.okSetup ){ @ (Record ID: %d(rid)) } @
Timelines:	- @ ancestors - @ \| descendants - @ \| both + @ ancestors + @ \| descendants + @ \| both db_prepare(&q, "SELECT substr(tag.tagname,5) FROM tagxref, tag " " WHERE rid=%d AND tagtype>0 " " AND tag.tagid=tagxref.tagid " " AND +tag.tagname GLOB 'sym-*'", rid); while( db_step(&q)==SQLITE_ROW ){ @@ -424,11 +426,11 @@ @ \| edit } @

rcvid	Date	User	IP Address
%d(rcvid)	- @	%s(zDate)	- @	%h(zUser)	- @	%s(zIpAddr)	%d(rcvid)	%s(zDate)	%h(zUser)	%s(zIpAddr)

$
$</div> +@ <div class="title"><small>$<project_name></small><br />$<title></div> @ <div class="status"><nobr><th1> @ if {[info exists login]} { @ puts "Logged in as $login" @ } else { @ puts "Not logged in" @@ -600,11 +600,11 @@ @ </head> @ <body> @ <div class="header"> @ <div class="logo"> @  -@ <br><nobr>$<project_name></nobr> +@ <br /><nobr>$<project_name></nobr> @ </div> @ <div class="title">$<title></div> @ <div class="status"><nobr><th1> @ if {[info exists login]} { @ puts "Logged in as $login" @@ -731,18 +731,18 @@ db_begin_transaction(); /* Process requests to delete a user-defined skin */ if( P("del1") && (zName = skinVarName(P("sn"), 1))!=0 ){ style_header("Confirm Custom Skin Delete"); - @ <form action="%s(g.zBaseURL)/setup_skin" method="POST"> + @ <form action="%s(g.zBaseURL)/setup_skin" method="post"><div> @ <p>Deletion of a custom skin is a permanent action that cannot @ be undone. Please confirm that this is what you want to do:</p> - @ <input type="hidden" name="sn" value="%h(P("sn"))"> - @ <input type="submit" name="del2" value="Confirm - Delete The Skin"> - @ <input type="submit" name="cancel" value="Cancel - Do Not Delete"> + @ <input type="hidden" name="sn" value="%h(P("sn"))" /> + @ <input type="submit" name="del2" value="Confirm - Delete The Skin" /> + @ <input type="submit" name="cancel" value="Cancel - Do Not Delete" /> login_insert_csrf_secret(); - @ </form> + @ </div></form> style_footer(); return; } if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){ db_multi_exec("DELETE FROM config WHERE name=%Q", zName); @@ -812,15 +812,15 @@ for(i=0; i<sizeof(aBuiltinSkin)/sizeof(aBuiltinSkin[0]); i++){ z = aBuiltinSkin[i].zName; if( strcmp(aBuiltinSkin[i].zValue, zCurrent)==0 ){ @ <li><p>%h(z). <b>Currently In Use</b></p> }else{ - @ <li><form action="%s(g.zBaseURL)/setup_skin" method="POST"> + @ <li><form action="%s(g.zBaseURL)/setup_skin" method="post"><div> @ %h(z). - @ <input type="hidden" name="sn" value="%h(z)"> - @ <input type="submit" name="load" value="Use This Skin"> - @ </form></li> + @ <input type="hidden" name="sn" value="%h(z)" /> + @ <input type="submit" name="load" value="Use This Skin" /> + @ </div></form></li> } } db_prepare(&q, "SELECT substr(name, 6), value FROM config" " WHERE name GLOB 'skin:*'" Index: src/stat.c ================================================================== --- src/stat.c +++ src/stat.c @@ -28,15 +28,17 @@ ** Show statistics and global information about the repository. */ void stat_page(void){ i64 t; int n, m, fsize; + int szMax, szAvg; char zBuf[100]; + login_check_credentials(); if( !g.okRead ){ login_needed(); return; } style_header("Repository Statistics"); - @ <p><table class="label-value"> + @ <table class="label-value"> @ <tr><th>Repository Size:</th><td> fsize = file_size(g.zRepositoryName); @ %d(fsize) bytes @ </td></tr> @ <tr><th>Number Of Artifacts:</th><td> @@ -44,14 +46,21 @@ m = db_int(0, "SELECT count(*) FROM delta"); @ %d(n) (stored as %d(n-m) full text and %d(m) delta blobs) @ </td></tr> if( n>0 ){ int a, b; + Stmt q; @ <tr><th>Uncompressed Artifact Size:</th><td> - t = db_int64(0, "SELECT total(size) FROM blob WHERE size>0"); + db_prepare(&q, "SELECT total(size), avg(size), max(size)" + " FROM blob WHERE size>0"); + db_step(&q); + t = db_column_int64(&q, 0); + szAvg = db_column_int(&q, 1); + szMax = db_column_int(&q, 2); + db_finalize(&q); sqlite3_snprintf(sizeof(zBuf), zBuf, "%lld", t); - @ %d((int)(((double)t)/(double)n)) bytes average, %s(zBuf) bytes total + @ %d(szAvg) bytes average, %d(szMax) bytes max, %s(zBuf) bytes total @ </td></tr> @ <tr><th>Compression Ratio:</th><td> if( t/fsize < 5 ){ b = 10; fsize /= 10; @@ -82,10 +91,12 @@ @ </td></tr> @ <tr><th>Duration Of Project:</th><td> n = db_int(0, "SELECT julianday('now') - (SELECT min(mtime) FROM event)" " + 0.99"); @ %d(n) days + sqlite3_snprintf(sizeof(zBuf), zBuf, "%.2f", n/365.24); + @ or approximately %s(zBuf) years @ </td></tr> @ <tr><th>Project ID:</th><td> @ %h(db_get("project-code","")) @ </td></tr> @ <tr><th>Server ID:</th><td> @@ -94,19 +105,20 @@ @ <tr><th>Fossil Version:</th><td> @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION) @ </td></tr> @ <tr><th>SQLite Version:</th><td> - @ %h(db_text(0, "SELECT substr(sqlite_source_id(),1,30)")) - @ (%h(SQLITE_VERSION)) + sqlite3_snprintf(sizeof(zBuf), zBuf, "%.19s [%.10s] (%s)", + SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION); + @ %s(zBuf) @ </td></tr> @ <tr><th>Database Stats:</th><td> @ %d(db_int(0, "PRAGMA %s.page_count", g.zRepoDb)) pages, @ %d(db_int(0, "PRAGMA %s.page_size", g.zRepoDb)) bytes/page, @ %d(db_int(0, "PRAGMA %s.freelist_count", g.zRepoDb)) free pages, @ %s(db_text(0, "PRAGMA %s.encoding", g.zRepoDb)), @ %s(db_text(0, "PRAGMA %s.journal_mode", g.zRepoDb)) mode @ </td></tr> - @ </table></p> + @ </table> style_footer(); } Index: src/style.c ================================================================== --- src/style.c +++ src/style.c @@ -139,20 +139,23 @@ } @ <div class="content"> cgi_destination(CGI_BODY); /* Put the footer at the bottom of the page. + ** the additional clear/both is needed to extend the content + ** part to the end of an optional sidebox. */ - @ </div><br clear="both"/> + @ <div style="clear: both;"></div> + @ </div> zFooter = db_get("footer", (char*)zDefaultFooter); if( g.thTrace ) Th_Trace("BEGIN_FOOTER<br />\n", -1); Th_Render(zFooter); if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1); /* Render trace log if TH1 tracing is enabled. */ if( g.thTrace ){ - cgi_append_content("<font color=\"red\"><hr>\n", -1); + cgi_append_content("<font color=\"red\"><hr />\n", -1); cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog)); cgi_append_content("</font>\n", -1); } } @@ -179,27 +182,27 @@ const char zDefaultHeader[] = @ <html> @ <head> @ <title>$<project_name>: $<title> @ +@ href="$baseurl/timeline.rss" /> @ +@ media="screen" /> @ @ @

$
$</div> -@ <div class="status"><nobr><th1> +@ <div class="title"><small>$<project_name></small><br />$<title></div> +@ <div class="status"><th1> @ if {[info exists login]} { @ puts "Logged in as $login" @ } else { @ puts "Not logged in" @ } -@ </th1></nobr></div> +@ </th1></div> @ </div> @ <div class="mainmenu"><th1> @ html "<a href='$baseurl$index_page'>Home</a> " @ if {[anycap jor]} { @ html "<a href='$baseurl/timeline'>Timeline</a> " @@ -274,11 +277,11 @@ @ font-weight: bold; @ text-align: center; @ padding: 0 0 0 1em; @ color: #558195; @ vertical-align: bottom; -@ width: 100%; +@ width: 100% ; @ } @ @ /* The login status message in the top right-hand corner */ @ div.status { @ display: table-cell; @@ -286,16 +289,17 @@ @ vertical-align: bottom; @ color: #558195; @ font-size: 0.8em; @ font-weight: bold; @ min-width: 200px; +@ white-space: nowrap; @ } @ @ /* The header across the top of the page */ @ div.header { @ display: table; -@ width: 100%; +@ width: 100% ; @ } @ @ /* The main menu bar that appears at the top of the page beneath @ ** the header */ @ div.mainmenu { @@ -339,10 +343,11 @@ @ padding: 1px 1px 1px 1px; @ font-size: 1.2em; @ font-weight: bold; @ background-color: #558195; @ color: white; +@ white-space: nowrap; @ } @ @ /* The "Date" that occurs on the left hand side of timelines */ @ div.divider { @ background: #a1c4d4; @@ -368,83 +373,344 @@ @ div.footer a { color: white; } @ div.footer a:link { color: white; } @ div.footer a:visited { color: white; } @ div.footer a:hover { background-color: white; color: #558195; } @ -@ /* <verbatim> blocks */ +@ /* verbatim blocks */ @ pre.verbatim { @ background-color: #f5f5f5; @ padding: 0.5em; @} @ -; -const char zTableLabelValueCSS[] = @ /* The label/value pairs on (for example) the ci page */ @ table.label-value th { @ vertical-align: top; @ text-align: right; @ padding: 0.2ex 2ex; @ } -; -const char zDivSidebox[] = -@ /* The nomenclature sidebox for branches,.. */ -@ div.sidebox { -@ float: right; -@ border-width: medium; -@ border-style: double; -@ margin: 10; -@ } -; -const char zDivSideboxTitle[] = -@ /* The nomenclature title in sideboxes for branches,.. */ -@ div.sideboxTitle { -@ display: inline; -@ font-weight: bold; -@ } -; - - -/* The following table holds the names of CSS elements and the CSS -** text that implements those elements. -*/ -static const struct { - const char *zElement; /* Name of the CSS element */ - const char *zText; /* Text of the element */ -} cssElements[] = { - { "table.label-value", zTableLabelValueCSS }, - { "div.sidebox", zDivSidebox }, - { "div.sideboxTitle", zDivSideboxTitle }, -}; +@ +; + + +/* The following table contains bits of default CSS that must +** be included if they are not found in the application-defined +** CSS. +*/ +const struct strctCssDefaults { + char const * const elementClass; /* Name of element needed */ + char const * const comment; /* Comment text */ + char const * const value; /* CSS text */ +} cssDefaultList[] = { + { "", + "", + zDefaultCSS + }, + { "div.sidebox", + "The nomenclature sidebox for branches,..", + @ float: right; + @ background-color: white; + @ border-width: medium; + @ border-style: double; + @ margin: 10; + }, + { "div.sideboxTitle", + "The nomenclature title in sideboxes for branches,..", + @ display: inline; + @ font-weight: bold; + }, + { "div.sideboxDescribed", + "The defined element in sideboxes for branches,..", + @ display: inline; + @ font-weight: bold; + }, + { "span.disabled", + "The defined element in sideboxes for branches,..", + @ color: red; + }, + { "span.timelineDisabled", + "The suppressed duplicates lines in timeline, ..", + @ font-style: italic; + @ font-size: small; + }, + { "table.timelineTable", + "the format for the timeline data table", + @ cellspacing: 0; + @ border: 0; + @ cellpadding: 0 + }, + { "td.timelineTableCell", + "the format for the timeline data cells", + @ valign: top; + @ align: left; + }, + { "span.timelineLeaf", + "the format for the timeline leaf marks", + @ font-weight: bold; + }, + { "a.timelineHistLink", + "the format for the timeline version links", + @ + }, + { "span.timelineHistDsp", + "the format for the timeline version display(no history permission!)", + @ font-weight: bold; + }, + { "td.timelineTime", + "the format for the timeline time display", + @ vertical-align: top; + @ text-align: right; + }, + { "td.timelineGraph", + "the format for the grap placeholder cells in timelines", + @ width: 20; + @ text-align: left; + @ vertical-align: top; + }, + { "a.tagLink", + "the format for the tag links", + @ + }, + { "span.tagDsp", + "the format for the tag display(no history permission!)", + @ font-weight: bold; + }, + { "span.wikiError", + "the format for wiki errors", + @ font-weight: bold; + @ color: red; + }, + { "span.infoTagCancelled", + "the format for fixed/canceled tags,..", + @ font-weight: bold; + @ text-decoration: line-through; + }, + { "span.infoTag", + "the format for tags,..", + @ font-weight: bold; + }, + { "span.wikiTagCancelled", + "the format for fixed/cancelled tags,.. on wiki pages", + @ text-decoration: line-through; + }, + { "table.browser", + "format for the file display table", + @ /* the format for wiki errors */ + @ width: 100% ; + @ border: 0; + }, + { "td.browser", + "format for cells in the file browser", + @ width: 24% ; + @ vertical-align: top; + }, + { "ul.browser", + "format for the list in the file browser", + @ margin-left: 0.5em; + @ padding-left: 0.5em; + }, + { "table.login_out", + "table format for login/out label/input table", + @ text-align: left; + @ margin-right: 10px; + @ margin-left: 10px; + @ margin-top: 10px; + }, + { "div.captcha", + "captcha display options", + @ text-align: center; + }, + { "table.captcha", + "format for the layout table, used for the captcha display", + @ margin: auto; + @ padding: 10px; + @ outline-width: 1; + @ outline-style: double; + }, + { "td.login_out_label", + "format for the label cells in the login/out table", + @ text-align: center; + }, + { "span.loginError", + "format for login error messages", + @ color: red; + }, + { "span.note", + "format for leading text for notes", + @ font-weight: bold; + }, + { "span.textareaLabel", + "format for textare labels", + @ font-weight: bold; + }, + { "table.usetupLayoutTable", + "format for the user setup layout table", + @ outline-style: none; + @ padding: 0; + @ margin: 25px; + }, + { "td.usetupColumnLayout", + "format of the columns on the user setup list page", + @ vertical-align: top + }, + { "table.usetupUserList", + "format for the user list table on the user setup page", + @ outline-style: double; + @ outline-width: 1; + @ padding: 10px; + }, + { "th.usetupListUser", + "format for table header user in user list on user setup page", + @ text-align: right; + @ padding-right: 20px; + }, + { "th.usetupListCap", + "format for table header capabilities in user list on user setup page", + @ text-align: center; + @ padding-right: 15px; + }, + { "th.usetupListCon", + "format for table header contact info in user list on user setup page", + @ text-align: left; + }, + { "td.usetupListUser", + "format for table cell user in user list on user setup page", + @ text-align: right; + @ padding-right: 20px; + @ white-space:nowrap; + }, + { "td.usetupListCap", + "format for table cell capabilities in user list on user setup page", + @ text-align: center; + @ padding-right: 15px; + }, + { "td.usetupListCon", + "format for table cell contact info in user list on user setup page", + @ text-align: left + }, + { "div.ueditCapBox", + "layout definition for the capabilities box on the user edit detail page", + @ float: left; + @ margin-right: 20px; + @ margin-bottom: 20px; + }, + { "td.usetupEditLabel", + "format of the label cells in the detailed user edit page", + @ text-align: right; + @ vertical-align: top; + @ white-space: nowrap; + }, + { "span.ueditInheritNobody", + "color for capabilities, inherited by nobody", + @ color: green; + }, + { "span.ueditInheritDeveloper", + "color for capabilities, inherited by developer", + @ color: red; + }, + { "span.ueditInheritReader", + "color for capabilities, inherited by reader", + @ color: black; + }, + { "span.ueditInheritAnonymous", + "color for capabilities, inherited by anonymous", + @ color: blue; + }, + { "span.capability", + "format for capabilites, mentioned on the user edit page", + @ font-weight: bold; + }, + { "span.usertype", + "format for different user types, mentioned on the user edit page", + @ font-weight: bold; + }, + { "span.usertype:before", + "leading text for user types, mentioned on the user edit page", + @ content:"'"; + }, + { "span.usertype:after", + "trailing text for user types, mentioned on the user edit page", + @ content:"'"; + }, + { "span.wikiruleHead", + "format for leading text in wikirules definitions", + @ font-weight: bold; + }, + { "td.tktDspLabel", + "format for labels on ticket display page", + @ text-align: right; + }, + { "td.tktDspValue", + "format for values on ticket display page", + @ text-align: left; + @ vertical-align: top; + @ background-color: #d0d0d0; + }, + { "span.tktError", + "format for ticket error messages", + @ color: red; + @ font-weight: bold; + }, + { 0, + 0, + 0 + } +}; + +/* +** Append all of the default CSS to the CGI output. +*/ +void cgi_append_default_css(void) { + int i; + + for (i=0;cssDefaultList[i].elementClass;i++){ + if (cssDefaultList[i].elementClass[0]){ + cgi_printf("/* %s */\n%s {\n%s\n}\n\n", + cssDefaultList[i].comment, + cssDefaultList[i].elementClass, + cssDefaultList[i].value + ); + }else{ + cgi_printf("%s", + cssDefaultList[i].value + ); + } + } +} /* ** WEBPAGE: style.css */ void page_style_css(void){ - const char *zCSS; + const char *zCSS = 0; int i; cgi_set_content_type("text/css"); zCSS = db_get("css",(char*)zDefaultCSS); /* append user defined css */ cgi_append_content(zCSS, -1); /* add special missing definitions */ - for(i=0; i<count(cssElements); i++){ - if( strstr(cssElements[i].zElement, zCSS)==0 ){ - cgi_append_content(cssElements[i].zText, -1); + for (i=1;cssDefaultList[i].elementClass;i++) + if (!strstr(zCSS,cssDefaultList[i].elementClass)) { + cgi_append_content("/* ", -1); + cgi_append_content(cssDefaultList[i].comment, -1); + cgi_append_content(" */\n", -1); + cgi_append_content(cssDefaultList[i].elementClass, -1); + cgi_append_content(" {\n", -1); + cgi_append_content(cssDefaultList[i].value, -1); + cgi_append_content("}\n\n", -1); } - } g.isConst = 1; } /* ** WEBPAGE: test_env */ void page_test_env(void){ style_header("Environment Test"); #if !defined(_WIN32) - @ uid=%d(getuid()), gid=%d(getgid())<br> + @ uid=%d(getuid()), gid=%d(getgid())<br /> #endif - @ g.zBaseURL = %h(g.zBaseURL)<br> - @ g.zTop = %h(g.zTop)<br> + @ g.zBaseURL = %h(g.zBaseURL)<br /> + @ g.zTop = %h(g.zTop)<br /> cgi_print_all(); style_footer(); } Index: src/tag.c ================================================================== --- src/tag.c +++ src/tag.c @@ -514,13 +514,14 @@ ); @ <ul> while( db_step(&q)==SQLITE_ROW ){ const char *zName = db_column_text(&q, 0); if( g.okHistory ){ - @ <li><a href=%s(g.zBaseURL)/timeline?t=%T(zName)>%h(zName)</a></li> + @ <li><a class="tagLink" href="%s(g.zBaseURL)/timeline?t=%T(zName)"> + @ %h(zName)</a></li> }else{ - @ <li><strong>%h(zName)</strong></li> + @ <li><span class="tagDsp">%h(zName)</span></li> } } @ </ul> db_finalize(&q); style_footer(); @@ -542,13 +543,14 @@ rid ); while( db_step(&q)==SQLITE_ROW ){ const char *zTagName = db_column_text(&q, 0); if( g.okHistory ){ - @ <a href="%s(g.zBaseURL)/timeline?t=%T(zTagName)">[%h(zTagName)]</a> + @ <a class="tagLink" href="%s(g.zBaseURL)/timeline?t=%T(zTagName)"> + @ [%h(zTagName)]</a> }else{ - @ <b>[%h(zTagName)]</b> + @ <span class="tagDsp">[%h(zTagName)]</span> } } db_finalize(&q); } @@ -573,14 +575,14 @@ " ORDER BY event.mtime DESC", timeline_query_for_www() ); www_print_timeline(&q, 0, tagtimeline_extra); db_finalize(&q); - @ <br clear="both"> - @ <script> + @ <br /> + @ <script type="text/JavaScript"> @ function xin(id){ @ } @ function xout(id){ @ } @ </script> style_footer(); } Index: src/th_main.c ================================================================== --- src/th_main.c +++ src/th_main.c @@ -278,11 +278,12 @@ blob_reset(&name); for(i=0; i<nElem; i++){ zH = htmlize((char*)azElem[i], aszElem[i]); if( zValue && aszElem[i]==nValue && memcmp(zValue, azElem[i], nValue)==0 ){ - z = mprintf("<option value=\"%s\" selected>%s</option>", zH, zH); + z = mprintf("<option value=\"%s\" selected=\"selected\">%s</option>", + zH, zH); }else{ z = mprintf("<option value=\"%s\">%s</option>", zH, zH); } free(zH); sendText(z, -1, 0); Index: src/timeline.c ================================================================== --- src/timeline.c +++ src/timeline.c @@ -48,13 +48,14 @@ */ void hyperlink_to_uuid(const char *zUuid){ char zShortUuid[UUID_SIZE+1]; shorten_uuid(zShortUuid, zUuid); if( g.okHistory ){ - @ <a href="%s(g.zBaseURL)/info/%s(zShortUuid)">[%s(zShortUuid)]</a> + @ <a class="timelineHistLink" href="%s(g.zBaseURL)/info/%s(zShortUuid)"> + @ [%s(zShortUuid)]</a> }else{ - @ <b>[%s(zShortUuid)]</b> + @ <span class="timelineHistDsp">[%s(zShortUuid)]</span> } } /* ** Generate a hyperlink that invokes javascript to highlight @@ -83,11 +84,11 @@ void hyperlink_to_diff(const char *zV1, const char *zV2){ if( g.okHistory ){ if( zV2==0 ){ @ <a href="%s(g.zBaseURL)/diff?v2=%s(zV1)">[diff]</a> }else{ - @ <a href="%s(g.zBaseURL)/diff?v1=%s(zV1)&v2=%s(zV2)">[diff]</a> + @ <a href="%s(g.zBaseURL)/diff?v1=%s(zV1)&v2=%s(zV2)">[diff]</a> } } } /* @@ -109,11 +110,11 @@ */ void hyperlink_to_user(const char *zU, const char *zD, const char *zSuf){ if( zSuf==0 ) zSuf = ""; if( g.okHistory ){ if( zD && zD[0] ){ - @ <a href="%s(g.zTop)/timeline?c=%T(zD)&u=%T(zU)">%h(zU)</a>%s(zSuf) + @ <a href="%s(g.zTop)/timeline?c=%T(zD)&u=%T(zU)">%h(zU)</a>%s(zSuf) }else{ @ <a href="%s(g.zTop)/timeline?u=%T(zU)">%h(zU)</a>%s(zSuf) } }else{ @ %s(zU) @@ -189,14 +190,17 @@ }else{ wikiFlags = WIKI_INLINE | WIKI_NOBLOCK; } if( tmFlags & TIMELINE_GRAPH ){ pGraph = graph_init(); + /* style is not moved to css, because this is + ** a technical div for the timeline graph + */ @ <div id="canvas" style="position:relative;width:1px;height:1px;"></div> } - @ <table cellspacing=0 border=0 cellpadding=0> + @ <table class="timelineTable"> blob_zero(&comment); while( db_step(pQuery)==SQLITE_ROW ){ int rid = db_column_int(pQuery, 0); const char *zUuid = db_column_text(pQuery, 1); int isLeaf = db_column_int(pQuery, 5); @@ -218,30 +222,30 @@ } } } prevTagid = tagid; if( suppressCnt ){ - @ <tr><td><td><td> - @ <small><i>... %d(suppressCnt) similar - @ event%s(suppressCnt>1?"s":"") omitted.</i></small></tr> + @ <tr><td /><td /><td> + @ <span class="timelineDisabled">... %d(suppressCnt) similar + @ event%s(suppressCnt>1?"s":"") omitted.</span></td></tr> suppressCnt = 0; } if( strcmp(zType,"div")==0 ){ - @ <tr><td colspan=3><hr></td></tr> + @ <tr><td colspan="3"><hr /></td></tr> continue; } if( memcmp(zDate, zPrevDate, 10) ){ sprintf(zPrevDate, "%.10s", zDate); @ <tr><td> - @ <div class="divider"><nobr>%s(zPrevDate)</nobr></div> + @ <div class="divider">%s(zPrevDate)</div> @ </td></tr> } memcpy(zTime, &zDate[11], 5); zTime[5] = 0; @ <tr> - @ <td valign="top" align="right">%s(zTime)</td> - @ <td width="20" align="left" valign="top"> + @ <td class="timelineTime">%s(zTime)</td> + @ <td class="timelineGraph"> if( pGraph && zType[0]=='c' ){ int nParent = 0; int aParent[32]; const char *zBr; int gidx; @@ -267,24 +271,25 @@ } gidx = graph_add_row(pGraph, rid, nParent, aParent, zBr, zBgClr); db_reset(&qbranch); @ <div id="m%d(gidx)"></div> } + @</td> if( zBgClr && zBgClr[0] ){ - @ <td valign="top" align="left" bgcolor="%h(zBgClr)"> + @ <td class="timelineTableCell" style="background-color: %h(zBgClr);"> }else{ - @ <td valign="top" align="left"> + @ <td class="timelineTableCell"> } if( zType[0]=='c' ){ hyperlink_to_uuid(zUuid); if( isLeaf ){ if( db_exists("SELECT 1 FROM tagxref" " WHERE rid=%d AND tagid=%d AND tagtype>0", rid, TAG_CLOSED) ){ - @ <b>Closed-Leaf:</b> + @ <span class="timelineLeaf">Closed-Leaf:</span> }else{ - @ <b>Leaf:</b> + @ <span class="timelineLeaf">Leaf:</span> } } }else if( (tmFlags & TIMELINE_ARTID)!=0 ){ hyperlink_to_uuid(zUuid); } @@ -309,23 +314,27 @@ xExtra(rid); } @ </td></tr> } if( suppressCnt ){ - @ <tr><td><td><td> - @ <small><i>... %d(suppressCnt) similar - @ event%s(suppressCnt>1?"s":"") omitted.</i></small></tr> + @ <tr><td /><td /><td> + @ <span class="timelineDisabled">... %d(suppressCnt) similar + @ event%s(suppressCnt>1?"s":"") omitted.</span></td></tr> suppressCnt = 0; } if( pGraph ){ graph_finish(pGraph, (tmFlags & TIMELINE_DISJOINT)!=0); if( pGraph->nErr ){ graph_free(pGraph); pGraph = 0; }else{ - @ <tr><td><td> + /* style is not moved to css, because this is + ** a technical div for the timeline graph + */ + @ <tr><td /><td> @ <div id="grbtm" style="width:%d(pGraph->mxRail*20+30)px;"></div> + @ </td></tr> } } @ </table> timeline_output_graph_javascript(pGraph); } @@ -337,11 +346,11 @@ void timeline_output_graph_javascript(GraphContext *pGraph){ if( pGraph && pGraph->nErr==0 ){ GraphRow *pRow; int i; char cSep; - @ <script type="text/JavaScript"> + @ <script type="text/JavaScript"> cgi_printf("var rowinfo = [\n"); for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){ cgi_printf("{id:\"m%d\",bg:\"%s\",r:%d,d:%d,mo:%d,mu:%d,u:%d,au:", pRow->idx, pRow->zBgClr, @@ -883,15 +892,15 @@ }else if( zBrName ){ blob_appendf(&desc, " related to \"%h\"", zBrName); tmFlags |= TIMELINE_DISJOINT; } if( zAfter ){ - blob_appendf(&desc, " occurring on or after %h.<br>", zAfter); + blob_appendf(&desc, " occurring on or after %h.<br />", zAfter); }else if( zBefore ){ - blob_appendf(&desc, " occurring on or before %h.<br>", zBefore); + blob_appendf(&desc, " occurring on or before %h.<br />", zBefore); }else if( zCirca ){ - blob_appendf(&desc, " occurring around %h.<br>", zCirca); + blob_appendf(&desc, " occurring around %h.<br />", zCirca); } if( zSearch ){ blob_appendf(&desc, " matching \"%h\"", zSearch); } if( g.okHistory ){ Index: src/tkt.c ================================================================== --- src/tkt.c +++ src/tkt.c @@ -313,11 +313,11 @@ style_submenu_element("New Ticket", "Create a new ticket", "%s/tktnew", g.zTop); } if( g.okApndTkt && g.okAttach ){ style_submenu_element("Attach", "Add An Attachment", - "%s/attachadd?tkt=%T&from=%s/tktview/%t", + "%s/attachadd?tkt=%T&from=%s/tktview/%t", g.zTop, zUuid, g.zTop, zUuid); } style_header("View Ticket"); if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br />\n", -1); ticket_init(); @@ -342,24 +342,24 @@ while( db_step(&q)==SQLITE_ROW ){ const char *zDate = db_column_text(&q, 0); const char *zFile = db_column_text(&q, 1); const char *zUser = db_column_text(&q, 2); if( cnt==0 ){ - @ <hr><h2>Attachments:</h2> + @ <hr /><h2>Attachments:</h2> @ <ul> } cnt++; if( g.okRead && g.okHistory ){ - @ <li><a href="%s(g.zTop)/attachview?tkt=%s(zFullName)&file=%t(zFile)"> + @ <li><a href="%s(g.zTop)/attachview?tkt=%s(zFullName)&file=%t(zFile)"> @ %h(zFile)</a> }else{ @ %h(zFile) } @ added by %h(zUser) on hyperlink_to_date(zDate, "."); if( g.okWrTkt && g.okAttach ){ - @ [<a href="%s(g.zTop)/attachdelete?tkt=%s(zFullName)&file=%t(zFile)&from=%s(g.zTop)/tktview%%3fname=%s(zFullName)">delete</a>] + @ [<a href="%s(g.zTop)/attachdelete?tkt=%s(zFullName)&file=%t(zFile)&from=%s(g.zTop)/tktview%%3fname=%s(zFullName)">delete</a>] } } if( cnt ){ @ </ul> } @@ -511,12 +511,13 @@ if( g.thTrace ) Th_Trace("BEGIN_TKTNEW<br />\n", -1); ticket_init(); getAllTicketFields(); initializeVariablesFromDb(); initializeVariablesFromCGI(); - @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)"> + @ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><p> login_insert_csrf_secret(); + @ </p> zScript = ticket_newpage_code(); Th_Store("login", g.zLogin); Th_Store("date", db_text(0, "SELECT datetime('now')")); Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd, (void*)&zNewUuid, 0); @@ -554,34 +555,36 @@ cgi_redirectf("tktview?name=%T", zName); } style_header("Edit Ticket"); if( zName==0 || (nName = strlen(zName))<4 || nName>UUID_SIZE || !validate16(zName,nName) ){ - @ <font color="red"><b>Not a valid ticket id: \"%h(zName)\"</b></font> + @ <span class="tktError">Not a valid ticket id: \"%h(zName)\"</span> style_footer(); return; } nRec = db_int(0, "SELECT count(*) FROM ticket WHERE tkt_uuid GLOB '%q*'", zName); if( nRec==0 ){ - @ <font color="red"><b>No such ticket: \"%h(zName)\"</b></font> + @ <span class="tktError">No such ticket: \"%h(zName)\"</span> style_footer(); return; } if( nRec>1 ){ - @ <font color="red"><b>%d(nRec) tickets begin with: \"%h(zName)\"</b></font> + @ <span class="tktError"><b>%d(nRec) tickets begin with: + @ \"%h(zName)\"</span> style_footer(); return; } if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1); ticket_init(); getAllTicketFields(); initializeVariablesFromCGI(); initializeVariablesFromDb(); - @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)"> - @ <input type="hidden" name="name" value="%s(zName)"> + @ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><p> + @ <input type="hidden" name="name" value="%s(zName)" /> login_insert_csrf_secret(); + @ </p> zScript = ticket_editpage_code(); Th_Store("login", g.zLogin); Th_Store("date", db_text(0, "SELECT datetime('now')")); Th_CreateCommand(g.interp, "append_field", appendRemarkCmd, 0, 0); Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd, (void*)&zName,0); @@ -624,11 +627,11 @@ return 0; } /* ** WEBPAGE: tkttimeline -** URL: /tkttimeline?name=TICKETUUID&y=TYPE +** URL: /tkttimeline?name=TICKETUUID&y=TYPE ** ** Show the change history for a single ticket in timeline format. */ void tkttimeline_page(void){ Stmt q; @@ -644,11 +647,11 @@ if( !g.okHistory || !g.okRdTkt ){ login_needed(); return; } zUuid = PD("name",""); zType = PD("y","a"); if( zType[0]!='c' ){ style_submenu_element("Check-ins", "Check-ins", - "%s/tkttimeline?name=%T&y=ci", g.zTop, zUuid); + "%s/tkttimeline?name=%T&y=ci", g.zTop, zUuid); }else{ style_submenu_element("Timeline", "Timeline", "%s/tkttimeline?name=%T", g.zTop, zUuid); } style_submenu_element("History", "History", @@ -776,12 +779,12 @@ @ <p>Ticket change @ [<a href="%s(g.zTop)/artifact/%T(zChngUuid)">%s(zShort)</a>] @ (rid %d(rid)) by hyperlink_to_user(m.zUser,zDate," on"); hyperlink_to_date(zDate, ":"); - ticket_output_change_artifact(&m); @ </p> + ticket_output_change_artifact(&m); } manifest_clear(&m); } } db_finalize(&q); Index: src/tktsetup.c ================================================================== --- src/tktsetup.c +++ src/tktsetup.c @@ -130,21 +130,21 @@ db_set(zDbField, z, 0); if( xRebuild ) xRebuild(); cgi_redirect("tktsetup"); } } - @ <form action="%s(g.zBaseURL)/%s(g.zPath)" method="POST"> + @ <form action="%s(g.zBaseURL)/%s(g.zPath)" method="post"><div> login_insert_csrf_secret(); @ <p>%s(zDesc)</p> @ <textarea name="x" rows="%d(height)" cols="80">%h(z)</textarea> - @ <blockquote> - @ <input type="submit" name="submit" value="Apply Changes"> - @ <input type="submit" name="clear" value="Revert To Default"> - @ <input type="submit" name="setup" value="Cancel"> - @ </blockquote> - @ </form> - @ <hr> + @ <blockquote><p> + @ <input type="submit" name="submit" value="Apply Changes" /> + @ <input type="submit" name="clear" value="Revert To Default" /> + @ <input type="submit" name="setup" value="Cancel" /> + @ </p></blockquote> + @ </div></form> + @ <hr /> @ <h2>Default %s(zTitle)</h2> @ <blockquote><pre> @ %h(zDfltValue) @ </pre></blockquote> style_footer(); @@ -153,13 +153,13 @@ /* ** WEBPAGE: tktsetup_tab */ void tktsetup_tab_page(void){ static const char zDesc[] = - @ <p>Enter a valid CREATE TABLE statement for the "ticket" table. The + @ Enter a valid CREATE TABLE statement for the "ticket" table. The @ table must contain columns named "tkt_id", "tkt_uuid", and "tkt_mtime" - @ with an unique index on "tkt_uuid" and "tkt_mtime".</p> + @ with an unique index on "tkt_uuid" and "tkt_mtime". ; tktsetup_generic( "Ticket Table Schema", "ticket-table", zDefaultTicketTable, @@ -229,12 +229,12 @@ /* ** WEBPAGE: tktsetup_com */ void tktsetup_com_page(void){ static const char zDesc[] = - @ <p>Enter TH1 script that initializes variables prior to generating - @ any of the ticket view, edit, or creation pages.</p> + @ Enter TH1 script that initializes variables prior to generating + @ any of the ticket view, edit, or creation pages. ; tktsetup_generic( "Ticket Common Script", "ticket-common", zDefaultTicketCommon, @@ -250,80 +250,80 @@ @ if {[info exists submit]} { @ set status Open @ submit_ticket @ } @ </th1> -@ <h1 align="center">Enter A New Ticket</h1> +@ <h1 style="text-align: center;">Enter A New Ticket</h1> @ <table cellpadding="5"> @ <tr> @ <td colspan="2"> -@ Enter a one-line summary of the ticket:<br> -@ <input type="text" name="title" size="60" value="$<title>"> +@ Enter a one-line summary of the ticket:<br /> +@ <input type="text" name="title" size="60" value="$<title>" /> @ </td> @ </tr> @ @ <tr> -@ <td align="right">Type: +@ <td style="text-align: center;">Type: @ <th1>combobox type $type_choices 1</th1> @ </td> @ <td>What type of ticket is this?</td> @ </tr> @ @ <tr> -@ <td align="right">Version: -@ <input type="text" name="foundin" size="20" value="$<foundin>"> +@ <td style="text-align: center;">Version: +@ <input type="text" name="foundin" size="20" value="$<foundin>" /> @ </td> @ <td>In what version or build number do you observe the problem?</td> @ </tr> @ @ <tr> -@ <td align="right">Severity: +@ <td style="text-align: center;">Severity: @ <th1>combobox severity $severity_choices 1</th1> @ </td> @ <td>How debilitating is the problem? How badly does the problem @ affect the operation of the product?</td> @ </tr> @ @ <tr> -@ <td align="right">EMail: -@ <input type="text" name="private_contact" value="$<private_contact>" size="30"> +@ <td style="text-align: center;">EMail: +@ <input type="text" name="private_contact" value="$<private_contact>" size="30" /> @ </td> -@ <td><u>Not publicly visible</u>. Used by developers to contact you with -@ questions.</td> +@ <td><span style="text-decoration: underline;">Not publicly visible</span>. +@ Used by developers to contact you with questions.</td> @ </tr> @ @ <tr> @ <td colspan="2"> @ Enter a detailed description of the problem. @ For code defects, be sure to provide details on exactly how @ the problem can be reproduced. Provide as much detail as @ possible. -@ <br> +@ <br /> @ <th1>set nline [linecount $comment 50 10]</th1> @ <textarea name="comment" cols="80" rows="$nline" -@ wrap="virtual" class="wikiedit">$<comment></textarea><br> -@ <input type="submit" name="preview" value="Preview"> +@ wrap="virtual" class="wikiedit">$<comment></textarea><br /> +@ <input type="submit" name="preview" value="Preview" /></td> @ </tr> @ @ <th1>enable_output [info exists preview]</th1> @ <tr><td colspan="2"> -@ Description Preview:<br><hr> +@ Description Preview:<br /><hr /> @ <th1>wiki $comment</th1> -@ <hr> +@ <hr /> @ </td></tr> @ <th1>enable_output 1</th1> @ @ <tr> -@ <td align="right"> -@ <input type="submit" name="submit" value="Submit"> +@ <td style="text-align: center;"> +@ <input type="submit" name="submit" value="Submit" /> @ </td> @ <td>After filling in the information above, press this button to create @ the new ticket</td> @ </tr> @ <tr> -@ <td align="right"> -@ <input type="submit" name="cancel" value="Cancel"> +@ <td style="text-align: center;"> +@ <input type="submit" name="cancel" value="Cancel" /> @ </td> @ <td>Abandon and forget this ticket</td> @ </tr> @ </table> ; @@ -338,12 +338,12 @@ /* ** WEBPAGE: tktsetup_newpage */ void tktsetup_newpage_page(void){ static const char zDesc[] = - @ <p>Enter HTML with embedded TH1 script that will render the "new ticket" - @ page</p> + @ Enter HTML with embedded TH1 script that will render the "new ticket" + @ page ; tktsetup_generic( "HTML For New Tickets", "ticket-newpage", zDefaultNew, @@ -354,51 +354,50 @@ ); } static const char zDefaultView[] = @ <table cellpadding="5"> -@ <tr><td align="right">Ticket UUID:</td><td bgcolor="#d0d0d0" colspan="3"> -@ $<tkt_uuid> -@ </td></tr> -@ <tr><td align="right">Title:</td> -@ <td bgcolor="#d0d0d0" colspan="3" valign="top"> +@ <tr><td class="tktDspLabel">Ticket UUID:</td> +@ <td class="tktDspValue" colspan="3">$<tkt_uuid></td></tr> +@ <tr><td class="tktDspLabel">Title:</td> +@ <td class="tktDspValue" colspan="3"> @ <th1>wiki $title</th1> @ </td></tr> -@ <tr><td align="right">Status:</td><td bgcolor="#d0d0d0"> +@ <tr><td class="tktDspLabel">Status:</td><td class="tktDspValue"> @ $<status> @ </td> -@ <td align="right">Type:</td><td bgcolor="#d0d0d0"> +@ <td class="tktDspLabel">Type:</td><td class="tktDspValue"> @ $<type> @ </td></tr> -@ <tr><td align="right">Severity:</td><td bgcolor="#d0d0d0"> +@ <tr><td class="tktDspLabel">Severity:</td><td class="tktDspValue"> @ $<severity> @ </td> -@ <td align="right">Priority:</td><td bgcolor="#d0d0d0"> +@ <td class="tktDspLabel">Priority:</td><td class="tktDspValue"> @ $<priority> @ </td></tr> -@ <tr><td align="right">Subsystem:</td><td bgcolor="#d0d0d0"> +@ <tr><td class="tktDspLabel">Subsystem:</td><td class="tktDspValue"> @ $<subsystem> @ </td> -@ <td align="right">Resolution:</td><td bgcolor="#d0d0d0"> +@ <td class="tktDspLabel">Resolution:</td><td class="tktDspValue"> @ $<resolution> @ </td></tr> -@ <tr><td align="right">Last Modified:</td><td bgcolor="#d0d0d0"> +@ <tr><td class="tktDspLabel">Last Modified:</td><td class="tktDspValue"> @ $<tkt_datetime> @ </td> @ <th1>enable_output [hascap e]</th1> -@ <td align="right">Contact:</td><td bgcolor="#d0d0d0"> +@ <td class="tktDspLabel">Contact:</td><td class="tktDspValue"> @ $<private_contact> @ </td> @ <th1>enable_output 1</th1> @ </tr> -@ <tr><td align="right">Version Found In:</td> -@ <td colspan="3" valign="top" bgcolor="#d0d0d0"> +@ <tr><td class="tktDspLabel">Version Found In:</td> +@ <td colspan="3" valign="top" class="tktDspValue"> @ $<foundin> @ </td></tr> @ <tr><td>Description & Comments:</td></tr> -@ <tr><td colspan="4" bgcolor="#d0d0d0"> -@ <span bgcolor="#d0d0d0"><th1>wiki $comment</th1></span> +@ <tr><td colspan="4" class="tktDspValue"> +@ <th1>wiki $comment</th1> @ </td></tr> @ </table> ; @@ -412,12 +411,11 @@ /* ** WEBPAGE: tktsetup_viewpage */ void tktsetup_viewpage_page(void){ static const char zDesc[] = - @ <p>Enter HTML with embedded TH1 script that will render the "view ticket" - @ page</p> + @ Enter HTML with embedded TH1 script that will render the "view ticket" page ; tktsetup_generic( "HTML For Viewing Tickets", "ticket-viewpage", zDefaultView, @@ -432,51 +430,51 @@ @ <th1> @ if {![info exists username]} {set username $login} @ if {[info exists submit]} { @ if {[info exists cmappnd]} { @ if {[string length $cmappnd]>0} { -@ set ctxt "\n\n<hr><i>[htmlize $login]" +@ set ctxt "\n\n<hr /><i>[htmlize $login]" @ if {$username ne $login} { @ set ctxt "$ctxt claiming to be [htmlize $username]" @ } -@ set ctxt "$ctxt added on [date]:</i><br>\n$cmappnd" +@ set ctxt "$ctxt added on [date]:</i><br />\n$cmappnd" @ append_field comment $ctxt @ } @ } @ submit_ticket @ } @ </th1> @ <table cellpadding="5"> -@ <tr><td align="right">Title:</td><td> -@ <input type="text" name="title" value="$<title>" size="60"> +@ <tr><td class="tktDspLabel">Title:</td><td> +@ <input type="text" name="title" value="$<title>" size="60" /> @ </td></tr> -@ <tr><td align="right">Status:</td><td> +@ <tr><td class="tktDspLabel">Status:</td><td> @ <th1>combobox status $status_choices 1</th1> @ </td></tr> -@ <tr><td align="right">Type:</td><td> +@ <tr><td class="tktDspLabel">Type:</td><td> @ <th1>combobox type $type_choices 1</th1> @ </td></tr> -@ <tr><td align="right">Severity:</td><td> +@ <tr><td class="tktDspLabel">Severity:</td><td> @ <th1>combobox severity $severity_choices 1</th1> @ </td></tr> -@ <tr><td align="right">Priority:</td><td> +@ <tr><td class="tktDspLabel">Priority:</td><td> @ <th1>combobox priority $priority_choices 1</th1> @ </td></tr> -@ <tr><td align="right">Resolution:</td><td> +@ <tr><td class="tktDspLabel">Resolution:</td><td> @ <th1>combobox resolution $resolution_choices 1</th1> @ </td></tr> -@ <tr><td align="right">Subsystem:</td><td> +@ <tr><td class="tktDspLabel">Subsystem:</td><td> @ <th1>combobox subsystem $subsystem_choices 1</th1> @ </td></tr> @ <th1>enable_output [hascap e]</th1> -@ <tr><td align="right">Contact:</td><td> +@ <tr><td class="tktDspLabel">Contact:</td><td> @ <input type="text" name="private_contact" size="40" -@ value="$<private_contact>"> +@ value="$<private_contact>" /> @ </td></tr> @ <th1>enable_output 1</th1> -@ <tr><td align="right">Version Found In:</td><td> -@ <input type="text" name="foundin" size="50" value="$<foundin>"> +@ <tr><td class="tktDspLabel">Version Found In:</td><td> +@ <input type="text" name="foundin" size="50" value="$<foundin>" /> @ </td></tr> @ <tr><td colspan="2"> @ <th1> @ if {![info exists eall]} {set eall 0} @ if {[info exists aonlybtn]} {set eall 0} @@ -484,45 +482,45 @@ @ if {![hascap w]} {set eall 0} @ if {![info exists cmappnd]} {set cmappnd {}} @ set nline [linecount $comment 15 10] @ enable_output $eall @ </th1> -@ Description And Comments:<br> +@ Description And Comments:<br /> @ <textarea name="comment" cols="80" rows="$nline" -@ wrap="virtual" class="wikiedit">$<comment></textarea><br> -@ <input type="hidden" name="eall" value="1"> -@ <input type="submit" name="aonlybtn" value="Append Remark"> -@ <input type="submit" name="preview1btn" value="Preview"> +@ wrap="virtual" class="wikiedit">$<comment></textarea><br /> +@ <input type="hidden" name="eall" value="1" /> +@ <input type="submit" name="aonlybtn" value="Append Remark" /> +@ <input type="submit" name="preview1btn" value="Preview" /> @ <th1>enable_output [expr {!$eall}]</th1> @ Append Remark from -@ <input type="text" name="username" value="$<username>" size="30">:<br> +@ <input type="text" name="username" value="$<username>" size="30" />:<br /> @ <textarea name="cmappnd" cols="80" rows="15" -@ wrap="virtual" class="wikiedit">$<cmappnd></textarea><br> +@ wrap="virtual" class="wikiedit">$<cmappnd></textarea><br /> @ <th1>enable_output [expr {[hascap w] && !$eall}]</th1> -@ <input type="submit" name="eallbtn" value="Edit All"> +@ <input type="submit" name="eallbtn" value="Edit All" /> @ <th1>enable_output [expr {!$eall}]</th1> -@ <input type="submit" name="preview2btn" value="Preview"> +@ <input type="submit" name="preview2btn" value="Preview" /> @ <th1>enable_output 1</th1> @ </td></tr> @ @ <th1>enable_output [info exists preview1btn]</th1> @ <tr><td colspan="2"> -@ Description Preview:<br><hr> +@ Description Preview:<br /><hr /> @ <th1>wiki $comment</th1> -@ <hr> +@ <hr /> @ </td></tr> @ <th1>enable_output [info exists preview2btn]</th1> @ <tr><td colspan="2"> -@ Description Preview:<br><hr> +@ Description Preview:<br /><hr /> @ <th1>wiki $cmappnd</th1> -@ <hr> +@ <hr /> @ </td></tr> @ <th1>enable_output 1</th1> @ @ <tr><td align="right"></td><td> -@ <input type="submit" name="submit" value="Submit Changes"> -@ <input type="submit" name="cancel" value="Cancel"> +@ <input type="submit" name="submit" value="Submit Changes" /> +@ <input type="submit" name="cancel" value="Cancel" /> @ </td></tr> @ </table> ; /* @@ -535,12 +533,11 @@ /* ** WEBPAGE: tktsetup_editpage */ void tktsetup_editpage_page(void){ static const char zDesc[] = - @ <p>Enter HTML with embedded TH1 script that will render the "edit ticket" - @ page</p> + @ Enter HTML with embedded TH1 script that will render the "edit ticket" page ; tktsetup_generic( "HTML For Editing Tickets", "ticket-editpage", zDefaultEdit, @@ -585,12 +582,11 @@ /* ** WEBPAGE: tktsetup_reportlist */ void tktsetup_reportlist(void){ static const char zDesc[] = - @ <p>Enter HTML with embedded TH1 script that will render the "report list" - @ page</p> + @ Enter HTML with embedded TH1 script that will render the "report list" page ; tktsetup_generic( "HTML For Report List", "ticket-reportlist", zDefaultReportList, @@ -633,13 +629,13 @@ /* ** WEBPAGE: tktsetup_rpttplt */ void tktsetup_rpttplt_page(void){ static const char zDesc[] = - @ <p>Enter the default ticket report format template. This is the + @ Enter the default ticket report format template. This is the @ the template report format that initially appears when creating a - @ new ticket summary report.</p> + @ new ticket summary report. ; tktsetup_generic( "Default Report Template", "ticket-report-template", zDefaultReport, @@ -674,13 +670,13 @@ /* ** WEBPAGE: tktsetup_keytplt */ void tktsetup_keytplt_page(void){ static const char zDesc[] = - @ <p>Enter the default ticket report color-key template. This is the + @ Enter the default ticket report color-key template. This is the @ the color-key that initially appears when creating a - @ new ticket summary report.</p> + @ new ticket summary report. ; tktsetup_generic( "Default Report Color-Key Template", "ticket-key-template", zDefaultKey, @@ -703,34 +699,34 @@ if( P("setup") ){ cgi_redirect("tktsetup"); } style_header("Ticket Display On Timelines"); db_begin_transaction(); - @ <form action="%s(g.zBaseURL)/tktsetup_timeline" method="POST"> + @ <form action="%s(g.zBaseURL)/tktsetup_timeline" method="post"><div> login_insert_csrf_secret(); - @ <hr> + @ <hr /> entry_attribute("Ticket Title", 40, "ticket-title-expr", "t", "title"); @ <p>An SQL expression in a query against the TICKET table that will @ return the title of the ticket for display purposes.</p> - @ <hr> + @ <hr /> entry_attribute("Ticket Status", 40, "ticket-status-column", "s", "status"); @ <p>The name of the column in the TICKET table that contains the ticket @ status in human-readable form. Case sensitive.</p> - @ <hr> + @ <hr /> entry_attribute("Ticket Closed", 40, "ticket-closed-expr", "c", "status='Closed'"); @ <p>An SQL expression that evaluates to true in a TICKET table query if @ the ticket is closed.</p> - @ <hr> + @ <hr /> @ <p> - @ <input type="submit" name="submit" value="Apply Changes"> - @ <input type="submit" name="setup" value="Cancel"> + @ <input type="submit" name="submit" value="Apply Changes" /> + @ <input type="submit" name="setup" value="Cancel" /> @ </p> - @ </form> + @ </div></form> db_end_transaction(0); style_footer(); } Index: src/translate.c ================================================================== --- src/translate.c +++ src/translate.c @@ -66,15 +66,16 @@ /* ** Translate the input stream into the output stream */ static void trans(FILE *in, FILE *out){ - int i, j, k; /* Loop counters */ - char c1, c2; /* Characters used to start a comment */ - int lastWasEq = 0; /* True if last non-whitespace character was "=" */ - char zLine[2000]; /* A single line of input */ - char zOut[4000]; /* The input line translated into appropriate output */ + int i, j, k; /* Loop counters */ + char c1, c2; /* Characters used to start a comment */ + int lastWasEq = 0; /* True if last non-whitespace character was "=" */ + int lastWasComma = 0; /* True if last non-whitespace character was "," */ + char zLine[2000]; /* A single line of input */ + char zOut[4000]; /* The input line translated into appropriate output */ c1 = c2 = '-'; while( fgets(zLine, sizeof(zLine), in) ){ for(i=0; zLine[i] && isspace(zLine[i]); i++){} if( zLine[i]!='@' ){ @@ -85,14 +86,16 @@ c1 = zLine[14]; c2 = zLine[15]; } i += strlen(&zLine[i]); while( i>0 && isspace(zLine[i-1]) ){ i--; } - lastWasEq = i>0 && zLine[i-1]=='='; - }else if( lastWasEq ){ + lastWasEq = i>0 && zLine[i-1]=='='; + lastWasComma = i>0 && zLine[i-1]==','; + }else if( lastWasEq || lastWasComma){ /* If the last non-whitespace character before the first @ was - ** an "=" then generate a string literal. But skip comments + ** an "="(var init/set) or a ","(const definition in list) then + ** generate a string literal. But skip comments ** consisting of all text between c1 and c2 (default "--") ** and end of line. */ int indent, omitline; i++; Index: src/update.c ================================================================== --- src/update.c +++ src/update.c @@ -111,10 +111,11 @@ tid = db_int(0, "SELECT rid FROM leaves, event" " WHERE event.objid=leaves.rid" " ORDER BY event.mtime DESC"); } + if( tid==vid ) return; /* Nothing to update */ db_begin_transaction(); vfile_check_signature(vid, 1); if( !nochangeFlag ) undo_begin(); load_vfile_from_rid(tid); Index: src/url.c ================================================================== --- src/url.c +++ src/url.c @@ -351,11 +351,11 @@ zName2 = 0; z = zValue2; if( z==0 ) continue; } blob_appendf(&p->url, "%s%s=%T", zSep, p->azName[i], z); - zSep = "&"; + zSep = "&"; } if( zName1 && zValue1 ){ blob_appendf(&p->url, "%s%s=%T", zSep, zName1, zValue1); } if( zName2 && zValue2 ){ Index: src/wiki.c ================================================================== --- src/wiki.c +++ src/wiki.c @@ -48,15 +48,15 @@ /* ** Output rules for well-formed wiki pages */ static void well_formed_wiki_name_rules(void){ @ <ul> - @ <li> Must not begin or end with a space. + @ <li> Must not begin or end with a space.</li> @ <li> Must not contain any control characters, including tab or - @ newline. - @ <li> Must not have two or more spaces in a row internally. - @ <li> Must be between 3 and 100 characters in length. + @ newline.</li> + @ <li> Must not have two or more spaces in a row internally.</li> + @ <li> Must be between 3 and 100 characters in length.</li> @ </ul> } /* ** Check a wiki name. If it is not well-formed, then issue an error @@ -63,12 +63,12 @@ ** and return true. If it is well-formed, return false. */ static int check_name(const char *z){ if( !wiki_name_is_wellformed((const unsigned char *)z) ){ style_header("Wiki Page Name Error"); - @ The wiki name "<b>%h(z)</b>" is not well-formed. Rules for - @ wiki page names: + @ The wiki name "<span class="wikiError">%h(z)</span>" is not well-formed. + @ Rules for wiki page names: well_formed_wiki_name_rules(); style_footer(); return 1; } return 0; @@ -155,14 +155,14 @@ if( g.okNewWiki ){ @ <li> Create a <a href="%s(g.zBaseURL)/wikinew">new wiki page</a>.</li> } @ <li> <a href="%s(g.zBaseURL)/wcontent">List of All Wiki Pages</a> @ available on this server.</li> - @ <li> <form method="GET" action="%s(g.zBaseURL)/wfind"> - @ Search wiki titles: <input type="text" name="title"/> - @ <input type="submit" /> - @ </li> + @ <li> <form method="get" action="%s(g.zBaseURL)/wfind"><div> + @ Search wiki titles: <input type="text" name="title"/> + @ <input type="submit" /></div></form> + @ </li> @ </ul> style_footer(); return; } if( check_name(zPageName) ) return; @@ -194,11 +194,11 @@ style_submenu_element("Edit", "Edit Wiki Page", "%s/wikiedit?name=%T", g.zTop, zPageName); } if( rid && g.okApndWiki && g.okAttach ){ style_submenu_element("Attach", "Add An Attachment", - "%s/attachadd?page=%T&from=%s/wiki%%3fname=%T", + "%s/attachadd?page=%T&from=%s/wiki%%3fname=%T", g.zTop, zPageName, g.zTop, zPageName); } if( rid && g.okApndWiki ){ style_submenu_element("Append", "Add A Comment", "%s/wikiappend?name=%T", g.zTop, zPageName); @@ -227,19 +227,20 @@ @ <hr><h2>Attachments:</h2> @ <ul> } cnt++; if( g.okHistory && g.okRead ){ - @ <li><a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)"> + @ <li> + @ <a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)"> @ %h(zFile)</a> }else{ @ <li>%h(zFile) } @ added by %h(zUser) on hyperlink_to_date(zDate, "."); if( g.okWrWiki && g.okAttach ){ - @ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>] + @ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>] } } if( cnt ){ @ </ul> } @@ -351,30 +352,30 @@ zHtmlPageName = mprintf("Edit: %s", zPageName); style_header(zHtmlPageName); if( P("preview")!=0 ){ blob_zero(&wiki); blob_append(&wiki, zBody, -1); - @ Preview:<hr> + @ Preview:<hr /> wiki_convert(&wiki, 0, 0); - @ <hr> + @ <hr /> blob_reset(&wiki); } for(n=2, z=zBody; z[0]; z++){ if( z[0]=='\n' ) n++; } if( n<20 ) n = 20; if( n>40 ) n = 40; - @ <form method="POST" action="%s(g.zBaseURL)/wikiedit"> + @ <form method="post" action="%s(g.zBaseURL)/wikiedit"><div> login_insert_csrf_secret(); - @ <input type="hidden" name="name" value="%h(zPageName)"> + @ <input type="hidden" name="name" value="%h(zPageName)" /> @ <textarea name="w" class="wikiedit" cols="80" @ rows="%d(n)" wrap="virtual">%h(zBody)</textarea> - @ <br> - @ <input type="submit" name="preview" value="Preview Your Changes"> - @ <input type="submit" name="submit" value="Apply These Changes"> - @ <input type="submit" name="cancel" value="Cancel"> - @ </form> + @ <br /> + @ <input type="submit" name="preview" value="Preview Your Changes" /> + @ <input type="submit" name="submit" value="Apply These Changes" /> + @ <input type="submit" name="cancel" value="Cancel" /> + @ </div></form> if( !isSandbox ){ manifest_clear(&m); } style_footer(); } @@ -396,21 +397,20 @@ zName = PD("name",""); if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){ cgi_redirectf("wikiedit?name=%T", zName); } style_header("Create A New Wiki Page"); - @ <p>Rules for wiki page names: + @ <p>Rules for wiki page names:</p> well_formed_wiki_name_rules(); - @ </p> - @ <form method="POST" action="%s(g.zBaseURL)/wikinew"> + @ <form method="post" action="%s(g.zBaseURL)/wikinew"> @ <p>Name of new wiki page: - @ <input type="text" width="35" name="name" value="%h(zName)"> - @ <input type="submit" value="Create"> + @ <input style="width: 35;" type="text" name="name" value="%h(zName)" /> + @ <input type="submit" value="Create" /> @ </p></form> if( zName[0] ){ - @ <p><b><font color="red"> - @ "%h(zName)" is not a valid wiki page name!</font></b></p> + @ <p><span class="wikiError"> + @ "%h(zName)" is not a valid wiki page name!</span></p> } style_footer(); } @@ -537,15 +537,15 @@ zUser = PD("u", g.zLogin); @ <form method="POST" action="%s(g.zBaseURL)/wikiappend"> login_insert_csrf_secret(); @ <input type="hidden" name="name" value="%h(zPageName)"> @ Your Name: - @ <input type="text" name="u" size="20" value="%h(zUser)"><br> - @ Comment to append:<br> + @ <input type="text" name="u" size="20" value="%h(zUser)"><br /> + @ Comment to append:<br /> @ <textarea name="r" class="wikiedit" cols="80" @ rows="10" wrap="virtual">%h(PD("r",""))</textarea> - @ <br> + @ <br /> @ <input type="submit" name="preview" value="Preview Your Comment"> @ <input type="submit" name="submit" value="Append Your Changes"> @ <input type="submit" name="cancel" value="Cancel"> @ </form> style_footer(); @@ -560,11 +560,11 @@ ** Function called to output extra text at the end of each line in ** a wiki history listing. */ static void wiki_history_extra(int rid){ if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){ - @ <a href="%s(g.zTop)/wdiff?name=%t(zWikiPageName)&a=%d(rid)">[diff]</a> + @ <a href="%s(g.zTop)/wdiff?name=%t(zWikiPageName)&a=%d(rid)">[diff]</a> } } /* ** WEBPAGE: whistory @@ -740,39 +740,39 @@ @ </ol> @ <p>We call the first five rules above "wiki" formatting rules. The @ last two rules are the HTML formatting rule.</p> @ <h2>Formatting Rule Details</h2> @ <ol> - @ <li> <p><b>Paragraphs</b>. Any sequence of one or more blank lines forms + @ <li> <p><span class="wikiruleHead">Paragraphs</span>. Any sequence of one or more blank lines forms @ a paragraph break. Centered or right-justified paragraphs are not @ supported by wiki markup, but you can do these things if you need them - @ using HTML.</p> - @ <li> <p><b>Bullet Lists</b>. + @ using HTML.</p></li> + @ <li> <p><span class="wikiruleHead">Bullet Lists</span>. @ A bullet list item is a line that begins with a single "*" character @ surrounded on @ both sides by two or more spaces or by a tab. Only a single level - @ of bullet list is supported by wiki. For nested lists, use HTML.</p> - @ <li> <p><b>Enumeration Lists</b>. + @ of bullet list is supported by wiki. For nested lists, use HTML.</p></li> + @ <li> <p><span class="wikiruleHead">Enumeration Lists</span>. @ An enumeration list item is a line that begins with a single "#" character @ surrounded on both sides by two or more spaces or by a tab. Only a single @ level of enumeration list is supported by wiki. For nested lists or for - @ enumerations that count using letters or roman numerials, use HTML.</p> - @ <li> <p><b>Indented Paragraphs</b>. + @ enumerations that count using letters or roman numerials, use HTML.</p></li> + @ <li> <p><span class="wikiruleHead">Indented Paragraphs</span>. @ Any paragraph that begins with two or more spaces or a tab and @ which is not a bullet or enumeration list item is rendered @ indented. Only a single level of indentation is supported by wiki; use - @ HTML for deeper indentation.</p> - @ <li> <p><b>Hyperlinks</b>. + @ HTML for deeper indentation.</p></li> + @ <li> <p><span class="wikiruleHead">Hyperlinks</span>. @ Text within square brackets ("[...]") becomes a hyperlink. The @ target can be a wiki page name, the artifact ID of a check-in or ticket, @ the name of an image, or a URL. By default, the target is displayed @ as the text of the hyperlink. But you can specify alternative text @ after the target name separated by a "|" character.</p> @ <p>You can also link to internal anchor names using [#anchor-name], providing @ you have added the necessary "<a name="anchor-name"></a>" - @ tag to your wiki page.</p> - @ <li> <p><b>HTML</b>. + @ tag to your wiki page.</p></li> + @ <li> <p><span class="wikiruleHead">HTML</span>. @ The following standard HTML elements may be used: @ <a> @ <address> @ <b> @ <big> @@ -822,16 +822,16 @@ @ <verbatim> and <nowiki>. @ No other elements are allowed. All attributes are checked and @ only a few benign attributes are allowed on each element. @ In particular, any attributes that specify javascript or CSS @ are elided.</p></li> - @ <li><p><b>Special Markup.</b> + @ <li><p><span class="wikiruleHead">Special Markup.</span> @ The <nowiki> tag disables all wiki formatting rules @ through the matching </nowiki> element. @ The <verbatim> tag works like <pre> with the addition @ that it also disables all wiki and HTML markup - @ through the matching </verbatim>. + @ through the matching </verbatim>.</p></li> @ </ol> style_footer(); } /* Index: src/wikiformat.c ================================================================== --- src/wikiformat.c +++ src/wikiformat.c @@ -321,21 +321,21 @@ } /* ** Token types */ -#define TOKEN_MARKUP 1 /* <...> */ -#define TOKEN_CHARACTER 2 /* "&" or "<" not part of markup */ -#define TOKEN_LINK 3 /* [...] */ -#define TOKEN_PARAGRAPH 4 /* blank lines */ -#define TOKEN_NEWLINE 5 /* A single "\n" */ -#define TOKEN_BUL_LI 6 /* " * " */ -#define TOKEN_NUM_LI 7 /* " # " */ -#define TOKEN_ENUM 8 /* " \(?\d+[.)]? " */ -#define TOKEN_INDENT 9 /* " " */ -#define TOKEN_RAW 10 /* Output exactly (used when wiki-use-html==1) */ -#define TOKEN_TEXT 11 /* None of the above */ +#define TOKEN_MARKUP 1 /* <...> */ +#define TOKEN_CHARACTER 2 /* "&" or "<" not part of markup */ +#define TOKEN_LINK 3 /* [...] */ +#define TOKEN_PARAGRAPH 4 /* blank lines */ +#define TOKEN_NEWLINE 5 /* A single "\n" */ +#define TOKEN_BUL_LI 6 /* " * " */ +#define TOKEN_NUM_LI 7 /* " # " */ +#define TOKEN_ENUM 8 /* " \(?\d+[.)]? " */ +#define TOKEN_INDENT 9 /* " " */ +#define TOKEN_RAW 10 /* Output exactly (used when wiki-use-html==1) */ +#define TOKEN_TEXT 11 /* None of the above */ /* ** State flags */ #define AT_NEWLINE 0x001 /* At start of a line */ @@ -745,10 +745,13 @@ static void renderMarkup(Blob *pOut, ParsedMarkup *p){ int i; if( p->endTag ){ blob_appendf(pOut, "</%s>", aMarkup[p->iCode].zName); }else{ + /* Close active paragraph for several elements, which are not allowed + ** in paragraphs in XHTML. + */ blob_appendf(pOut, "<%s", aMarkup[p->iCode].zName); for(i=0; i<p->nAttr; i++){ blob_appendf(pOut, " %s", aAttribute[p->aAttr[i].iACode].zName); if( p->aAttr[i].zValue ){ const char *zVal = p->aAttr[i].zValue; @@ -756,10 +759,13 @@ blob_appendf(pOut, "=\"%s%s\"", g.zBaseURL, zVal); }else{ blob_appendf(pOut, "=\"%s\"", zVal); } } + } + if (p->iType & MUTYPE_SINGLE){ + blob_append(pOut, " /", 2); } blob_append(pOut, ">", 1); } } @@ -885,12 +891,13 @@ /* ** Begin a new paragraph if that something that is needed. */ static void startAutoParagraph(Renderer *p){ - if( p->wantAutoParagraph==0 || p->wikiList==MARKUP_OL || p->wikiList==MARKUP_UL ) return; - blob_appendf(p->pOut, "<p>", -1); + if( p->wantAutoParagraph==0 ) return; + if( p->wikiList==MARKUP_OL || p->wikiList==MARKUP_UL ) return; + blob_appendf(p->pOut, "<p type=\"auto\">", -1); pushStack(p, MARKUP_P); p->wantAutoParagraph = 0; p->inAutoParagraph = 1; } @@ -1019,17 +1026,18 @@ /* Special display processing for tickets. Display the hyperlink ** as crossed out if the ticket is closed. */ if( isClosed ){ if( g.okHistory ){ - blob_appendf(p->pOut,"<a href=\"%s/info/%s\"><s>", - g.zBaseURL, zTarget + blob_appendf(p->pOut, + "<a href=\"%s/info/%s\"><span class=\"wikiTagCancelled\">", + g.zBaseURL, zTarget ); - zTerm = "</s></a>"; + zTerm = "</span></a>"; }else{ - blob_appendf(p->pOut,"<s>"); - zTerm = "</s>"; + blob_appendf(p->pOut,"<span class=\"wikiTagCancelled\">"); + zTerm = "</span>"; } }else{ if( g.okHistory ){ blob_appendf(p->pOut,"<a href=\"%s/info/%s\">", g.zBaseURL, zTarget @@ -1133,10 +1141,11 @@ }else{ if( p->wikiList!=MARKUP_UL ){ if( p->wikiList ){ popStackToTag(p, p->wikiList); } + endAutoParagraph(p); pushStack(p, MARKUP_UL); blob_append(p->pOut, "<ul>", 4); p->wikiList = MARKUP_UL; } popStackToTag(p, MARKUP_LI); @@ -1152,10 +1161,11 @@ }else{ if( p->wikiList!=MARKUP_OL ){ if( p->wikiList ){ popStackToTag(p, p->wikiList); } + endAutoParagraph(p); pushStack(p, MARKUP_OL); blob_append(p->pOut, "<ol>", 4); p->wikiList = MARKUP_OL; } popStackToTag(p, MARKUP_LI); @@ -1171,10 +1181,11 @@ }else{ if( p->wikiList!=MARKUP_OL ){ if( p->wikiList ){ popStackToTag(p, p->wikiList); } + endAutoParagraph(p); pushStack(p, MARKUP_OL); blob_append(p->pOut, "<ol>", 4); p->wikiList = MARKUP_OL; } popStackToTag(p, MARKUP_LI); @@ -1233,11 +1244,13 @@ p->state = savedState; blob_append(p->pOut, zClose, -1); break; } case TOKEN_TEXT: { - startAutoParagraph(p); + int i; + for(i=0; i<n && isspace(z[i]); i++){} + if( i<n ) startAutoParagraph(p); blob_append(p->pOut, z, n); break; } case TOKEN_RAW: { blob_append(p->pOut, z, n); @@ -1347,16 +1360,19 @@ blob_appendf(p->pOut, "<pre name='code' class='%s'>", markup.aAttr[vAttrIdx].zValue); vAttrDidAppend=1; } } - if( !vAttrDidAppend ) + if( !vAttrDidAppend ) { + endAutoParagraph(p); blob_append(p->pOut, "<pre class='verbatim'>",-1); + } p->wantAutoParagraph = 0; }else if( markup.iType==MUTYPE_LI ){ if( backupToType(p, MUTYPE_LIST)==0 ){ + endAutoParagraph(p); pushStack(p, MARKUP_UL); blob_append(p->pOut, "<ul>", 4); } pushStack(p, MARKUP_LI); renderMarkup(p->pOut, &markup); @@ -1384,12 +1400,22 @@ pushStack(p, markup.iCode); }else { if( markup.iType==MUTYPE_FONT ){ startAutoParagraph(p); - }else if( markup.iType==MUTYPE_BLOCK ){ + }else if( markup.iType==MUTYPE_BLOCK || markup.iType==MUTYPE_LIST ){ p->wantAutoParagraph = 0; + } + if( markup.iCode==MARKUP_HR + || markup.iCode==MARKUP_H1 + || markup.iCode==MARKUP_H2 + || markup.iCode==MARKUP_H3 + || markup.iCode==MARKUP_H4 + || markup.iCode==MARKUP_H5 + || markup.iCode==MARKUP_P + ){ + endAutoParagraph(p); } if( (markup.iType & MUTYPE_STACK )!=0 ){ pushStack(p, markup.iCode); } renderMarkup(p->pOut, &markup);

User ID:	User ID:
Password:		Password:

- @
%s(zPrevDate)
+ @
%s(zPrevDate)
@

@ %s(zTime)

}else{ - @

} sqlite3_snprintf(sizeof(zShort), zShort, "%.10s", zUuid); sqlite3_snprintf(sizeof(zShortCkin), zShortCkin, "%.10s", zCkin); if( zUuid ){ if( g.okHistory ){ @@ -187,27 +187,29 @@ hyperlink_to_uuid(zShortCkin); @ %h(zCom) (user: hyperlink_to_user(zUser, zDate, ""); @ branch: %h(zBr)) if( g.okHistory && zUuid ){ + const char *z = zFilename; if( fpid ){ @ [diff] } - @ + @ @ [annotate] } - @