Fossil SCM

Minor revisions to the timeline controls to permit for easier reading.

mistachkin 2015-02-06 19:35 UTC trunk
Commit 7d20d72af8ab3c1510286a37fcd250466fe36cfe
Parent d9dfe11d0c8f859…
2 files changed +4 -2 +4 -4
~ src/style.c ~ src/timeline.c
M src/style.c
+4 -2
--- src/style.c
+++ src/style.c
@@ -504,25 +504,27 @@
504504
 cgi_tag_query_parameter(zQPN);
505505
 switch( aSubmenuCtrl[i].eType ){
506506
 case FF_ENTRY: {
507507
 cgi_printf(
508508
 "<span class='submenuctrl'>"
509
- "%h:&nbsp;<input type='text' name='%s' size='%d' "
509
+ "%h%s<input type='text' name='%s' size='%d' "
510510
 "value='%h'></span>\n",
511511
 aSubmenuCtrl[i].zLabel,
512
+ aSubmenuCtrl[i].zLabel ? ":&nbsp;" : "",
512513
 zQPN,
513514
 aSubmenuCtrl[i].iSize,
514515
 PD(zQPN,"")
515516
 );
516517
 break;
517518
 }
518519
 case FF_CKBOX: {
519520
 cgi_printf(
520521
 "<span class='submenuctrl'>"
521
- "%h:&nbsp;<input type='checkbox' name='%s'%s "
522
+ "%h%s<input type='checkbox' name='%s'%s "
522523
 "onchange='gebi(\"f01\").submit();'></span>\n",
523524
 aSubmenuCtrl[i].zLabel,
525
+ aSubmenuCtrl[i].zLabel ? ":&nbsp;" : "",
524526
 zQPN,
525527
 PB(zQPN) ? " checked":""
526528
 );
527529
 break;
528530
 }
529531
--- src/style.c
+++ src/style.c
@@ -504,25 +504,27 @@
504 cgi_tag_query_parameter(zQPN);
505 switch( aSubmenuCtrl[i].eType ){
506 case FF_ENTRY: {
507 cgi_printf(
508 "<span class='submenuctrl'>"
509 "%h:&nbsp;<input type='text' name='%s' size='%d' "
510 "value='%h'></span>\n",
511 aSubmenuCtrl[i].zLabel,
 
512 zQPN,
513 aSubmenuCtrl[i].iSize,
514 PD(zQPN,"")
515 );
516 break;
517 }
518 case FF_CKBOX: {
519 cgi_printf(
520 "<span class='submenuctrl'>"
521 "%h:&nbsp;<input type='checkbox' name='%s'%s "
522 "onchange='gebi(\"f01\").submit();'></span>\n",
523 aSubmenuCtrl[i].zLabel,
 
524 zQPN,
525 PB(zQPN) ? " checked":""
526 );
527 break;
528 }
529
--- src/style.c
+++ src/style.c
@@ -504,25 +504,27 @@
504 cgi_tag_query_parameter(zQPN);
505 switch( aSubmenuCtrl[i].eType ){
506 case FF_ENTRY: {
507 cgi_printf(
508 "<span class='submenuctrl'>"
509 "%h%s<input type='text' name='%s' size='%d' "
510 "value='%h'></span>\n",
511 aSubmenuCtrl[i].zLabel,
512 aSubmenuCtrl[i].zLabel ? ":&nbsp;" : "",
513 zQPN,
514 aSubmenuCtrl[i].iSize,
515 PD(zQPN,"")
516 );
517 break;
518 }
519 case FF_CKBOX: {
520 cgi_printf(
521 "<span class='submenuctrl'>"
522 "%h%s<input type='checkbox' name='%s'%s "
523 "onchange='gebi(\"f01\").submit();'></span>\n",
524 aSubmenuCtrl[i].zLabel,
525 aSubmenuCtrl[i].zLabel ? ":&nbsp;" : "",
526 zQPN,
527 PB(zQPN) ? " checked":""
528 );
529 break;
530 }
531
M src/timeline.c
+4 -4
--- src/timeline.c
+++ src/timeline.c
@@ -1309,13 +1309,13 @@
13091309
 if( p_rid ){
13101310
 /* If both p= and d= are set, we don't have the uuid of d yet. */
13111311
 zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", d_rid);
13121312
 }
13131313
 }
1314
- style_submenu_binary("v","With Files","Without Files");
1315
- style_submenu_entry("n","Lines",1);
1314
+ style_submenu_entry("n",0,1);
13161315
 timeline_y_submenu();
1316
+ style_submenu_binary("v","With Files","Without Files");
13171317
 }else if( f_rid && g.perm.Read ){
13181318
 /* If f= is present, ignore all other parameters other than n= */
13191319
 char *zUuid;
13201320
 db_multi_exec(
13211321
 "CREATE TEMP TABLE IF NOT EXISTS ok(rid INTEGER PRIMARY KEY);"
@@ -1551,13 +1551,13 @@
15511551
 if( zType[0]=='a' || zType[0]=='c' ){
15521552
 if( (tmFlags & TIMELINE_UNHIDE)==0 ){
15531553
 timeline_submenu(&url, "Unhide", "unhide", "", 0);
15541554
 }
15551555
 }
1556
- style_submenu_binary("v","With Files","Without Files");
1556
+ style_submenu_entry("n",0,1);
15571557
 if( zUses==0 ) timeline_y_submenu();
1558
- style_submenu_entry("n","Lines",1);
1558
+ style_submenu_binary("v","With Files","Without Files");
15591559
 }
15601560
 }
15611561
 if( P("showsql") ){
15621562
 @ <blockquote>%h(blob_sql_text(&sql))</blockquote>
15631563
 }
15641564
--- src/timeline.c
+++ src/timeline.c
@@ -1309,13 +1309,13 @@
1309 if( p_rid ){
1310 /* If both p= and d= are set, we don't have the uuid of d yet. */
1311 zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", d_rid);
1312 }
1313 }
1314 style_submenu_binary("v","With Files","Without Files");
1315 style_submenu_entry("n","Lines",1);
1316 timeline_y_submenu();
 
1317 }else if( f_rid && g.perm.Read ){
1318 /* If f= is present, ignore all other parameters other than n= */
1319 char *zUuid;
1320 db_multi_exec(
1321 "CREATE TEMP TABLE IF NOT EXISTS ok(rid INTEGER PRIMARY KEY);"
@@ -1551,13 +1551,13 @@
1551 if( zType[0]=='a' || zType[0]=='c' ){
1552 if( (tmFlags & TIMELINE_UNHIDE)==0 ){
1553 timeline_submenu(&url, "Unhide", "unhide", "", 0);
1554 }
1555 }
1556 style_submenu_binary("v","With Files","Without Files");
1557 if( zUses==0 ) timeline_y_submenu();
1558 style_submenu_entry("n","Lines",1);
1559 }
1560 }
1561 if( P("showsql") ){
1562 @ <blockquote>%h(blob_sql_text(&sql))</blockquote>
1563 }
1564
--- src/timeline.c
+++ src/timeline.c
@@ -1309,13 +1309,13 @@
1309 if( p_rid ){
1310 /* If both p= and d= are set, we don't have the uuid of d yet. */
1311 zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", d_rid);
1312 }
1313 }
1314 style_submenu_entry("n",0,1);
 
1315 timeline_y_submenu();
1316 style_submenu_binary("v","With Files","Without Files");
1317 }else if( f_rid && g.perm.Read ){
1318 /* If f= is present, ignore all other parameters other than n= */
1319 char *zUuid;
1320 db_multi_exec(
1321 "CREATE TEMP TABLE IF NOT EXISTS ok(rid INTEGER PRIMARY KEY);"
@@ -1551,13 +1551,13 @@
1551 if( zType[0]=='a' || zType[0]=='c' ){
1552 if( (tmFlags & TIMELINE_UNHIDE)==0 ){
1553 timeline_submenu(&url, "Unhide", "unhide", "", 0);
1554 }
1555 }
1556 style_submenu_entry("n",0,1);
1557 if( zUses==0 ) timeline_y_submenu();
1558 style_submenu_binary("v","With Files","Without Files");
1559 }
1560 }
1561 if( P("showsql") ){
1562 @ <blockquote>%h(blob_sql_text(&sql))</blockquote>
1563 }
1564

Keyboard Shortcuts

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