Fossil

Check-in [e621ef43]
Login

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

Overview
Comment:merged trunk changes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | wolfgangFormat2CSS
Files: files | file ages | folders
SHA1: e621ef436757ec3329e07a31d107ebdaf2c88176
User & Date: wolfgang 2010-09-08 17:30:44
Context
2010-09-08
18:16
layout sideboxes using css, css is only added to the user defined css, if the corresponding class is missing check-in: b34a583f user: wolfgang tags: wolfgangFormat2CSS
17:30
merged trunk changes check-in: e621ef43 user: wolfgang tags: wolfgangFormat2CSS
17:23
merged trunk changes check-in: a2d5230d user: wolfgang tags: wolfgangFormat2CSS
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/setup.c.

   908    908     @ The default CSS is shown below for reference.  Other examples
   909    909     @ of CSS files can be seen on the <a href="setup_skin">skins page</a>.
   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   /*
   921    922   ** WEBPAGE: setup_header

Changes to src/style.c.

   383    383   @ /* The label/value pairs on (for example) the ci page */
   384    384   @ table.label-value th {
   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){
   395    405     const char *zCSS    = 0;
   396    406     const char *zCSSdef = 0;
   397    407   
   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   */
   410    421   void page_test_env(void){