Fossil SCM
Improvements to the title on the /help webpage.
Commit
e28cc7373a6698f5bf6e303f602e97e695bc619beb200e4605c887f9153770e4
Parent
0150eda979ee867…
1 file changed
+14
-9
+14
-9
| --- src/dispatch.c | ||
| +++ src/dispatch.c | ||
| @@ -838,30 +838,35 @@ | ||
| 838 | 838 | if( zCmd && *zCmd ){ |
| 839 | 839 | int rc; |
| 840 | 840 | const CmdOrPage *pCmd = 0; |
| 841 | 841 | |
| 842 | 842 | style_set_current_feature("tkt"); |
| 843 | - style_header("Help: %s", zCmd); | |
| 844 | - | |
| 845 | - style_submenu_element("Command-List", "%R/help"); | |
| 843 | + style_submenu_element("Topic-List", "%R/help"); | |
| 846 | 844 | if( search_restrict(SRCH_HELP)!=0 ){ |
| 847 | 845 | style_submenu_element("Search","%R/search?y=h"); |
| 848 | 846 | } |
| 849 | 847 | rc = dispatch_name_search(zCmd, CMDFLAG_ANY|CMDFLAG_PREFIX, &pCmd); |
| 850 | - if( *zCmd=='/' ){ | |
| 848 | + if( pCmd ){ | |
| 849 | + style_header("Help: %s", pCmd->zName); | |
| 850 | + }else{ | |
| 851 | + style_header("Help"); | |
| 852 | + } | |
| 853 | + if( pCmd==0 ){ | |
| 854 | + /* No <h1> line in this case */ | |
| 855 | + }else if( *zCmd=='/' ){ | |
| 851 | 856 | /* Some of the webpages require query parameters in order to work. |
| 852 | 857 | ** @ <h1>The "<a href='%R%s(zCmd)'>%s(zCmd)</a>" page:</h1> */ |
| 853 | - @ <h1>The "%h(zCmd)" page:</h1> | |
| 858 | + @ <h1>The "%h(pCmd->zName)" page:</h1> | |
| 854 | 859 | }else if( rc==0 && (pCmd->eCmdFlags & CMDFLAG_SETTING)!=0 ){ |
| 855 | 860 | @ <h1>The "%h(pCmd->zName)" setting:</h1> |
| 856 | 861 | }else{ |
| 857 | - @ <h1>The "%h(zCmd)" command:</h1> | |
| 862 | + @ <h1>The "%h(pCmd->zName)" command:</h1> | |
| 858 | 863 | } |
| 859 | - if( rc==1 ){ | |
| 860 | - @ unknown command: %h(zCmd) | |
| 864 | + if( rc==1 || (rc==2 && zCmd[0]=='/') ){ | |
| 865 | + @ Unknown topic: "%h(zCmd)" | |
| 861 | 866 | }else if( rc==2 ){ |
| 862 | - @ ambiguous command prefix: %h(zCmd) | |
| 867 | + @ Ambiguous prefix: "%h(zCmd)" | |
| 863 | 868 | }else{ |
| 864 | 869 | if( pCmd->zHelp[0]==0 ){ |
| 865 | 870 | @ No help available for "%h(pCmd->zName)" |
| 866 | 871 | }else if( P("plaintext") ){ |
| 867 | 872 | Blob txt; |
| 868 | 873 |
| --- src/dispatch.c | |
| +++ src/dispatch.c | |
| @@ -838,30 +838,35 @@ | |
| 838 | if( zCmd && *zCmd ){ |
| 839 | int rc; |
| 840 | const CmdOrPage *pCmd = 0; |
| 841 | |
| 842 | style_set_current_feature("tkt"); |
| 843 | style_header("Help: %s", zCmd); |
| 844 | |
| 845 | style_submenu_element("Command-List", "%R/help"); |
| 846 | if( search_restrict(SRCH_HELP)!=0 ){ |
| 847 | style_submenu_element("Search","%R/search?y=h"); |
| 848 | } |
| 849 | rc = dispatch_name_search(zCmd, CMDFLAG_ANY|CMDFLAG_PREFIX, &pCmd); |
| 850 | if( *zCmd=='/' ){ |
| 851 | /* Some of the webpages require query parameters in order to work. |
| 852 | ** @ <h1>The "<a href='%R%s(zCmd)'>%s(zCmd)</a>" page:</h1> */ |
| 853 | @ <h1>The "%h(zCmd)" page:</h1> |
| 854 | }else if( rc==0 && (pCmd->eCmdFlags & CMDFLAG_SETTING)!=0 ){ |
| 855 | @ <h1>The "%h(pCmd->zName)" setting:</h1> |
| 856 | }else{ |
| 857 | @ <h1>The "%h(zCmd)" command:</h1> |
| 858 | } |
| 859 | if( rc==1 ){ |
| 860 | @ unknown command: %h(zCmd) |
| 861 | }else if( rc==2 ){ |
| 862 | @ ambiguous command prefix: %h(zCmd) |
| 863 | }else{ |
| 864 | if( pCmd->zHelp[0]==0 ){ |
| 865 | @ No help available for "%h(pCmd->zName)" |
| 866 | }else if( P("plaintext") ){ |
| 867 | Blob txt; |
| 868 |
| --- src/dispatch.c | |
| +++ src/dispatch.c | |
| @@ -838,30 +838,35 @@ | |
| 838 | if( zCmd && *zCmd ){ |
| 839 | int rc; |
| 840 | const CmdOrPage *pCmd = 0; |
| 841 | |
| 842 | style_set_current_feature("tkt"); |
| 843 | style_submenu_element("Topic-List", "%R/help"); |
| 844 | if( search_restrict(SRCH_HELP)!=0 ){ |
| 845 | style_submenu_element("Search","%R/search?y=h"); |
| 846 | } |
| 847 | rc = dispatch_name_search(zCmd, CMDFLAG_ANY|CMDFLAG_PREFIX, &pCmd); |
| 848 | if( pCmd ){ |
| 849 | style_header("Help: %s", pCmd->zName); |
| 850 | }else{ |
| 851 | style_header("Help"); |
| 852 | } |
| 853 | if( pCmd==0 ){ |
| 854 | /* No <h1> line in this case */ |
| 855 | }else if( *zCmd=='/' ){ |
| 856 | /* Some of the webpages require query parameters in order to work. |
| 857 | ** @ <h1>The "<a href='%R%s(zCmd)'>%s(zCmd)</a>" page:</h1> */ |
| 858 | @ <h1>The "%h(pCmd->zName)" page:</h1> |
| 859 | }else if( rc==0 && (pCmd->eCmdFlags & CMDFLAG_SETTING)!=0 ){ |
| 860 | @ <h1>The "%h(pCmd->zName)" setting:</h1> |
| 861 | }else{ |
| 862 | @ <h1>The "%h(pCmd->zName)" command:</h1> |
| 863 | } |
| 864 | if( rc==1 || (rc==2 && zCmd[0]=='/') ){ |
| 865 | @ Unknown topic: "%h(zCmd)" |
| 866 | }else if( rc==2 ){ |
| 867 | @ Ambiguous prefix: "%h(zCmd)" |
| 868 | }else{ |
| 869 | if( pCmd->zHelp[0]==0 ){ |
| 870 | @ No help available for "%h(pCmd->zName)" |
| 871 | }else if( P("plaintext") ){ |
| 872 | Blob txt; |
| 873 |