Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Improved some labels and help text and corrected the 'hint' styling to encompass elements outside of the FORM element. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | checkin-without-checkout |
| Files: | files | file ages | folders |
| SHA3-256: |
f41eb6964cb88a6c670456df4198824b |
| User & Date: | stephan 2020-05-02 17:50:05.268 |
Context
|
2020-05-02
| ||
| 20:46 | Fixed a bogus bit of css. ... (check-in: b203f2e967 user: stephan tags: checkin-without-checkout) | |
| 17:50 | Improved some labels and help text and corrected the 'hint' styling to encompass elements outside of the FORM element. ... (check-in: f41eb6964c user: stephan tags: checkin-without-checkout) | |
| 17:41 | Comment updates. ... (check-in: 43d6e3caf2 user: stephan tags: checkin-without-checkout) | |
Changes
Changes to src/checkin.c.
| ︙ | ︙ | |||
3758 3759 3760 3761 3762 3763 3764 |
}
/* All set. Here we go... */
#define fp fossil_print
/* ^^^ Appologies, Richard, but the @ form plays havoc with emacs */
fp("<h1>Editing:</h1>");
| | | 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 |
}
/* All set. Here we go... */
#define fp fossil_print
/* ^^^ Appologies, Richard, but the @ form plays havoc with emacs */
fp("<h1>Editing:</h1>");
fp("<p class='fileedit-hint'>");
fp("File: <code>%h</code><br>"
"Version: <code id='r-label'>%s</code><br>",
zFilename, zRevResolved);
fp("Permalink: <code>"
"<a id='permalink' href='%R/fileedit?file=%T&r=%!S'>"
"/fileedit?file=%T&r=%!S</a></code><br>"
"(Clicking the permalink will reload the page and discard "
|
| ︙ | ︙ | |||
3786 3787 3788 3789 3790 3791 3792 |
/******* Comment *******/
fp("<h3>Checkin Comment</h3>\n");
fp("<textarea name='comment' rows='3' cols='80'>");
if(zComment && *zComment){
fp("%h"/*%h? %s?*/, zComment);
}
fp("</textarea>\n");
| | | 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 |
/******* Comment *******/
fp("<h3>Checkin Comment</h3>\n");
fp("<textarea name='comment' rows='3' cols='80'>");
if(zComment && *zComment){
fp("%h"/*%h? %s?*/, zComment);
}
fp("</textarea>\n");
fp("<div class='fileedit-hint'>Comments use the Fossil wiki markup "
"syntax.</div>"/*TODO: radiobuttons for fossil/me/plain text*/);
/******* Content *******/
fp("<h3>File Content</h3>\n");
fp("<textarea name='content' id='fileedit-content' "
"rows='20' cols='80'>");
fp("Loading...");
|
| ︙ | ︙ | |||
3809 3810 3811 3812 3813 3814 3815 |
** TODO?: date-override date selection field. Maybe use
** an input[type=datetime-local].
*/
if(0==submitMode || P("dry_run")!=0){
cimi.flags |= CIMINI_DRY_RUN;
}
style_labeled_checkbox("dry_run", "Dry-run?", "1",
| > > > | | | | > > > > > > > > > < < < < < < < < < | | | 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 |
** TODO?: date-override date selection field. Maybe use
** an input[type=datetime-local].
*/
if(0==submitMode || P("dry_run")!=0){
cimi.flags |= CIMINI_DRY_RUN;
}
style_labeled_checkbox("dry_run", "Dry-run?", "1",
"In dry-run mode, the Save button performs "
"all work needed for saving but then rolls "
"back the transaction, and thus does not "
"really save.",
cimi.flags & CIMINI_DRY_RUN);
if(P("allow_fork")!=0){
cimi.flags |= CIMINI_ALLOW_FORK;
}
style_labeled_checkbox("allow_fork", "Allow fork?", "1",
"Allow saving to create a fork?",
cimi.flags & CIMINI_ALLOW_FORK);
if(P("allow_older")!=0){
cimi.flags |= CIMINI_ALLOW_OLDER;
}
style_labeled_checkbox("allow_older", "Allow older?", "1",
"Allow saving against a parent version "
"which has a newer timestamp?",
cimi.flags & CIMINI_ALLOW_OLDER);
if(P("exec_bit")!=0){
cimi.filePerm = PERM_EXE;
}
style_labeled_checkbox("exec_bit", "Executable?", "1",
"Set the executable bit?",
PERM_EXE==cimi.filePerm);
if(P("allow_merge_conflict")!=0){
cimi.flags |= CIMINI_ALLOW_MERGE_MARKER;
}
style_labeled_checkbox("allow_merge_conflict",
"Allow merge conflict markers?", "1",
"Allow saving even if the content contains "
"what appear to be fossil merge conflict "
"markers?",
cimi.flags & CIMINI_ALLOW_MERGE_MARKER);
if(P("prefer_delta")!=0){
cimi.flags |= CIMINI_PREFER_DELTA;
}
style_labeled_checkbox("prefer_delta",
"Prefer delta manifest?", "1",
"Will create a delta manifest, instead of "
"baseline, if conditions are favorable to do "
"so. This option is only a suggestion.",
cimi.flags & CIMINI_PREFER_DELTA);
{/* EOL conversion policy... */
const int eolMode = submitMode==0 ? 0 : atoi(PD("eol","0"));
switch(eolMode){
case 1: cimi.flags |= CIMINI_CONVERT_EOL_UNIX; break;
case 2: cimi.flags |= CIMINI_CONVERT_EOL_WINDOWS; break;
default: cimi.flags |= CIMINI_CONVERT_EOL_INHERIT; break;
}
fp("<select name='eol' "
"title='EOL conversion policy, noting that form-processing "
"may implicitly change the line endings of the input.'>");
fp("<option value='0'%s>Inherit EOLs</option>",
(eolMode!=1 && eolMode!=2) ? " selected" : "");
fp("<option value='1'%s/>Unix EOLs</option>",
eolMode==1 ? " selected" : "");
fp("<option value='2'%s>Windows EOLs</option>",
eolMode==2 ? " selected" : "");
fp("</select>");
}
fp("</div></fieldset>") /* end of checkboxes */;
/******* Buttons *******/
fp("<fieldset class='fileedit-options'>"
"<legend>Tell the server to...</legend><div>");
fp("<button type='submit' name='submit' value='1'>"
"Save</button>");
fp("<button type='submit' name='submit' value='2'>"
"Preview (TODO)</button>");
fp("<button type='submit' name='submit' value='3'>"
"Diff (TODO)</button>");
fp("</div></fieldset>");
/******* End of form *******/
|
| ︙ | ︙ |
Changes to src/default_css.txt.
| ︙ | ︙ | |||
875 876 877 878 879 880 881 |
}
.fileedit-form .fileedit-buttons > div > * {
margin: 0 0.25em 0.25em 0.25em;
}
.fileedit-form .fileedit-options > div > * {
margin: 0 0.25em 0.25em 0.25em;
}
| | | 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 |
}
.fileedit-form .fileedit-buttons > div > * {
margin: 0 0.25em 0.25em 0.25em;
}
.fileedit-form .fileedit-options > div > * {
margin: 0 0.25em 0.25em 0.25em;
}
.fileedit-hint {
font-size: 80%;
opacity: 0.75;
}
.fileedit-error-report {
background: yellow;
color: darkred;
margin: 1em 0;
|
| ︙ | ︙ |