Fossil SCM

Add autofocus to search entry boxes.

drh 2015-02-04 13:32 trunk
Commit c799881474dde5e3c490cc550176eee0813de0da
Parent 188c62c2d591ce2…
3 files changed +8 -5 +1 -1 +1 -1
~ src/search.c ~ www/mkindex.tcl ~ www/permutedindex.html
M src/search.c
+8 -5
--- src/search.c
+++ src/search.c
@@ -886,34 +886,37 @@
886886
 ** The entry box is shown disabled if srchFlags is 0.
887887
 */
888888
 void search_screen(unsigned srchFlags, const char *zAction){
889889
 const char *zType = 0;
890890
 const char *zClass = 0;
891
- const char *zDisable;
891
+ const char *zDisable1;
892
+ const char *zDisable2;
892893
 const char *zPattern;
893894
 switch( srchFlags ){
894895
 case SRCH_CKIN: zType = " Check-ins"; zClass = "Ckin"; break;
895896
 case SRCH_DOC: zType = " Docs"; zClass = "Doc"; break;
896897
 case SRCH_TKT: zType = " Tickets"; zClass = "Tkt"; break;
897898
 case SRCH_WIKI: zType = " Wiki"; zClass = "Wiki"; break;
898899
 }
899900
 srchFlags = search_restrict(srchFlags);
900901
 if( srchFlags==0 ){
901
- zDisable = " disabled";
902
+ zDisable1 = " disabled";
903
+ zDisable2 = " disabled";
902904
 zPattern = "";
903905
 }else{
904
- zDisable = "";
906
+ zDisable1 = " autofocus";
907
+ zDisable2 = "";
905908
 zPattern = PD("s","");
906909
 }
907910
 @ <form method='GET' action='%s(zAction)'>
908911
 if( zClass ){
909912
 @ <div class='searchForm searchForm%s(zClass)'>
910913
 }else{
911914
 @ <div class='searchForm'>
912915
 }
913
- @ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable)>
914
- @ <input type="submit" value="Search%s(zType)"%s(zDisable)>
916
+ @ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable1)>
917
+ @ <input type="submit" value="Search%s(zType)"%s(zDisable2)>
915918
 if( srchFlags==0 ){
916919
 @ <p class="generalError">Search is disabled</p>
917920
 }
918921
 @ </div></form>
919922
 while( fossil_isspace(zPattern[0]) ) zPattern++;
920923
--- src/search.c
+++ src/search.c
@@ -886,34 +886,37 @@
886 ** The entry box is shown disabled if srchFlags is 0.
887 */
888 void search_screen(unsigned srchFlags, const char *zAction){
889 const char *zType = 0;
890 const char *zClass = 0;
891 const char *zDisable;
 
892 const char *zPattern;
893 switch( srchFlags ){
894 case SRCH_CKIN: zType = " Check-ins"; zClass = "Ckin"; break;
895 case SRCH_DOC: zType = " Docs"; zClass = "Doc"; break;
896 case SRCH_TKT: zType = " Tickets"; zClass = "Tkt"; break;
897 case SRCH_WIKI: zType = " Wiki"; zClass = "Wiki"; break;
898 }
899 srchFlags = search_restrict(srchFlags);
900 if( srchFlags==0 ){
901 zDisable = " disabled";
 
902 zPattern = "";
903 }else{
904 zDisable = "";
 
905 zPattern = PD("s","");
906 }
907 @ <form method='GET' action='%s(zAction)'>
908 if( zClass ){
909 @ <div class='searchForm searchForm%s(zClass)'>
910 }else{
911 @ <div class='searchForm'>
912 }
913 @ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable)>
914 @ <input type="submit" value="Search%s(zType)"%s(zDisable)>
915 if( srchFlags==0 ){
916 @ <p class="generalError">Search is disabled</p>
917 }
918 @ </div></form>
919 while( fossil_isspace(zPattern[0]) ) zPattern++;
920
--- src/search.c
+++ src/search.c
@@ -886,34 +886,37 @@
886 ** The entry box is shown disabled if srchFlags is 0.
887 */
888 void search_screen(unsigned srchFlags, const char *zAction){
889 const char *zType = 0;
890 const char *zClass = 0;
891 const char *zDisable1;
892 const char *zDisable2;
893 const char *zPattern;
894 switch( srchFlags ){
895 case SRCH_CKIN: zType = " Check-ins"; zClass = "Ckin"; break;
896 case SRCH_DOC: zType = " Docs"; zClass = "Doc"; break;
897 case SRCH_TKT: zType = " Tickets"; zClass = "Tkt"; break;
898 case SRCH_WIKI: zType = " Wiki"; zClass = "Wiki"; break;
899 }
900 srchFlags = search_restrict(srchFlags);
901 if( srchFlags==0 ){
902 zDisable1 = " disabled";
903 zDisable2 = " disabled";
904 zPattern = "";
905 }else{
906 zDisable1 = " autofocus";
907 zDisable2 = "";
908 zPattern = PD("s","");
909 }
910 @ <form method='GET' action='%s(zAction)'>
911 if( zClass ){
912 @ <div class='searchForm searchForm%s(zClass)'>
913 }else{
914 @ <div class='searchForm'>
915 }
916 @ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable1)>
917 @ <input type="submit" value="Search%s(zType)"%s(zDisable2)>
918 if( srchFlags==0 ){
919 @ <p class="generalError">Search is disabled</p>
920 }
921 @ </div></form>
922 while( fossil_isspace(zPattern[0]) ) zPattern++;
923
M www/mkindex.tcl
+1 -1
--- www/mkindex.tcl
+++ www/mkindex.tcl
@@ -84,11 +84,11 @@
8484
 puts $out \
8585
 "<div class='fossil-doc' data-title='Index Of Fossil Documentation'>"
8686
 puts $out {
8787
 <center>
8888
 <form action='../../../docsrch' method='GET'>
89
-<input type="text" name="s" size="40">
89
+<input type="text" name="s" size="40" autofocus>
9090
 <input type="submit" value="Search Docs">
9191
 </form>
9292
 </center>
9393
 <h2>Primary Documents:</h2>
9494
 <ul>
9595
--- www/mkindex.tcl
+++ www/mkindex.tcl
@@ -84,11 +84,11 @@
84 puts $out \
85 "<div class='fossil-doc' data-title='Index Of Fossil Documentation'>"
86 puts $out {
87 <center>
88 <form action='../../../docsrch' method='GET'>
89 <input type="text" name="s" size="40">
90 <input type="submit" value="Search Docs">
91 </form>
92 </center>
93 <h2>Primary Documents:</h2>
94 <ul>
95
--- www/mkindex.tcl
+++ www/mkindex.tcl
@@ -84,11 +84,11 @@
84 puts $out \
85 "<div class='fossil-doc' data-title='Index Of Fossil Documentation'>"
86 puts $out {
87 <center>
88 <form action='../../../docsrch' method='GET'>
89 <input type="text" name="s" size="40" autofocus>
90 <input type="submit" value="Search Docs">
91 </form>
92 </center>
93 <h2>Primary Documents:</h2>
94 <ul>
95
M www/permutedindex.html
+1 -1
--- www/permutedindex.html
+++ www/permutedindex.html
@@ -1,10 +1,10 @@
11
 <div class='fossil-doc' data-title='Index Of Fossil Documentation'>
22
33
 <center>
44
 <form action='../../../docsrch' method='GET'>
5
-<input type="text" name="s" size="40">
5
+<input type="text" name="s" size="40" autofocus>
66
 <input type="submit" value="Search Docs">
77
 </form>
88
 </center>
99
 <h2>Primary Documents:</h2>
1010
 <ul>
1111
--- www/permutedindex.html
+++ www/permutedindex.html
@@ -1,10 +1,10 @@
1 <div class='fossil-doc' data-title='Index Of Fossil Documentation'>
2
3 <center>
4 <form action='../../../docsrch' method='GET'>
5 <input type="text" name="s" size="40">
6 <input type="submit" value="Search Docs">
7 </form>
8 </center>
9 <h2>Primary Documents:</h2>
10 <ul>
11
--- www/permutedindex.html
+++ www/permutedindex.html
@@ -1,10 +1,10 @@
1 <div class='fossil-doc' data-title='Index Of Fossil Documentation'>
2
3 <center>
4 <form action='../../../docsrch' method='GET'>
5 <input type="text" name="s" size="40" autofocus>
6 <input type="submit" value="Search Docs">
7 </form>
8 </center>
9 <h2>Primary Documents:</h2>
10 <ul>
11

Keyboard Shortcuts

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