Fossil SCM

Capitalize button labels for consistency with other pages. Change "Show Whitespace Differences" to "Show Whitespace Changes".

joel 2014-03-05 00:42 diff-eolws
Commit 756c187590dc9c4af284ac4c63d2d291e54ebfe3
Parent 0c670599bff5c70…
1 file changed +10 -10
~ src/info.c
M src/info.c
+10 -10
--- src/info.c
+++ src/info.c
@@ -681,33 +681,33 @@
681681
 }
682682
 diffFlags = construct_diff_flags(verboseFlag, sideBySide);
683683
 zW = (diffFlags&(DIFF_IGNORE_SOLWS|DIFF_IGNORE_EOLWS))?"&w":"";
684684
 if( verboseFlag ){
685685
 @ %z(xhref("class='button'","%R/%s/%T",zPageHide,zName))
686
- @ hide&nbsp;diffs</a>
686
+ @ Hide&nbsp;Diffs</a>
687687
 if( sideBySide ){
688688
 @ %z(xhref("class='button'","%R/%s/%T?sbs=0%s",zPage,zName,zW))
689
- @ unified&nbsp;diffs</a>
689
+ @ Unified&nbsp;Diffs</a>
690690
 }else{
691691
 @ %z(xhref("class='button'","%R/%s/%T?sbs=1%s",zPage,zName,zW))
692
- @ side-by-side&nbsp;diffs</a>
692
+ @ Side-by-Side&nbsp;Diffs</a>
693693
 }
694694
 if( *zW ){
695695
 @ %z(xhref("class='button'","%R/%s/%T?sbs=%d",zPage,zName,sideBySide))
696
- @ show&nbsp;whitespace&nbsp;differences</a>
696
+ @ Show&nbsp;Whitespace&nbsp;Changes</a>
697697
 }else{
698698
 @ %z(xhref("class='button'","%R/%s/%T?sbs=%d&w",zPage,zName,sideBySide))
699
- @ ignore&nbsp;whitespace</a>
699
+ @ Ignore&nbsp;Whitespace</a>
700700
 }
701701
 }else{
702702
 @ %z(xhref("class='button'","%R/%s/%T?sbs=0",zPage,zName))
703
- @ show&nbsp;unified&nbsp;diffs</a>
703
+ @ Show&nbsp;Unified&nbsp;Diffs</a>
704704
 @ %z(xhref("class='button'","%R/%s/%T?sbs=1",zPage,zName))
705
- @ show&nbsp;side-by-side&nbsp;diffs</a>
705
+ @ Show&nbsp;Side-by-Side&nbsp;Diffs</a>
706706
 }
707707
 @ %z(xhref("class='button'","%R/vpatch?from=%S&to=%S",zParent,zUuid))
708
- @ patch</a></div>
708
+ @ Patch</a></div>
709709
 if( pRe ){
710710
 @ <p><b>Only differences that match regular expression "%h(zRe)"
711711
 @ are shown.</b></p>
712712
 }
713713
 db_prepare(&q3,
@@ -996,11 +996,11 @@
996996
 "%R/vdiff?from=%T&to=%T&sbs=0%s%T%s",
997997
 zFrom, zTo,
998998
 zGlob ? "&glob=" : "", zGlob ? zGlob : "", zW);
999999
 }
10001000
 if( !sideBySide ){
1001
- style_submenu_element("Side-by-side Diff", "sbsdiff",
1001
+ style_submenu_element("Side-by-Side Diff", "sbsdiff",
10021002
 "%R/vdiff?from=%T&to=%T&sbs=1%s%T%s",
10031003
 zFrom, zTo,
10041004
 zGlob ? "&glob=" : "", zGlob ? zGlob : "", zW);
10051005
 }
10061006
 if( sideBySide || !verboseFlag ) {
@@ -1384,11 +1384,11 @@
13841384
13851385
 style_header("Diff");
13861386
 style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch",
13871387
 g.zTop, P("v1"), P("v2"));
13881388
 if( !sideBySide ){
1389
- style_submenu_element("Side-by-side Diff", "sbsdiff",
1389
+ style_submenu_element("Side-by-Side Diff", "sbsdiff",
13901390
 "%s/fdiff?v1=%T&v2=%T&sbs=1",
13911391
 g.zTop, P("v1"), P("v2"));
13921392
 }else{
13931393
 style_submenu_element("Unified Diff", "udiff",
13941394
 "%s/fdiff?v1=%T&v2=%T&sbs=0",
13951395
--- src/info.c
+++ src/info.c
@@ -681,33 +681,33 @@
681 }
682 diffFlags = construct_diff_flags(verboseFlag, sideBySide);
683 zW = (diffFlags&(DIFF_IGNORE_SOLWS|DIFF_IGNORE_EOLWS))?"&w":"";
684 if( verboseFlag ){
685 @ %z(xhref("class='button'","%R/%s/%T",zPageHide,zName))
686 @ hide&nbsp;diffs</a>
687 if( sideBySide ){
688 @ %z(xhref("class='button'","%R/%s/%T?sbs=0%s",zPage,zName,zW))
689 @ unified&nbsp;diffs</a>
690 }else{
691 @ %z(xhref("class='button'","%R/%s/%T?sbs=1%s",zPage,zName,zW))
692 @ side-by-side&nbsp;diffs</a>
693 }
694 if( *zW ){
695 @ %z(xhref("class='button'","%R/%s/%T?sbs=%d",zPage,zName,sideBySide))
696 @ show&nbsp;whitespace&nbsp;differences</a>
697 }else{
698 @ %z(xhref("class='button'","%R/%s/%T?sbs=%d&w",zPage,zName,sideBySide))
699 @ ignore&nbsp;whitespace</a>
700 }
701 }else{
702 @ %z(xhref("class='button'","%R/%s/%T?sbs=0",zPage,zName))
703 @ show&nbsp;unified&nbsp;diffs</a>
704 @ %z(xhref("class='button'","%R/%s/%T?sbs=1",zPage,zName))
705 @ show&nbsp;side-by-side&nbsp;diffs</a>
706 }
707 @ %z(xhref("class='button'","%R/vpatch?from=%S&to=%S",zParent,zUuid))
708 @ patch</a></div>
709 if( pRe ){
710 @ <p><b>Only differences that match regular expression "%h(zRe)"
711 @ are shown.</b></p>
712 }
713 db_prepare(&q3,
@@ -996,11 +996,11 @@
996 "%R/vdiff?from=%T&to=%T&sbs=0%s%T%s",
997 zFrom, zTo,
998 zGlob ? "&glob=" : "", zGlob ? zGlob : "", zW);
999 }
1000 if( !sideBySide ){
1001 style_submenu_element("Side-by-side Diff", "sbsdiff",
1002 "%R/vdiff?from=%T&to=%T&sbs=1%s%T%s",
1003 zFrom, zTo,
1004 zGlob ? "&glob=" : "", zGlob ? zGlob : "", zW);
1005 }
1006 if( sideBySide || !verboseFlag ) {
@@ -1384,11 +1384,11 @@
1384
1385 style_header("Diff");
1386 style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch",
1387 g.zTop, P("v1"), P("v2"));
1388 if( !sideBySide ){
1389 style_submenu_element("Side-by-side Diff", "sbsdiff",
1390 "%s/fdiff?v1=%T&v2=%T&sbs=1",
1391 g.zTop, P("v1"), P("v2"));
1392 }else{
1393 style_submenu_element("Unified Diff", "udiff",
1394 "%s/fdiff?v1=%T&v2=%T&sbs=0",
1395
--- src/info.c
+++ src/info.c
@@ -681,33 +681,33 @@
681 }
682 diffFlags = construct_diff_flags(verboseFlag, sideBySide);
683 zW = (diffFlags&(DIFF_IGNORE_SOLWS|DIFF_IGNORE_EOLWS))?"&w":"";
684 if( verboseFlag ){
685 @ %z(xhref("class='button'","%R/%s/%T",zPageHide,zName))
686 @ Hide&nbsp;Diffs</a>
687 if( sideBySide ){
688 @ %z(xhref("class='button'","%R/%s/%T?sbs=0%s",zPage,zName,zW))
689 @ Unified&nbsp;Diffs</a>
690 }else{
691 @ %z(xhref("class='button'","%R/%s/%T?sbs=1%s",zPage,zName,zW))
692 @ Side-by-Side&nbsp;Diffs</a>
693 }
694 if( *zW ){
695 @ %z(xhref("class='button'","%R/%s/%T?sbs=%d",zPage,zName,sideBySide))
696 @ Show&nbsp;Whitespace&nbsp;Changes</a>
697 }else{
698 @ %z(xhref("class='button'","%R/%s/%T?sbs=%d&w",zPage,zName,sideBySide))
699 @ Ignore&nbsp;Whitespace</a>
700 }
701 }else{
702 @ %z(xhref("class='button'","%R/%s/%T?sbs=0",zPage,zName))
703 @ Show&nbsp;Unified&nbsp;Diffs</a>
704 @ %z(xhref("class='button'","%R/%s/%T?sbs=1",zPage,zName))
705 @ Show&nbsp;Side-by-Side&nbsp;Diffs</a>
706 }
707 @ %z(xhref("class='button'","%R/vpatch?from=%S&to=%S",zParent,zUuid))
708 @ Patch</a></div>
709 if( pRe ){
710 @ <p><b>Only differences that match regular expression "%h(zRe)"
711 @ are shown.</b></p>
712 }
713 db_prepare(&q3,
@@ -996,11 +996,11 @@
996 "%R/vdiff?from=%T&to=%T&sbs=0%s%T%s",
997 zFrom, zTo,
998 zGlob ? "&glob=" : "", zGlob ? zGlob : "", zW);
999 }
1000 if( !sideBySide ){
1001 style_submenu_element("Side-by-Side Diff", "sbsdiff",
1002 "%R/vdiff?from=%T&to=%T&sbs=1%s%T%s",
1003 zFrom, zTo,
1004 zGlob ? "&glob=" : "", zGlob ? zGlob : "", zW);
1005 }
1006 if( sideBySide || !verboseFlag ) {
@@ -1384,11 +1384,11 @@
1384
1385 style_header("Diff");
1386 style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch",
1387 g.zTop, P("v1"), P("v2"));
1388 if( !sideBySide ){
1389 style_submenu_element("Side-by-Side Diff", "sbsdiff",
1390 "%s/fdiff?v1=%T&v2=%T&sbs=1",
1391 g.zTop, P("v1"), P("v2"));
1392 }else{
1393 style_submenu_element("Unified Diff", "udiff",
1394 "%s/fdiff?v1=%T&v2=%T&sbs=0",
1395

Keyboard Shortcuts

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