Fossil SCM

3 layouts in timeline moved to css

Ratte 2010-09-05 09:58 stv-skinning
Commit 5bba36b2bc2fb42bbf927495b91531eff1fe98b8
Parent b96d3e5c9f451cc…
3 files changed +1 +10 +3 -3
~ src/setup.c ~ src/style.c ~ src/timeline.c
M src/setup.c
+1
--- src/setup.c
+++ src/setup.c
@@ -913,10 +913,11 @@
913913
 @ %h(zDefaultCSS)
914914
 @ /* internal page layout */
915915
 @ %h(zTdTimelineTimeStampCell)
916916
 @ %h(zTdTimelineOmitted)
917917
 @ %h(zTdTimelineComment)
918
+ @ %h(zTdTimelineLeafDsp)
918919
 @ </pre></blockquote>
919920
 style_footer();
920921
 db_end_transaction(0);
921922
 }
922923
923924
--- src/setup.c
+++ src/setup.c
@@ -913,10 +913,11 @@
913 @ %h(zDefaultCSS)
914 @ /* internal page layout */
915 @ %h(zTdTimelineTimeStampCell)
916 @ %h(zTdTimelineOmitted)
917 @ %h(zTdTimelineComment)
 
918 @ </pre></blockquote>
919 style_footer();
920 db_end_transaction(0);
921 }
922
923
--- src/setup.c
+++ src/setup.c
@@ -913,10 +913,11 @@
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
M src/style.c
+10
--- src/style.c
+++ src/style.c
@@ -337,10 +337,11 @@
337337
 @ padding: 1px 1px 1px 1px;
338338
 @ font-size: 1.2em;
339339
 @ font-weight: bold;
340340
 @ background-color: #558195;
341341
 @ color: white;
342
+@ white-space: nowrap;
342343
 @ }
343344
 @
344345
 @ /* The "Date" that occurs on the left hand side of timelines */
345346
 @ div.divider {
346347
 @ background: #a1c4d4;
@@ -400,10 +401,17 @@
400401
 @ td.timelineComment {
401402
 @ valign: top;
402403
 @ text-align: left;
403404
 @ }
404405
 ;
406
+const char zTdTimelineLeafDsp[] =
407
+@ /* The leaf description in timeline tables */
408
+@ div.timelineLeafDsp {
409
+@ font-weight: bold;
410
+@ display: inline;
411
+@ }
412
+;
405413
406414
 /*
407415
 ** WEBPAGE: style.css
408416
 */
409417
 void page_style_css(void){
@@ -418,10 +426,12 @@
418426
 cgi_append_content(zTdTimelineTimeStampCell,-1);
419427
 if (!strstr(zCSS,"timelineOmitted"))
420428
 cgi_append_content(zTdTimelineOmitted,-1);
421429
 if (!strstr(zCSS,"timelineComment"))
422430
 cgi_append_content(zTdTimelineComment,-1);
431
+ if (!strstr(zCSS,"timelineLeafDsp"))
432
+ cgi_append_content(zTdTimelineLeafDsp,-1);
423433
 g.isConst = 1;
424434
 }
425435
426436
 /*
427437
 ** WEBPAGE: test_env
428438
--- src/style.c
+++ src/style.c
@@ -337,10 +337,11 @@
337 @ padding: 1px 1px 1px 1px;
338 @ font-size: 1.2em;
339 @ font-weight: bold;
340 @ background-color: #558195;
341 @ color: white;
 
342 @ }
343 @
344 @ /* The "Date" that occurs on the left hand side of timelines */
345 @ div.divider {
346 @ background: #a1c4d4;
@@ -400,10 +401,17 @@
400 @ td.timelineComment {
401 @ valign: top;
402 @ text-align: left;
403 @ }
404 ;
 
 
 
 
 
 
 
405
406 /*
407 ** WEBPAGE: style.css
408 */
409 void page_style_css(void){
@@ -418,10 +426,12 @@
418 cgi_append_content(zTdTimelineTimeStampCell,-1);
419 if (!strstr(zCSS,"timelineOmitted"))
420 cgi_append_content(zTdTimelineOmitted,-1);
421 if (!strstr(zCSS,"timelineComment"))
422 cgi_append_content(zTdTimelineComment,-1);
 
 
423 g.isConst = 1;
424 }
425
426 /*
427 ** WEBPAGE: test_env
428
--- src/style.c
+++ src/style.c
@@ -337,10 +337,11 @@
337 @ padding: 1px 1px 1px 1px;
338 @ font-size: 1.2em;
339 @ font-weight: bold;
340 @ background-color: #558195;
341 @ color: white;
342 @ white-space: nowrap;
343 @ }
344 @
345 @ /* The "Date" that occurs on the left hand side of timelines */
346 @ div.divider {
347 @ background: #a1c4d4;
@@ -400,10 +401,17 @@
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,10 +426,12 @@
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
M src/timeline.c
+3 -3
--- src/timeline.c
+++ src/timeline.c
@@ -230,11 +230,11 @@
230230
 continue;
231231
 }
232232
 if( memcmp(zDate, zPrevDate, 10) ){
233233
 sprintf(zPrevDate, "%.10s", zDate);
234234
 @ <tr><td>
235
- @ <div class="divider"><nobr>%s(zPrevDate)</nobr></div>
235
+ @ <div class="divider">%s(zPrevDate)</div>
236236
 @ </td></tr>
237237
 }
238238
 memcpy(zTime, &zDate[11], 5);
239239
 zTime[5] = 0;
240240
 @ <tr>
@@ -278,13 +278,13 @@
278278
 hyperlink_to_uuid(zUuid);
279279
 if( isLeaf ){
280280
 if( db_exists("SELECT 1 FROM tagxref"
281281
 " WHERE rid=%d AND tagid=%d AND tagtype>0",
282282
 rid, TAG_CLOSED) ){
283
- @ <b>Closed-Leaf:</b>
283
+ @ <div class="timelineLeafDsp">Closed-Leaf:</div>
284284
 }else{
285
- @ <b>Leaf:</b>
285
+ @ <div class="timelineLeafDsp">Leaf:</div>
286286
 }
287287
 }
288288
 }else if( (tmFlags & TIMELINE_ARTID)!=0 ){
289289
 hyperlink_to_uuid(zUuid);
290290
 }
291291
--- src/timeline.c
+++ src/timeline.c
@@ -230,11 +230,11 @@
230 continue;
231 }
232 if( memcmp(zDate, zPrevDate, 10) ){
233 sprintf(zPrevDate, "%.10s", zDate);
234 @ <tr><td>
235 @ <div class="divider"><nobr>%s(zPrevDate)</nobr></div>
236 @ </td></tr>
237 }
238 memcpy(zTime, &zDate[11], 5);
239 zTime[5] = 0;
240 @ <tr>
@@ -278,13 +278,13 @@
278 hyperlink_to_uuid(zUuid);
279 if( isLeaf ){
280 if( db_exists("SELECT 1 FROM tagxref"
281 " WHERE rid=%d AND tagid=%d AND tagtype>0",
282 rid, TAG_CLOSED) ){
283 @ <b>Closed-Leaf:</b>
284 }else{
285 @ <b>Leaf:</b>
286 }
287 }
288 }else if( (tmFlags & TIMELINE_ARTID)!=0 ){
289 hyperlink_to_uuid(zUuid);
290 }
291
--- src/timeline.c
+++ src/timeline.c
@@ -230,11 +230,11 @@
230 continue;
231 }
232 if( memcmp(zDate, zPrevDate, 10) ){
233 sprintf(zPrevDate, "%.10s", zDate);
234 @ <tr><td>
235 @ <div class="divider">%s(zPrevDate)</div>
236 @ </td></tr>
237 }
238 memcpy(zTime, &zDate[11], 5);
239 zTime[5] = 0;
240 @ <tr>
@@ -278,13 +278,13 @@
278 hyperlink_to_uuid(zUuid);
279 if( isLeaf ){
280 if( db_exists("SELECT 1 FROM tagxref"
281 " WHERE rid=%d AND tagid=%d AND tagtype>0",
282 rid, TAG_CLOSED) ){
283 @ <div class="timelineLeafDsp">Closed-Leaf:</div>
284 }else{
285 @ <div class="timelineLeafDsp">Leaf:</div>
286 }
287 }
288 }else if( (tmFlags & TIMELINE_ARTID)!=0 ){
289 hyperlink_to_uuid(zUuid);
290 }
291

Keyboard Shortcuts

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