Fossil SCM

merged trunk changes

wolfgang 2010-09-08 17:30 wolfgangFormat2CSS

Commit e621ef436757ec3329e07a31d107ebdaf2c88176

Parent a2d5230d24b9f17…

2 files changed +1 +12 -1

M src/setup.c

		--- src/setup.c
		+++ src/setup.c
		@@ -910,10 +910,11 @@
910	910	@ See also the <a href="setup_header">header</a> and
911	911	@ <a href="setup_footer">footer</a> editing screens.
912	912	@ <blockquote><pre>
913	913	@ %h(zDefaultCSS)
914	914	@ %h(zTableLabelValueCSS)
	915	+ @ %h(zDivNomenclatureSidebox)
915	916	@ </pre></blockquote>
916	917	style_footer();
917	918	db_end_transaction(0);
918	919	}
919	920
920	921

	--- src/setup.c
	+++ src/setup.c
	@@ -910,10 +910,11 @@
910	@ See also the <a href="setup_header">header</a> and
911	@ <a href="setup_footer">footer</a> editing screens.
912	@ <blockquote><pre>
913	@ %h(zDefaultCSS)
914	@ %h(zTableLabelValueCSS)

915	@ </pre></blockquote>
916	style_footer();
917	db_end_transaction(0);
918	}
919
920

	--- src/setup.c
	+++ src/setup.c
	@@ -910,10 +910,11 @@
910	@ See also the <a href="setup_header">header</a> and
911	@ <a href="setup_footer">footer</a> editing screens.
912	@ <blockquote><pre>
913	@ %h(zDefaultCSS)
914	@ %h(zTableLabelValueCSS)
915	@ %h(zDivNomenclatureSidebox)
916	@ </pre></blockquote>
917	style_footer();
918	db_end_transaction(0);
919	}
920
921

M src/style.c

+12 -1

		--- src/style.c
		+++ src/style.c
		@@ -385,10 +385,20 @@
385	385	@ vertical-align: top;
386	386	@ text-align: right;
387	387	@ padding: 0.2ex 2ex;
388	388	@ }
389	389	;
	390	+const char zDivNomenclatureSidebox[] =
	391	+@ /* The nomenclature sidebox for branches,.. */
	392	+@ div.nomenclatureSidebox {
	393	+@ float: right;
	394	+@ width: 33%;
	395	+@ border-width: medium;
	396	+@ border-style: double;
	397	+@ margin: 10;
	398	+@ }
	399	+;
390	400
391	401	/*
392	402	** WEBPAGE: style.css
393	403	*/
394	404	void page_style_css(void){
		@@ -398,11 +408,12 @@
398	408	cgi_set_content_type("text/css");
399	409	zCSS = db_get("css",(char*)zDefaultCSS);
400	410	/* append user defined css */
401	411	cgi_append_content(zCSS, -1);
402	412	/* add special missing definitions */
403		- if (!strstr("table.label-value",zCSS)) cgi_append_content(zTableLabelValueCSS, -1);
	413	+ if (!strstr("table.label-value",zCSS)) cgi_append_content(zTableLabelValueCSS, -1);
	414	+ if (!strstr("div.nomenclatureSidebox",zCSS)) cgi_append_content(zDivNomenclatureSidebox, -1);
404	415	g.isConst = 1;
405	416	}
406	417
407	418	/*
408	419	** WEBPAGE: test_env
409	420

	--- src/style.c
	+++ src/style.c
	@@ -385,10 +385,20 @@
385	@ vertical-align: top;
386	@ text-align: right;
387	@ padding: 0.2ex 2ex;
388	@ }
389	;










390
391	/*
392	** WEBPAGE: style.css
393	*/
394	void page_style_css(void){
	@@ -398,11 +408,12 @@
398	cgi_set_content_type("text/css");
399	zCSS = db_get("css",(char*)zDefaultCSS);
400	/* append user defined css */
401	cgi_append_content(zCSS, -1);
402	/* add special missing definitions */
403	if (!strstr("table.label-value",zCSS)) cgi_append_content(zTableLabelValueCSS, -1);

404	g.isConst = 1;
405	}
406
407	/*
408	** WEBPAGE: test_env
409

	--- src/style.c
	+++ src/style.c
	@@ -385,10 +385,20 @@
385	@ vertical-align: top;
386	@ text-align: right;
387	@ padding: 0.2ex 2ex;
388	@ }
389	;
390	const char zDivNomenclatureSidebox[] =
391	@ /* The nomenclature sidebox for branches,.. */
392	@ div.nomenclatureSidebox {
393	@ float: right;
394	@ width: 33%;
395	@ border-width: medium;
396	@ border-style: double;
397	@ margin: 10;
398	@ }
399	;
400
401	/*
402	** WEBPAGE: style.css
403	*/
404	void page_style_css(void){
	@@ -398,11 +408,12 @@
408	cgi_set_content_type("text/css");
409	zCSS = db_get("css",(char*)zDefaultCSS);
410	/* append user defined css */
411	cgi_append_content(zCSS, -1);
412	/* add special missing definitions */
413	if (!strstr("table.label-value",zCSS)) cgi_append_content(zTableLabelValueCSS, -1);
414	if (!strstr("div.nomenclatureSidebox",zCSS)) cgi_append_content(zDivNomenclatureSidebox, -1);
415	g.isConst = 1;
416	}
417
418	/*
419	** WEBPAGE: test_env
420