Fossil SCM

sidebox via css

Ratte 2010-09-05 10:59 stv-skinning
Commit ff3b6b323b619187a4a117d8f48f3fc692fe4083
Parent 5bba36b2bc2fb42…
5 files changed +3 -2 +3 -2 +3 -1 +25 -3 +1 -1
~ src/branch.c ~ src/descendants.c ~ src/setup.c ~ src/style.c ~ src/timeline.c
M src/branch.c
+3 -2
--- src/branch.c
+++ src/branch.c
@@ -229,11 +229,12 @@
229229
 }else{
230230
 style_submenu_element("Closed","Closed","brlist?closed");
231231
 }
232232
 login_anonymous_available();
233233
 compute_leaves(0, 1);
234
- style_sidebox_begin("Nomenclature:", "33%");
234
+ @ <div class="nomenclatureSidebox">
235
+ @ Nomenclature:
235236
 @ <ol>
236237
 @ <li> An <a href="brlist">open branch</a> is a branch that has one or
237238
 @ more <a href="leaves">open leaves.</a>
238239
 @ The presence of open leaves presumably means
239240
 @ that the branch is still being extended with new check-ins.</li>
@@ -240,11 +241,11 @@
240241
 @ <li> A <a href="brlist?closed">closed branch</a> is a branch with only
241242
 @ <a href="leaves?closed">closed leaves</a>.
242243
 @ Closed branches are fixed and do not change (unless they are first
243244
 @ reopened)</li>
244245
 @ </ol>
245
- style_sidebox_end();
246
+ @ </div>
246247
247248
 cnt = 0;
248249
 if( !showClosed ){
249250
 db_prepare(&q,
250251
 "SELECT DISTINCT value FROM tagxref"
251252
--- src/branch.c
+++ src/branch.c
@@ -229,11 +229,12 @@
229 }else{
230 style_submenu_element("Closed","Closed","brlist?closed");
231 }
232 login_anonymous_available();
233 compute_leaves(0, 1);
234 style_sidebox_begin("Nomenclature:", "33%");
 
235 @ <ol>
236 @ <li> An <a href="brlist">open branch</a> is a branch that has one or
237 @ more <a href="leaves">open leaves.</a>
238 @ The presence of open leaves presumably means
239 @ that the branch is still being extended with new check-ins.</li>
@@ -240,11 +241,11 @@
240 @ <li> A <a href="brlist?closed">closed branch</a> is a branch with only
241 @ <a href="leaves?closed">closed leaves</a>.
242 @ Closed branches are fixed and do not change (unless they are first
243 @ reopened)</li>
244 @ </ol>
245 style_sidebox_end();
246
247 cnt = 0;
248 if( !showClosed ){
249 db_prepare(&q,
250 "SELECT DISTINCT value FROM tagxref"
251
--- src/branch.c
+++ src/branch.c
@@ -229,11 +229,12 @@
229 }else{
230 style_submenu_element("Closed","Closed","brlist?closed");
231 }
232 login_anonymous_available();
233 compute_leaves(0, 1);
234 @ <div class="nomenclatureSidebox">
235 @ Nomenclature:
236 @ <ol>
237 @ <li> An <a href="brlist">open branch</a> is a branch that has one or
238 @ more <a href="leaves">open leaves.</a>
239 @ The presence of open leaves presumably means
240 @ that the branch is still being extended with new check-ins.</li>
@@ -240,11 +241,11 @@
241 @ <li> A <a href="brlist?closed">closed branch</a> is a branch with only
242 @ <a href="leaves?closed">closed leaves</a>.
243 @ Closed branches are fixed and do not change (unless they are first
244 @ reopened)</li>
245 @ </ol>
246 @ </div>
247
248 cnt = 0;
249 if( !showClosed ){
250 db_prepare(&q,
251 "SELECT DISTINCT value FROM tagxref"
252
M src/descendants.c
+3 -2
--- src/descendants.c
+++ src/descendants.c
@@ -316,19 +316,20 @@
316316
 style_submenu_element("Open", "Open", "leaves");
317317
 }
318318
 style_header("Leaves");
319319
 login_anonymous_available();
320320
 compute_leaves(0, showAll ? 0 : showClosed ? 2 : 1);
321
- style_sidebox_begin("Nomenclature:", "33%");
321
+ @ <div class="nomenclatureSidebox">
322
+ @ Nomenclature:
322323
 @ <ol>
323324
 @ <li> A <b>leaf</b> is a check-in with no descendants.</li>
324325
 @ <li> An <b>open leaf</b> is a leaf that does not have a "closed" tag
325326
 @ and is thus assumed to still be in use.</li>
326327
 @ <li> A <b>closed leaf</b> has a "closed" tag and is thus assumed to
327328
 @ be historical and no longer in active use.</li>
328329
 @ </ol>
329
- style_sidebox_end();
330
+ @ </div>
330331
331332
 if( showAll ){
332333
 @ <h1>All leaves, both open and closed:</h1>
333334
 }else if( showClosed ){
334335
 @ <h1>Closed leaves:</h1>
335336
--- src/descendants.c
+++ src/descendants.c
@@ -316,19 +316,20 @@
316 style_submenu_element("Open", "Open", "leaves");
317 }
318 style_header("Leaves");
319 login_anonymous_available();
320 compute_leaves(0, showAll ? 0 : showClosed ? 2 : 1);
321 style_sidebox_begin("Nomenclature:", "33%");
 
322 @ <ol>
323 @ <li> A <b>leaf</b> is a check-in with no descendants.</li>
324 @ <li> An <b>open leaf</b> is a leaf that does not have a "closed" tag
325 @ and is thus assumed to still be in use.</li>
326 @ <li> A <b>closed leaf</b> has a "closed" tag and is thus assumed to
327 @ be historical and no longer in active use.</li>
328 @ </ol>
329 style_sidebox_end();
330
331 if( showAll ){
332 @ <h1>All leaves, both open and closed:</h1>
333 }else if( showClosed ){
334 @ <h1>Closed leaves:</h1>
335
--- src/descendants.c
+++ src/descendants.c
@@ -316,19 +316,20 @@
316 style_submenu_element("Open", "Open", "leaves");
317 }
318 style_header("Leaves");
319 login_anonymous_available();
320 compute_leaves(0, showAll ? 0 : showClosed ? 2 : 1);
321 @ <div class="nomenclatureSidebox">
322 @ Nomenclature:
323 @ <ol>
324 @ <li> A <b>leaf</b> is a check-in with no descendants.</li>
325 @ <li> An <b>open leaf</b> is a leaf that does not have a "closed" tag
326 @ and is thus assumed to still be in use.</li>
327 @ <li> A <b>closed leaf</b> has a "closed" tag and is thus assumed to
328 @ be historical and no longer in active use.</li>
329 @ </ol>
330 @ </div>
331
332 if( showAll ){
333 @ <h1>All leaves, both open and closed:</h1>
334 }else if( showClosed ){
335 @ <h1>Closed leaves:</h1>
336
M src/setup.c
+3 -1
--- src/setup.c
+++ src/setup.c
@@ -910,14 +910,16 @@
910910
 @ See also the <a href="setup_header">header</a> and
911911
 @ <a href="setup_footer">footer</a> editing screens.
912912
 @ <blockquote><pre>
913913
 @ %h(zDefaultCSS)
914914
 @ /* internal page layout */
915
+ @ %h(zTdTimelineTable)
915916
 @ %h(zTdTimelineTimeStampCell)
916917
 @ %h(zTdTimelineOmitted)
917918
 @ %h(zTdTimelineComment)
918
- @ %h(zTdTimelineLeafDsp)
919
+ @ %h(zDivTimelineLeafDsp)
920
+ @ %h(zDivNomenclatureSidebox)
919921
 @ </pre></blockquote>
920922
 style_footer();
921923
 db_end_transaction(0);
922924
 }
923925
924926
--- src/setup.c
+++ src/setup.c
@@ -910,14 +910,16 @@
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 @ /* internal page layout */
 
915 @ %h(zTdTimelineTimeStampCell)
916 @ %h(zTdTimelineOmitted)
917 @ %h(zTdTimelineComment)
918 @ %h(zTdTimelineLeafDsp)
 
919 @ </pre></blockquote>
920 style_footer();
921 db_end_transaction(0);
922 }
923
924
--- src/setup.c
+++ src/setup.c
@@ -910,14 +910,16 @@
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 @ /* internal page layout */
915 @ %h(zTdTimelineTable)
916 @ %h(zTdTimelineTimeStampCell)
917 @ %h(zTdTimelineOmitted)
918 @ %h(zTdTimelineComment)
919 @ %h(zDivTimelineLeafDsp)
920 @ %h(zDivNomenclatureSidebox)
921 @ </pre></blockquote>
922 style_footer();
923 db_end_transaction(0);
924 }
925
926
M src/style.c
+25 -3
--- src/style.c
+++ src/style.c
@@ -379,10 +379,18 @@
379379
 @ table.label-value th {
380380
 @ vertical-align: top;
381381
 @ text-align: right;
382382
 @ padding: 0.2ex 2ex;
383383
 @ }
384
+;
385
+const char zTdTimelineTable[] =
386
+@ /* The time column in timeline tables */
387
+@ table.timelineTable {
388
+@ cellspacing: 0;
389
+@ border: 0;
390
+@ cellpadding: 0;
391
+@}
384392
 ;
385393
 const char zTdTimelineTimeStampCell[] =
386394
 @ /* The time column in timeline tables */
387395
 @ td.timelineTimeStampCell {
388396
 @ valign: top;
@@ -401,18 +409,28 @@
401409
 @ td.timelineComment {
402410
 @ valign: top;
403411
 @ text-align: left;
404412
 @ }
405413
 ;
406
-const char zTdTimelineLeafDsp[] =
414
+const char zDivTimelineLeafDsp[] =
407415
 @ /* The leaf description in timeline tables */
408416
 @ div.timelineLeafDsp {
409417
 @ font-weight: bold;
410418
 @ display: inline;
411419
 @ }
412420
 ;
413
-
421
+const char zDivNomenclatureSidebox[] =
422
+@ /* The nomenclature sidebox for branches,.. */
423
+@ div.nomenclatureSidebox {
424
+@ float: right;
425
+@ width: 33%;
426
+@ border-width: medium;
427
+@ border-style: double;
428
+@ margin: 10;
429
+@ }
430
+;
431
+
414432
 /*
415433
 ** WEBPAGE: style.css
416434
 */
417435
 void page_style_css(void){
418436
 char *zCSS = 0;
@@ -420,18 +438,22 @@
420438
 cgi_set_content_type("text/css");
421439
 zCSS = db_get("css",(char*)zDefaultCSS);
422440
 cgi_append_content(zCSS, -1);
423441
 cgi_append_content("\n", -1);
424442
 /* append internal classes, if not already in style sheet */
443
+ if (!strstr(zCSS,"timelineTable"))
444
+ cgi_append_content(zTdTimelineTable,-1);
425445
 if (!strstr(zCSS,"timelineTimeStampCell"))
426446
 cgi_append_content(zTdTimelineTimeStampCell,-1);
427447
 if (!strstr(zCSS,"timelineOmitted"))
428448
 cgi_append_content(zTdTimelineOmitted,-1);
429449
 if (!strstr(zCSS,"timelineComment"))
430450
 cgi_append_content(zTdTimelineComment,-1);
431451
 if (!strstr(zCSS,"timelineLeafDsp"))
432
- cgi_append_content(zTdTimelineLeafDsp,-1);
452
+ cgi_append_content(zDivTimelineLeafDsp,-1);
453
+ if (!strstr(zCSS,"nomenclatureSidebox"))
454
+ cgi_append_content(zDivNomenclatureSidebox,-1);
433455
 g.isConst = 1;
434456
 }
435457
436458
 /*
437459
 ** WEBPAGE: test_env
438460
--- src/style.c
+++ src/style.c
@@ -379,10 +379,18 @@
379 @ table.label-value th {
380 @ vertical-align: top;
381 @ text-align: right;
382 @ padding: 0.2ex 2ex;
383 @ }
 
 
 
 
 
 
 
 
384 ;
385 const char zTdTimelineTimeStampCell[] =
386 @ /* The time column in timeline tables */
387 @ td.timelineTimeStampCell {
388 @ valign: top;
@@ -401,18 +409,28 @@
401 @ td.timelineComment {
402 @ valign: top;
403 @ text-align: left;
404 @ }
405 ;
406 const char zTdTimelineLeafDsp[] =
407 @ /* The leaf description in timeline tables */
408 @ div.timelineLeafDsp {
409 @ font-weight: bold;
410 @ display: inline;
411 @ }
412 ;
413
 
 
 
 
 
 
 
 
 
 
414 /*
415 ** WEBPAGE: style.css
416 */
417 void page_style_css(void){
418 char *zCSS = 0;
@@ -420,18 +438,22 @@
420 cgi_set_content_type("text/css");
421 zCSS = db_get("css",(char*)zDefaultCSS);
422 cgi_append_content(zCSS, -1);
423 cgi_append_content("\n", -1);
424 /* append internal classes, if not already in style sheet */
 
 
425 if (!strstr(zCSS,"timelineTimeStampCell"))
426 cgi_append_content(zTdTimelineTimeStampCell,-1);
427 if (!strstr(zCSS,"timelineOmitted"))
428 cgi_append_content(zTdTimelineOmitted,-1);
429 if (!strstr(zCSS,"timelineComment"))
430 cgi_append_content(zTdTimelineComment,-1);
431 if (!strstr(zCSS,"timelineLeafDsp"))
432 cgi_append_content(zTdTimelineLeafDsp,-1);
 
 
433 g.isConst = 1;
434 }
435
436 /*
437 ** WEBPAGE: test_env
438
--- src/style.c
+++ src/style.c
@@ -379,10 +379,18 @@
379 @ table.label-value th {
380 @ vertical-align: top;
381 @ text-align: right;
382 @ padding: 0.2ex 2ex;
383 @ }
384 ;
385 const char zTdTimelineTable[] =
386 @ /* The time column in timeline tables */
387 @ table.timelineTable {
388 @ cellspacing: 0;
389 @ border: 0;
390 @ cellpadding: 0;
391 @}
392 ;
393 const char zTdTimelineTimeStampCell[] =
394 @ /* The time column in timeline tables */
395 @ td.timelineTimeStampCell {
396 @ valign: top;
@@ -401,18 +409,28 @@
409 @ td.timelineComment {
410 @ valign: top;
411 @ text-align: left;
412 @ }
413 ;
414 const char zDivTimelineLeafDsp[] =
415 @ /* The leaf description in timeline tables */
416 @ div.timelineLeafDsp {
417 @ font-weight: bold;
418 @ display: inline;
419 @ }
420 ;
421 const char zDivNomenclatureSidebox[] =
422 @ /* The nomenclature sidebox for branches,.. */
423 @ div.nomenclatureSidebox {
424 @ float: right;
425 @ width: 33%;
426 @ border-width: medium;
427 @ border-style: double;
428 @ margin: 10;
429 @ }
430 ;
431
432 /*
433 ** WEBPAGE: style.css
434 */
435 void page_style_css(void){
436 char *zCSS = 0;
@@ -420,18 +438,22 @@
438 cgi_set_content_type("text/css");
439 zCSS = db_get("css",(char*)zDefaultCSS);
440 cgi_append_content(zCSS, -1);
441 cgi_append_content("\n", -1);
442 /* append internal classes, if not already in style sheet */
443 if (!strstr(zCSS,"timelineTable"))
444 cgi_append_content(zTdTimelineTable,-1);
445 if (!strstr(zCSS,"timelineTimeStampCell"))
446 cgi_append_content(zTdTimelineTimeStampCell,-1);
447 if (!strstr(zCSS,"timelineOmitted"))
448 cgi_append_content(zTdTimelineOmitted,-1);
449 if (!strstr(zCSS,"timelineComment"))
450 cgi_append_content(zTdTimelineComment,-1);
451 if (!strstr(zCSS,"timelineLeafDsp"))
452 cgi_append_content(zDivTimelineLeafDsp,-1);
453 if (!strstr(zCSS,"nomenclatureSidebox"))
454 cgi_append_content(zDivNomenclatureSidebox,-1);
455 g.isConst = 1;
456 }
457
458 /*
459 ** WEBPAGE: test_env
460
M src/timeline.c
+1 -1
--- src/timeline.c
+++ src/timeline.c
@@ -192,11 +192,11 @@
192192
 if( tmFlags & TIMELINE_GRAPH ){
193193
 pGraph = graph_init();
194194
 @ <div id="canvas" style="position:relative;width:1px;height:1px;"></div>
195195
 }
196196
197
- @ <table cellspacing=0 border=0 cellpadding=0>
197
+ @ <table class="timelineTable">
198198
 blob_zero(&comment);
199199
 while( db_step(pQuery)==SQLITE_ROW ){
200200
 int rid = db_column_int(pQuery, 0);
201201
 const char *zUuid = db_column_text(pQuery, 1);
202202
 int isLeaf = db_column_int(pQuery, 5);
203203
--- src/timeline.c
+++ src/timeline.c
@@ -192,11 +192,11 @@
192 if( tmFlags & TIMELINE_GRAPH ){
193 pGraph = graph_init();
194 @ <div id="canvas" style="position:relative;width:1px;height:1px;"></div>
195 }
196
197 @ <table cellspacing=0 border=0 cellpadding=0>
198 blob_zero(&comment);
199 while( db_step(pQuery)==SQLITE_ROW ){
200 int rid = db_column_int(pQuery, 0);
201 const char *zUuid = db_column_text(pQuery, 1);
202 int isLeaf = db_column_int(pQuery, 5);
203
--- src/timeline.c
+++ src/timeline.c
@@ -192,11 +192,11 @@
192 if( tmFlags & TIMELINE_GRAPH ){
193 pGraph = graph_init();
194 @ <div id="canvas" style="position:relative;width:1px;height:1px;"></div>
195 }
196
197 @ <table class="timelineTable">
198 blob_zero(&comment);
199 while( db_step(pQuery)==SQLITE_ROW ){
200 int rid = db_column_int(pQuery, 0);
201 const char *zUuid = db_column_text(pQuery, 1);
202 int isLeaf = db_column_int(pQuery, 5);
203

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button