Fossil SCM

Improved some labels and help text and corrected the 'hint' styling to encompass elements outside of the FORM element.

stephan 2020-05-02 17:50 UTC checkin-without-checkout
Commit f41eb6964cb88a6c670456df4198824b0b003518c0e9a0d06fda3b1332488f54
Parent 43d6e3caf2dc5d5…
2 files changed +20 -17 +1 -1
~ src/checkin.c ~ src/default_css.txt
M src/checkin.c
+20 -17
--- src/checkin.c
+++ src/checkin.c
@@ -3760,11 +3760,11 @@
37603760
 /* All set. Here we go... */
37613761
 #define fp fossil_print
37623762
 /* ^^^ Appologies, Richard, but the @ form plays havoc with emacs */
37633763
37643764
 fp("<h1>Editing:</h1>");
3765
- fp("<p class='hint'>");
3765
+ fp("<p class='fileedit-hint'>");
37663766
 fp("File: <code>%h</code><br>"
37673767
 "Version: <code id='r-label'>%s</code><br>",
37683768
 zFilename, zRevResolved);
37693769
 fp("Permalink: <code>"
37703770
 "<a id='permalink' href='%R/fileedit?file=%T&r=%!S'>"
@@ -3788,11 +3788,11 @@
37883788
 fp("<textarea name='comment' rows='3' cols='80'>");
37893789
 if(zComment && *zComment){
37903790
 fp("%h"/*%h? %s?*/, zComment);
37913791
 }
37923792
 fp("</textarea>\n");
3793
- fp("<div class='hint'>Comments use the Fossil wiki markup "
3793
+ fp("<div class='fileedit-hint'>Comments use the Fossil wiki markup "
37943794
 "syntax.</div>"/*TODO: radiobuttons for fossil/me/plain text*/);
37953795
37963796
 /******* Content *******/
37973797
 fp("<h3>File Content</h3>\n");
37983798
 fp("<textarea name='content' id='fileedit-content' "
@@ -3811,11 +3811,14 @@
38113811
 */
38123812
 if(0==submitMode || P("dry_run")!=0){
38133813
 cimi.flags |= CIMINI_DRY_RUN;
38143814
 }
38153815
 style_labeled_checkbox("dry_run", "Dry-run?", "1",
3816
- "In dry-run mode, do not really save.",
3816
+ "In dry-run mode, the Save button performs "
3817
+ "all work needed for saving but then rolls "
3818
+ "back the transaction, and thus does not "
3819
+ "really save.",
38173820
 cimi.flags & CIMINI_DRY_RUN);
38183821
 if(P("allow_fork")!=0){
38193822
 cimi.flags |= CIMINI_ALLOW_FORK;
38203823
 }
38213824
 style_labeled_checkbox("allow_fork", "Allow fork?", "1",
@@ -3823,18 +3826,18 @@
38233826
 cimi.flags & CIMINI_ALLOW_FORK);
38243827
 if(P("allow_older")!=0){
38253828
 cimi.flags |= CIMINI_ALLOW_OLDER;
38263829
 }
38273830
 style_labeled_checkbox("allow_older", "Allow older?", "1",
3828
- "Allow saving to a version which has "
3829
- "a newer timestamp?",
3831
+ "Allow saving against a parent version "
3832
+ "which has a newer timestamp?",
38303833
 cimi.flags & CIMINI_ALLOW_OLDER);
38313834
 if(P("exec_bit")!=0){
38323835
 cimi.filePerm = PERM_EXE;
38333836
 }
38343837
 style_labeled_checkbox("exec_bit", "Executable?", "1",
3835
- "Set executable bit?",
3838
+ "Set the executable bit?",
38363839
 PERM_EXE==cimi.filePerm);
38373840
 if(P("allow_merge_conflict")!=0){
38383841
 cimi.flags |= CIMINI_ALLOW_MERGE_MARKER;
38393842
 }
38403843
 style_labeled_checkbox("allow_merge_conflict",
@@ -3841,10 +3844,19 @@
38413844
 "Allow merge conflict markers?", "1",
38423845
 "Allow saving even if the content contains "
38433846
 "what appear to be fossil merge conflict "
38443847
 "markers?",
38453848
 cimi.flags & CIMINI_ALLOW_MERGE_MARKER);
3849
+ if(P("prefer_delta")!=0){
3850
+ cimi.flags |= CIMINI_PREFER_DELTA;
3851
+ }
3852
+ style_labeled_checkbox("prefer_delta",
3853
+ "Prefer delta manifest?", "1",
3854
+ "Will create a delta manifest, instead of "
3855
+ "baseline, if conditions are favorable to do "
3856
+ "so. This option is only a suggestion.",
3857
+ cimi.flags & CIMINI_PREFER_DELTA);
38463858
 {/* EOL conversion policy... */
38473859
 const int eolMode = submitMode==0 ? 0 : atoi(PD("eol","0"));
38483860
 switch(eolMode){
38493861
 case 1: cimi.flags |= CIMINI_CONVERT_EOL_UNIX; break;
38503862
 case 2: cimi.flags |= CIMINI_CONVERT_EOL_WINDOWS; break;
@@ -3859,27 +3871,18 @@
38593871
 eolMode==1 ? " selected" : "");
38603872
 fp("<option value='2'%s>Windows EOLs</option>",
38613873
 eolMode==2 ? " selected" : "");
38623874
 fp("</select>");
38633875
 }
3864
- if(P("prefer_delta")!=0){
3865
- cimi.flags |= CIMINI_PREFER_DELTA;
3866
- }
3867
- style_labeled_checkbox("prefer_delta",
3868
- "Prefer delta manifest?", "1",
3869
- "Will create a delta manifest, instead of "
3870
- "baseline, if conditions are favorable to do "
3871
- "so. This option is only a suggestion.",
3872
- cimi.flags & CIMINI_PREFER_DELTA);
38733876
38743877
 fp("</div></fieldset>") /* end of checkboxes */;
38753878
38763879
 /******* Buttons *******/
38773880
 fp("<fieldset class='fileedit-options'>"
3878
- "<legend>Several buttons are TODO</legend><div>");
3881
+ "<legend>Tell the server to...</legend><div>");
38793882
 fp("<button type='submit' name='submit' value='1'>"
3880
- "Submit</button>");
3883
+ "Save</button>");
38813884
 fp("<button type='submit' name='submit' value='2'>"
38823885
 "Preview (TODO)</button>");
38833886
 fp("<button type='submit' name='submit' value='3'>"
38843887
 "Diff (TODO)</button>");
38853888
 fp("</div></fieldset>");
38863889
--- src/checkin.c
+++ src/checkin.c
@@ -3760,11 +3760,11 @@
3760 /* All set. Here we go... */
3761 #define fp fossil_print
3762 /* ^^^ Appologies, Richard, but the @ form plays havoc with emacs */
3763
3764 fp("<h1>Editing:</h1>");
3765 fp("<p class='hint'>");
3766 fp("File: <code>%h</code><br>"
3767 "Version: <code id='r-label'>%s</code><br>",
3768 zFilename, zRevResolved);
3769 fp("Permalink: <code>"
3770 "<a id='permalink' href='%R/fileedit?file=%T&r=%!S'>"
@@ -3788,11 +3788,11 @@
3788 fp("<textarea name='comment' rows='3' cols='80'>");
3789 if(zComment && *zComment){
3790 fp("%h"/*%h? %s?*/, zComment);
3791 }
3792 fp("</textarea>\n");
3793 fp("<div class='hint'>Comments use the Fossil wiki markup "
3794 "syntax.</div>"/*TODO: radiobuttons for fossil/me/plain text*/);
3795
3796 /******* Content *******/
3797 fp("<h3>File Content</h3>\n");
3798 fp("<textarea name='content' id='fileedit-content' "
@@ -3811,11 +3811,14 @@
3811 */
3812 if(0==submitMode || P("dry_run")!=0){
3813 cimi.flags |= CIMINI_DRY_RUN;
3814 }
3815 style_labeled_checkbox("dry_run", "Dry-run?", "1",
3816 "In dry-run mode, do not really save.",
 
 
 
3817 cimi.flags & CIMINI_DRY_RUN);
3818 if(P("allow_fork")!=0){
3819 cimi.flags |= CIMINI_ALLOW_FORK;
3820 }
3821 style_labeled_checkbox("allow_fork", "Allow fork?", "1",
@@ -3823,18 +3826,18 @@
3823 cimi.flags & CIMINI_ALLOW_FORK);
3824 if(P("allow_older")!=0){
3825 cimi.flags |= CIMINI_ALLOW_OLDER;
3826 }
3827 style_labeled_checkbox("allow_older", "Allow older?", "1",
3828 "Allow saving to a version which has "
3829 "a newer timestamp?",
3830 cimi.flags & CIMINI_ALLOW_OLDER);
3831 if(P("exec_bit")!=0){
3832 cimi.filePerm = PERM_EXE;
3833 }
3834 style_labeled_checkbox("exec_bit", "Executable?", "1",
3835 "Set executable bit?",
3836 PERM_EXE==cimi.filePerm);
3837 if(P("allow_merge_conflict")!=0){
3838 cimi.flags |= CIMINI_ALLOW_MERGE_MARKER;
3839 }
3840 style_labeled_checkbox("allow_merge_conflict",
@@ -3841,10 +3844,19 @@
3841 "Allow merge conflict markers?", "1",
3842 "Allow saving even if the content contains "
3843 "what appear to be fossil merge conflict "
3844 "markers?",
3845 cimi.flags & CIMINI_ALLOW_MERGE_MARKER);
 
 
 
 
 
 
 
 
 
3846 {/* EOL conversion policy... */
3847 const int eolMode = submitMode==0 ? 0 : atoi(PD("eol","0"));
3848 switch(eolMode){
3849 case 1: cimi.flags |= CIMINI_CONVERT_EOL_UNIX; break;
3850 case 2: cimi.flags |= CIMINI_CONVERT_EOL_WINDOWS; break;
@@ -3859,27 +3871,18 @@
3859 eolMode==1 ? " selected" : "");
3860 fp("<option value='2'%s>Windows EOLs</option>",
3861 eolMode==2 ? " selected" : "");
3862 fp("</select>");
3863 }
3864 if(P("prefer_delta")!=0){
3865 cimi.flags |= CIMINI_PREFER_DELTA;
3866 }
3867 style_labeled_checkbox("prefer_delta",
3868 "Prefer delta manifest?", "1",
3869 "Will create a delta manifest, instead of "
3870 "baseline, if conditions are favorable to do "
3871 "so. This option is only a suggestion.",
3872 cimi.flags & CIMINI_PREFER_DELTA);
3873
3874 fp("</div></fieldset>") /* end of checkboxes */;
3875
3876 /******* Buttons *******/
3877 fp("<fieldset class='fileedit-options'>"
3878 "<legend>Several buttons are TODO</legend><div>");
3879 fp("<button type='submit' name='submit' value='1'>"
3880 "Submit</button>");
3881 fp("<button type='submit' name='submit' value='2'>"
3882 "Preview (TODO)</button>");
3883 fp("<button type='submit' name='submit' value='3'>"
3884 "Diff (TODO)</button>");
3885 fp("</div></fieldset>");
3886
--- src/checkin.c
+++ src/checkin.c
@@ -3760,11 +3760,11 @@
3760 /* All set. Here we go... */
3761 #define fp fossil_print
3762 /* ^^^ Appologies, Richard, but the @ form plays havoc with emacs */
3763
3764 fp("<h1>Editing:</h1>");
3765 fp("<p class='fileedit-hint'>");
3766 fp("File: <code>%h</code><br>"
3767 "Version: <code id='r-label'>%s</code><br>",
3768 zFilename, zRevResolved);
3769 fp("Permalink: <code>"
3770 "<a id='permalink' href='%R/fileedit?file=%T&r=%!S'>"
@@ -3788,11 +3788,11 @@
3788 fp("<textarea name='comment' rows='3' cols='80'>");
3789 if(zComment && *zComment){
3790 fp("%h"/*%h? %s?*/, zComment);
3791 }
3792 fp("</textarea>\n");
3793 fp("<div class='fileedit-hint'>Comments use the Fossil wiki markup "
3794 "syntax.</div>"/*TODO: radiobuttons for fossil/me/plain text*/);
3795
3796 /******* Content *******/
3797 fp("<h3>File Content</h3>\n");
3798 fp("<textarea name='content' id='fileedit-content' "
@@ -3811,11 +3811,14 @@
3811 */
3812 if(0==submitMode || P("dry_run")!=0){
3813 cimi.flags |= CIMINI_DRY_RUN;
3814 }
3815 style_labeled_checkbox("dry_run", "Dry-run?", "1",
3816 "In dry-run mode, the Save button performs "
3817 "all work needed for saving but then rolls "
3818 "back the transaction, and thus does not "
3819 "really save.",
3820 cimi.flags & CIMINI_DRY_RUN);
3821 if(P("allow_fork")!=0){
3822 cimi.flags |= CIMINI_ALLOW_FORK;
3823 }
3824 style_labeled_checkbox("allow_fork", "Allow fork?", "1",
@@ -3823,18 +3826,18 @@
3826 cimi.flags & CIMINI_ALLOW_FORK);
3827 if(P("allow_older")!=0){
3828 cimi.flags |= CIMINI_ALLOW_OLDER;
3829 }
3830 style_labeled_checkbox("allow_older", "Allow older?", "1",
3831 "Allow saving against a parent version "
3832 "which has a newer timestamp?",
3833 cimi.flags & CIMINI_ALLOW_OLDER);
3834 if(P("exec_bit")!=0){
3835 cimi.filePerm = PERM_EXE;
3836 }
3837 style_labeled_checkbox("exec_bit", "Executable?", "1",
3838 "Set the executable bit?",
3839 PERM_EXE==cimi.filePerm);
3840 if(P("allow_merge_conflict")!=0){
3841 cimi.flags |= CIMINI_ALLOW_MERGE_MARKER;
3842 }
3843 style_labeled_checkbox("allow_merge_conflict",
@@ -3841,10 +3844,19 @@
3844 "Allow merge conflict markers?", "1",
3845 "Allow saving even if the content contains "
3846 "what appear to be fossil merge conflict "
3847 "markers?",
3848 cimi.flags & CIMINI_ALLOW_MERGE_MARKER);
3849 if(P("prefer_delta")!=0){
3850 cimi.flags |= CIMINI_PREFER_DELTA;
3851 }
3852 style_labeled_checkbox("prefer_delta",
3853 "Prefer delta manifest?", "1",
3854 "Will create a delta manifest, instead of "
3855 "baseline, if conditions are favorable to do "
3856 "so. This option is only a suggestion.",
3857 cimi.flags & CIMINI_PREFER_DELTA);
3858 {/* EOL conversion policy... */
3859 const int eolMode = submitMode==0 ? 0 : atoi(PD("eol","0"));
3860 switch(eolMode){
3861 case 1: cimi.flags |= CIMINI_CONVERT_EOL_UNIX; break;
3862 case 2: cimi.flags |= CIMINI_CONVERT_EOL_WINDOWS; break;
@@ -3859,27 +3871,18 @@
3871 eolMode==1 ? " selected" : "");
3872 fp("<option value='2'%s>Windows EOLs</option>",
3873 eolMode==2 ? " selected" : "");
3874 fp("</select>");
3875 }
 
 
 
 
 
 
 
 
 
3876
3877 fp("</div></fieldset>") /* end of checkboxes */;
3878
3879 /******* Buttons *******/
3880 fp("<fieldset class='fileedit-options'>"
3881 "<legend>Tell the server to...</legend><div>");
3882 fp("<button type='submit' name='submit' value='1'>"
3883 "Save</button>");
3884 fp("<button type='submit' name='submit' value='2'>"
3885 "Preview (TODO)</button>");
3886 fp("<button type='submit' name='submit' value='3'>"
3887 "Diff (TODO)</button>");
3888 fp("</div></fieldset>");
3889
M src/default_css.txt
+1 -1
--- src/default_css.txt
+++ src/default_css.txt
@@ -877,11 +877,11 @@
877877
 margin: 0 0.25em 0.25em 0.25em;
878878
 }
879879
 .fileedit-form .fileedit-options > div > * {
880880
 margin: 0 0.25em 0.25em 0.25em;
881881
 }
882
-.fileedit-form .hint {
882
+.fileedit-hint {
883883
 font-size: 80%;
884884
 opacity: 0.75;
885885
 }
886886
 .fileedit-error-report {
887887
 background: yellow;
888888
--- src/default_css.txt
+++ src/default_css.txt
@@ -877,11 +877,11 @@
877 margin: 0 0.25em 0.25em 0.25em;
878 }
879 .fileedit-form .fileedit-options > div > * {
880 margin: 0 0.25em 0.25em 0.25em;
881 }
882 .fileedit-form .hint {
883 font-size: 80%;
884 opacity: 0.75;
885 }
886 .fileedit-error-report {
887 background: yellow;
888
--- src/default_css.txt
+++ src/default_css.txt
@@ -877,11 +877,11 @@
877 margin: 0 0.25em 0.25em 0.25em;
878 }
879 .fileedit-form .fileedit-options > div > * {
880 margin: 0 0.25em 0.25em 0.25em;
881 }
882 .fileedit-hint {
883 font-size: 80%;
884 opacity: 0.75;
885 }
886 .fileedit-error-report {
887 background: yellow;
888

Keyboard Shortcuts

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