Fossil

Check-in [ff3b6b323b]
Login

Check-in [ff3b6b323b]

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

Overview
Comment:sidebox via css
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | stv-skinning
Files: files | file ages | folders
SHA1: ff3b6b323b619187a4a117d8f48f3fc692fe4083
User & Date: Ratte 2010-09-05 10:59:59.000
Context
2010-09-05
13:07
merged main trunk ... (check-in: 7766e68992 user: Ratte tags: stv-skinning)
10:59
sidebox via css ... (check-in: ff3b6b323b user: Ratte tags: stv-skinning)
09:58
3 layouts in timeline moved to css ... (check-in: 5bba36b2bc user: Ratte tags: stv-skinning)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/branch.c.
227
228
229
230
231
232
233

234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
  if( showClosed ){
    style_submenu_element("Open","Open","brlist");
  }else{
    style_submenu_element("Closed","Closed","brlist?closed");
  }
  login_anonymous_available();
  compute_leaves(0, 1);

  style_sidebox_begin("Nomenclature:", "33%");
  @ <ol>
  @ <li> An <a href="brlist">open branch</a> is a branch that has one or
  @ more <a href="leaves">open leaves.</a>
  @ The presence of open leaves presumably means
  @ that the branch is still being extended with new check-ins.</li>
  @ <li> A <a href="brlist?closed">closed branch</a> is a branch with only
  @ <a href="leaves?closed">closed leaves</a>.
  @ Closed branches are fixed and do not change (unless they are first
  @ reopened)</li>
  @ </ol>
  style_sidebox_end();

  cnt = 0;
  if( !showClosed ){
    db_prepare(&q,
      "SELECT DISTINCT value FROM tagxref"
      " WHERE tagid=%d AND value NOT NULL"
      "   AND rid IN leaves"







>
|










|







227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
  if( showClosed ){
    style_submenu_element("Open","Open","brlist");
  }else{
    style_submenu_element("Closed","Closed","brlist?closed");
  }
  login_anonymous_available();
  compute_leaves(0, 1);
  @ <div class="nomenclatureSidebox">
  @ Nomenclature:
  @ <ol>
  @ <li> An <a href="brlist">open branch</a> is a branch that has one or
  @ more <a href="leaves">open leaves.</a>
  @ The presence of open leaves presumably means
  @ that the branch is still being extended with new check-ins.</li>
  @ <li> A <a href="brlist?closed">closed branch</a> is a branch with only
  @ <a href="leaves?closed">closed leaves</a>.
  @ Closed branches are fixed and do not change (unless they are first
  @ reopened)</li>
  @ </ol>
  @ </div>

  cnt = 0;
  if( !showClosed ){
    db_prepare(&q,
      "SELECT DISTINCT value FROM tagxref"
      " WHERE tagid=%d AND value NOT NULL"
      "   AND rid IN leaves"
Changes to src/descendants.c.
314
315
316
317
318
319
320

321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
  }
  if( showClosed || showAll ){
    style_submenu_element("Open", "Open", "leaves");
  }
  style_header("Leaves");
  login_anonymous_available();
  compute_leaves(0, showAll ? 0 : showClosed ? 2 : 1);

  style_sidebox_begin("Nomenclature:", "33%");
  @ <ol>
  @ <li> A <b>leaf</b> is a check-in with no descendants.</li>
  @ <li> An <b>open leaf</b> is a leaf that does not have a "closed" tag
  @ and is thus assumed to still be in use.</li>
  @ <li> A <b>closed leaf</b> has a "closed" tag and is thus assumed to
  @ be historical and no longer in active use.</li>
  @ </ol>
  style_sidebox_end();

  if( showAll ){
    @ <h1>All leaves, both open and closed:</h1>
  }else if( showClosed ){
    @ <h1>Closed leaves:</h1>
  }else{
    @ <h1>Open leaves:</h1>







>
|







|







314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
  }
  if( showClosed || showAll ){
    style_submenu_element("Open", "Open", "leaves");
  }
  style_header("Leaves");
  login_anonymous_available();
  compute_leaves(0, showAll ? 0 : showClosed ? 2 : 1);
  @ <div class="nomenclatureSidebox">
  @ Nomenclature:
  @ <ol>
  @ <li> A <b>leaf</b> is a check-in with no descendants.</li>
  @ <li> An <b>open leaf</b> is a leaf that does not have a "closed" tag
  @ and is thus assumed to still be in use.</li>
  @ <li> A <b>closed leaf</b> has a "closed" tag and is thus assumed to
  @ be historical and no longer in active use.</li>
  @ </ol>
  @ </div>

  if( showAll ){
    @ <h1>All leaves, both open and closed:</h1>
  }else if( showClosed ){
    @ <h1>Closed leaves:</h1>
  }else{
    @ <h1>Open leaves:</h1>
Changes to src/setup.c.
908
909
910
911
912
913
914

915
916
917
918

919
920
921
922
923
924
925
  @ 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)
  @ /* internal page layout */

  @ %h(zTdTimelineTimeStampCell)
  @ %h(zTdTimelineOmitted)
  @ %h(zTdTimelineComment)
  @ %h(zTdTimelineLeafDsp)

  @ </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
924
925
926
927
  @ 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)
  @ /* internal page layout */
  @ %h(zTdTimelineTable)
  @ %h(zTdTimelineTimeStampCell)
  @ %h(zTdTimelineOmitted)
  @ %h(zTdTimelineComment)
  @ %h(zDivTimelineLeafDsp)
  @ %h(zDivNomenclatureSidebox)
  @ </pre></blockquote>
  style_footer();
  db_end_transaction(0);
}

/*
** WEBPAGE: setup_header
Changes to src/style.c.
377
378
379
380
381
382
383








384
385
386
387
388
389
390
@
@ /* 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 zTdTimelineTimeStampCell[] = 
@ /* The time column in timeline tables */
@ td.timelineTimeStampCell {
@   valign: top;
@   text-align: right;
@}







>
>
>
>
>
>
>
>







377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
@
@ /* 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 zTdTimelineTable[] = 
@ /* The time column in timeline tables */
@ table.timelineTable {
@   cellspacing: 0;
@   border: 0;
@   cellpadding: 0;
@}
;
const char zTdTimelineTimeStampCell[] = 
@ /* The time column in timeline tables */
@ td.timelineTimeStampCell {
@   valign: top;
@   text-align: right;
@}
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
427
428
429
430
431
432


433
434
435
436
437
438
439
const char zTdTimelineComment[] =
@ /* The comment cell in timeline tables */
@ td.timelineComment {
@   valign: top;
@   text-align: left;
@ }
;
const char zTdTimelineLeafDsp[] =
@ /* The leaf description in timeline tables */
@ div.timelineLeafDsp {
@   font-weight: bold;
@   display: inline;
@ }
;









 

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

  cgi_set_content_type("text/css");
  zCSS = db_get("css",(char*)zDefaultCSS);
  cgi_append_content(zCSS, -1);
  cgi_append_content("\n", -1);
  /* append internal classes, if not already in style sheet */


  if (!strstr(zCSS,"timelineTimeStampCell"))
    cgi_append_content(zTdTimelineTimeStampCell,-1);
  if (!strstr(zCSS,"timelineOmitted"))
    cgi_append_content(zTdTimelineOmitted,-1);
  if (!strstr(zCSS,"timelineComment"))
    cgi_append_content(zTdTimelineComment,-1);
  if (!strstr(zCSS,"timelineLeafDsp"))
    cgi_append_content(zTdTimelineLeafDsp,-1);


  g.isConst = 1;
}

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







|






>
>
>
>
>
>
>
>
>
|
>











>
>







|
>
>







407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
const char zTdTimelineComment[] =
@ /* The comment cell in timeline tables */
@ td.timelineComment {
@   valign: top;
@   text-align: left;
@ }
;
const char zDivTimelineLeafDsp[] =
@ /* The leaf description in timeline tables */
@ div.timelineLeafDsp {
@   font-weight: bold;
@   display: inline;
@ }
;
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){
  char *zCSS = 0;

  cgi_set_content_type("text/css");
  zCSS = db_get("css",(char*)zDefaultCSS);
  cgi_append_content(zCSS, -1);
  cgi_append_content("\n", -1);
  /* append internal classes, if not already in style sheet */
  if (!strstr(zCSS,"timelineTable"))
    cgi_append_content(zTdTimelineTable,-1);
  if (!strstr(zCSS,"timelineTimeStampCell"))
    cgi_append_content(zTdTimelineTimeStampCell,-1);
  if (!strstr(zCSS,"timelineOmitted"))
    cgi_append_content(zTdTimelineOmitted,-1);
  if (!strstr(zCSS,"timelineComment"))
    cgi_append_content(zTdTimelineComment,-1);
  if (!strstr(zCSS,"timelineLeafDsp"))
    cgi_append_content(zDivTimelineLeafDsp,-1);
  if (!strstr(zCSS,"nomenclatureSidebox"))
    cgi_append_content(zDivNomenclatureSidebox,-1);
  g.isConst = 1;
}

/*
** WEBPAGE: test_env
*/
void page_test_env(void){
Changes to src/timeline.c.
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
    wikiFlags = WIKI_INLINE | WIKI_NOBLOCK;
  }
  if( tmFlags & TIMELINE_GRAPH ){
    pGraph = graph_init();
    @ <div id="canvas" style="position:relative;width:1px;height:1px;"></div>
  }

  @ <table cellspacing=0 border=0 cellpadding=0>
  blob_zero(&comment);
  while( db_step(pQuery)==SQLITE_ROW ){
    int rid = db_column_int(pQuery, 0);
    const char *zUuid = db_column_text(pQuery, 1);
    int isLeaf = db_column_int(pQuery, 5);
    const char *zBgClr = db_column_text(pQuery, 6);
    const char *zDate = db_column_text(pQuery, 2);







|







190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
    wikiFlags = WIKI_INLINE | WIKI_NOBLOCK;
  }
  if( tmFlags & TIMELINE_GRAPH ){
    pGraph = graph_init();
    @ <div id="canvas" style="position:relative;width:1px;height:1px;"></div>
  }

  @ <table class="timelineTable">
  blob_zero(&comment);
  while( db_step(pQuery)==SQLITE_ROW ){
    int rid = db_column_int(pQuery, 0);
    const char *zUuid = db_column_text(pQuery, 1);
    int isLeaf = db_column_int(pQuery, 5);
    const char *zBgClr = db_column_text(pQuery, 6);
    const char *zDate = db_column_text(pQuery, 2);