Fossil

Check-in [b34a583f32]
Login

Check-in [b34a583f32]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:layout sideboxes using css, css is only added to the user defined css, if the corresponding class is missing
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | wolfgangFormat2CSS
Files: files | file ages | folders
SHA1: b34a583f32dd24c601396c73d453c029e0f3f48a
User & Date: wolfgang 2010-09-08 18:16:05.000
Context
2010-09-09
10:31
Merge in changes from the wolfgangFormat2CSS branch. ... (check-in: 34f9b9de58 user: drh tags: trunk)
2010-09-08
19:26
reduced html validator errors on branch page ... (check-in: 156358e296 user: wolfgang tags: wolfgangFormat2CSS)
18:16
layout sideboxes using css, css is only added to the user defined css, if the corresponding class is missing ... (check-in: b34a583f32 user: wolfgang tags: wolfgangFormat2CSS)
17:30
merged trunk changes ... (check-in: e621ef4367 user: wolfgang tags: wolfgangFormat2CSS)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/setup.c.
︙︙
908
909
910
911
912
913
914
915

916
917
918
919
920
921
922

  @ The default CSS is shown below for reference.  Other examples
  @ of CSS files can be seen on the <a href="setup_skin">skins page</a>.
  @ See also the <a href="setup_header">header</a> and
  @ <a href="setup_footer">footer</a> editing screens.
  @ <blockquote><pre>
  @ %h(zDefaultCSS)
  @ %h(zTableLabelValueCSS)
  @ %h(zDivNomenclatureSidebox)

  @ </pre></blockquote>
  style_footer();
  db_end_transaction(0);
}

/*
** WEBPAGE: setup_header








|
>








908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923

  @ The default CSS is shown below for reference.  Other examples
  @ of CSS files can be seen on the <a href="setup_skin">skins page</a>.
  @ See also the <a href="setup_header">header</a> and
  @ <a href="setup_footer">footer</a> editing screens.
  @ <blockquote><pre>
  @ %h(zDefaultCSS)
  @ %h(zTableLabelValueCSS)
  @ %h(zDivSidebox)
  @ %h(zDivSideboxTitle)
  @ </pre></blockquote>
  style_footer();
  db_end_transaction(0);
}

/*
** WEBPAGE: setup_header
︙︙
Changes to src/style.c.
︙︙
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181


/*
** Begin a side-box on the right-hand side of a page.  The title and
** the width of the box are given as arguments.  The width is usually
** a percentage of total screen width.
*/
void style_sidebox_begin(const char *zTitle, const char *zWidth){
  @ <table width="%s(zWidth)" align="right" border="1" cellpadding=5
  @  vspace=5 hspace=5>
  @ <tr><td>
  @ <b>%h(zTitle)</b>
}

/* End the side-box
*/
void style_sidebox_end(void){
  @ </td></tr></table>
}

/* @-comment: // */
/*
** The default page header.
*/
const char zDefaultHeader[] = 








|
<
<
|





|








158
159
160
161
162
163
164
165


166
167
168
169
170
171
172
173
174
175
176
177
178
179


/*
** Begin a side-box on the right-hand side of a page.  The title and
** the width of the box are given as arguments.  The width is usually
** a percentage of total screen width.
*/
void style_sidebox_begin(const char *zTitle, const char *zWidth){
  @ <div class="sidebox" style="width:%s(zWidth)">


  @ <div class="sideboxTitle">%h(zTitle)</div>
}

/* End the side-box
*/
void style_sidebox_end(void){
  @ </div>
}

/* @-comment: // */
/*
** The default page header.
*/
const char zDefaultHeader[] =
︙︙
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398







399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414

415
416
417
418
419
420
421

@ /* The label/value pairs on (for example) the ci page */
@ table.label-value th {
@   vertical-align: top;
@   text-align: right;
@   padding: 0.2ex 2ex;
@ }
;
const char zDivNomenclatureSidebox[] =
@ /* The nomenclature sidebox for branches,.. */
@ div.nomenclatureSidebox {
@   float: right;
@   width: 33%;
@   border-width: medium;
@   border-style: double;
@   margin: 10;
@ }







;

/*
** WEBPAGE: style.css
*/
void page_style_css(void){
  const char *zCSS    = 0;
  const char *zCSSdef = 0;

  cgi_set_content_type("text/css");
  zCSS = db_get("css",(char*)zDefaultCSS);
  /* append user defined css */
  cgi_append_content(zCSS, -1);
  /* add special missing definitions */
  if (!strstr("table.label-value",zCSS))       cgi_append_content(zTableLabelValueCSS, -1);
  if (!strstr("div.nomenclatureSidebox",zCSS)) cgi_append_content(zDivNomenclatureSidebox, -1);

  g.isConst = 1;
}

/*
** WEBPAGE: test_env
*/
void page_test_env(void){








|

|

<




>
>
>
>
>
>
>















|
>








381
382
383
384
385
386
387
388
389
390
391

392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426

@ /* The label/value pairs on (for example) the ci page */
@ table.label-value th {
@   vertical-align: top;
@   text-align: right;
@   padding: 0.2ex 2ex;
@ }
;
const char zDivSidebox[] =
@ /* The nomenclature sidebox for branches,.. */
@ div.sidebox {
@   float: right;

@   border-width: medium;
@   border-style: double;
@   margin: 10;
@ }
;
const char zDivSideboxTitle[] =
@ /* The nomenclature title in sideboxes for branches,.. */
@ div.sideboxTitle {
@   display: inline;
@   font-weight: bold;
@ }
;

/*
** WEBPAGE: style.css
*/
void page_style_css(void){
  const char *zCSS    = 0;
  const char *zCSSdef = 0;

  cgi_set_content_type("text/css");
  zCSS = db_get("css",(char*)zDefaultCSS);
  /* append user defined css */
  cgi_append_content(zCSS, -1);
  /* add special missing definitions */
  if (!strstr("table.label-value",zCSS))       cgi_append_content(zTableLabelValueCSS, -1);
  if (!strstr("div.sidebox",zCSS))             cgi_append_content(zDivSidebox, -1);
  if (!strstr("div.sideboxTitle",zCSS))        cgi_append_content(zDivSideboxTitle, -1);
  g.isConst = 1;
}

/*
** WEBPAGE: test_env
*/
void page_test_env(void){
︙︙