Fossil SCM

merge trunk

jan.nijtmans 2012-11-25 20:44 ticket-d17d6e5b17 merge

Commit 22a543bcf5245c34147cee5791864832980f126e

Parent d3bee356ba27b95…

8 files changed +1 -1 +1 -1 +25 +25 +4 -4 +75 -75 +14 -14 +1 -1

~ src/checkout.c ~ src/db.c ~ src/file.c ~ src/file.c ~ src/setup.c ~ src/skins.c ~ src/style.c ~ src/wikiformat.c

M src/checkout.c

+1 -1

		--- src/checkout.c
		+++ src/checkout.c
		@@ -106,11 +106,11 @@
106	106	/* Check the EXE permission status of all files
107	107	*/
108	108	pManifest = manifest_get(vid, CFTYPE_MANIFEST);
109	109	if( pManifest==0 ) return;
110	110	blob_zero(&filename);
111		- blob_appendf(&filename, "%s/", g.zLocalRoot);
	111	+ blob_appendf(&filename, "%s", g.zLocalRoot);
112	112	baseLen = blob_size(&filename);
113	113	manifest_file_rewind(pManifest);
114	114	while( (pFile = manifest_file_next(pManifest, 0))!=0 ){
115	115	int isExe;
116	116	blob_append(&filename, pFile->zName, -1);
117	117

	--- src/checkout.c
	+++ src/checkout.c
	@@ -106,11 +106,11 @@
106	/* Check the EXE permission status of all files
107	*/
108	pManifest = manifest_get(vid, CFTYPE_MANIFEST);
109	if( pManifest==0 ) return;
110	blob_zero(&filename);
111	blob_appendf(&filename, "%s/", g.zLocalRoot);
112	baseLen = blob_size(&filename);
113	manifest_file_rewind(pManifest);
114	while( (pFile = manifest_file_next(pManifest, 0))!=0 ){
115	int isExe;
116	blob_append(&filename, pFile->zName, -1);
117

	--- src/checkout.c
	+++ src/checkout.c
	@@ -106,11 +106,11 @@
106	/* Check the EXE permission status of all files
107	*/
108	pManifest = manifest_get(vid, CFTYPE_MANIFEST);
109	if( pManifest==0 ) return;
110	blob_zero(&filename);
111	blob_appendf(&filename, "%s", g.zLocalRoot);
112	baseLen = blob_size(&filename);
113	manifest_file_rewind(pManifest);
114	while( (pFile = manifest_file_next(pManifest, 0))!=0 ){
115	int isExe;
116	blob_append(&filename, pFile->zName, -1);
117

M src/db.c

+1 -1

		--- src/db.c
		+++ src/db.c
		@@ -1697,11 +1697,11 @@
1697	1697	** and a checkout is open. */
1698	1698	if( cacheEntry==0 ){
1699	1699	Blob versionedPathname;
1700	1700	char *zVersionedPathname;
1701	1701	blob_zero(&versionedPathname);
1702		- blob_appendf(&versionedPathname, "%s/.fossil-settings/%s",
	1702	+ blob_appendf(&versionedPathname, "%s.fossil-settings/%s",
1703	1703	g.zLocalRoot, zName);
1704	1704	zVersionedPathname = blob_str(&versionedPathname);
1705	1705	if( file_size(zVersionedPathname)>=0 ){
1706	1706	/* File exists, and contains the value for this setting. Load from
1707	1707	** the file. */
1708	1708

	--- src/db.c
	+++ src/db.c
	@@ -1697,11 +1697,11 @@
1697	** and a checkout is open. */
1698	if( cacheEntry==0 ){
1699	Blob versionedPathname;
1700	char *zVersionedPathname;
1701	blob_zero(&versionedPathname);
1702	blob_appendf(&versionedPathname, "%s/.fossil-settings/%s",
1703	g.zLocalRoot, zName);
1704	zVersionedPathname = blob_str(&versionedPathname);
1705	if( file_size(zVersionedPathname)>=0 ){
1706	/* File exists, and contains the value for this setting. Load from
1707	** the file. */
1708

	--- src/db.c
	+++ src/db.c
	@@ -1697,11 +1697,11 @@
1697	** and a checkout is open. */
1698	if( cacheEntry==0 ){
1699	Blob versionedPathname;
1700	char *zVersionedPathname;
1701	blob_zero(&versionedPathname);
1702	blob_appendf(&versionedPathname, "%s.fossil-settings/%s",
1703	g.zLocalRoot, zName);
1704	zVersionedPathname = blob_str(&versionedPathname);
1705	if( file_size(zVersionedPathname)>=0 ){
1706	/* File exists, and contains the value for this setting. Load from
1707	** the file. */
1708

M src/file.c

+25

		--- src/file.c
		+++ src/file.c
		@@ -495,10 +495,35 @@
495	495	if( c=='.' ){
496	496	if( z[1]=='/' \|\| z[1]==0 ) return 0;
497	497	if( z[1]=='.' && (z[2]=='/' \|\| z[2]==0) ) return 0;
498	498	}
499	499	for(i=0; (c=z[i])!=0; i++){
	500	+ if( (c & 0xf0) == 0xf0 ) {
	501	+ /* Unicode characters > U+FFFF are not supported.
	502	+ * Windows XP and earlier cannot handle them.
	503	+ */
	504	+ return 0;
	505	+ }
	506	+ if( (c & 0xf0) == 0xe0 ) {
	507	+ /* This is a 3-byte UTF-8 character */
	508	+ if ( (c & 0xfe) == 0xee ){
	509	+ /* Range U+E000 - U+FFFF (Starting with 0xee or 0xef in UTF-8 ) */
	510	+ if ( (c & 1) && ((z[i+1] & 0xff) >= 0xa4) ){
	511	+ /* But exclude U+F900 - U+FFFF (0xef followed by byte >= 0xa4),
	512	+ * which contain valid characters. */
	513	+ continue;
	514	+ }
	515	+ /* Unicode character in the range U+E000 - U+F8FF are for
	516	+ * private use, they shouldn't occur in filenames. */
	517	+ return 0;
	518	+ }
	519	+ if( ((c & 0xff) == 0xed) && ((z[i+1] & 0xe0) == 0xa0) ){
	520	+ /* Unicode character in the range U+D800 - U+DFFF are for
	521	+ * surrogate pairs, they shouldn't occur in filenames. */
	522	+ return 0;
	523	+ }
	524	+ }
500	525	if( c=='\\' ){
501	526	return 0;
502	527	}
503	528	if( c=='/' ){
504	529	if( z[i+1]=='/' ) return 0;
505	530

	--- src/file.c
	+++ src/file.c
	@@ -495,10 +495,35 @@
495	if( c=='.' ){
496	if( z[1]=='/' \|\| z[1]==0 ) return 0;
497	if( z[1]=='.' && (z[2]=='/' \|\| z[2]==0) ) return 0;
498	}
499	for(i=0; (c=z[i])!=0; i++){

























500	if( c=='\\' ){
501	return 0;
502	}
503	if( c=='/' ){
504	if( z[i+1]=='/' ) return 0;
505

	--- src/file.c
	+++ src/file.c
	@@ -495,10 +495,35 @@
495	if( c=='.' ){
496	if( z[1]=='/' \|\| z[1]==0 ) return 0;
497	if( z[1]=='.' && (z[2]=='/' \|\| z[2]==0) ) return 0;
498	}
499	for(i=0; (c=z[i])!=0; i++){
500	if( (c & 0xf0) == 0xf0 ) {
501	/* Unicode characters > U+FFFF are not supported.
502	* Windows XP and earlier cannot handle them.
503	*/
504	return 0;
505	}
506	if( (c & 0xf0) == 0xe0 ) {
507	/* This is a 3-byte UTF-8 character */
508	if ( (c & 0xfe) == 0xee ){
509	/* Range U+E000 - U+FFFF (Starting with 0xee or 0xef in UTF-8 ) */
510	if ( (c & 1) && ((z[i+1] & 0xff) >= 0xa4) ){
511	/* But exclude U+F900 - U+FFFF (0xef followed by byte >= 0xa4),
512	* which contain valid characters. */
513	continue;
514	}
515	/* Unicode character in the range U+E000 - U+F8FF are for
516	* private use, they shouldn't occur in filenames. */
517	return 0;
518	}
519	if( ((c & 0xff) == 0xed) && ((z[i+1] & 0xe0) == 0xa0) ){
520	/* Unicode character in the range U+D800 - U+DFFF are for
521	* surrogate pairs, they shouldn't occur in filenames. */
522	return 0;
523	}
524	}
525	if( c=='\\' ){
526	return 0;
527	}
528	if( c=='/' ){
529	if( z[i+1]=='/' ) return 0;
530

M src/file.c

+25

		--- src/file.c
		+++ src/file.c
		@@ -495,10 +495,35 @@
495	495	if( c=='.' ){
496	496	if( z[1]=='/' \|\| z[1]==0 ) return 0;
497	497	if( z[1]=='.' && (z[2]=='/' \|\| z[2]==0) ) return 0;
498	498	}
499	499	for(i=0; (c=z[i])!=0; i++){
	500	+ if( (c & 0xf0) == 0xf0 ) {
	501	+ /* Unicode characters > U+FFFF are not supported.
	502	+ * Windows XP and earlier cannot handle them.
	503	+ */
	504	+ return 0;
	505	+ }
	506	+ if( (c & 0xf0) == 0xe0 ) {
	507	+ /* This is a 3-byte UTF-8 character */
	508	+ if ( (c & 0xfe) == 0xee ){
	509	+ /* Range U+E000 - U+FFFF (Starting with 0xee or 0xef in UTF-8 ) */
	510	+ if ( (c & 1) && ((z[i+1] & 0xff) >= 0xa4) ){
	511	+ /* But exclude U+F900 - U+FFFF (0xef followed by byte >= 0xa4),
	512	+ * which contain valid characters. */
	513	+ continue;
	514	+ }
	515	+ /* Unicode character in the range U+E000 - U+F8FF are for
	516	+ * private use, they shouldn't occur in filenames. */
	517	+ return 0;
	518	+ }
	519	+ if( ((c & 0xff) == 0xed) && ((z[i+1] & 0xe0) == 0xa0) ){
	520	+ /* Unicode character in the range U+D800 - U+DFFF are for
	521	+ * surrogate pairs, they shouldn't occur in filenames. */
	522	+ return 0;
	523	+ }
	524	+ }
500	525	if( c=='\\' ){
501	526	return 0;
502	527	}
503	528	if( c=='/' ){
504	529	if( z[i+1]=='/' ) return 0;
505	530

	--- src/file.c
	+++ src/file.c
	@@ -495,10 +495,35 @@
495	if( c=='.' ){
496	if( z[1]=='/' \|\| z[1]==0 ) return 0;
497	if( z[1]=='.' && (z[2]=='/' \|\| z[2]==0) ) return 0;
498	}
499	for(i=0; (c=z[i])!=0; i++){

























500	if( c=='\\' ){
501	return 0;
502	}
503	if( c=='/' ){
504	if( z[i+1]=='/' ) return 0;
505

	--- src/file.c
	+++ src/file.c
	@@ -495,10 +495,35 @@
495	if( c=='.' ){
496	if( z[1]=='/' \|\| z[1]==0 ) return 0;
497	if( z[1]=='.' && (z[2]=='/' \|\| z[2]==0) ) return 0;
498	}
499	for(i=0; (c=z[i])!=0; i++){
500	if( (c & 0xf0) == 0xf0 ) {
501	/* Unicode characters > U+FFFF are not supported.
502	* Windows XP and earlier cannot handle them.
503	*/
504	return 0;
505	}
506	if( (c & 0xf0) == 0xe0 ) {
507	/* This is a 3-byte UTF-8 character */
508	if ( (c & 0xfe) == 0xee ){
509	/* Range U+E000 - U+FFFF (Starting with 0xee or 0xef in UTF-8 ) */
510	if ( (c & 1) && ((z[i+1] & 0xff) >= 0xa4) ){
511	/* But exclude U+F900 - U+FFFF (0xef followed by byte >= 0xa4),
512	* which contain valid characters. */
513	continue;
514	}
515	/* Unicode character in the range U+E000 - U+F8FF are for
516	* private use, they shouldn't occur in filenames. */
517	return 0;
518	}
519	if( ((c & 0xff) == 0xed) && ((z[i+1] & 0xe0) == 0xa0) ){
520	/* Unicode character in the range U+D800 - U+DFFF are for
521	* surrogate pairs, they shouldn't occur in filenames. */
522	return 0;
523	}
524	}
525	if( c=='\\' ){
526	return 0;
527	}
528	if( c=='/' ){
529	if( z[i+1]=='/' ) return 0;
530

M src/setup.c

+4 -4

		--- src/setup.c
		+++ src/setup.c
		@@ -1024,21 +1024,21 @@
1024	1024	@ is not currently part of any login-group.
1025	1025	@ To join a login group, fill out the form below.</p>
1026	1026	@
1027	1027	@ <form action="%s(g.zTop)/setup_login_group" method="post"><div>
1028	1028	login_insert_csrf_secret();
1029		- @ <blockquote><table broder="0">
	1029	+ @ <blockquote><table border="0">
1030	1030	@
1031	1031	@ <tr><td align="right"><b>Repository filename in group to join:</b></td>
1032	1032	@ <td width="5"></td><td>
1033	1033	@ <input type="text" size="50" value="%h(zRepo)" name="repo"></td></tr>
1034	1034	@
1035		- @ <td align="right"><b>Login on the above repo:</b></td>
	1035	+ @ <tr><td align="right"><b>Login on the above repo:</b></td>
1036	1036	@ <td width="5"></td><td>
1037	1037	@ <input type="text" size="20" value="%h(zLogin)" name="login"></td></tr>
1038	1038	@
1039		- @ <td align="right"><b>Password:</b></td>
	1039	+ @ <tr><td align="right"><b>Password:</b></td>
1040	1040	@ <td width="5"></td><td>
1041	1041	@ <input type="password" size="20" name="pw"></td></tr>
1042	1042	@
1043	1043	@ <tr><td align="right"><b>Name of login-group:</b></td>
1044	1044	@ <td width="5"></td><td>
		@@ -1045,11 +1045,11 @@
1045	1045	@ <input type="text" size="30" value="%h(zNewName)" name="newname">
1046	1046	@ (only used if creating a new login-group).</td></tr>
1047	1047	@
1048	1048	@ <tr><td colspan="3" align="center">
1049	1049	@ <input type="submit" value="Join" name="join"></td></tr>
1050		- @ </table>
	1050	+ @ </table></blockquote></div></form>
1051	1051	}else{
1052	1052	Stmt q;
1053	1053	int n = 0;
1054	1054	@ <p>This repository (in the file "%h(zSelfRepo)")
1055	1055	@ is currently part of the "<b>%h(zGroup)</b>" login group.
1056	1056

	--- src/setup.c
	+++ src/setup.c
	@@ -1024,21 +1024,21 @@
1024	@ is not currently part of any login-group.
1025	@ To join a login group, fill out the form below.</p>
1026	@
1027	@ <form action="%s(g.zTop)/setup_login_group" method="post"><div>
1028	login_insert_csrf_secret();
1029	@ <blockquote><table broder="0">
1030	@
1031	@ <tr><td align="right"><b>Repository filename in group to join:</b></td>
1032	@ <td width="5"></td><td>
1033	@ <input type="text" size="50" value="%h(zRepo)" name="repo"></td></tr>
1034	@
1035	@ <td align="right"><b>Login on the above repo:</b></td>
1036	@ <td width="5"></td><td>
1037	@ <input type="text" size="20" value="%h(zLogin)" name="login"></td></tr>
1038	@
1039	@ <td align="right"><b>Password:</b></td>
1040	@ <td width="5"></td><td>
1041	@ <input type="password" size="20" name="pw"></td></tr>
1042	@
1043	@ <tr><td align="right"><b>Name of login-group:</b></td>
1044	@ <td width="5"></td><td>
	@@ -1045,11 +1045,11 @@
1045	@ <input type="text" size="30" value="%h(zNewName)" name="newname">
1046	@ (only used if creating a new login-group).</td></tr>
1047	@
1048	@ <tr><td colspan="3" align="center">
1049	@ <input type="submit" value="Join" name="join"></td></tr>
1050	@ </table>
1051	}else{
1052	Stmt q;
1053	int n = 0;
1054	@ <p>This repository (in the file "%h(zSelfRepo)")
1055	@ is currently part of the "<b>%h(zGroup)</b>" login group.
1056

	--- src/setup.c
	+++ src/setup.c
	@@ -1024,21 +1024,21 @@
1024	@ is not currently part of any login-group.
1025	@ To join a login group, fill out the form below.</p>
1026	@
1027	@ <form action="%s(g.zTop)/setup_login_group" method="post"><div>
1028	login_insert_csrf_secret();
1029	@ <blockquote><table border="0">
1030	@
1031	@ <tr><td align="right"><b>Repository filename in group to join:</b></td>
1032	@ <td width="5"></td><td>
1033	@ <input type="text" size="50" value="%h(zRepo)" name="repo"></td></tr>
1034	@
1035	@ <tr><td align="right"><b>Login on the above repo:</b></td>
1036	@ <td width="5"></td><td>
1037	@ <input type="text" size="20" value="%h(zLogin)" name="login"></td></tr>
1038	@
1039	@ <tr><td align="right"><b>Password:</b></td>
1040	@ <td width="5"></td><td>
1041	@ <input type="password" size="20" name="pw"></td></tr>
1042	@
1043	@ <tr><td align="right"><b>Name of login-group:</b></td>
1044	@ <td width="5"></td><td>
	@@ -1045,11 +1045,11 @@
1045	@ <input type="text" size="30" value="%h(zNewName)" name="newname">
1046	@ (only used if creating a new login-group).</td></tr>
1047	@
1048	@ <tr><td colspan="3" align="center">
1049	@ <input type="submit" value="Join" name="join"></td></tr>
1050	@ </table></blockquote></div></form>
1051	}else{
1052	Stmt q;
1053	int n = 0;
1054	@ <p>This repository (in the file "%h(zSelfRepo)")
1055	@ is currently part of the "<b>%h(zGroup)</b>" login group.
1056

M src/skins.c

+75 -75

		--- src/skins.c
		+++ src/skins.c
		@@ -24,20 +24,20 @@
24	24	/* @-comment: ## */
25	25	/*
26	26	** A black-and-white theme with the project title in a bar across the top
27	27	** and no logo image.
28	28	*/
29		-static const char zBuiltinSkin1[] =
	29	+static const char zBuiltinSkin1[] =
30	30	@ REPLACE INTO config(name,mtime,value)
31	31	@ VALUES('css',now(),'/* General settings for the entire page */
32	32	@ body {
33	33	@ margin: 0ex 1ex;
34	34	@ padding: 0px;
35	35	@ background-color: white;
36	36	@ font-family: sans-serif;
37	37	@ }
38		-@
	38	+@
39	39	@ /* The project logo in the upper left-hand corner of each page */
40	40	@ div.logo {
41	41	@ display: table-row;
42	42	@ text-align: center;
43	43	@ /* vertical-align: bottom;*/
		@@ -46,11 +46,11 @@
46	46	@ background-color: #707070;
47	47	@ color: #ffffff;
48	48	@ min-width: 200px;
49	49	@ white-space: nowrap;
50	50	@ }
51		-@
	51	+@
52	52	@ /* The page title centered at the top of each page */
53	53	@ div.title {
54	54	@ display: table-cell;
55	55	@ font-size: 1.5em;
56	56	@ font-weight: bold;
		@@ -58,11 +58,11 @@
58	58	@ padding: 0 0 0 10px;
59	59	@ color: #404040;
60	60	@ vertical-align: bottom;
61	61	@ width: 100%;
62	62	@ }
63		-@
	63	+@
64	64	@ /* The login status message in the top right-hand corner */
65	65	@ div.status {
66	66	@ display: table-cell;
67	67	@ text-align: right;
68	68	@ vertical-align: bottom;
		@@ -70,17 +70,17 @@
70	70	@ font-size: 0.8em;
71	71	@ font-weight: bold;
72	72	@ min-width: 200px;
73	73	@ white-space: nowrap;
74	74	@ }
75		-@
	75	+@
76	76	@ /* The header across the top of the page */
77	77	@ div.header {
78	78	@ display: table;
79	79	@ width: 100%;
80	80	@ }
81		-@
	81	+@
82	82	@ /* The main menu bar that appears at the top of the page beneath
83	83	@ ** the header */
84	84	@ div.mainmenu {
85	85	@ padding: 5px 10px 5px 10px;
86	86	@ font-size: 0.9em;
		@@ -117,11 +117,11 @@
117	117	@ }
118	118	@ /* Hyperlink colors */
119	119	@ div.content a { color: #604000; }
120	120	@ div.content a:link { color: #604000;}
121	121	@ div.content a:visited { color: #600000; }
122		-@
	122	+@
123	123	@ /* Some pages have section dividers */
124	124	@ div.section {
125	125	@ margin-bottom: 0px;
126	126	@ margin-top: 1em;
127	127	@ padding: 1px 1px 1px 1px;
		@@ -129,11 +129,11 @@
129	129	@ font-weight: bold;
130	130	@ background-color: #404040;
131	131	@ color: white;
132	132	@ white-space: nowrap;
133	133	@ }
134		-@
	134	+@
135	135	@ /* The "Date" that occurs on the left hand side of timelines */
136	136	@ div.divider {
137	137	@ background: #a0a0a0;
138	138	@ border: 2px #505050 solid;
139	139	@ font-size: 1em; font-weight: normal;
		@@ -141,21 +141,21 @@
141	141	@ margin: .2em 0 .2em 0;
142	142	@ float: left;
143	143	@ clear: left;
144	144	@ white-space: nowrap;
145	145	@ }
146		-@
	146	+@
147	147	@ /* The footer at the very bottom of the page */
148	148	@ div.footer {
149	149	@ font-size: 0.8em;
150	150	@ margin-top: 12px;
151	151	@ padding: 5px 10px 5px 10px;
152	152	@ text-align: right;
153	153	@ background-color: #404040;
154	154	@ color: white;
155	155	@ }
156		-@
	156	+@
157	157	@ /* The label/value pairs on (for example) the vinfo page */
158	158	@ table.label-value th {
159	159	@ vertical-align: top;
160	160	@ text-align: right;
161	161	@ padding: 0.2ex 2ex;
		@@ -211,30 +211,30 @@
211	211	@ }
212	212	@ </th1></div>
213	213	@ ');
214	214	@ REPLACE INTO config(name,mtime,value)
215	215	@ VALUES('footer',now(),'<div class="footer">
216		-@ Fossil version $manifest_version $manifest_date
	216	+@ Fossil version $manifest_version $manifest_date
217	217	@ </div>
218	218	@ </body></html>
219	219	@ ');
220	220	;
221	221
222	222	/*
223	223	** A tan theme with the project title above the user identification
224	224	** and no logo image.
225	225	*/
226		-static const char zBuiltinSkin2[] =
	226	+static const char zBuiltinSkin2[] =
227	227	@ REPLACE INTO config(name,mtime,value)
228	228	@ VALUES('css',now(),'/* General settings for the entire page */
229	229	@ body {
230	230	@ margin: 0ex 0ex;
231	231	@ padding: 0px;
232	232	@ background-color: #fef3bc;
233	233	@ font-family: sans-serif;
234	234	@ }
235		-@
	235	+@
236	236	@ /* The project logo in the upper left-hand corner of each page */
237	237	@ div.logo {
238	238	@ display: inline;
239	239	@ text-align: center;
240	240	@ vertical-align: bottom;
		@@ -241,11 +241,11 @@
241	241	@ font-weight: bold;
242	242	@ font-size: 2.5em;
243	243	@ color: #a09048;
244	244	@ white-space: nowrap;
245	245	@ }
246		-@
	246	+@
247	247	@ /* The page title centered at the top of each page */
248	248	@ div.title {
249	249	@ display: table-cell;
250	250	@ font-size: 2em;
251	251	@ font-weight: bold;
		@@ -253,11 +253,11 @@
253	253	@ padding: 0 0 0 5px;
254	254	@ color: #a09048;
255	255	@ vertical-align: bottom;
256	256	@ width: 100%;
257	257	@ }
258		-@
	258	+@
259	259	@ /* The login status message in the top right-hand corner */
260	260	@ div.status {
261	261	@ display: table-cell;
262	262	@ text-align: right;
263	263	@ vertical-align: bottom;
		@@ -265,17 +265,17 @@
265	265	@ padding: 5px 5px 0 0;
266	266	@ font-size: 0.8em;
267	267	@ font-weight: bold;
268	268	@ white-space: nowrap;
269	269	@ }
270		-@
	270	+@
271	271	@ /* The header across the top of the page */
272	272	@ div.header {
273	273	@ display: table;
274	274	@ width: 100%;
275	275	@ }
276		-@
	276	+@
277	277	@ /* The main menu bar that appears at the top of the page beneath
278	278	@ ** the header */
279	279	@ div.mainmenu {
280	280	@ padding: 5px 10px 5px 10px;
281	281	@ font-size: 0.9em;
		@@ -283,11 +283,11 @@
283	283	@ text-align: center;
284	284	@ letter-spacing: 1px;
285	285	@ background-color: #a09048;
286	286	@ color: black;
287	287	@ }
288		-@
	288	+@
289	289	@ /* The submenu bar that sometimes appears below the main menu */
290	290	@ div.submenu, div.sectionmenu {
291	291	@ padding: 3px 10px 3px 0px;
292	292	@ font-size: 0.9em;
293	293	@ text-align: center;
		@@ -302,21 +302,21 @@
302	302	@ }
303	303	@ div.mainmenu a:hover, div.submenu a:hover, div.sectionmenu>a.button:hover {
304	304	@ color: #a09048;
305	305	@ background-color: white;
306	306	@ }
307		-@
	307	+@
308	308	@ /* All page content from the bottom of the menu or submenu down to
309	309	@ ** the footer */
310	310	@ div.content {
311	311	@ padding: 1ex 5px;
312	312	@ }
313	313	@ div.content a { color: #706532; }
314	314	@ div.content a:link { color: #706532; }
315	315	@ div.content a:visited { color: #704032; }
316	316	@ div.content a:hover { background-color: white; color: #706532; }
317		-@
	317	+@
318	318	@ /* Some pages have section dividers */
319	319	@ div.section {
320	320	@ margin-bottom: 0px;
321	321	@ margin-top: 1em;
322	322	@ padding: 3px 3px 0 3px;
		@@ -324,11 +324,11 @@
324	324	@ font-weight: bold;
325	325	@ background-color: #a09048;
326	326	@ color: white;
327	327	@ white-space: nowrap;
328	328	@ }
329		-@
	329	+@
330	330	@ /* The "Date" that occurs on the left hand side of timelines */
331	331	@ div.divider {
332	332	@ background: #e1d498;
333	333	@ border: 2px #a09048 solid;
334	334	@ font-size: 1em; font-weight: normal;
		@@ -336,33 +336,33 @@
336	336	@ margin: .2em 0 .2em 0;
337	337	@ float: left;
338	338	@ clear: left;
339	339	@ white-space: nowrap;
340	340	@ }
341		-@
	341	+@
342	342	@ /* The footer at the very bottom of the page */
343	343	@ div.footer {
344	344	@ font-size: 0.8em;
345	345	@ margin-top: 12px;
346	346	@ padding: 5px 10px 5px 10px;
347	347	@ text-align: right;
348	348	@ background-color: #a09048;
349	349	@ color: white;
350	350	@ }
351		-@
	351	+@
352	352	@ /* Hyperlink colors */
353	353	@ div.footer a { color: white; }
354	354	@ div.footer a:link { color: white; }
355	355	@ div.footer a:visited { color: white; }
356	356	@ div.footer a:hover { background-color: white; color: #558195; }
357		-@
	357	+@
358	358	@ /* <verbatim> blocks */
359	359	@ pre.verbatim {
360	360	@ background-color: #f5f5f5;
361	361	@ padding: 0.5em;
362	362	@ }
363		-@
	363	+@
364	364	@ /* The label/value pairs on (for example) the ci page */
365	365	@ table.label-value th {
366	366	@ vertical-align: top;
367	367	@ text-align: right;
368	368	@ padding: 0.2ex 2ex;
		@@ -430,39 +430,39 @@
430	430
431	431	/*
432	432	** Black letters on a white or cream background with the main menu
433	433	** stuck on the left-hand side.
434	434	*/
435		-static const char zBuiltinSkin3[] =
	435	+static const char zBuiltinSkin3[] =
436	436	@ REPLACE INTO config(name,mtime,value)
437	437	@ VALUES('css',now(),'/* General settings for the entire page */
438	438	@ body {
439	439	@ margin:0px 0px 0px 0px;
440	440	@ padding:0px;
441	441	@ font-family:verdana, arial, helvetica, "sans serif";
442	442	@ color:#333;
443	443	@ background-color:white;
444	444	@ }
445		-@
	445	+@
446	446	@ /* consistent colours */
447	447	@ h2 {
448	448	@ color: #333;
449	449	@ }
450	450	@ h3 {
451	451	@ color: #333;
452	452	@ }
453		-@
	453	+@
454	454	@ /* The project logo in the upper left-hand corner of each page */
455	455	@ div.logo {
456	456	@ display: table-cell;
457	457	@ text-align: left;
458	458	@ vertical-align: bottom;
459	459	@ font-weight: bold;
460	460	@ color: #333;
461	461	@ white-space: nowrap;
462	462	@ }
463		-@
	463	+@
464	464	@ /* The page title centered at the top of each page */
465	465	@ div.title {
466	466	@ display: table-cell;
467	467	@ font-size: 2em;
468	468	@ font-weight: bold;
		@@ -469,11 +469,11 @@
469	469	@ text-align: center;
470	470	@ color: #333;
471	471	@ vertical-align: bottom;
472	472	@ width: 100%;
473	473	@ }
474		-@
	474	+@
475	475	@ /* The login status message in the top right-hand corner */
476	476	@ div.status {
477	477	@ display: table-cell;
478	478	@ padding-right: 10px;
479	479	@ text-align: right;
		@@ -482,21 +482,21 @@
482	482	@ color: #333;
483	483	@ font-size: 0.8em;
484	484	@ font-weight: bold;
485	485	@ white-space: nowrap;
486	486	@ }
487		-@
	487	+@
488	488	@ /* The header across the top of the page */
489	489	@ div.header {
490	490	@ margin:10px 0px 10px 0px;
491	491	@ padding:1px 0px 0px 20px;
492	492	@ border-style:solid;
493	493	@ border-color:black;
494	494	@ border-width:1px 0px;
495	495	@ background-color:#eee;
496	496	@ }
497		-@
	497	+@
498	498	@ /* The main menu bar that appears at the top left of the page beneath
499	499	@ ** the header. Width must be co-ordinated with the container below */
500	500	@ div.mainmenu {
501	501	@ float: left;
502	502	@ margin-left: 10px;
		@@ -506,11 +506,11 @@
506	506	@ padding:5px;
507	507	@ background-color:#eee;
508	508	@ border:1px solid #999;
509	509	@ width:8em;
510	510	@ }
511		-@
	511	+@
512	512	@ /* Main menu is now a list */
513	513	@ div.mainmenu ul {
514	514	@ padding: 0;
515	515	@ list-style:none;
516	516	@ }
		@@ -521,17 +521,17 @@
521	521	@ }
522	522	@ div.mainmenu a:hover {
523	523	@ color: #eee;
524	524	@ background-color: #333;
525	525	@ }
526		-@
	526	+@
527	527	@ /* Container for the sub-menu and content so they don''t spread
528	528	@ ** out underneath the main menu */
529	529	@ #container {
530	530	@ padding-left: 9em;
531	531	@ }
532		-@
	532	+@
533	533	@ /* The submenu bar that sometimes appears below the main menu */
534	534	@ div.submenu, div.sectionmenu {
535	535	@ padding: 3px 10px 3px 10px;
536	536	@ font-size: 0.9em;
537	537	@ text-align: center;
		@@ -548,17 +548,17 @@
548	548	@ }
549	549	@ div.submenu a:hover, div.sectionmenu>a.button:hover {
550	550	@ color: #eee;
551	551	@ background-color: #333;
552	552	@ }
553		-@
	553	+@
554	554	@ /* All page content from the bottom of the menu or submenu down to
555	555	@ ** the footer */
556	556	@ div.content {
557	557	@ padding: 2ex 1ex 0ex 2ex;
558	558	@ }
559		-@
	559	+@
560	560	@ /* Some pages have section dividers */
561	561	@ div.section {
562	562	@ margin-bottom: 0px;
563	563	@ margin-top: 1em;
564	564	@ padding: 1px 1px 1px 1px;
		@@ -569,11 +569,11 @@
569	569	@ border-width:1px 0px;
570	570	@ background-color: #eee;
571	571	@ color: #333;
572	572	@ white-space: nowrap;
573	573	@ }
574		-@
	574	+@
575	575	@ /* The "Date" that occurs on the left hand side of timelines */
576	576	@ div.divider {
577	577	@ background: #eee;
578	578	@ border: 2px #999 solid;
579	579	@ font-size: 1em; font-weight: normal;
		@@ -582,27 +582,27 @@
582	582	@ float: left;
583	583	@ clear: left;
584	584	@ color: #333;
585	585	@ white-space: nowrap;
586	586	@ }
587		-@
	587	+@
588	588	@ /* The footer at the very bottom of the page */
589	589	@ div.footer {
590	590	@ font-size: 0.8em;
591	591	@ margin-top: 12px;
592	592	@ padding: 5px 10px 5px 10px;
593	593	@ text-align: right;
594	594	@ background-color: #eee;
595	595	@ color: #555;
596	596	@ }
597		-@
	597	+@
598	598	@ /* <verbatim> blocks */
599	599	@ pre.verbatim {
600	600	@ background-color: #f5f5f5;
601	601	@ padding: 0.5em;
602	602	@ }
603		-@
	603	+@
604	604	@ /* The label/value pairs on (for example) the ci page */
605	605	@ table.label-value th {
606	606	@ vertical-align: top;
607	607	@ text-align: right;
608	608	@ padding: 0.2ex 2ex;
		@@ -673,11 +673,11 @@
673	673
674	674
675	675	/*
676	676	** Shadow boxes and rounded corners.
677	677	*/
678		-static const char zBuiltinSkin4[] =
	678	+static const char zBuiltinSkin4[] =
679	679	@ REPLACE INTO config(name,mtime,value)
680	680	@ VALUES('css',now(),'/* General settings for the entire page */
681	681	@ html {
682	682	@ min-height: 100%;
683	683	@ }
		@@ -687,28 +687,28 @@
687	687	@ background-color: white;
688	688	@ color: #333;
689	689	@ font-family: Verdana, sans-serif;
690	690	@ font-size: 0.8em;
691	691	@ }
692		-@
	692	+@
693	693	@ /* The project logo in the upper left-hand corner of each page */
694	694	@ div.logo {
695	695	@ display: table-cell;
696	696	@ text-align: right;
697	697	@ vertical-align: bottom;
698	698	@ font-weight: normal;
699	699	@ white-space: nowrap;
700	700	@ }
701		-@
	701	+@
702	702	@ /* Widths */
703	703	@ div.header, div.mainmenu, div.submenu, div.content, div.footer {
704	704	@ max-width: 900px;
705	705	@ margin: auto;
706	706	@ padding: 3px 20px 3px 20px;
707	707	@ clear: both;
708	708	@ }
709		-@
	709	+@
710	710	@ /* The page title at the top of each page */
711	711	@ div.title {
712	712	@ display: table-cell;
713	713	@ padding-left: 10px;
714	714	@ font-size: 2em;
		@@ -719,21 +719,21 @@
719	719	@ font-family: Verdana, sans-serif;
720	720	@ font-weight: bold;
721	721	@ color: #558195;
722	722	@ text-shadow: 0px 2px 2px #999999;
723	723	@ }
724		-@
	724	+@
725	725	@ /* The login status message in the top right-hand corner */
726	726	@ div.status {
727	727	@ display: table-cell;
728	728	@ text-align: right;
729	729	@ vertical-align: bottom;
730	730	@ color: #333;
731	731	@ margin-right: -20px;
732	732	@ white-space: nowrap;
733	733	@ }
734		-@
	734	+@
735	735	@ /* The main menu bar that appears at the top of the page beneath
736	736	@ ** the header */
737	737	@ div.mainmenu {
738	738	@ text-align: center;
739	739	@ color: white;
		@@ -743,11 +743,11 @@
743	743	@ padding-top: 8px;
744	744	@ padding-bottom: 8px;
745	745	@ background-color: #446979;
746	746	@ box-shadow: 0px 3px 4px #333333;
747	747	@ }
748		-@
	748	+@
749	749	@ /* The submenu bar that sometimes appears below the main menu */
750	750	@ div.submenu {
751	751	@ padding-top:10px;
752	752	@ padding-bottom:0;
753	753	@ text-align: right;
		@@ -768,24 +768,24 @@
768	768	@ color: #000;
769	769	@ font-family: Arial;
770	770	@ text-decoration: none;
771	771	@ margin:auto;
772	772	@ border-radius: 5px;
773		-@ background-color: #e0e0e0 ;
	773	+@ background-color: #e0e0e0;
774	774	@ text-shadow: 0px -1px 0px #eee;
775	775	@ border: 1px solid #000;
776	776	@ }
777		-@
	777	+@
778	778	@ div.mainmenu a:hover {
779	779	@ color: #000;
780	780	@ background-color: white;
781	781	@ }
782		-@
	782	+@
783	783	@ div.submenu a:hover, div.sectionmenu>a.button:hover {
784		-@ background-color: #c0c0c0 ;
	784	+@ background-color: #c0c0c0;
785	785	@ }
786		-@
	786	+@
787	787	@ /* All page content from the bottom of the menu or submenu down to
788	788	@ ** the footer */
789	789	@ div.content {
790	790	@ background-color: #fff;
791	791	@ box-shadow: 0px 3px 4px #999;
		@@ -792,12 +792,12 @@
792	792	@ border-bottom-right-radius: 5px;
793	793	@ border-bottom-left-radius: 5px;
794	794	@ padding-bottom: 1em;
795	795	@ min-height:40%;
796	796	@ }
797		-@
798		-@
	797	+@
	798	+@
799	799	@ /* Some pages have section dividers */
800	800	@ div.section {
801	801	@ margin-bottom: 0.5em;
802	802	@ margin-top: 1em;
803	803	@ margin-right: auto;
		@@ -809,69 +809,69 @@
809	809	@ border-radius: 5px;
810	810	@ background-color: #446979;
811	811	@ box-shadow: 0px 3px 4px #333333;
812	812	@ white-space: nowrap;
813	813	@ }
814		-@
	814	+@
815	815	@ /* The "Date" that occurs on the left hand side of timelines */
816	816	@ div.divider {
817		-@ font-size: 1.2em;
	817	+@ font-size: 1.2em;
818	818	@ font-family: Georgia, serif;
819	819	@ font-weight: bold;
820	820	@ margin-top: 1em;
821	821	@ white-space: nowrap;
822	822	@ }
823		-@
	823	+@
824	824	@ /* The footer at the very bottom of the page */
825	825	@ div.footer {
826	826	@ font-size: 0.9em;
827	827	@ text-align: right;
828	828	@ margin-bottom: 1em;
829	829	@ color: #666;
830	830	@ }
831		-@
	831	+@
832	832	@ /* Hyperlink colors in the footer */
833	833	@ div.footer a { color: white; }
834	834	@ div.footer a:link { color: white; }
835	835	@ div.footer a:visited { color: white; }
836	836	@ div.footer a:hover { background-color: white; color: #558195; }
837		-@
	837	+@
838	838	@ /* <verbatim> blocks */
839	839	@ pre.verbatim, blockquote pre {
840	840	@ font-family: Dejavu Sans Mono, Monaco, Lucida Console, monospace;
841	841	@ background-color: #f3f3f3;
842	842	@ padding: 0.5em;
843	843	@ white-space: pre-wrap;
844	844	@ }
845		-@
	845	+@
846	846	@ blockquote pre {
847	847	@ border: 1px #000 dashed;
848	848	@ }
849		-@
	849	+@
850	850	@ /* The label/value pairs on (for example) the ci page */
851	851	@ table.label-value th {
852	852	@ vertical-align: top;
853	853	@ text-align: right;
854	854	@ padding: 0.2ex 2ex;
855	855	@ }
856		-@
857		-@
	856	+@
	857	+@
858	858	@ table.report {
859	859	@ border-collapse:collapse;
860	860	@ border: 1px solid #999;
861	861	@ margin: 1em 0 1em 0;
862	862	@ }
863		-@
	863	+@
864	864	@ table.report tr th {
865	865	@ padding: 3px 5px;
866		-@ text-transform : capitalize;
	866	+@ text-transform: capitalize;
867	867	@ }
868		-@
	868	+@
869	869	@ table.report tr td {
870	870	@ padding: 3px 5px;
871	871	@ }
872		-@
	872	+@
873	873	@ textarea {
874	874	@ font-size: 1em;
875	875	@ }');
876	876	@ REPLACE INTO config(name,mtime,value) VALUES('header',now(),'<html>
877	877	@ <head>
		@@ -952,11 +952,11 @@
952	952	** Fossil repository. Additionally, if the Tcl integration feature is
953	953	** enabled, the loaded version of Tcl is included, with a hyperlink to the
954	954	** official Tcl/Tk web site. The footer also contains a TH1 script block
955	955	** to help accomplish these tasks.
956	956	*/
957		-static const char zBuiltinSkin5[] =
	957	+static const char zBuiltinSkin5[] =
958	958	@ REPLACE INTO config(name,mtime,value)
959	959	@ VALUES('css',now(),'/* General settings for the entire page */
960	960	@ body {
961	961	@ margin: 0ex 1ex;
962	962	@ padding: 0px;
		@@ -982,11 +982,11 @@
982	982	@ font-weight: bold;
983	983	@ text-align: center;
984	984	@ padding: 0 0 0 1em;
985	985	@ color: #558195;
986	986	@ vertical-align: bottom;
987		-@ width: 100% ;
	987	+@ width: 100%;
988	988	@ }
989	989	@
990	990	@ /* The login status message in the top right-hand corner */
991	991	@ div.status {
992	992	@ display: table-cell;
		@@ -1000,11 +1000,11 @@
1000	1000	@ }
1001	1001	@
1002	1002	@ /* The header across the top of the page */
1003	1003	@ div.header {
1004	1004	@ display: table;
1005		-@ width: 100% ;
	1005	+@ width: 100%;
1006	1006	@ }
1007	1007	@
1008	1008	@ /* The main menu bar that appears at the top of the page beneath
1009	1009	@ ** the header */
1010	1010	@ div.mainmenu {
		@@ -1085,11 +1085,11 @@
1085	1085	@ /* Hyperlink colors in the footer */
1086	1086	@ div.footer a { color: white; }
1087	1087	@ div.footer a:link { color: white; }
1088	1088	@ div.footer a:visited { color: white; }
1089	1089	@ div.footer a:hover { background-color: white; color: #558195; }
1090		-@
	1090	+@
1091	1091	@ /* verbatim blocks */
1092	1092	@ pre.verbatim {
1093	1093	@ background-color: #f5f5f5;
1094	1094	@ padding: 0.5em;
1095	1095	@}
		@@ -1397,11 +1397,11 @@
1397	1397	style_header("Skins");
1398	1398	if( zErr ){
1399	1399	@ <p><font color="red">%h(zErr)</font></p>
1400	1400	}
1401	1401	@ <p>A "skin" is a combination of
1402		- @ <a href="setup_editcss">CSS</a>,
	1402	+ @ <a href="setup_editcss">CSS</a>,
1403	1403	@ <a href="setup_header">Header</a>,
1404	1404	@ <a href="setup_footer">Footer</a>, and
1405	1405	@ <a href="setup_logo">Logo</a> that determines the look and feel
1406	1406	@ of the web interface.</p>
1407	1407	@
		@@ -1411,11 +1411,11 @@
1411	1411	z = aBuiltinSkin[i].zName;
1412	1412	if( fossil_strcmp(aBuiltinSkin[i].zValue, zCurrent)==0 ){
1413	1413	@ <li><p>%h(z).   <b>Currently In Use</b></p>
1414	1414	}else{
1415	1415	@ <li><form action="%s(g.zTop)/setup_skin" method="post"><div>
1416		- @ %h(z).
	1416	+ @ %h(z).
1417	1417	@ <input type="hidden" name="sn" value="%h(z)" />
1418	1418	@ <input type="submit" name="load" value="Use This Skin" />
1419	1419	@ </div></form></li>
1420	1420	}
1421	1421	}
		@@ -1429,11 +1429,11 @@
1429	1429	const char *zV = db_column_text(&q, 1);
1430	1430	if( fossil_strcmp(zV, zCurrent)==0 ){
1431	1431	@ <li><p>%h(zN).   <b>Currently In Use</b></p>
1432	1432	}else{
1433	1433	@ <li><form action="%s(g.zTop)/setup_skin" method="post">
1434		- @ %h(zN).
	1434	+ @ %h(zN).
1435	1435	@ <input type="hidden" name="sn" value="%h(zN)">
1436	1436	@ <input type="submit" name="load" value="Use This Skin">
1437	1437	@ <input type="submit" name="del1" value="Delete This Skin">
1438	1438	@ </form></li>
1439	1439	}
1440	1440

	--- src/skins.c
	+++ src/skins.c
	@@ -24,20 +24,20 @@
24	/* @-comment: ## */
25	/*
26	** A black-and-white theme with the project title in a bar across the top
27	** and no logo image.
28	*/
29	static const char zBuiltinSkin1[] =
30	@ REPLACE INTO config(name,mtime,value)
31	@ VALUES('css',now(),'/* General settings for the entire page */
32	@ body {
33	@ margin: 0ex 1ex;
34	@ padding: 0px;
35	@ background-color: white;
36	@ font-family: sans-serif;
37	@ }
38	@
39	@ /* The project logo in the upper left-hand corner of each page */
40	@ div.logo {
41	@ display: table-row;
42	@ text-align: center;
43	@ /* vertical-align: bottom;*/
	@@ -46,11 +46,11 @@
46	@ background-color: #707070;
47	@ color: #ffffff;
48	@ min-width: 200px;
49	@ white-space: nowrap;
50	@ }
51	@
52	@ /* The page title centered at the top of each page */
53	@ div.title {
54	@ display: table-cell;
55	@ font-size: 1.5em;
56	@ font-weight: bold;
	@@ -58,11 +58,11 @@
58	@ padding: 0 0 0 10px;
59	@ color: #404040;
60	@ vertical-align: bottom;
61	@ width: 100%;
62	@ }
63	@
64	@ /* The login status message in the top right-hand corner */
65	@ div.status {
66	@ display: table-cell;
67	@ text-align: right;
68	@ vertical-align: bottom;
	@@ -70,17 +70,17 @@
70	@ font-size: 0.8em;
71	@ font-weight: bold;
72	@ min-width: 200px;
73	@ white-space: nowrap;
74	@ }
75	@
76	@ /* The header across the top of the page */
77	@ div.header {
78	@ display: table;
79	@ width: 100%;
80	@ }
81	@
82	@ /* The main menu bar that appears at the top of the page beneath
83	@ ** the header */
84	@ div.mainmenu {
85	@ padding: 5px 10px 5px 10px;
86	@ font-size: 0.9em;
	@@ -117,11 +117,11 @@
117	@ }
118	@ /* Hyperlink colors */
119	@ div.content a { color: #604000; }
120	@ div.content a:link { color: #604000;}
121	@ div.content a:visited { color: #600000; }
122	@
123	@ /* Some pages have section dividers */
124	@ div.section {
125	@ margin-bottom: 0px;
126	@ margin-top: 1em;
127	@ padding: 1px 1px 1px 1px;
	@@ -129,11 +129,11 @@
129	@ font-weight: bold;
130	@ background-color: #404040;
131	@ color: white;
132	@ white-space: nowrap;
133	@ }
134	@
135	@ /* The "Date" that occurs on the left hand side of timelines */
136	@ div.divider {
137	@ background: #a0a0a0;
138	@ border: 2px #505050 solid;
139	@ font-size: 1em; font-weight: normal;
	@@ -141,21 +141,21 @@
141	@ margin: .2em 0 .2em 0;
142	@ float: left;
143	@ clear: left;
144	@ white-space: nowrap;
145	@ }
146	@
147	@ /* The footer at the very bottom of the page */
148	@ div.footer {
149	@ font-size: 0.8em;
150	@ margin-top: 12px;
151	@ padding: 5px 10px 5px 10px;
152	@ text-align: right;
153	@ background-color: #404040;
154	@ color: white;
155	@ }
156	@
157	@ /* The label/value pairs on (for example) the vinfo page */
158	@ table.label-value th {
159	@ vertical-align: top;
160	@ text-align: right;
161	@ padding: 0.2ex 2ex;
	@@ -211,30 +211,30 @@
211	@ }
212	@ </th1></div>
213	@ ');
214	@ REPLACE INTO config(name,mtime,value)
215	@ VALUES('footer',now(),'<div class="footer">
216	@ Fossil version $manifest_version $manifest_date
217	@ </div>
218	@ </body></html>
219	@ ');
220	;
221
222	/*
223	** A tan theme with the project title above the user identification
224	** and no logo image.
225	*/
226	static const char zBuiltinSkin2[] =
227	@ REPLACE INTO config(name,mtime,value)
228	@ VALUES('css',now(),'/* General settings for the entire page */
229	@ body {
230	@ margin: 0ex 0ex;
231	@ padding: 0px;
232	@ background-color: #fef3bc;
233	@ font-family: sans-serif;
234	@ }
235	@
236	@ /* The project logo in the upper left-hand corner of each page */
237	@ div.logo {
238	@ display: inline;
239	@ text-align: center;
240	@ vertical-align: bottom;
	@@ -241,11 +241,11 @@
241	@ font-weight: bold;
242	@ font-size: 2.5em;
243	@ color: #a09048;
244	@ white-space: nowrap;
245	@ }
246	@
247	@ /* The page title centered at the top of each page */
248	@ div.title {
249	@ display: table-cell;
250	@ font-size: 2em;
251	@ font-weight: bold;
	@@ -253,11 +253,11 @@
253	@ padding: 0 0 0 5px;
254	@ color: #a09048;
255	@ vertical-align: bottom;
256	@ width: 100%;
257	@ }
258	@
259	@ /* The login status message in the top right-hand corner */
260	@ div.status {
261	@ display: table-cell;
262	@ text-align: right;
263	@ vertical-align: bottom;
	@@ -265,17 +265,17 @@
265	@ padding: 5px 5px 0 0;
266	@ font-size: 0.8em;
267	@ font-weight: bold;
268	@ white-space: nowrap;
269	@ }
270	@
271	@ /* The header across the top of the page */
272	@ div.header {
273	@ display: table;
274	@ width: 100%;
275	@ }
276	@
277	@ /* The main menu bar that appears at the top of the page beneath
278	@ ** the header */
279	@ div.mainmenu {
280	@ padding: 5px 10px 5px 10px;
281	@ font-size: 0.9em;
	@@ -283,11 +283,11 @@
283	@ text-align: center;
284	@ letter-spacing: 1px;
285	@ background-color: #a09048;
286	@ color: black;
287	@ }
288	@
289	@ /* The submenu bar that sometimes appears below the main menu */
290	@ div.submenu, div.sectionmenu {
291	@ padding: 3px 10px 3px 0px;
292	@ font-size: 0.9em;
293	@ text-align: center;
	@@ -302,21 +302,21 @@
302	@ }
303	@ div.mainmenu a:hover, div.submenu a:hover, div.sectionmenu>a.button:hover {
304	@ color: #a09048;
305	@ background-color: white;
306	@ }
307	@
308	@ /* All page content from the bottom of the menu or submenu down to
309	@ ** the footer */
310	@ div.content {
311	@ padding: 1ex 5px;
312	@ }
313	@ div.content a { color: #706532; }
314	@ div.content a:link { color: #706532; }
315	@ div.content a:visited { color: #704032; }
316	@ div.content a:hover { background-color: white; color: #706532; }
317	@
318	@ /* Some pages have section dividers */
319	@ div.section {
320	@ margin-bottom: 0px;
321	@ margin-top: 1em;
322	@ padding: 3px 3px 0 3px;
	@@ -324,11 +324,11 @@
324	@ font-weight: bold;
325	@ background-color: #a09048;
326	@ color: white;
327	@ white-space: nowrap;
328	@ }
329	@
330	@ /* The "Date" that occurs on the left hand side of timelines */
331	@ div.divider {
332	@ background: #e1d498;
333	@ border: 2px #a09048 solid;
334	@ font-size: 1em; font-weight: normal;
	@@ -336,33 +336,33 @@
336	@ margin: .2em 0 .2em 0;
337	@ float: left;
338	@ clear: left;
339	@ white-space: nowrap;
340	@ }
341	@
342	@ /* The footer at the very bottom of the page */
343	@ div.footer {
344	@ font-size: 0.8em;
345	@ margin-top: 12px;
346	@ padding: 5px 10px 5px 10px;
347	@ text-align: right;
348	@ background-color: #a09048;
349	@ color: white;
350	@ }
351	@
352	@ /* Hyperlink colors */
353	@ div.footer a { color: white; }
354	@ div.footer a:link { color: white; }
355	@ div.footer a:visited { color: white; }
356	@ div.footer a:hover { background-color: white; color: #558195; }
357	@
358	@ /* <verbatim> blocks */
359	@ pre.verbatim {
360	@ background-color: #f5f5f5;
361	@ padding: 0.5em;
362	@ }
363	@
364	@ /* The label/value pairs on (for example) the ci page */
365	@ table.label-value th {
366	@ vertical-align: top;
367	@ text-align: right;
368	@ padding: 0.2ex 2ex;
	@@ -430,39 +430,39 @@
430
431	/*
432	** Black letters on a white or cream background with the main menu
433	** stuck on the left-hand side.
434	*/
435	static const char zBuiltinSkin3[] =
436	@ REPLACE INTO config(name,mtime,value)
437	@ VALUES('css',now(),'/* General settings for the entire page */
438	@ body {
439	@ margin:0px 0px 0px 0px;
440	@ padding:0px;
441	@ font-family:verdana, arial, helvetica, "sans serif";
442	@ color:#333;
443	@ background-color:white;
444	@ }
445	@
446	@ /* consistent colours */
447	@ h2 {
448	@ color: #333;
449	@ }
450	@ h3 {
451	@ color: #333;
452	@ }
453	@
454	@ /* The project logo in the upper left-hand corner of each page */
455	@ div.logo {
456	@ display: table-cell;
457	@ text-align: left;
458	@ vertical-align: bottom;
459	@ font-weight: bold;
460	@ color: #333;
461	@ white-space: nowrap;
462	@ }
463	@
464	@ /* The page title centered at the top of each page */
465	@ div.title {
466	@ display: table-cell;
467	@ font-size: 2em;
468	@ font-weight: bold;
	@@ -469,11 +469,11 @@
469	@ text-align: center;
470	@ color: #333;
471	@ vertical-align: bottom;
472	@ width: 100%;
473	@ }
474	@
475	@ /* The login status message in the top right-hand corner */
476	@ div.status {
477	@ display: table-cell;
478	@ padding-right: 10px;
479	@ text-align: right;
	@@ -482,21 +482,21 @@
482	@ color: #333;
483	@ font-size: 0.8em;
484	@ font-weight: bold;
485	@ white-space: nowrap;
486	@ }
487	@
488	@ /* The header across the top of the page */
489	@ div.header {
490	@ margin:10px 0px 10px 0px;
491	@ padding:1px 0px 0px 20px;
492	@ border-style:solid;
493	@ border-color:black;
494	@ border-width:1px 0px;
495	@ background-color:#eee;
496	@ }
497	@
498	@ /* The main menu bar that appears at the top left of the page beneath
499	@ ** the header. Width must be co-ordinated with the container below */
500	@ div.mainmenu {
501	@ float: left;
502	@ margin-left: 10px;
	@@ -506,11 +506,11 @@
506	@ padding:5px;
507	@ background-color:#eee;
508	@ border:1px solid #999;
509	@ width:8em;
510	@ }
511	@
512	@ /* Main menu is now a list */
513	@ div.mainmenu ul {
514	@ padding: 0;
515	@ list-style:none;
516	@ }
	@@ -521,17 +521,17 @@
521	@ }
522	@ div.mainmenu a:hover {
523	@ color: #eee;
524	@ background-color: #333;
525	@ }
526	@
527	@ /* Container for the sub-menu and content so they don''t spread
528	@ ** out underneath the main menu */
529	@ #container {
530	@ padding-left: 9em;
531	@ }
532	@
533	@ /* The submenu bar that sometimes appears below the main menu */
534	@ div.submenu, div.sectionmenu {
535	@ padding: 3px 10px 3px 10px;
536	@ font-size: 0.9em;
537	@ text-align: center;
	@@ -548,17 +548,17 @@
548	@ }
549	@ div.submenu a:hover, div.sectionmenu>a.button:hover {
550	@ color: #eee;
551	@ background-color: #333;
552	@ }
553	@
554	@ /* All page content from the bottom of the menu or submenu down to
555	@ ** the footer */
556	@ div.content {
557	@ padding: 2ex 1ex 0ex 2ex;
558	@ }
559	@
560	@ /* Some pages have section dividers */
561	@ div.section {
562	@ margin-bottom: 0px;
563	@ margin-top: 1em;
564	@ padding: 1px 1px 1px 1px;
	@@ -569,11 +569,11 @@
569	@ border-width:1px 0px;
570	@ background-color: #eee;
571	@ color: #333;
572	@ white-space: nowrap;
573	@ }
574	@
575	@ /* The "Date" that occurs on the left hand side of timelines */
576	@ div.divider {
577	@ background: #eee;
578	@ border: 2px #999 solid;
579	@ font-size: 1em; font-weight: normal;
	@@ -582,27 +582,27 @@
582	@ float: left;
583	@ clear: left;
584	@ color: #333;
585	@ white-space: nowrap;
586	@ }
587	@
588	@ /* The footer at the very bottom of the page */
589	@ div.footer {
590	@ font-size: 0.8em;
591	@ margin-top: 12px;
592	@ padding: 5px 10px 5px 10px;
593	@ text-align: right;
594	@ background-color: #eee;
595	@ color: #555;
596	@ }
597	@
598	@ /* <verbatim> blocks */
599	@ pre.verbatim {
600	@ background-color: #f5f5f5;
601	@ padding: 0.5em;
602	@ }
603	@
604	@ /* The label/value pairs on (for example) the ci page */
605	@ table.label-value th {
606	@ vertical-align: top;
607	@ text-align: right;
608	@ padding: 0.2ex 2ex;
	@@ -673,11 +673,11 @@
673
674
675	/*
676	** Shadow boxes and rounded corners.
677	*/
678	static const char zBuiltinSkin4[] =
679	@ REPLACE INTO config(name,mtime,value)
680	@ VALUES('css',now(),'/* General settings for the entire page */
681	@ html {
682	@ min-height: 100%;
683	@ }
	@@ -687,28 +687,28 @@
687	@ background-color: white;
688	@ color: #333;
689	@ font-family: Verdana, sans-serif;
690	@ font-size: 0.8em;
691	@ }
692	@
693	@ /* The project logo in the upper left-hand corner of each page */
694	@ div.logo {
695	@ display: table-cell;
696	@ text-align: right;
697	@ vertical-align: bottom;
698	@ font-weight: normal;
699	@ white-space: nowrap;
700	@ }
701	@
702	@ /* Widths */
703	@ div.header, div.mainmenu, div.submenu, div.content, div.footer {
704	@ max-width: 900px;
705	@ margin: auto;
706	@ padding: 3px 20px 3px 20px;
707	@ clear: both;
708	@ }
709	@
710	@ /* The page title at the top of each page */
711	@ div.title {
712	@ display: table-cell;
713	@ padding-left: 10px;
714	@ font-size: 2em;
	@@ -719,21 +719,21 @@
719	@ font-family: Verdana, sans-serif;
720	@ font-weight: bold;
721	@ color: #558195;
722	@ text-shadow: 0px 2px 2px #999999;
723	@ }
724	@
725	@ /* The login status message in the top right-hand corner */
726	@ div.status {
727	@ display: table-cell;
728	@ text-align: right;
729	@ vertical-align: bottom;
730	@ color: #333;
731	@ margin-right: -20px;
732	@ white-space: nowrap;
733	@ }
734	@
735	@ /* The main menu bar that appears at the top of the page beneath
736	@ ** the header */
737	@ div.mainmenu {
738	@ text-align: center;
739	@ color: white;
	@@ -743,11 +743,11 @@
743	@ padding-top: 8px;
744	@ padding-bottom: 8px;
745	@ background-color: #446979;
746	@ box-shadow: 0px 3px 4px #333333;
747	@ }
748	@
749	@ /* The submenu bar that sometimes appears below the main menu */
750	@ div.submenu {
751	@ padding-top:10px;
752	@ padding-bottom:0;
753	@ text-align: right;
	@@ -768,24 +768,24 @@
768	@ color: #000;
769	@ font-family: Arial;
770	@ text-decoration: none;
771	@ margin:auto;
772	@ border-radius: 5px;
773	@ background-color: #e0e0e0 ;
774	@ text-shadow: 0px -1px 0px #eee;
775	@ border: 1px solid #000;
776	@ }
777	@
778	@ div.mainmenu a:hover {
779	@ color: #000;
780	@ background-color: white;
781	@ }
782	@
783	@ div.submenu a:hover, div.sectionmenu>a.button:hover {
784	@ background-color: #c0c0c0 ;
785	@ }
786	@
787	@ /* All page content from the bottom of the menu or submenu down to
788	@ ** the footer */
789	@ div.content {
790	@ background-color: #fff;
791	@ box-shadow: 0px 3px 4px #999;
	@@ -792,12 +792,12 @@
792	@ border-bottom-right-radius: 5px;
793	@ border-bottom-left-radius: 5px;
794	@ padding-bottom: 1em;
795	@ min-height:40%;
796	@ }
797	@
798	@
799	@ /* Some pages have section dividers */
800	@ div.section {
801	@ margin-bottom: 0.5em;
802	@ margin-top: 1em;
803	@ margin-right: auto;
	@@ -809,69 +809,69 @@
809	@ border-radius: 5px;
810	@ background-color: #446979;
811	@ box-shadow: 0px 3px 4px #333333;
812	@ white-space: nowrap;
813	@ }
814	@
815	@ /* The "Date" that occurs on the left hand side of timelines */
816	@ div.divider {
817	@ font-size: 1.2em;
818	@ font-family: Georgia, serif;
819	@ font-weight: bold;
820	@ margin-top: 1em;
821	@ white-space: nowrap;
822	@ }
823	@
824	@ /* The footer at the very bottom of the page */
825	@ div.footer {
826	@ font-size: 0.9em;
827	@ text-align: right;
828	@ margin-bottom: 1em;
829	@ color: #666;
830	@ }
831	@
832	@ /* Hyperlink colors in the footer */
833	@ div.footer a { color: white; }
834	@ div.footer a:link { color: white; }
835	@ div.footer a:visited { color: white; }
836	@ div.footer a:hover { background-color: white; color: #558195; }
837	@
838	@ /* <verbatim> blocks */
839	@ pre.verbatim, blockquote pre {
840	@ font-family: Dejavu Sans Mono, Monaco, Lucida Console, monospace;
841	@ background-color: #f3f3f3;
842	@ padding: 0.5em;
843	@ white-space: pre-wrap;
844	@ }
845	@
846	@ blockquote pre {
847	@ border: 1px #000 dashed;
848	@ }
849	@
850	@ /* The label/value pairs on (for example) the ci page */
851	@ table.label-value th {
852	@ vertical-align: top;
853	@ text-align: right;
854	@ padding: 0.2ex 2ex;
855	@ }
856	@
857	@
858	@ table.report {
859	@ border-collapse:collapse;
860	@ border: 1px solid #999;
861	@ margin: 1em 0 1em 0;
862	@ }
863	@
864	@ table.report tr th {
865	@ padding: 3px 5px;
866	@ text-transform : capitalize;
867	@ }
868	@
869	@ table.report tr td {
870	@ padding: 3px 5px;
871	@ }
872	@
873	@ textarea {
874	@ font-size: 1em;
875	@ }');
876	@ REPLACE INTO config(name,mtime,value) VALUES('header',now(),'<html>
877	@ <head>
	@@ -952,11 +952,11 @@
952	** Fossil repository. Additionally, if the Tcl integration feature is
953	** enabled, the loaded version of Tcl is included, with a hyperlink to the
954	** official Tcl/Tk web site. The footer also contains a TH1 script block
955	** to help accomplish these tasks.
956	*/
957	static const char zBuiltinSkin5[] =
958	@ REPLACE INTO config(name,mtime,value)
959	@ VALUES('css',now(),'/* General settings for the entire page */
960	@ body {
961	@ margin: 0ex 1ex;
962	@ padding: 0px;
	@@ -982,11 +982,11 @@
982	@ font-weight: bold;
983	@ text-align: center;
984	@ padding: 0 0 0 1em;
985	@ color: #558195;
986	@ vertical-align: bottom;
987	@ width: 100% ;
988	@ }
989	@
990	@ /* The login status message in the top right-hand corner */
991	@ div.status {
992	@ display: table-cell;
	@@ -1000,11 +1000,11 @@
1000	@ }
1001	@
1002	@ /* The header across the top of the page */
1003	@ div.header {
1004	@ display: table;
1005	@ width: 100% ;
1006	@ }
1007	@
1008	@ /* The main menu bar that appears at the top of the page beneath
1009	@ ** the header */
1010	@ div.mainmenu {
	@@ -1085,11 +1085,11 @@
1085	@ /* Hyperlink colors in the footer */
1086	@ div.footer a { color: white; }
1087	@ div.footer a:link { color: white; }
1088	@ div.footer a:visited { color: white; }
1089	@ div.footer a:hover { background-color: white; color: #558195; }
1090	@
1091	@ /* verbatim blocks */
1092	@ pre.verbatim {
1093	@ background-color: #f5f5f5;
1094	@ padding: 0.5em;
1095	@}
	@@ -1397,11 +1397,11 @@
1397	style_header("Skins");
1398	if( zErr ){
1399	@ <p><font color="red">%h(zErr)</font></p>
1400	}
1401	@ <p>A "skin" is a combination of
1402	@ <a href="setup_editcss">CSS</a>,
1403	@ <a href="setup_header">Header</a>,
1404	@ <a href="setup_footer">Footer</a>, and
1405	@ <a href="setup_logo">Logo</a> that determines the look and feel
1406	@ of the web interface.</p>
1407	@
	@@ -1411,11 +1411,11 @@
1411	z = aBuiltinSkin[i].zName;
1412	if( fossil_strcmp(aBuiltinSkin[i].zValue, zCurrent)==0 ){
1413	@ <li><p>%h(z).   <b>Currently In Use</b></p>
1414	}else{
1415	@ <li><form action="%s(g.zTop)/setup_skin" method="post"><div>
1416	@ %h(z).
1417	@ <input type="hidden" name="sn" value="%h(z)" />
1418	@ <input type="submit" name="load" value="Use This Skin" />
1419	@ </div></form></li>
1420	}
1421	}
	@@ -1429,11 +1429,11 @@
1429	const char *zV = db_column_text(&q, 1);
1430	if( fossil_strcmp(zV, zCurrent)==0 ){
1431	@ <li><p>%h(zN).   <b>Currently In Use</b></p>
1432	}else{
1433	@ <li><form action="%s(g.zTop)/setup_skin" method="post">
1434	@ %h(zN).
1435	@ <input type="hidden" name="sn" value="%h(zN)">
1436	@ <input type="submit" name="load" value="Use This Skin">
1437	@ <input type="submit" name="del1" value="Delete This Skin">
1438	@ </form></li>
1439	}
1440

	--- src/skins.c
	+++ src/skins.c
	@@ -24,20 +24,20 @@
24	/* @-comment: ## */
25	/*
26	** A black-and-white theme with the project title in a bar across the top
27	** and no logo image.
28	*/
29	static const char zBuiltinSkin1[] =
30	@ REPLACE INTO config(name,mtime,value)
31	@ VALUES('css',now(),'/* General settings for the entire page */
32	@ body {
33	@ margin: 0ex 1ex;
34	@ padding: 0px;
35	@ background-color: white;
36	@ font-family: sans-serif;
37	@ }
38	@
39	@ /* The project logo in the upper left-hand corner of each page */
40	@ div.logo {
41	@ display: table-row;
42	@ text-align: center;
43	@ /* vertical-align: bottom;*/
	@@ -46,11 +46,11 @@
46	@ background-color: #707070;
47	@ color: #ffffff;
48	@ min-width: 200px;
49	@ white-space: nowrap;
50	@ }
51	@
52	@ /* The page title centered at the top of each page */
53	@ div.title {
54	@ display: table-cell;
55	@ font-size: 1.5em;
56	@ font-weight: bold;
	@@ -58,11 +58,11 @@
58	@ padding: 0 0 0 10px;
59	@ color: #404040;
60	@ vertical-align: bottom;
61	@ width: 100%;
62	@ }
63	@
64	@ /* The login status message in the top right-hand corner */
65	@ div.status {
66	@ display: table-cell;
67	@ text-align: right;
68	@ vertical-align: bottom;
	@@ -70,17 +70,17 @@
70	@ font-size: 0.8em;
71	@ font-weight: bold;
72	@ min-width: 200px;
73	@ white-space: nowrap;
74	@ }
75	@
76	@ /* The header across the top of the page */
77	@ div.header {
78	@ display: table;
79	@ width: 100%;
80	@ }
81	@
82	@ /* The main menu bar that appears at the top of the page beneath
83	@ ** the header */
84	@ div.mainmenu {
85	@ padding: 5px 10px 5px 10px;
86	@ font-size: 0.9em;
	@@ -117,11 +117,11 @@
117	@ }
118	@ /* Hyperlink colors */
119	@ div.content a { color: #604000; }
120	@ div.content a:link { color: #604000;}
121	@ div.content a:visited { color: #600000; }
122	@
123	@ /* Some pages have section dividers */
124	@ div.section {
125	@ margin-bottom: 0px;
126	@ margin-top: 1em;
127	@ padding: 1px 1px 1px 1px;
	@@ -129,11 +129,11 @@
129	@ font-weight: bold;
130	@ background-color: #404040;
131	@ color: white;
132	@ white-space: nowrap;
133	@ }
134	@
135	@ /* The "Date" that occurs on the left hand side of timelines */
136	@ div.divider {
137	@ background: #a0a0a0;
138	@ border: 2px #505050 solid;
139	@ font-size: 1em; font-weight: normal;
	@@ -141,21 +141,21 @@
141	@ margin: .2em 0 .2em 0;
142	@ float: left;
143	@ clear: left;
144	@ white-space: nowrap;
145	@ }
146	@
147	@ /* The footer at the very bottom of the page */
148	@ div.footer {
149	@ font-size: 0.8em;
150	@ margin-top: 12px;
151	@ padding: 5px 10px 5px 10px;
152	@ text-align: right;
153	@ background-color: #404040;
154	@ color: white;
155	@ }
156	@
157	@ /* The label/value pairs on (for example) the vinfo page */
158	@ table.label-value th {
159	@ vertical-align: top;
160	@ text-align: right;
161	@ padding: 0.2ex 2ex;
	@@ -211,30 +211,30 @@
211	@ }
212	@ </th1></div>
213	@ ');
214	@ REPLACE INTO config(name,mtime,value)
215	@ VALUES('footer',now(),'<div class="footer">
216	@ Fossil version $manifest_version $manifest_date
217	@ </div>
218	@ </body></html>
219	@ ');
220	;
221
222	/*
223	** A tan theme with the project title above the user identification
224	** and no logo image.
225	*/
226	static const char zBuiltinSkin2[] =
227	@ REPLACE INTO config(name,mtime,value)
228	@ VALUES('css',now(),'/* General settings for the entire page */
229	@ body {
230	@ margin: 0ex 0ex;
231	@ padding: 0px;
232	@ background-color: #fef3bc;
233	@ font-family: sans-serif;
234	@ }
235	@
236	@ /* The project logo in the upper left-hand corner of each page */
237	@ div.logo {
238	@ display: inline;
239	@ text-align: center;
240	@ vertical-align: bottom;
	@@ -241,11 +241,11 @@
241	@ font-weight: bold;
242	@ font-size: 2.5em;
243	@ color: #a09048;
244	@ white-space: nowrap;
245	@ }
246	@
247	@ /* The page title centered at the top of each page */
248	@ div.title {
249	@ display: table-cell;
250	@ font-size: 2em;
251	@ font-weight: bold;
	@@ -253,11 +253,11 @@
253	@ padding: 0 0 0 5px;
254	@ color: #a09048;
255	@ vertical-align: bottom;
256	@ width: 100%;
257	@ }
258	@
259	@ /* The login status message in the top right-hand corner */
260	@ div.status {
261	@ display: table-cell;
262	@ text-align: right;
263	@ vertical-align: bottom;
	@@ -265,17 +265,17 @@
265	@ padding: 5px 5px 0 0;
266	@ font-size: 0.8em;
267	@ font-weight: bold;
268	@ white-space: nowrap;
269	@ }
270	@
271	@ /* The header across the top of the page */
272	@ div.header {
273	@ display: table;
274	@ width: 100%;
275	@ }
276	@
277	@ /* The main menu bar that appears at the top of the page beneath
278	@ ** the header */
279	@ div.mainmenu {
280	@ padding: 5px 10px 5px 10px;
281	@ font-size: 0.9em;
	@@ -283,11 +283,11 @@
283	@ text-align: center;
284	@ letter-spacing: 1px;
285	@ background-color: #a09048;
286	@ color: black;
287	@ }
288	@
289	@ /* The submenu bar that sometimes appears below the main menu */
290	@ div.submenu, div.sectionmenu {
291	@ padding: 3px 10px 3px 0px;
292	@ font-size: 0.9em;
293	@ text-align: center;
	@@ -302,21 +302,21 @@
302	@ }
303	@ div.mainmenu a:hover, div.submenu a:hover, div.sectionmenu>a.button:hover {
304	@ color: #a09048;
305	@ background-color: white;
306	@ }
307	@
308	@ /* All page content from the bottom of the menu or submenu down to
309	@ ** the footer */
310	@ div.content {
311	@ padding: 1ex 5px;
312	@ }
313	@ div.content a { color: #706532; }
314	@ div.content a:link { color: #706532; }
315	@ div.content a:visited { color: #704032; }
316	@ div.content a:hover { background-color: white; color: #706532; }
317	@
318	@ /* Some pages have section dividers */
319	@ div.section {
320	@ margin-bottom: 0px;
321	@ margin-top: 1em;
322	@ padding: 3px 3px 0 3px;
	@@ -324,11 +324,11 @@
324	@ font-weight: bold;
325	@ background-color: #a09048;
326	@ color: white;
327	@ white-space: nowrap;
328	@ }
329	@
330	@ /* The "Date" that occurs on the left hand side of timelines */
331	@ div.divider {
332	@ background: #e1d498;
333	@ border: 2px #a09048 solid;
334	@ font-size: 1em; font-weight: normal;
	@@ -336,33 +336,33 @@
336	@ margin: .2em 0 .2em 0;
337	@ float: left;
338	@ clear: left;
339	@ white-space: nowrap;
340	@ }
341	@
342	@ /* The footer at the very bottom of the page */
343	@ div.footer {
344	@ font-size: 0.8em;
345	@ margin-top: 12px;
346	@ padding: 5px 10px 5px 10px;
347	@ text-align: right;
348	@ background-color: #a09048;
349	@ color: white;
350	@ }
351	@
352	@ /* Hyperlink colors */
353	@ div.footer a { color: white; }
354	@ div.footer a:link { color: white; }
355	@ div.footer a:visited { color: white; }
356	@ div.footer a:hover { background-color: white; color: #558195; }
357	@
358	@ /* <verbatim> blocks */
359	@ pre.verbatim {
360	@ background-color: #f5f5f5;
361	@ padding: 0.5em;
362	@ }
363	@
364	@ /* The label/value pairs on (for example) the ci page */
365	@ table.label-value th {
366	@ vertical-align: top;
367	@ text-align: right;
368	@ padding: 0.2ex 2ex;
	@@ -430,39 +430,39 @@
430
431	/*
432	** Black letters on a white or cream background with the main menu
433	** stuck on the left-hand side.
434	*/
435	static const char zBuiltinSkin3[] =
436	@ REPLACE INTO config(name,mtime,value)
437	@ VALUES('css',now(),'/* General settings for the entire page */
438	@ body {
439	@ margin:0px 0px 0px 0px;
440	@ padding:0px;
441	@ font-family:verdana, arial, helvetica, "sans serif";
442	@ color:#333;
443	@ background-color:white;
444	@ }
445	@
446	@ /* consistent colours */
447	@ h2 {
448	@ color: #333;
449	@ }
450	@ h3 {
451	@ color: #333;
452	@ }
453	@
454	@ /* The project logo in the upper left-hand corner of each page */
455	@ div.logo {
456	@ display: table-cell;
457	@ text-align: left;
458	@ vertical-align: bottom;
459	@ font-weight: bold;
460	@ color: #333;
461	@ white-space: nowrap;
462	@ }
463	@
464	@ /* The page title centered at the top of each page */
465	@ div.title {
466	@ display: table-cell;
467	@ font-size: 2em;
468	@ font-weight: bold;
	@@ -469,11 +469,11 @@
469	@ text-align: center;
470	@ color: #333;
471	@ vertical-align: bottom;
472	@ width: 100%;
473	@ }
474	@
475	@ /* The login status message in the top right-hand corner */
476	@ div.status {
477	@ display: table-cell;
478	@ padding-right: 10px;
479	@ text-align: right;
	@@ -482,21 +482,21 @@
482	@ color: #333;
483	@ font-size: 0.8em;
484	@ font-weight: bold;
485	@ white-space: nowrap;
486	@ }
487	@
488	@ /* The header across the top of the page */
489	@ div.header {
490	@ margin:10px 0px 10px 0px;
491	@ padding:1px 0px 0px 20px;
492	@ border-style:solid;
493	@ border-color:black;
494	@ border-width:1px 0px;
495	@ background-color:#eee;
496	@ }
497	@
498	@ /* The main menu bar that appears at the top left of the page beneath
499	@ ** the header. Width must be co-ordinated with the container below */
500	@ div.mainmenu {
501	@ float: left;
502	@ margin-left: 10px;
	@@ -506,11 +506,11 @@
506	@ padding:5px;
507	@ background-color:#eee;
508	@ border:1px solid #999;
509	@ width:8em;
510	@ }
511	@
512	@ /* Main menu is now a list */
513	@ div.mainmenu ul {
514	@ padding: 0;
515	@ list-style:none;
516	@ }
	@@ -521,17 +521,17 @@
521	@ }
522	@ div.mainmenu a:hover {
523	@ color: #eee;
524	@ background-color: #333;
525	@ }
526	@
527	@ /* Container for the sub-menu and content so they don''t spread
528	@ ** out underneath the main menu */
529	@ #container {
530	@ padding-left: 9em;
531	@ }
532	@
533	@ /* The submenu bar that sometimes appears below the main menu */
534	@ div.submenu, div.sectionmenu {
535	@ padding: 3px 10px 3px 10px;
536	@ font-size: 0.9em;
537	@ text-align: center;
	@@ -548,17 +548,17 @@
548	@ }
549	@ div.submenu a:hover, div.sectionmenu>a.button:hover {
550	@ color: #eee;
551	@ background-color: #333;
552	@ }
553	@
554	@ /* All page content from the bottom of the menu or submenu down to
555	@ ** the footer */
556	@ div.content {
557	@ padding: 2ex 1ex 0ex 2ex;
558	@ }
559	@
560	@ /* Some pages have section dividers */
561	@ div.section {
562	@ margin-bottom: 0px;
563	@ margin-top: 1em;
564	@ padding: 1px 1px 1px 1px;
	@@ -569,11 +569,11 @@
569	@ border-width:1px 0px;
570	@ background-color: #eee;
571	@ color: #333;
572	@ white-space: nowrap;
573	@ }
574	@
575	@ /* The "Date" that occurs on the left hand side of timelines */
576	@ div.divider {
577	@ background: #eee;
578	@ border: 2px #999 solid;
579	@ font-size: 1em; font-weight: normal;
	@@ -582,27 +582,27 @@
582	@ float: left;
583	@ clear: left;
584	@ color: #333;
585	@ white-space: nowrap;
586	@ }
587	@
588	@ /* The footer at the very bottom of the page */
589	@ div.footer {
590	@ font-size: 0.8em;
591	@ margin-top: 12px;
592	@ padding: 5px 10px 5px 10px;
593	@ text-align: right;
594	@ background-color: #eee;
595	@ color: #555;
596	@ }
597	@
598	@ /* <verbatim> blocks */
599	@ pre.verbatim {
600	@ background-color: #f5f5f5;
601	@ padding: 0.5em;
602	@ }
603	@
604	@ /* The label/value pairs on (for example) the ci page */
605	@ table.label-value th {
606	@ vertical-align: top;
607	@ text-align: right;
608	@ padding: 0.2ex 2ex;
	@@ -673,11 +673,11 @@
673
674
675	/*
676	** Shadow boxes and rounded corners.
677	*/
678	static const char zBuiltinSkin4[] =
679	@ REPLACE INTO config(name,mtime,value)
680	@ VALUES('css',now(),'/* General settings for the entire page */
681	@ html {
682	@ min-height: 100%;
683	@ }
	@@ -687,28 +687,28 @@
687	@ background-color: white;
688	@ color: #333;
689	@ font-family: Verdana, sans-serif;
690	@ font-size: 0.8em;
691	@ }
692	@
693	@ /* The project logo in the upper left-hand corner of each page */
694	@ div.logo {
695	@ display: table-cell;
696	@ text-align: right;
697	@ vertical-align: bottom;
698	@ font-weight: normal;
699	@ white-space: nowrap;
700	@ }
701	@
702	@ /* Widths */
703	@ div.header, div.mainmenu, div.submenu, div.content, div.footer {
704	@ max-width: 900px;
705	@ margin: auto;
706	@ padding: 3px 20px 3px 20px;
707	@ clear: both;
708	@ }
709	@
710	@ /* The page title at the top of each page */
711	@ div.title {
712	@ display: table-cell;
713	@ padding-left: 10px;
714	@ font-size: 2em;
	@@ -719,21 +719,21 @@
719	@ font-family: Verdana, sans-serif;
720	@ font-weight: bold;
721	@ color: #558195;
722	@ text-shadow: 0px 2px 2px #999999;
723	@ }
724	@
725	@ /* The login status message in the top right-hand corner */
726	@ div.status {
727	@ display: table-cell;
728	@ text-align: right;
729	@ vertical-align: bottom;
730	@ color: #333;
731	@ margin-right: -20px;
732	@ white-space: nowrap;
733	@ }
734	@
735	@ /* The main menu bar that appears at the top of the page beneath
736	@ ** the header */
737	@ div.mainmenu {
738	@ text-align: center;
739	@ color: white;
	@@ -743,11 +743,11 @@
743	@ padding-top: 8px;
744	@ padding-bottom: 8px;
745	@ background-color: #446979;
746	@ box-shadow: 0px 3px 4px #333333;
747	@ }
748	@
749	@ /* The submenu bar that sometimes appears below the main menu */
750	@ div.submenu {
751	@ padding-top:10px;
752	@ padding-bottom:0;
753	@ text-align: right;
	@@ -768,24 +768,24 @@
768	@ color: #000;
769	@ font-family: Arial;
770	@ text-decoration: none;
771	@ margin:auto;
772	@ border-radius: 5px;
773	@ background-color: #e0e0e0;
774	@ text-shadow: 0px -1px 0px #eee;
775	@ border: 1px solid #000;
776	@ }
777	@
778	@ div.mainmenu a:hover {
779	@ color: #000;
780	@ background-color: white;
781	@ }
782	@
783	@ div.submenu a:hover, div.sectionmenu>a.button:hover {
784	@ background-color: #c0c0c0;
785	@ }
786	@
787	@ /* All page content from the bottom of the menu or submenu down to
788	@ ** the footer */
789	@ div.content {
790	@ background-color: #fff;
791	@ box-shadow: 0px 3px 4px #999;
	@@ -792,12 +792,12 @@
792	@ border-bottom-right-radius: 5px;
793	@ border-bottom-left-radius: 5px;
794	@ padding-bottom: 1em;
795	@ min-height:40%;
796	@ }
797	@
798	@
799	@ /* Some pages have section dividers */
800	@ div.section {
801	@ margin-bottom: 0.5em;
802	@ margin-top: 1em;
803	@ margin-right: auto;
	@@ -809,69 +809,69 @@
809	@ border-radius: 5px;
810	@ background-color: #446979;
811	@ box-shadow: 0px 3px 4px #333333;
812	@ white-space: nowrap;
813	@ }
814	@
815	@ /* The "Date" that occurs on the left hand side of timelines */
816	@ div.divider {
817	@ font-size: 1.2em;
818	@ font-family: Georgia, serif;
819	@ font-weight: bold;
820	@ margin-top: 1em;
821	@ white-space: nowrap;
822	@ }
823	@
824	@ /* The footer at the very bottom of the page */
825	@ div.footer {
826	@ font-size: 0.9em;
827	@ text-align: right;
828	@ margin-bottom: 1em;
829	@ color: #666;
830	@ }
831	@
832	@ /* Hyperlink colors in the footer */
833	@ div.footer a { color: white; }
834	@ div.footer a:link { color: white; }
835	@ div.footer a:visited { color: white; }
836	@ div.footer a:hover { background-color: white; color: #558195; }
837	@
838	@ /* <verbatim> blocks */
839	@ pre.verbatim, blockquote pre {
840	@ font-family: Dejavu Sans Mono, Monaco, Lucida Console, monospace;
841	@ background-color: #f3f3f3;
842	@ padding: 0.5em;
843	@ white-space: pre-wrap;
844	@ }
845	@
846	@ blockquote pre {
847	@ border: 1px #000 dashed;
848	@ }
849	@
850	@ /* The label/value pairs on (for example) the ci page */
851	@ table.label-value th {
852	@ vertical-align: top;
853	@ text-align: right;
854	@ padding: 0.2ex 2ex;
855	@ }
856	@
857	@
858	@ table.report {
859	@ border-collapse:collapse;
860	@ border: 1px solid #999;
861	@ margin: 1em 0 1em 0;
862	@ }
863	@
864	@ table.report tr th {
865	@ padding: 3px 5px;
866	@ text-transform: capitalize;
867	@ }
868	@
869	@ table.report tr td {
870	@ padding: 3px 5px;
871	@ }
872	@
873	@ textarea {
874	@ font-size: 1em;
875	@ }');
876	@ REPLACE INTO config(name,mtime,value) VALUES('header',now(),'<html>
877	@ <head>
	@@ -952,11 +952,11 @@
952	** Fossil repository. Additionally, if the Tcl integration feature is
953	** enabled, the loaded version of Tcl is included, with a hyperlink to the
954	** official Tcl/Tk web site. The footer also contains a TH1 script block
955	** to help accomplish these tasks.
956	*/
957	static const char zBuiltinSkin5[] =
958	@ REPLACE INTO config(name,mtime,value)
959	@ VALUES('css',now(),'/* General settings for the entire page */
960	@ body {
961	@ margin: 0ex 1ex;
962	@ padding: 0px;
	@@ -982,11 +982,11 @@
982	@ font-weight: bold;
983	@ text-align: center;
984	@ padding: 0 0 0 1em;
985	@ color: #558195;
986	@ vertical-align: bottom;
987	@ width: 100%;
988	@ }
989	@
990	@ /* The login status message in the top right-hand corner */
991	@ div.status {
992	@ display: table-cell;
	@@ -1000,11 +1000,11 @@
1000	@ }
1001	@
1002	@ /* The header across the top of the page */
1003	@ div.header {
1004	@ display: table;
1005	@ width: 100%;
1006	@ }
1007	@
1008	@ /* The main menu bar that appears at the top of the page beneath
1009	@ ** the header */
1010	@ div.mainmenu {
	@@ -1085,11 +1085,11 @@
1085	@ /* Hyperlink colors in the footer */
1086	@ div.footer a { color: white; }
1087	@ div.footer a:link { color: white; }
1088	@ div.footer a:visited { color: white; }
1089	@ div.footer a:hover { background-color: white; color: #558195; }
1090	@
1091	@ /* verbatim blocks */
1092	@ pre.verbatim {
1093	@ background-color: #f5f5f5;
1094	@ padding: 0.5em;
1095	@}
	@@ -1397,11 +1397,11 @@
1397	style_header("Skins");
1398	if( zErr ){
1399	@ <p><font color="red">%h(zErr)</font></p>
1400	}
1401	@ <p>A "skin" is a combination of
1402	@ <a href="setup_editcss">CSS</a>,
1403	@ <a href="setup_header">Header</a>,
1404	@ <a href="setup_footer">Footer</a>, and
1405	@ <a href="setup_logo">Logo</a> that determines the look and feel
1406	@ of the web interface.</p>
1407	@
	@@ -1411,11 +1411,11 @@
1411	z = aBuiltinSkin[i].zName;
1412	if( fossil_strcmp(aBuiltinSkin[i].zValue, zCurrent)==0 ){
1413	@ <li><p>%h(z).   <b>Currently In Use</b></p>
1414	}else{
1415	@ <li><form action="%s(g.zTop)/setup_skin" method="post"><div>
1416	@ %h(z).
1417	@ <input type="hidden" name="sn" value="%h(z)" />
1418	@ <input type="submit" name="load" value="Use This Skin" />
1419	@ </div></form></li>
1420	}
1421	}
	@@ -1429,11 +1429,11 @@
1429	const char *zV = db_column_text(&q, 1);
1430	if( fossil_strcmp(zV, zCurrent)==0 ){
1431	@ <li><p>%h(zN).   <b>Currently In Use</b></p>
1432	}else{
1433	@ <li><form action="%s(g.zTop)/setup_skin" method="post">
1434	@ %h(zN).
1435	@ <input type="hidden" name="sn" value="%h(zN)">
1436	@ <input type="submit" name="load" value="Use This Skin">
1437	@ <input type="submit" name="del1" value="Delete This Skin">
1438	@ </form></li>
1439	}
1440

M src/style.c

+14 -14

		--- src/style.c
		+++ src/style.c
		@@ -66,11 +66,11 @@
66	66	**
67	67	** The form of the anchor tag is determined by the g.javascriptHyperlink
68	68	** variable. The href="URL" form is used if g.javascriptHyperlink is false.
69	69	** If g.javascriptHyperlink is true then the
70	70	** id="ID" form is used and javascript is generated in the footer to cause
71		-** href values to be inserted after the page has loaded. If
	71	+** href values to be inserted after the page has loaded. If
72	72	** g.perm.History is false, then the <a id="ID"> form is still
73	73	** generated but the javascript is not generated so the links never
74	74	** activate.
75	75	**
76	76	** Filling in the href="URL" using javascript is a defense against bots.
		@@ -218,21 +218,21 @@
218	218	** Draw the header.
219	219	*/
220	220	void style_header(const char *zTitleFormat, ...){
221	221	va_list ap;
222	222	char *zTitle;
223		- const char zHeader = db_get("header", (char)zDefaultHeader);
	223	+ const char zHeader = db_get("header", (char)zDefaultHeader);
224	224	login_check_credentials();
225	225
226	226	va_start(ap, zTitleFormat);
227	227	zTitle = vmprintf(zTitleFormat, ap);
228	228	va_end(ap);
229		-
	229	+
230	230	cgi_destination(CGI_HEADER);
231	231
232	232	@ <!DOCTYPE html>
233		-
	233	+
234	234	if( g.thTrace ) Th_Trace("BEGIN_HEADER<br />\n", -1);
235	235
236	236	/* Generate the header up through the main menu */
237	237	Th_Store("project_name", db_get("project-name","Unnamed Fossil Project"));
238	238	Th_Store("title", zTitle);
		@@ -295,11 +295,11 @@
295	295	*/
296	296	void style_footer(void){
297	297	const char *zFooter;
298	298
299	299	if( !headerHasBeenGenerated ) return;
300		-
	300	+
301	301	/* Go back and put the submenu at the top of the page. We delay the
302	302	** creation of the submenu until the end so that we can add elements
303	303	** to the submenu while generating page text.
304	304	*/
305	305	cgi_destination(CGI_HEADER);
		@@ -336,11 +336,11 @@
336	336
337	337	zFooter = db_get("footer", (char*)zDefaultFooter);
338	338	if( g.thTrace ) Th_Trace("BEGIN_FOOTER<br />\n", -1);
339	339	Th_Render(zFooter);
340	340	if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1);
341		-
	341	+
342	342	/* Render trace log if TH1 tracing is enabled. */
343	343	if( g.thTrace ){
344	344	cgi_append_content("<span class=\"thTrace\"><hr />\n", -1);
345	345	cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog));
346	346	cgi_append_content("</span>\n", -1);
		@@ -366,11 +366,11 @@
366	366
367	367	/* @-comment: // */
368	368	/*
369	369	** The default page header.
370	370	*/
371		-const char zDefaultHeader[] =
	371	+const char zDefaultHeader[] =
372	372	@ <html>
373	373	@ <head>
374	374	@ <base href="$baseurl/$current_page" />
375	375	@ <title>$<project_name>: $<title></title>
376	376	@ <link rel="alternate" type="application/rss+xml" title="RSS Feed"
		@@ -425,11 +425,11 @@
425	425	;
426	426
427	427	/*
428	428	** The default page footer
429	429	*/
430		-const char zDefaultFooter[] =
	430	+const char zDefaultFooter[] =
431	431	@ <div class="footer">
432	432	@ Fossil version $release_version $manifest_version $manifest_date
433	433	@ </div>
434	434	@ </body></html>
435	435	;
		@@ -439,11 +439,11 @@
439	439	** It's assembled by different strings for each class.
440	440	** The default css conatains all definitions.
441	441	** The style sheet, send to the client only contains the ones,
442	442	** not defined in the user defined css.
443	443	*/
444		-const char zDefaultCSS[] =
	444	+const char zDefaultCSS[] =
445	445	@ /* General settings for the entire page */
446	446	@ body {
447	447	@ margin: 0ex 1ex;
448	448	@ padding: 0px;
449	449	@ background-color: white;
		@@ -468,11 +468,11 @@
468	468	@ font-weight: bold;
469	469	@ text-align: center;
470	470	@ padding: 0 0 0 1em;
471	471	@ color: #558195;
472	472	@ vertical-align: bottom;
473		-@ width: 100% ;
	473	+@ width: 100%;
474	474	@ }
475	475	@
476	476	@ /* The login status message in the top right-hand corner */
477	477	@ div.status {
478	478	@ display: table-cell;
		@@ -486,11 +486,11 @@
486	486	@ }
487	487	@
488	488	@ /* The header across the top of the page */
489	489	@ div.header {
490	490	@ display: table;
491		-@ width: 100% ;
	491	+@ width: 100%;
492	492	@ }
493	493	@
494	494	@ /* The main menu bar that appears at the top of the page beneath
495	495	@ ** the header */
496	496	@ div.mainmenu {
		@@ -571,11 +571,11 @@
571	571	@ /* Hyperlink colors in the footer */
572	572	@ div.footer a { color: white; }
573	573	@ div.footer a:link { color: white; }
574	574	@ div.footer a:visited { color: white; }
575	575	@ div.footer a:hover { background-color: white; color: #558195; }
576		-@
	576	+@
577	577	@ /* verbatim blocks */
578	578	@ pre.verbatim {
579	579	@ background-color: #f5f5f5;
580	580	@ padding: 0.5em;
581	581	@}
		@@ -688,16 +688,16 @@
688	688	@ text-decoration: line-through;
689	689	},
690	690	{ "table.browser",
691	691	"format for the file display table",
692	692	@ /* the format for wiki errors */
693		- @ width: 100% ;
	693	+ @ width: 100%;
694	694	@ border: 0;
695	695	},
696	696	{ "td.browser",
697	697	"format for cells in the file browser",
698		- @ width: 24% ;
	698	+ @ width: 24%;
699	699	@ vertical-align: top;
700	700	},
701	701	{ "ul.browser",
702	702	"format for the list in the file browser",
703	703	@ margin-left: 0.5em;
704	704

	--- src/style.c
	+++ src/style.c
	@@ -66,11 +66,11 @@
66	**
67	** The form of the anchor tag is determined by the g.javascriptHyperlink
68	** variable. The href="URL" form is used if g.javascriptHyperlink is false.
69	** If g.javascriptHyperlink is true then the
70	** id="ID" form is used and javascript is generated in the footer to cause
71	** href values to be inserted after the page has loaded. If
72	** g.perm.History is false, then the <a id="ID"> form is still
73	** generated but the javascript is not generated so the links never
74	** activate.
75	**
76	** Filling in the href="URL" using javascript is a defense against bots.
	@@ -218,21 +218,21 @@
218	** Draw the header.
219	*/
220	void style_header(const char *zTitleFormat, ...){
221	va_list ap;
222	char *zTitle;
223	const char zHeader = db_get("header", (char)zDefaultHeader);
224	login_check_credentials();
225
226	va_start(ap, zTitleFormat);
227	zTitle = vmprintf(zTitleFormat, ap);
228	va_end(ap);
229
230	cgi_destination(CGI_HEADER);
231
232	@ <!DOCTYPE html>
233
234	if( g.thTrace ) Th_Trace("BEGIN_HEADER<br />\n", -1);
235
236	/* Generate the header up through the main menu */
237	Th_Store("project_name", db_get("project-name","Unnamed Fossil Project"));
238	Th_Store("title", zTitle);
	@@ -295,11 +295,11 @@
295	*/
296	void style_footer(void){
297	const char *zFooter;
298
299	if( !headerHasBeenGenerated ) return;
300
301	/* Go back and put the submenu at the top of the page. We delay the
302	** creation of the submenu until the end so that we can add elements
303	** to the submenu while generating page text.
304	*/
305	cgi_destination(CGI_HEADER);
	@@ -336,11 +336,11 @@
336
337	zFooter = db_get("footer", (char*)zDefaultFooter);
338	if( g.thTrace ) Th_Trace("BEGIN_FOOTER<br />\n", -1);
339	Th_Render(zFooter);
340	if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1);
341
342	/* Render trace log if TH1 tracing is enabled. */
343	if( g.thTrace ){
344	cgi_append_content("<span class=\"thTrace\"><hr />\n", -1);
345	cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog));
346	cgi_append_content("</span>\n", -1);
	@@ -366,11 +366,11 @@
366
367	/* @-comment: // */
368	/*
369	** The default page header.
370	*/
371	const char zDefaultHeader[] =
372	@ <html>
373	@ <head>
374	@ <base href="$baseurl/$current_page" />
375	@ <title>$<project_name>: $<title></title>
376	@ <link rel="alternate" type="application/rss+xml" title="RSS Feed"
	@@ -425,11 +425,11 @@
425	;
426
427	/*
428	** The default page footer
429	*/
430	const char zDefaultFooter[] =
431	@ <div class="footer">
432	@ Fossil version $release_version $manifest_version $manifest_date
433	@ </div>
434	@ </body></html>
435	;
	@@ -439,11 +439,11 @@
439	** It's assembled by different strings for each class.
440	** The default css conatains all definitions.
441	** The style sheet, send to the client only contains the ones,
442	** not defined in the user defined css.
443	*/
444	const char zDefaultCSS[] =
445	@ /* General settings for the entire page */
446	@ body {
447	@ margin: 0ex 1ex;
448	@ padding: 0px;
449	@ background-color: white;
	@@ -468,11 +468,11 @@
468	@ font-weight: bold;
469	@ text-align: center;
470	@ padding: 0 0 0 1em;
471	@ color: #558195;
472	@ vertical-align: bottom;
473	@ width: 100% ;
474	@ }
475	@
476	@ /* The login status message in the top right-hand corner */
477	@ div.status {
478	@ display: table-cell;
	@@ -486,11 +486,11 @@
486	@ }
487	@
488	@ /* The header across the top of the page */
489	@ div.header {
490	@ display: table;
491	@ width: 100% ;
492	@ }
493	@
494	@ /* The main menu bar that appears at the top of the page beneath
495	@ ** the header */
496	@ div.mainmenu {
	@@ -571,11 +571,11 @@
571	@ /* Hyperlink colors in the footer */
572	@ div.footer a { color: white; }
573	@ div.footer a:link { color: white; }
574	@ div.footer a:visited { color: white; }
575	@ div.footer a:hover { background-color: white; color: #558195; }
576	@
577	@ /* verbatim blocks */
578	@ pre.verbatim {
579	@ background-color: #f5f5f5;
580	@ padding: 0.5em;
581	@}
	@@ -688,16 +688,16 @@
688	@ text-decoration: line-through;
689	},
690	{ "table.browser",
691	"format for the file display table",
692	@ /* the format for wiki errors */
693	@ width: 100% ;
694	@ border: 0;
695	},
696	{ "td.browser",
697	"format for cells in the file browser",
698	@ width: 24% ;
699	@ vertical-align: top;
700	},
701	{ "ul.browser",
702	"format for the list in the file browser",
703	@ margin-left: 0.5em;
704

	--- src/style.c
	+++ src/style.c
	@@ -66,11 +66,11 @@
66	**
67	** The form of the anchor tag is determined by the g.javascriptHyperlink
68	** variable. The href="URL" form is used if g.javascriptHyperlink is false.
69	** If g.javascriptHyperlink is true then the
70	** id="ID" form is used and javascript is generated in the footer to cause
71	** href values to be inserted after the page has loaded. If
72	** g.perm.History is false, then the <a id="ID"> form is still
73	** generated but the javascript is not generated so the links never
74	** activate.
75	**
76	** Filling in the href="URL" using javascript is a defense against bots.
	@@ -218,21 +218,21 @@
218	** Draw the header.
219	*/
220	void style_header(const char *zTitleFormat, ...){
221	va_list ap;
222	char *zTitle;
223	const char zHeader = db_get("header", (char)zDefaultHeader);
224	login_check_credentials();
225
226	va_start(ap, zTitleFormat);
227	zTitle = vmprintf(zTitleFormat, ap);
228	va_end(ap);
229
230	cgi_destination(CGI_HEADER);
231
232	@ <!DOCTYPE html>
233
234	if( g.thTrace ) Th_Trace("BEGIN_HEADER<br />\n", -1);
235
236	/* Generate the header up through the main menu */
237	Th_Store("project_name", db_get("project-name","Unnamed Fossil Project"));
238	Th_Store("title", zTitle);
	@@ -295,11 +295,11 @@
295	*/
296	void style_footer(void){
297	const char *zFooter;
298
299	if( !headerHasBeenGenerated ) return;
300
301	/* Go back and put the submenu at the top of the page. We delay the
302	** creation of the submenu until the end so that we can add elements
303	** to the submenu while generating page text.
304	*/
305	cgi_destination(CGI_HEADER);
	@@ -336,11 +336,11 @@
336
337	zFooter = db_get("footer", (char*)zDefaultFooter);
338	if( g.thTrace ) Th_Trace("BEGIN_FOOTER<br />\n", -1);
339	Th_Render(zFooter);
340	if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1);
341
342	/* Render trace log if TH1 tracing is enabled. */
343	if( g.thTrace ){
344	cgi_append_content("<span class=\"thTrace\"><hr />\n", -1);
345	cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog));
346	cgi_append_content("</span>\n", -1);
	@@ -366,11 +366,11 @@
366
367	/* @-comment: // */
368	/*
369	** The default page header.
370	*/
371	const char zDefaultHeader[] =
372	@ <html>
373	@ <head>
374	@ <base href="$baseurl/$current_page" />
375	@ <title>$<project_name>: $<title></title>
376	@ <link rel="alternate" type="application/rss+xml" title="RSS Feed"
	@@ -425,11 +425,11 @@
425	;
426
427	/*
428	** The default page footer
429	*/
430	const char zDefaultFooter[] =
431	@ <div class="footer">
432	@ Fossil version $release_version $manifest_version $manifest_date
433	@ </div>
434	@ </body></html>
435	;
	@@ -439,11 +439,11 @@
439	** It's assembled by different strings for each class.
440	** The default css conatains all definitions.
441	** The style sheet, send to the client only contains the ones,
442	** not defined in the user defined css.
443	*/
444	const char zDefaultCSS[] =
445	@ /* General settings for the entire page */
446	@ body {
447	@ margin: 0ex 1ex;
448	@ padding: 0px;
449	@ background-color: white;
	@@ -468,11 +468,11 @@
468	@ font-weight: bold;
469	@ text-align: center;
470	@ padding: 0 0 0 1em;
471	@ color: #558195;
472	@ vertical-align: bottom;
473	@ width: 100%;
474	@ }
475	@
476	@ /* The login status message in the top right-hand corner */
477	@ div.status {
478	@ display: table-cell;
	@@ -486,11 +486,11 @@
486	@ }
487	@
488	@ /* The header across the top of the page */
489	@ div.header {
490	@ display: table;
491	@ width: 100%;
492	@ }
493	@
494	@ /* The main menu bar that appears at the top of the page beneath
495	@ ** the header */
496	@ div.mainmenu {
	@@ -571,11 +571,11 @@
571	@ /* Hyperlink colors in the footer */
572	@ div.footer a { color: white; }
573	@ div.footer a:link { color: white; }
574	@ div.footer a:visited { color: white; }
575	@ div.footer a:hover { background-color: white; color: #558195; }
576	@
577	@ /* verbatim blocks */
578	@ pre.verbatim {
579	@ background-color: #f5f5f5;
580	@ padding: 0.5em;
581	@}
	@@ -688,16 +688,16 @@
688	@ text-decoration: line-through;
689	},
690	{ "table.browser",
691	"format for the file display table",
692	@ /* the format for wiki errors */
693	@ width: 100%;
694	@ border: 0;
695	},
696	{ "td.browser",
697	"format for cells in the file browser",
698	@ width: 24%;
699	@ vertical-align: top;
700	},
701	{ "ul.browser",
702	"format for the list in the file browser",
703	@ margin-left: 0.5em;
704

M src/wikiformat.c

+1 -1

		--- src/wikiformat.c
		+++ src/wikiformat.c
		@@ -1150,13 +1150,13 @@
1150	1150	char zClose, / Write hyperlink closing text here */
1151	1151	int nClose, /* Bytes available in zClose[] */
1152	1152	const char zOrig / Complete document text */
1153	1153	){
1154	1154	const char *zTerm = "</a>";
1155		- assert( nClose>=20 );
1156	1155	const char *z;
1157	1156
	1157	+ assert( nClose>=20 );
1158	1158	if( strncmp(zTarget, "http:", 5)==0
1159	1159	\|\| strncmp(zTarget, "https:", 6)==0
1160	1160	\|\| strncmp(zTarget, "ftp:", 4)==0
1161	1161	\|\| strncmp(zTarget, "mailto:", 7)==0
1162	1162	){
1163	1163

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -1150,13 +1150,13 @@
1150	char zClose, / Write hyperlink closing text here */
1151	int nClose, /* Bytes available in zClose[] */
1152	const char zOrig / Complete document text */
1153	){
1154	const char *zTerm = "</a>";
1155	assert( nClose>=20 );
1156	const char *z;
1157

1158	if( strncmp(zTarget, "http:", 5)==0
1159	\|\| strncmp(zTarget, "https:", 6)==0
1160	\|\| strncmp(zTarget, "ftp:", 4)==0
1161	\|\| strncmp(zTarget, "mailto:", 7)==0
1162	){
1163

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -1150,13 +1150,13 @@
1150	char zClose, / Write hyperlink closing text here */
1151	int nClose, /* Bytes available in zClose[] */
1152	const char zOrig / Complete document text */
1153	){
1154	const char *zTerm = "</a>";

1155	const char *z;
1156
1157	assert( nClose>=20 );
1158	if( strncmp(zTarget, "http:", 5)==0
1159	\|\| strncmp(zTarget, "https:", 6)==0
1160	\|\| strncmp(zTarget, "ftp:", 4)==0
1161	\|\| strncmp(zTarget, "mailto:", 7)==0
1162	){
1163

Fossil SCM

Keyboard Shortcuts