Fossil SCM

Minor help text, style, and layout tweaks.

stephan 2020-05-14 03:55 fileedit-ajaxify
Commit 28b2261b75d5372ec1c8dc46e01e0617e46ab72d653cd9704942ddb9dbda562b
Parent 371b162ff38c0b2…
3 files changed +3 -1 +3 -3 +10 -7
~ src/default_css.txt ~ src/fileedit.c ~ src/fossil.page.fileedit.js
M src/default_css.txt
+3 -1
--- src/default_css.txt
+++ src/default_css.txt
@@ -955,19 +955,21 @@
955955
 margin: 0.5em 0 0.5em 0;
956956
 padding: 0.25em 0;
957957
 border-radius: 0.5em;
958958
 border-color: inherit;
959959
 border-width: 1px;
960
- font-size: 85%;
960
+ font-size: 90%;
961
+ overflow: auto;
961962
 }
962963
 body.fileedit fieldset > legend {
963964
 margin: 0 0 0 1em;
964965
 padding: 0 0.5em 0 0.5em;
965966
 }
966967
 body.fileedit fieldset > div {
967968
 margin: 0 0.25em 0 0.25em;
968969
 padding: 0;
970
+ overflow: auto;
969971
 }
970972
 body.fileedit fieldset > div > .input-with-label {
971973
 margin: 0.25em 0.5em;
972974
 }
973975
 body.fileedit fieldset > div > button {
974976
--- src/default_css.txt
+++ src/default_css.txt
@@ -955,19 +955,21 @@
955 margin: 0.5em 0 0.5em 0;
956 padding: 0.25em 0;
957 border-radius: 0.5em;
958 border-color: inherit;
959 border-width: 1px;
960 font-size: 85%;
 
961 }
962 body.fileedit fieldset > legend {
963 margin: 0 0 0 1em;
964 padding: 0 0.5em 0 0.5em;
965 }
966 body.fileedit fieldset > div {
967 margin: 0 0.25em 0 0.25em;
968 padding: 0;
 
969 }
970 body.fileedit fieldset > div > .input-with-label {
971 margin: 0.25em 0.5em;
972 }
973 body.fileedit fieldset > div > button {
974
--- src/default_css.txt
+++ src/default_css.txt
@@ -955,19 +955,21 @@
955 margin: 0.5em 0 0.5em 0;
956 padding: 0.25em 0;
957 border-radius: 0.5em;
958 border-color: inherit;
959 border-width: 1px;
960 font-size: 90%;
961 overflow: auto;
962 }
963 body.fileedit fieldset > legend {
964 margin: 0 0 0 1em;
965 padding: 0 0.5em 0 0.5em;
966 }
967 body.fileedit fieldset > div {
968 margin: 0 0.25em 0 0.25em;
969 padding: 0;
970 overflow: auto;
971 }
972 body.fileedit fieldset > div > .input-with-label {
973 margin: 0.25em 0.5em;
974 }
975 body.fileedit fieldset > div > button {
976
M src/fileedit.c
+3 -3
--- src/fileedit.c
+++ src/fileedit.c
@@ -2015,17 +2015,17 @@
20152015
 ">");
20162016
 {
20172017
 CX("<h1>Help &amp; Tips</h1>");
20182018
 CX("<ul>");
20192019
 CX("<li><strong>Only files matching the <code>fileedit-glob</code> "
2020
- "</strong> repository setting can be edited online. That setting "
2020
+ "repository setting</strong> can be edited online. That setting "
20212021
 "must be a comma- or newline-delimited list of glob patterns "
20222022
 "for files which may be edited online.</li>");
20232023
 CX("<li><strong>Clicking any links</strong> on this page will "
20242024
 "leave the page, <strong>losing any edits</strong>.</li>");
2025
- CX("<li>Saving edits creates a new commit with a single modified "
2026
- "file.</li>");
2025
+ CX("<li>Committing edits creates a new commit record with a single "
2026
+ "modified file.</li>");
20272027
 CX("<li>\"Delta manifests\" (see the checkbox on the Commit tab) "
20282028
 "make for smaller commit records, especially in repositories "
20292029
 "with many files.</li>");
20302030
 CX("<li>The file selector allows, for usability's sake, only files "
20312031
 "in leaf checkins to be selected, but files may be edited via "
20322032
--- src/fileedit.c
+++ src/fileedit.c
@@ -2015,17 +2015,17 @@
2015 ">");
2016 {
2017 CX("<h1>Help &amp; Tips</h1>");
2018 CX("<ul>");
2019 CX("<li><strong>Only files matching the <code>fileedit-glob</code> "
2020 "</strong> repository setting can be edited online. That setting "
2021 "must be a comma- or newline-delimited list of glob patterns "
2022 "for files which may be edited online.</li>");
2023 CX("<li><strong>Clicking any links</strong> on this page will "
2024 "leave the page, <strong>losing any edits</strong>.</li>");
2025 CX("<li>Saving edits creates a new commit with a single modified "
2026 "file.</li>");
2027 CX("<li>\"Delta manifests\" (see the checkbox on the Commit tab) "
2028 "make for smaller commit records, especially in repositories "
2029 "with many files.</li>");
2030 CX("<li>The file selector allows, for usability's sake, only files "
2031 "in leaf checkins to be selected, but files may be edited via "
2032
--- src/fileedit.c
+++ src/fileedit.c
@@ -2015,17 +2015,17 @@
2015 ">");
2016 {
2017 CX("<h1>Help &amp; Tips</h1>");
2018 CX("<ul>");
2019 CX("<li><strong>Only files matching the <code>fileedit-glob</code> "
2020 "repository setting</strong> can be edited online. That setting "
2021 "must be a comma- or newline-delimited list of glob patterns "
2022 "for files which may be edited online.</li>");
2023 CX("<li><strong>Clicking any links</strong> on this page will "
2024 "leave the page, <strong>losing any edits</strong>.</li>");
2025 CX("<li>Committing edits creates a new commit record with a single "
2026 "modified file.</li>");
2027 CX("<li>\"Delta manifests\" (see the checkbox on the Commit tab) "
2028 "make for smaller commit records, especially in repositories "
2029 "with many files.</li>");
2030 CX("<li>The file selector allows, for usability's sake, only files "
2031 "in leaf checkins to be selected, but files may be edited via "
2032
M src/fossil.page.fileedit.js
+10 -7
--- src/fossil.page.fileedit.js
+++ src/fossil.page.fileedit.js
@@ -54,11 +54,12 @@
5454
 const self = this;
5555
 F.fetch('fileedit',{
5656
 urlParams:'ajax=filelist&leaves',
5757
 responseType: 'json',
5858
 onload: function(list){
59
- D.append(D.clearElement(self.e.ciListLabel),"Open leaves:");
59
+ D.append(D.clearElement(self.e.ciListLabel),
60
+ "Open leaves (newest first):");
6061
 self.cache.checkins = list;
6162
 D.clearElement(D.enable(self.e.selectCi));
6263
 let loadThisOne;
6364
 list.forEach(function(o,n){
6465
 if(!n) loadThisOne = o;
@@ -87,13 +88,17 @@
8788
 const onload = (response)=>{
8889
 D.clearElement(selFiles, this.e.btnLoadFile);
8990
 D.append(
9091
 D.clearElement(this.e.fileListLabel),
9192
 "Editable files for ",
92
- D.a(F.repoUrl('timeline',{
93
- c: ciUuid
94
- }), F.hashDigits(ciUuid))
93
+ D.append(
94
+ D.code(),
95
+ D.a(F.repoUrl('timeline',{
96
+ c: ciUuid
97
+ }), F.hashDigits(ciUuid)),
98
+ ),
99
+ ":"
95100
 );
96101
 this.cache.files[response.checkin] = response;
97102
 response.editableFiles.forEach(function(fn,n){
98103
 D.option(selFiles, fn);
99104
 });
@@ -474,13 +479,11 @@
474479
 filename: this.finfo.filename,
475480
 checkin: rUrl
476481
 },false,true);
477482
 const purl = F.repoUrl('fileedit',purlArgs);
478483
 D.append(
479
- eTgt,
480
- "Permalink: ",
481
- D.append(D.code(),D.a(purl,true))
484
+ eTgt,"[",D.a(purl,"Editor permalink"),"]"
482485
 );
483486
 return this;
484487
 };
485488
486489
 /**
487490
--- src/fossil.page.fileedit.js
+++ src/fossil.page.fileedit.js
@@ -54,11 +54,12 @@
54 const self = this;
55 F.fetch('fileedit',{
56 urlParams:'ajax=filelist&leaves',
57 responseType: 'json',
58 onload: function(list){
59 D.append(D.clearElement(self.e.ciListLabel),"Open leaves:");
 
60 self.cache.checkins = list;
61 D.clearElement(D.enable(self.e.selectCi));
62 let loadThisOne;
63 list.forEach(function(o,n){
64 if(!n) loadThisOne = o;
@@ -87,13 +88,17 @@
87 const onload = (response)=>{
88 D.clearElement(selFiles, this.e.btnLoadFile);
89 D.append(
90 D.clearElement(this.e.fileListLabel),
91 "Editable files for ",
92 D.a(F.repoUrl('timeline',{
93 c: ciUuid
94 }), F.hashDigits(ciUuid))
 
 
 
 
95 );
96 this.cache.files[response.checkin] = response;
97 response.editableFiles.forEach(function(fn,n){
98 D.option(selFiles, fn);
99 });
@@ -474,13 +479,11 @@
474 filename: this.finfo.filename,
475 checkin: rUrl
476 },false,true);
477 const purl = F.repoUrl('fileedit',purlArgs);
478 D.append(
479 eTgt,
480 "Permalink: ",
481 D.append(D.code(),D.a(purl,true))
482 );
483 return this;
484 };
485
486 /**
487
--- src/fossil.page.fileedit.js
+++ src/fossil.page.fileedit.js
@@ -54,11 +54,12 @@
54 const self = this;
55 F.fetch('fileedit',{
56 urlParams:'ajax=filelist&leaves',
57 responseType: 'json',
58 onload: function(list){
59 D.append(D.clearElement(self.e.ciListLabel),
60 "Open leaves (newest first):");
61 self.cache.checkins = list;
62 D.clearElement(D.enable(self.e.selectCi));
63 let loadThisOne;
64 list.forEach(function(o,n){
65 if(!n) loadThisOne = o;
@@ -87,13 +88,17 @@
88 const onload = (response)=>{
89 D.clearElement(selFiles, this.e.btnLoadFile);
90 D.append(
91 D.clearElement(this.e.fileListLabel),
92 "Editable files for ",
93 D.append(
94 D.code(),
95 D.a(F.repoUrl('timeline',{
96 c: ciUuid
97 }), F.hashDigits(ciUuid)),
98 ),
99 ":"
100 );
101 this.cache.files[response.checkin] = response;
102 response.editableFiles.forEach(function(fn,n){
103 D.option(selFiles, fn);
104 });
@@ -474,13 +479,11 @@
479 filename: this.finfo.filename,
480 checkin: rUrl
481 },false,true);
482 const purl = F.repoUrl('fileedit',purlArgs);
483 D.append(
484 eTgt,"[",D.a(purl,"Editor permalink"),"]"
 
 
485 );
486 return this;
487 };
488
489 /**
490

Keyboard Shortcuts

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