Fossil SCM

merged back to trunk

wolfgang 2010-09-18 16:24 wolfgangFormat2CSS_2 merge
Commit 5a5e722fc470ae6b96978ca40a2cbf031df88e99
Parent 06bd8ebc6a88e8a…
3 files changed +4 -4 +1 -1 +36 -28
~ src/db.c ~ src/diff.c ~ src/setup.c
M src/db.c
+4 -4
--- src/db.c
+++ src/db.c
@@ -1503,14 +1503,14 @@
15031503
 ** The behaviour page doesn't use a special layout. It lists all
15041504
 ** set-commands and displays the 'set'-help as info.
15051505
 */
15061506
 #if INTERFACE
15071507
 struct stControlSettings {
1508
- char const * name;
1509
- char const * var;
1510
- int width;
1511
- char const * def;
1508
+ char const *name; /* Name of the setting */
1509
+ char const *var; /* Internal variable name used by db_set() */
1510
+ int width; /* Width of display. 0 for boolean values */
1511
+ char const *def; /* Default value */
15121512
 };
15131513
 #endif /* INTERFACE */
15141514
 struct stControlSettings const ctrlSettings[] = {
15151515
 { "auto-captcha", "autocaptcha", 0, "0" },
15161516
 { "auto-shun", 0, 0, "1" },
15171517
--- src/db.c
+++ src/db.c
@@ -1503,14 +1503,14 @@
1503 ** The behaviour page doesn't use a special layout. It lists all
1504 ** set-commands and displays the 'set'-help as info.
1505 */
1506 #if INTERFACE
1507 struct stControlSettings {
1508 char const * name;
1509 char const * var;
1510 int width;
1511 char const * def;
1512 };
1513 #endif /* INTERFACE */
1514 struct stControlSettings const ctrlSettings[] = {
1515 { "auto-captcha", "autocaptcha", 0, "0" },
1516 { "auto-shun", 0, 0, "1" },
1517
--- src/db.c
+++ src/db.c
@@ -1503,14 +1503,14 @@
1503 ** The behaviour page doesn't use a special layout. It lists all
1504 ** set-commands and displays the 'set'-help as info.
1505 */
1506 #if INTERFACE
1507 struct stControlSettings {
1508 char const *name; /* Name of the setting */
1509 char const *var; /* Internal variable name used by db_set() */
1510 int width; /* Width of display. 0 for boolean values */
1511 char const *def; /* Default value */
1512 };
1513 #endif /* INTERFACE */
1514 struct stControlSettings const ctrlSettings[] = {
1515 { "auto-captcha", "autocaptcha", 0, "0" },
1516 { "auto-shun", 0, 0, "1" },
1517
M src/diff.c
+1 -1
--- src/diff.c
+++ src/diff.c
@@ -824,11 +824,11 @@
824824
 ** COMMAND: annotate
825825
 **
826826
 ** %fossil annotate FILENAME
827827
 **
828828
 ** Output the text of a file with markings to show when each line of
829
-** the file was introduced.
829
+** the file was last modified.
830830
 */
831831
 void annotate_cmd(void){
832832
 int fnid; /* Filename ID */
833833
 int fid; /* File instance ID */
834834
 int mid; /* Manifest where file was checked in */
835835
--- src/diff.c
+++ src/diff.c
@@ -824,11 +824,11 @@
824 ** COMMAND: annotate
825 **
826 ** %fossil annotate FILENAME
827 **
828 ** Output the text of a file with markings to show when each line of
829 ** the file was introduced.
830 */
831 void annotate_cmd(void){
832 int fnid; /* Filename ID */
833 int fid; /* File instance ID */
834 int mid; /* Manifest where file was checked in */
835
--- src/diff.c
+++ src/diff.c
@@ -824,11 +824,11 @@
824 ** COMMAND: annotate
825 **
826 ** %fossil annotate FILENAME
827 **
828 ** Output the text of a file with markings to show when each line of
829 ** the file was last modified.
830 */
831 void annotate_cmd(void){
832 int fnid; /* Filename ID */
833 int fid; /* File instance ID */
834 int mid; /* Manifest where file was checked in */
835
M src/setup.c
+36 -28
--- src/setup.c
+++ src/setup.c
@@ -64,12 +64,12 @@
6464
 "Grant privileges to individual users.");
6565
 setup_menu_entry("Access", "setup_access",
6666
 "Control access settings.");
6767
 setup_menu_entry("Configuration", "setup_config",
6868
 "Configure the WWW components of the repository");
69
- setup_menu_entry("Behavior", "setup_behavior",
70
- "Configure the version control part of the repository");
69
+ setup_menu_entry("Settings", "setup_settings",
70
+ "Web interface to the \"fossil settings\" command");
7171
 setup_menu_entry("Timeline", "setup_timeline",
7272
 "Timeline display preferences");
7373
 setup_menu_entry("Tickets", "tktsetup",
7474
 "Configure the trouble-ticketing system for this repository");
7575
 setup_menu_entry("Skins", "setup_skin",
@@ -855,43 +855,51 @@
855855
 db_end_transaction(0);
856856
 style_footer();
857857
 }
858858
859859
 /*
860
-** WEBPAGE: setup_behavior
860
+** WEBPAGE: setup_settings
861861
 */
862
-void setup_behavior(void){
863
- int i;
864
- struct stControlSettings const * azSet;
862
+void setup_settings(void){
863
+ struct stControlSettings const *pSet;
865864
866865
 login_check_credentials();
867866
 if( !g.okSetup ){
868867
 login_needed();
869868
 }
870869
871
- style_header("SCM Behavior");
872
- db_begin_transaction();
873
- @ <form action="%s(g.zBaseURL)/setup_behavior" method="post"><div>
874
- login_insert_csrf_secret();
875
- for (azSet=ctrlSettings;azSet->name;azSet++) {
876
- if (azSet->width==0) {
877
- /* found boolean attribute */
878
- onoff_attribute(azSet->name, azSet->name, azSet->var?azSet->var:azSet->name, (azSet->def[0]=='1')?1:0);
879
- @ <hr />
880
- }
881
- }
882
- for (azSet=ctrlSettings;azSet->name;azSet++) {
883
- if (azSet->width!=0) {
884
- entry_attribute(azSet->name, azSet->width, azSet->name, azSet->var?azSet->var:azSet->name, (char*)azSet->def);
885
- @ <hr />
886
- }
887
- }
888
- @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
889
- @ <hr />
890
- @ These settings work in the same way, as the <kbd>set</kbd> commandline:<br>
891
- @ <pre>%s(zHelp_setting_cmd)</pre>
892
- @ </div></form>
870
+ style_header("Settings");
871
+ db_begin_transaction();
872
+ @ <p>This page provides a simple interface to the "fossil setting" command.
873
+ @ See the "fossil help setting" output below for further information on
874
+ @ the meaning of each setting.</p><hr />
875
+ @ <form action="%s(g.zBaseURL)/setup_settings" method="post"><div>
876
+ @ <table border="0"><tr><td valign="top">
877
+ login_insert_csrf_secret();
878
+ for(pSet=ctrlSettings; pSet->name!=0; pSet++){
879
+ if( pSet->width==0 ){
880
+ onoff_attribute(pSet->name, pSet->name,
881
+ pSet->var!=0 ? pSet->var : pSet->name,
882
+ pSet->def[0]=='1');
883
+ @ <br />
884
+ }
885
+ }
886
+ @ </td><td width="30"></td><td valign="top">
887
+ for(pSet=ctrlSettings; pSet->name!=0; pSet++){
888
+ if( pSet->width!=0 ){
889
+ entry_attribute(pSet->name, /*pSet->width*/ 40, pSet->name,
890
+ pSet->var!=0 ? pSet->var : pSet->name,
891
+ (char*)pSet->def);
892
+ @ <br />
893
+ }
894
+ }
895
+ @ </tr></table>
896
+ @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
897
+ @ </div></form>
898
+ @ <hr /><p>
899
+ @ These settings work in the same way, as the <kbd>set</kbd> commandline:<br>
900
+ @ <pre>%s(zHelp_setting_cmd)</pre></p>
893901
 db_end_transaction(0);
894902
 style_footer();
895903
 }
896904
897905
 /*
898906
--- src/setup.c
+++ src/setup.c
@@ -64,12 +64,12 @@
64 "Grant privileges to individual users.");
65 setup_menu_entry("Access", "setup_access",
66 "Control access settings.");
67 setup_menu_entry("Configuration", "setup_config",
68 "Configure the WWW components of the repository");
69 setup_menu_entry("Behavior", "setup_behavior",
70 "Configure the version control part of the repository");
71 setup_menu_entry("Timeline", "setup_timeline",
72 "Timeline display preferences");
73 setup_menu_entry("Tickets", "tktsetup",
74 "Configure the trouble-ticketing system for this repository");
75 setup_menu_entry("Skins", "setup_skin",
@@ -855,43 +855,51 @@
855 db_end_transaction(0);
856 style_footer();
857 }
858
859 /*
860 ** WEBPAGE: setup_behavior
861 */
862 void setup_behavior(void){
863 int i;
864 struct stControlSettings const * azSet;
865
866 login_check_credentials();
867 if( !g.okSetup ){
868 login_needed();
869 }
870
871 style_header("SCM Behavior");
872 db_begin_transaction();
873 @ <form action="%s(g.zBaseURL)/setup_behavior" method="post"><div>
874 login_insert_csrf_secret();
875 for (azSet=ctrlSettings;azSet->name;azSet++) {
876 if (azSet->width==0) {
877 /* found boolean attribute */
878 onoff_attribute(azSet->name, azSet->name, azSet->var?azSet->var:azSet->name, (azSet->def[0]=='1')?1:0);
879 @ <hr />
880 }
881 }
882 for (azSet=ctrlSettings;azSet->name;azSet++) {
883 if (azSet->width!=0) {
884 entry_attribute(azSet->name, azSet->width, azSet->name, azSet->var?azSet->var:azSet->name, (char*)azSet->def);
885 @ <hr />
886 }
887 }
888 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
889 @ <hr />
890 @ These settings work in the same way, as the <kbd>set</kbd> commandline:<br>
891 @ <pre>%s(zHelp_setting_cmd)</pre>
892 @ </div></form>
 
 
 
 
 
 
 
 
 
893 db_end_transaction(0);
894 style_footer();
895 }
896
897 /*
898
--- src/setup.c
+++ src/setup.c
@@ -64,12 +64,12 @@
64 "Grant privileges to individual users.");
65 setup_menu_entry("Access", "setup_access",
66 "Control access settings.");
67 setup_menu_entry("Configuration", "setup_config",
68 "Configure the WWW components of the repository");
69 setup_menu_entry("Settings", "setup_settings",
70 "Web interface to the \"fossil settings\" command");
71 setup_menu_entry("Timeline", "setup_timeline",
72 "Timeline display preferences");
73 setup_menu_entry("Tickets", "tktsetup",
74 "Configure the trouble-ticketing system for this repository");
75 setup_menu_entry("Skins", "setup_skin",
@@ -855,43 +855,51 @@
855 db_end_transaction(0);
856 style_footer();
857 }
858
859 /*
860 ** WEBPAGE: setup_settings
861 */
862 void setup_settings(void){
863 struct stControlSettings const *pSet;
 
864
865 login_check_credentials();
866 if( !g.okSetup ){
867 login_needed();
868 }
869
870 style_header("Settings");
871 db_begin_transaction();
872 @ <p>This page provides a simple interface to the "fossil setting" command.
873 @ See the "fossil help setting" output below for further information on
874 @ the meaning of each setting.</p><hr />
875 @ <form action="%s(g.zBaseURL)/setup_settings" method="post"><div>
876 @ <table border="0"><tr><td valign="top">
877 login_insert_csrf_secret();
878 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
879 if( pSet->width==0 ){
880 onoff_attribute(pSet->name, pSet->name,
881 pSet->var!=0 ? pSet->var : pSet->name,
882 pSet->def[0]=='1');
883 @ <br />
884 }
885 }
886 @ </td><td width="30"></td><td valign="top">
887 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
888 if( pSet->width!=0 ){
889 entry_attribute(pSet->name, /*pSet->width*/ 40, pSet->name,
890 pSet->var!=0 ? pSet->var : pSet->name,
891 (char*)pSet->def);
892 @ <br />
893 }
894 }
895 @ </tr></table>
896 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
897 @ </div></form>
898 @ <hr /><p>
899 @ These settings work in the same way, as the <kbd>set</kbd> commandline:<br>
900 @ <pre>%s(zHelp_setting_cmd)</pre></p>
901 db_end_transaction(0);
902 style_footer();
903 }
904
905 /*
906

Keyboard Shortcuts

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