Fossil SCM

more formats to css

wolfgang 2010-09-28 15:45 wolfgangFormat2CSS_2
Commit e05f750a4546aeecabb411d2e92506bea8fb8775
Parent 6759e00eb89fcf3…
7 files changed +4 -4 +3 -3 +2 -2 +6 -6 +44 -4 +2 -2 +1 -1
~ src/main.c ~ src/report.c ~ src/setup.c ~ src/shun.c ~ src/style.c ~ src/th_main.c ~ src/tktsetup.c
M src/main.c
+4 -4
--- src/main.c
+++ src/main.c
@@ -292,11 +292,11 @@
292292
 va_start(ap, zFormat);
293293
 z = vmprintf(zFormat, ap);
294294
 va_end(ap);
295295
 if( g.cgiOutput && once ){
296296
 once = 0;
297
- cgi_printf("<p><font color=\"red\">%h</font></p>", z);
297
+ cgi_printf("<p class=\"generalError\">%h</p>", z);
298298
 cgi_reply();
299299
 }else{
300300
 fprintf(stderr, "%s: %s\n", g.argv[0], z);
301301
 }
302302
 db_force_rollback();
@@ -309,11 +309,11 @@
309309
 va_start(ap, zFormat);
310310
 z = vmprintf(zFormat, ap);
311311
 va_end(ap);
312312
 if( g.cgiOutput ){
313313
 g.cgiOutput = 0;
314
- cgi_printf("<p><font color=\"red\">%h</font></p>", z);
314
+ cgi_printf("<p class=\"generalError\">%h</p>", z);
315315
 cgi_reply();
316316
 }else{
317317
 fprintf(stderr, "%s: %s\n", g.argv[0], z);
318318
 }
319319
 db_force_rollback();
@@ -337,11 +337,11 @@
337337
 va_start(ap, zFormat);
338338
 z = vmprintf(zFormat, ap);
339339
 va_end(ap);
340340
 if( g.cgiOutput ){
341341
 g.cgiOutput = 0;
342
- cgi_printf("<p><font color=\"red\">%h</font></p>", z);
342
+ cgi_printf("<p class=\"generalError\">%h</p>", z);
343343
 cgi_reply();
344344
 }else{
345345
 fprintf(stderr, "%s: %s\n", g.argv[0], z);
346346
 }
347347
 db_force_rollback();
@@ -355,11 +355,11 @@
355355
 va_list ap;
356356
 va_start(ap, zFormat);
357357
 z = vmprintf(zFormat, ap);
358358
 va_end(ap);
359359
 if( g.cgiOutput ){
360
- cgi_printf("<p><font color=\"red\">%h</font></p>", z);
360
+ cgi_printf("<p class=\"generalError\">%h</p>", z);
361361
 }else{
362362
 fprintf(stderr, "%s: %s\n", g.argv[0], z);
363363
 }
364364
 }
365365
366366
--- src/main.c
+++ src/main.c
@@ -292,11 +292,11 @@
292 va_start(ap, zFormat);
293 z = vmprintf(zFormat, ap);
294 va_end(ap);
295 if( g.cgiOutput && once ){
296 once = 0;
297 cgi_printf("<p><font color=\"red\">%h</font></p>", z);
298 cgi_reply();
299 }else{
300 fprintf(stderr, "%s: %s\n", g.argv[0], z);
301 }
302 db_force_rollback();
@@ -309,11 +309,11 @@
309 va_start(ap, zFormat);
310 z = vmprintf(zFormat, ap);
311 va_end(ap);
312 if( g.cgiOutput ){
313 g.cgiOutput = 0;
314 cgi_printf("<p><font color=\"red\">%h</font></p>", z);
315 cgi_reply();
316 }else{
317 fprintf(stderr, "%s: %s\n", g.argv[0], z);
318 }
319 db_force_rollback();
@@ -337,11 +337,11 @@
337 va_start(ap, zFormat);
338 z = vmprintf(zFormat, ap);
339 va_end(ap);
340 if( g.cgiOutput ){
341 g.cgiOutput = 0;
342 cgi_printf("<p><font color=\"red\">%h</font></p>", z);
343 cgi_reply();
344 }else{
345 fprintf(stderr, "%s: %s\n", g.argv[0], z);
346 }
347 db_force_rollback();
@@ -355,11 +355,11 @@
355 va_list ap;
356 va_start(ap, zFormat);
357 z = vmprintf(zFormat, ap);
358 va_end(ap);
359 if( g.cgiOutput ){
360 cgi_printf("<p><font color=\"red\">%h</font></p>", z);
361 }else{
362 fprintf(stderr, "%s: %s\n", g.argv[0], z);
363 }
364 }
365
366
--- src/main.c
+++ src/main.c
@@ -292,11 +292,11 @@
292 va_start(ap, zFormat);
293 z = vmprintf(zFormat, ap);
294 va_end(ap);
295 if( g.cgiOutput && once ){
296 once = 0;
297 cgi_printf("<p class=\"generalError\">%h</p>", z);
298 cgi_reply();
299 }else{
300 fprintf(stderr, "%s: %s\n", g.argv[0], z);
301 }
302 db_force_rollback();
@@ -309,11 +309,11 @@
309 va_start(ap, zFormat);
310 z = vmprintf(zFormat, ap);
311 va_end(ap);
312 if( g.cgiOutput ){
313 g.cgiOutput = 0;
314 cgi_printf("<p class=\"generalError\">%h</p>", z);
315 cgi_reply();
316 }else{
317 fprintf(stderr, "%s: %s\n", g.argv[0], z);
318 }
319 db_force_rollback();
@@ -337,11 +337,11 @@
337 va_start(ap, zFormat);
338 z = vmprintf(zFormat, ap);
339 va_end(ap);
340 if( g.cgiOutput ){
341 g.cgiOutput = 0;
342 cgi_printf("<p class=\"generalError\">%h</p>", z);
343 cgi_reply();
344 }else{
345 fprintf(stderr, "%s: %s\n", g.argv[0], z);
346 }
347 db_force_rollback();
@@ -355,11 +355,11 @@
355 va_list ap;
356 va_start(ap, zFormat);
357 z = vmprintf(zFormat, ap);
358 va_end(ap);
359 if( g.cgiOutput ){
360 cgi_printf("<p class=\"generalError\">%h</p>", z);
361 }else{
362 fprintf(stderr, "%s: %s\n", g.argv[0], z);
363 }
364 }
365
366
M src/report.c
+3 -3
--- src/report.c
+++ src/report.c
@@ -397,11 +397,11 @@
397397
 if( rn>0 ){
398398
 style_submenu_element("Delete", "Delete", "rptedit?rn=%d&amp;del1=1", rn);
399399
 }
400400
 style_header(rn>0 ? "Edit Report Format":"Create New Report Format");
401401
 if( zErr ){
402
- @ <blockquote><font color="#ff0000"><b>%h(zErr)</b></font></blockquote>
402
+ @ <blockquote class="reportError">%h(zErr)</blockquote>
403403
 }
404404
 @ <form action="rptedit" method="post"><div>
405405
 @ <input type="hidden" name="rn" value="%d(rn)" />
406406
 @ <p>Report Title:<br />
407407
 @ <input type="text" name="t" value="%h(zTitle)" size="60" /></p>
@@ -930,17 +930,17 @@
930930
 sqlite3_set_authorizer(g.db, report_query_authorizer, (void*)&zErr1);
931931
 sqlite3_exec(g.db, zSql, generate_html, &sState, &zErr2);
932932
 sqlite3_set_authorizer(g.db, 0, 0);
933933
 @ </table>
934934
 if( zErr1 ){
935
- @ <p><font color="red"><b>Error: %h(zErr1)</b></font></p>
935
+ @ <p class="reportError">Error: %h(zErr1)</p>
936936
 }else if( zErr2 ){
937
- @ <p><font color="red"><b>Error: %h(zErr2)</b></font></p>
937
+ @ <p class="reportError">Error: %h(zErr2)</p>
938938
 }
939939
 style_footer();
940940
 }else{
941941
 sqlite3_set_authorizer(g.db, report_query_authorizer, (void*)&zErr1);
942942
 sqlite3_exec(g.db, zSql, output_tab_separated, &count, &zErr2);
943943
 sqlite3_set_authorizer(g.db, 0, 0);
944944
 cgi_set_content_type("text/plain");
945945
 }
946946
 }
947947
--- src/report.c
+++ src/report.c
@@ -397,11 +397,11 @@
397 if( rn>0 ){
398 style_submenu_element("Delete", "Delete", "rptedit?rn=%d&amp;del1=1", rn);
399 }
400 style_header(rn>0 ? "Edit Report Format":"Create New Report Format");
401 if( zErr ){
402 @ <blockquote><font color="#ff0000"><b>%h(zErr)</b></font></blockquote>
403 }
404 @ <form action="rptedit" method="post"><div>
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>
@@ -930,17 +930,17 @@
930 sqlite3_set_authorizer(g.db, report_query_authorizer, (void*)&zErr1);
931 sqlite3_exec(g.db, zSql, generate_html, &sState, &zErr2);
932 sqlite3_set_authorizer(g.db, 0, 0);
933 @ </table>
934 if( zErr1 ){
935 @ <p><font color="red"><b>Error: %h(zErr1)</b></font></p>
936 }else if( zErr2 ){
937 @ <p><font color="red"><b>Error: %h(zErr2)</b></font></p>
938 }
939 style_footer();
940 }else{
941 sqlite3_set_authorizer(g.db, report_query_authorizer, (void*)&zErr1);
942 sqlite3_exec(g.db, zSql, output_tab_separated, &count, &zErr2);
943 sqlite3_set_authorizer(g.db, 0, 0);
944 cgi_set_content_type("text/plain");
945 }
946 }
947
--- src/report.c
+++ src/report.c
@@ -397,11 +397,11 @@
397 if( rn>0 ){
398 style_submenu_element("Delete", "Delete", "rptedit?rn=%d&amp;del1=1", rn);
399 }
400 style_header(rn>0 ? "Edit Report Format":"Create New Report Format");
401 if( zErr ){
402 @ <blockquote class="reportError">%h(zErr)</blockquote>
403 }
404 @ <form action="rptedit" method="post"><div>
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>
@@ -930,17 +930,17 @@
930 sqlite3_set_authorizer(g.db, report_query_authorizer, (void*)&zErr1);
931 sqlite3_exec(g.db, zSql, generate_html, &sState, &zErr2);
932 sqlite3_set_authorizer(g.db, 0, 0);
933 @ </table>
934 if( zErr1 ){
935 @ <p class="reportError">Error: %h(zErr1)</p>
936 }else if( zErr2 ){
937 @ <p class="reportError">Error: %h(zErr2)</p>
938 }
939 style_footer();
940 }else{
941 sqlite3_set_authorizer(g.db, report_query_authorizer, (void*)&zErr1);
942 sqlite3_exec(g.db, zSql, output_tab_separated, &count, &zErr2);
943 sqlite3_set_authorizer(g.db, 0, 0);
944 cgi_set_content_type("text/plain");
945 }
946 }
947
M src/setup.c
+2 -2
--- src/setup.c
+++ src/setup.c
@@ -507,14 +507,14 @@
507507
 @ </div></form>
508508
 @ </div>
509509
 @ <h2>Privileges And Capabilities:</h2>
510510
 @ <ul>
511511
 if( higherUser ){
512
- @ <li><p><font color="blue"><b>
512
+ @ <li><p class=missingPriv">
513513
 @ User %h(zLogin) has Setup privileges and you only have Admin privileges
514514
 @ so you are not permitted to make changes to %h(zLogin).
515
- @ </b></font></p></li>
515
+ @ </p></li>
516516
 @
517517
 }
518518
 @ <li><p>
519519
 @ The <span class="capability">Setup</span> user can make arbitrary
520520
 @ configuration changes. An <span class="usertype">Admin</span> user
521521
--- src/setup.c
+++ src/setup.c
@@ -507,14 +507,14 @@
507 @ </div></form>
508 @ </div>
509 @ <h2>Privileges And Capabilities:</h2>
510 @ <ul>
511 if( higherUser ){
512 @ <li><p><font color="blue"><b>
513 @ User %h(zLogin) has Setup privileges and you only have Admin privileges
514 @ so you are not permitted to make changes to %h(zLogin).
515 @ </b></font></p></li>
516 @
517 }
518 @ <li><p>
519 @ The <span class="capability">Setup</span> user can make arbitrary
520 @ configuration changes. An <span class="usertype">Admin</span> user
521
--- src/setup.c
+++ src/setup.c
@@ -507,14 +507,14 @@
507 @ </div></form>
508 @ </div>
509 @ <h2>Privileges And Capabilities:</h2>
510 @ <ul>
511 if( higherUser ){
512 @ <li><p class=missingPriv">
513 @ User %h(zLogin) has Setup privileges and you only have Admin privileges
514 @ so you are not permitted to make changes to %h(zLogin).
515 @ </p></li>
516 @
517 }
518 @ <li><p>
519 @ The <span class="capability">Setup</span> user can make arbitrary
520 @ configuration changes. An <span class="usertype">Admin</span> user
521
M src/shun.c
+6 -6
--- src/shun.c
+++ src/shun.c
@@ -69,29 +69,29 @@
6969
 style_header("Shunned Artifacts");
7070
 if( zUuid && P("sub") ){
7171
 login_verify_csrf_secret();
7272
 db_multi_exec("DELETE FROM shun WHERE uuid='%s'", zUuid);
7373
 if( db_exists("SELECT 1 FROM blob WHERE uuid='%s'", zUuid) ){
74
- @ <p><font color="blue">Artifact
74
+ @ <p class="noMoreShun">Artifact
7575
 @ <a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a> is no
76
- @ longer being shunned.</font></p>
76
+ @ longer being shunned.</p>
7777
 }else{
78
- @ <p><font color="blue">Artifact %s(zUuid)</a> will no longer
78
+ @ <p class="noMoreShun">Artifact %s(zUuid) will no longer
7979
 @ be shunned. But it does not exist in the repository. It
8080
 @ may be necessary to rebuild the repository using the
8181
 @ <b>fossil rebuild</b> command-line before the artifact content
82
- @ can pulled in from other respositories.</font></p>
82
+ @ can pulled in from other respositories.</p>
8383
 }
8484
 }
8585
 if( zUuid && P("add") ){
8686
 login_verify_csrf_secret();
8787
 db_multi_exec("INSERT OR IGNORE INTO shun VALUES('%s')", zUuid);
88
- @ <p><font color="blue">Artifact
88
+ @ <p class="shunned">Artifact
8989
 @ <a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a> has been
9090
 @ shunned. It will no longer be pushed.
9191
 @ It will be removed from the repository the next time the respository
92
- @ is rebuilt using the <b>fossil rebuild</b> command-line</font></p>
92
+ @ is rebuilt using the <b>fossil rebuild</b> command-line</p>
9393
 }
9494
 @ <p>A shunned artifact will not be pushed nor accepted in a pull and the
9595
 @ artifact content will be purged from the repository the next time the
9696
 @ repository is rebuilt. A list of shunned artifacts can be seen at the
9797
 @ bottom of this page.</p>
9898
--- src/shun.c
+++ src/shun.c
@@ -69,29 +69,29 @@
69 style_header("Shunned Artifacts");
70 if( zUuid && P("sub") ){
71 login_verify_csrf_secret();
72 db_multi_exec("DELETE FROM shun WHERE uuid='%s'", zUuid);
73 if( db_exists("SELECT 1 FROM blob WHERE uuid='%s'", zUuid) ){
74 @ <p><font color="blue">Artifact
75 @ <a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a> is no
76 @ longer being shunned.</font></p>
77 }else{
78 @ <p><font color="blue">Artifact %s(zUuid)</a> will no longer
79 @ be shunned. But it does not exist in the repository. It
80 @ may be necessary to rebuild the repository using the
81 @ <b>fossil rebuild</b> command-line before the artifact content
82 @ can pulled in from other respositories.</font></p>
83 }
84 }
85 if( zUuid && P("add") ){
86 login_verify_csrf_secret();
87 db_multi_exec("INSERT OR IGNORE INTO shun VALUES('%s')", zUuid);
88 @ <p><font color="blue">Artifact
89 @ <a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a> has been
90 @ shunned. It will no longer be pushed.
91 @ It will be removed from the repository the next time the respository
92 @ is rebuilt using the <b>fossil rebuild</b> command-line</font></p>
93 }
94 @ <p>A shunned artifact will not be pushed nor accepted in a pull and the
95 @ artifact content will be purged from the repository the next time the
96 @ repository is rebuilt. A list of shunned artifacts can be seen at the
97 @ bottom of this page.</p>
98
--- src/shun.c
+++ src/shun.c
@@ -69,29 +69,29 @@
69 style_header("Shunned Artifacts");
70 if( zUuid && P("sub") ){
71 login_verify_csrf_secret();
72 db_multi_exec("DELETE FROM shun WHERE uuid='%s'", zUuid);
73 if( db_exists("SELECT 1 FROM blob WHERE uuid='%s'", zUuid) ){
74 @ <p class="noMoreShun">Artifact
75 @ <a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a> is no
76 @ longer being shunned.</p>
77 }else{
78 @ <p class="noMoreShun">Artifact %s(zUuid) will no longer
79 @ be shunned. But it does not exist in the repository. It
80 @ may be necessary to rebuild the repository using the
81 @ <b>fossil rebuild</b> command-line before the artifact content
82 @ can pulled in from other respositories.</p>
83 }
84 }
85 if( zUuid && P("add") ){
86 login_verify_csrf_secret();
87 db_multi_exec("INSERT OR IGNORE INTO shun VALUES('%s')", zUuid);
88 @ <p class="shunned">Artifact
89 @ <a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a> has been
90 @ shunned. It will no longer be pushed.
91 @ It will be removed from the repository the next time the respository
92 @ is rebuilt using the <b>fossil rebuild</b> command-line</p>
93 }
94 @ <p>A shunned artifact will not be pushed nor accepted in a pull and the
95 @ artifact content will be purged from the repository the next time the
96 @ repository is rebuilt. A list of shunned artifacts can be seen at the
97 @ bottom of this page.</p>
98
M src/style.c
+44 -4
--- src/style.c
+++ src/style.c
@@ -159,13 +159,13 @@
159159
 Th_Render(zFooter);
160160
 if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1);
161161
162162
 /* Render trace log if TH1 tracing is enabled. */
163163
 if( g.thTrace ){
164
- cgi_append_content("<font color=\"red\"><hr />\n", -1);
164
+ cgi_append_content("<span class=\"thTrace\"><hr />\n", -1);
165165
 cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog));
166
- cgi_append_content("</font>\n", -1);
166
+ cgi_append_content("</span>\n", -1);
167167
 }
168168
 }
169169
170170
 /*
171171
 ** Begin a side-box on the right-hand side of a page. The title and
@@ -531,13 +531,13 @@
531531
 },
532532
 { "table.captcha",
533533
 "format for the layout table, used for the captcha display",
534534
 @ margin: auto;
535535
 @ padding: 10px;
536
- @ border-width: 1;
536
+ @ border-width: 4px;
537537
 @ border-style: double;
538
- @ bordor-color: black;
538
+ @ border-color: black;
539539
 },
540540
 { "td.login_out_label",
541541
 "format for the label cells in the login/out table",
542542
 @ text-align: center;
543543
 },
@@ -639,10 +639,14 @@
639639
 @ content:"'";
640640
 },
641641
 { "span.usertype:after",
642642
 "trailing text for user types, mentioned on the user edit page",
643643
 @ content:"'";
644
+ },
645
+ { "p.missingPriv",
646
+ "format for missing priviliges note on user setup page",
647
+ @ color: blue;
644648
 },
645649
 { "span.wikiruleHead",
646650
 "format for leading text in wikirules definitions",
647651
 @ font-weight: bold;
648652
 },
@@ -688,10 +692,46 @@
688692
 @ # to a standard jscolor definition with java script in the footer.
689693
 },
690694
 { "div.endContent",
691695
 "format for end of content area, to be used to clear page flow(sidebox on branch,..",
692696
 @ clear: both;
697
+ },
698
+ { "p.generalError",
699
+ "format for general errors",
700
+ @ color: red;
701
+ },
702
+ { "p.tktsetupError",
703
+ "format for tktsetup errors",
704
+ @ color: red;
705
+ @ font-weight: bold;
706
+ },
707
+ { "p.thmainError",
708
+ "format for th script errors",
709
+ @ color: red;
710
+ @ font-weight: bold;
711
+ },
712
+ { "span.thTrace",
713
+ "format for th script trace messages",
714
+ @ color: red;
715
+ },
716
+ { "p:reportError",
717
+ "format for report configuration errors",
718
+ @ color: red;
719
+ @ font-weight: bold;
720
+ },
721
+ { "blockquote.reportError",
722
+ "format for report configuration errors",
723
+ @ color: red;
724
+ @ font-weight: bold;
725
+ },
726
+ { "p.noMoreShun",
727
+ "format for artifact lines, no longer shunned",
728
+ @ color: blue;
729
+ },
730
+ { "p.shunned",
731
+ "format for artifact lines beeing shunned",
732
+ @ color: blue;
693733
 },
694734
 { 0,
695735
 0,
696736
 0
697737
 }
698738
--- src/style.c
+++ src/style.c
@@ -159,13 +159,13 @@
159 Th_Render(zFooter);
160 if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1);
161
162 /* Render trace log if TH1 tracing is enabled. */
163 if( g.thTrace ){
164 cgi_append_content("<font color=\"red\"><hr />\n", -1);
165 cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog));
166 cgi_append_content("</font>\n", -1);
167 }
168 }
169
170 /*
171 ** Begin a side-box on the right-hand side of a page. The title and
@@ -531,13 +531,13 @@
531 },
532 { "table.captcha",
533 "format for the layout table, used for the captcha display",
534 @ margin: auto;
535 @ padding: 10px;
536 @ border-width: 1;
537 @ border-style: double;
538 @ bordor-color: black;
539 },
540 { "td.login_out_label",
541 "format for the label cells in the login/out table",
542 @ text-align: center;
543 },
@@ -639,10 +639,14 @@
639 @ content:"'";
640 },
641 { "span.usertype:after",
642 "trailing text for user types, mentioned on the user edit page",
643 @ content:"'";
 
 
 
 
644 },
645 { "span.wikiruleHead",
646 "format for leading text in wikirules definitions",
647 @ font-weight: bold;
648 },
@@ -688,10 +692,46 @@
688 @ # to a standard jscolor definition with java script in the footer.
689 },
690 { "div.endContent",
691 "format for end of content area, to be used to clear page flow(sidebox on branch,..",
692 @ clear: both;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
693 },
694 { 0,
695 0,
696 0
697 }
698
--- src/style.c
+++ src/style.c
@@ -159,13 +159,13 @@
159 Th_Render(zFooter);
160 if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1);
161
162 /* Render trace log if TH1 tracing is enabled. */
163 if( g.thTrace ){
164 cgi_append_content("<span class=\"thTrace\"><hr />\n", -1);
165 cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog));
166 cgi_append_content("</span>\n", -1);
167 }
168 }
169
170 /*
171 ** Begin a side-box on the right-hand side of a page. The title and
@@ -531,13 +531,13 @@
531 },
532 { "table.captcha",
533 "format for the layout table, used for the captcha display",
534 @ margin: auto;
535 @ padding: 10px;
536 @ border-width: 4px;
537 @ border-style: double;
538 @ border-color: black;
539 },
540 { "td.login_out_label",
541 "format for the label cells in the login/out table",
542 @ text-align: center;
543 },
@@ -639,10 +639,14 @@
639 @ content:"'";
640 },
641 { "span.usertype:after",
642 "trailing text for user types, mentioned on the user edit page",
643 @ content:"'";
644 },
645 { "p.missingPriv",
646 "format for missing priviliges note on user setup page",
647 @ color: blue;
648 },
649 { "span.wikiruleHead",
650 "format for leading text in wikirules definitions",
651 @ font-weight: bold;
652 },
@@ -688,10 +692,46 @@
692 @ # to a standard jscolor definition with java script in the footer.
693 },
694 { "div.endContent",
695 "format for end of content area, to be used to clear page flow(sidebox on branch,..",
696 @ clear: both;
697 },
698 { "p.generalError",
699 "format for general errors",
700 @ color: red;
701 },
702 { "p.tktsetupError",
703 "format for tktsetup errors",
704 @ color: red;
705 @ font-weight: bold;
706 },
707 { "p.thmainError",
708 "format for th script errors",
709 @ color: red;
710 @ font-weight: bold;
711 },
712 { "span.thTrace",
713 "format for th script trace messages",
714 @ color: red;
715 },
716 { "p:reportError",
717 "format for report configuration errors",
718 @ color: red;
719 @ font-weight: bold;
720 },
721 { "blockquote.reportError",
722 "format for report configuration errors",
723 @ color: red;
724 @ font-weight: bold;
725 },
726 { "p.noMoreShun",
727 "format for artifact lines, no longer shunned",
728 @ color: blue;
729 },
730 { "p.shunned",
731 "format for artifact lines beeing shunned",
732 @ color: blue;
733 },
734 { 0,
735 0,
736 0
737 }
738
M src/th_main.c
+2 -2
--- src/th_main.c
+++ src/th_main.c
@@ -504,14 +504,14 @@
504504
 }else{
505505
 i++;
506506
 }
507507
 }
508508
 if( rc==TH_ERROR ){
509
- sendText("<hr><p><font color=\"red\"><b>ERROR: ", -1, 0);
509
+ sendText("<hr><p class=\"thmainError\">ERROR: ", -1, 0);
510510
 zResult = (char*)Th_GetResult(g.interp, &n);
511511
 sendText((char*)zResult, n, 1);
512
- sendText("</b></font></p>", -1, 0);
512
+ sendText("</p>", -1, 0);
513513
 }else{
514514
 sendText(z, i, 0);
515515
 }
516516
 return rc;
517517
 }
518518
--- src/th_main.c
+++ src/th_main.c
@@ -504,14 +504,14 @@
504 }else{
505 i++;
506 }
507 }
508 if( rc==TH_ERROR ){
509 sendText("<hr><p><font color=\"red\"><b>ERROR: ", -1, 0);
510 zResult = (char*)Th_GetResult(g.interp, &n);
511 sendText((char*)zResult, n, 1);
512 sendText("</b></font></p>", -1, 0);
513 }else{
514 sendText(z, i, 0);
515 }
516 return rc;
517 }
518
--- src/th_main.c
+++ src/th_main.c
@@ -504,14 +504,14 @@
504 }else{
505 i++;
506 }
507 }
508 if( rc==TH_ERROR ){
509 sendText("<hr><p class=\"thmainError\">ERROR: ", -1, 0);
510 zResult = (char*)Th_GetResult(g.interp, &n);
511 sendText((char*)zResult, n, 1);
512 sendText("</p>", -1, 0);
513 }else{
514 sendText(z, i, 0);
515 }
516 return rc;
517 }
518
M src/tktsetup.c
+1 -1
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -123,11 +123,11 @@
123123
 z = zDfltValue;
124124
 }else if( isSubmit ){
125125
 char *zErr = 0;
126126
 login_verify_csrf_secret();
127127
 if( xText && (zErr = xText(z))!=0 ){
128
- @ <p><font color="red"><b>ERROR: %h(zErr)</b></font></p>
128
+ @ <p class="tktsetupError"><b>ERROR: %h(zErr)</b></p>
129129
 }else{
130130
 db_set(zDbField, z, 0);
131131
 if( xRebuild ) xRebuild();
132132
 cgi_redirect("tktsetup");
133133
 }
134134
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -123,11 +123,11 @@
123 z = zDfltValue;
124 }else if( isSubmit ){
125 char *zErr = 0;
126 login_verify_csrf_secret();
127 if( xText && (zErr = xText(z))!=0 ){
128 @ <p><font color="red"><b>ERROR: %h(zErr)</b></font></p>
129 }else{
130 db_set(zDbField, z, 0);
131 if( xRebuild ) xRebuild();
132 cgi_redirect("tktsetup");
133 }
134
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -123,11 +123,11 @@
123 z = zDfltValue;
124 }else if( isSubmit ){
125 char *zErr = 0;
126 login_verify_csrf_secret();
127 if( xText && (zErr = xText(z))!=0 ){
128 @ <p class="tktsetupError"><b>ERROR: %h(zErr)</b></p>
129 }else{
130 db_set(zDbField, z, 0);
131 if( xRebuild ) xRebuild();
132 cgi_redirect("tktsetup");
133 }
134

Keyboard Shortcuts

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