From 90d5a46227b5c6c70a8ce1c3994981df25bdc3bc Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Mon, 23 May 2022 19:48:45 +0100
Subject: [PATCH 1/6] Submit becomes Publish

---
 blog.py                  |  2 +-
 daemon.py                |  2 +-
 webapp_accesskeys.py     |  2 +-
 webapp_column_left.py    |  2 +-
 webapp_column_right.py   |  6 +++---
 webapp_create_post.py    |  2 +-
 webapp_person_options.py | 14 +++++++-------
 webapp_profile.py        |  4 ++--
 webapp_search.py         |  6 +++---
 webapp_theme_designer.py |  2 +-
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/blog.py b/blog.py
index 078d50ff7..464300a34 100644
--- a/blog.py
+++ b/blog.py
@@ -892,7 +892,7 @@ def html_edit_blog(media_instance: bool, translate: {},
         translate['Cancel'] + '</button></a>'
     edit_blog_form += \
         '      <input type="submit" name="submitPost" value="' + \
-        translate['Submit'] + '">'
+        translate['Publish'] + '">'
     edit_blog_form += '    </center></div>'
     if media_instance:
         edit_blog_form += edit_blog_image_section
diff --git a/daemon.py b/daemon.py
index e85d7064c..c41ae06e5 100644
--- a/daemon.py
+++ b/daemon.py
@@ -18806,7 +18806,7 @@ class PubServer(BaseHTTPRequestHandler):
                    not fields.get('pinToProfile'):
                     print('WARN: no message, image description or pin')
                     return -1
-                submit_text = self.server.translate['Submit']
+                submit_text = self.server.translate['Publish']
                 custom_submit_text = \
                     get_config_param(self.server.base_dir, 'customSubmitText')
                 if custom_submit_text:
diff --git a/webapp_accesskeys.py b/webapp_accesskeys.py
index 25a290ba3..223b55975 100644
--- a/webapp_accesskeys.py
+++ b/webapp_accesskeys.py
@@ -98,7 +98,7 @@ def html_access_keys(css_cache: {}, base_dir: str,
         translate['Go Back'] + '</button>\n' + \
         '    <button type="submit" class="button" ' + \
         'name="submitAccessKeys" accesskey="' + submit_key + '">' + \
-        translate['Submit'] + '</button>\n    </center>\n'
+        translate['Publish'] + '</button>\n    </center>\n'
 
     access_keys_form += '    <table class="accesskeys">\n'
     access_keys_form += '      <colgroup>\n'
diff --git a/webapp_column_left.py b/webapp_column_left.py
index a1b057d51..a13f048a6 100644
--- a/webapp_column_left.py
+++ b/webapp_column_left.py
@@ -476,7 +476,7 @@ def html_edit_links(css_cache: {}, translate: {}, base_dir: str, path: str,
         '      <h1>' + translate['Edit Links'] + '</h1>'
     edit_links_form += \
         '      <input type="submit" name="submitLinks" value="' + \
-        translate['Submit'] + '" ' + \
+        translate['Publish'] + '" ' + \
         'accesskey="' + access_keys['submitButton'] + '">\n'
     edit_links_form += \
         '    </div>\n'
diff --git a/webapp_column_right.py b/webapp_column_right.py
index a848920c3..a88e0849b 100644
--- a/webapp_column_right.py
+++ b/webapp_column_right.py
@@ -418,7 +418,7 @@ def html_citations(base_dir: str, nickname: str, domain: str,
     # submit button
     html_str += \
         '    <input type="submit" name="submitCitations" value="' + \
-        translate['Submit'] + '">\n'
+        translate['Publish'] + '">\n'
     html_str += '  </center>\n'
 
     citations_separator = '#####'
@@ -596,7 +596,7 @@ def html_edit_newswire(css_cache: {}, translate: {}, base_dir: str, path: str,
         '    <div class="containerSubmitNewPost">\n'
     edit_newswire_form += \
         '      <input type="submit" name="submitNewswire" value="' + \
-        translate['Submit'] + '" ' + \
+        translate['Publish'] + '" ' + \
         'accesskey="' + access_keys['submitButton'] + '">\n'
     edit_newswire_form += \
         '    </div>\n'
@@ -712,7 +712,7 @@ def html_edit_news_post(css_cache: {}, translate: {}, base_dir: str, path: str,
         '<button class="cancelbtn">' + translate['Go Back'] + '</button></a>\n'
     edit_news_post_form += \
         '      <input type="submit" name="submitEditedNewsPost" value="' + \
-        translate['Submit'] + '">\n'
+        translate['Publish'] + '">\n'
     edit_news_post_form += \
         '    </div>\n'
 
diff --git a/webapp_create_post.py b/webapp_create_post.py
index 68052569d..841791022 100644
--- a/webapp_create_post.py
+++ b/webapp_create_post.py
@@ -870,7 +870,7 @@ def html_new_post(css_cache: {}, media_instance: bool, translate: {},
             '      <td><input type="submit" name="submitCitations" value="' + \
             translate['Citations'] + '"></td>\n'
 
-    submit_text = translate['Submit']
+    submit_text = translate['Publish']
     if custom_submit_text:
         submit_text = custom_submit_text
     new_post_form += \
diff --git a/webapp_person_options.py b/webapp_person_options.py
index a35702199..627f8e0ba 100644
--- a/webapp_person_options.py
+++ b/webapp_person_options.py
@@ -272,7 +272,7 @@ def html_person_options(default_timeline: str,
                     'accesskey="' + access_keys['enterPetname'] + '">\n' \
                     '    <button type="submit" class="buttonsmall" ' + \
                     'name="submitPetname">' + \
-                    translate['Submit'] + '</button><br>\n'
+                    translate['Publish'] + '</button><br>\n'
 
             # Notify when a post arrives from this person
             if is_following_actor(base_dir, nickname, domain, options_actor):
@@ -282,7 +282,7 @@ def html_person_options(default_timeline: str,
                     translate['Notify me when this account posts'] + \
                     '\n    <button type="submit" class="buttonsmall" ' + \
                     'name="submitNotifyOnPost">' + \
-                    translate['Submit'] + '</button><br>\n'
+                    translate['Publish'] + '</button><br>\n'
                 if not notify_when_person_posts(base_dir, nickname, domain,
                                                 options_nickname,
                                                 options_domain_full):
@@ -295,7 +295,7 @@ def html_person_options(default_timeline: str,
                     translate['Receive calendar events from this account'] + \
                     '\n    <button type="submit" class="buttonsmall" ' + \
                     'name="submitOnCalendar">' + \
-                    translate['Submit'] + '</button><br>\n'
+                    translate['Publish'] + '</button><br>\n'
                 if not receiving_calendar_events(base_dir, nickname, domain,
                                                  options_nickname,
                                                  options_domain_full):
@@ -320,7 +320,7 @@ def html_person_options(default_timeline: str,
                         translate['Allow news posts'] + \
                         '\n    <button type="submit" class="buttonsmall" ' + \
                         'name="submitPostToNews">' + \
-                        translate['Submit'] + '</button><br>\n'
+                        translate['Publish'] + '</button><br>\n'
                     if os.path.isfile(newswire_blocked_filename):
                         checkbox_str = checkbox_str.replace(' checked>', '>')
                     else:
@@ -340,7 +340,7 @@ def html_person_options(default_timeline: str,
                     translate['News posts are moderated'] + \
                     '\n    <button type="submit" class="buttonsmall" ' + \
                     'name="submitModNewsPosts">' + \
-                    translate['Submit'] + '</button><br>\n'
+                    translate['Publish'] + '</button><br>\n'
                 if not os.path.isfile(moderated_filename):
                     checkbox_str = checkbox_str.replace(' checked>', '>')
                 options_str += checkbox_str
@@ -358,7 +358,7 @@ def html_person_options(default_timeline: str,
                         translate['Featured writer'] + \
                         '\n    <button type="submit" class="buttonsmall" ' + \
                         'name="submitPostToFeatures">' + \
-                        translate['Submit'] + '</button><br>\n'
+                        translate['Publish'] + '</button><br>\n'
                     if not is_featured_writer(base_dir, options_nickname,
                                               options_domain):
                         checkbox_str = checkbox_str.replace(' checked>', '>')
@@ -434,7 +434,7 @@ def html_person_options(default_timeline: str,
             '    <br><br>' + translate['Notes'] + ': \n'
         options_str += '    <button type="submit" class="buttonsmall" ' + \
             'name="submitPersonNotes">' + \
-            translate['Submit'] + '</button><br>\n'
+            translate['Publish'] + '</button><br>\n'
         options_str += \
             '    <textarea id="message" ' + \
             'name="optionnotes" style="height:400px" spellcheck="true" ' + \
diff --git a/webapp_profile.py b/webapp_profile.py
index 9314474a2..2b5023a4e 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -2168,7 +2168,7 @@ def _html_edit_profile_top_banner(base_dir: str,
         '      <center>\n' + \
         '        <input type="submit" name="submitProfile" ' + \
         'accesskey="' + access_keys['submitButton'] + '" ' + \
-        'value="' + translate['Submit'] + '">\n' + \
+        'value="' + translate['Publish'] + '">\n' + \
         '      </center>\n'
     edit_profile_form += '    </div>\n'
 
@@ -2431,7 +2431,7 @@ def html_edit_profile(server, css_cache: {}, translate: {},
     edit_profile_form += \
         '      <center>\n' + \
         '        <input type="submit" name="submitProfile" value="' + \
-        translate['Submit'] + '">\n' + \
+        translate['Publish'] + '">\n' + \
         '      </center>\n'
     edit_profile_form += '    </div>\n'
 
diff --git a/webapp_search.py b/webapp_search.py
index f15a12e3a..d7888044f 100644
--- a/webapp_search.py
+++ b/webapp_search.py
@@ -366,7 +366,7 @@ def html_search_emoji_text_entry(css_cache: {}, translate: {},
     emoji_str += '    <input type="text" name="searchtext" autofocus><br>\n'
     emoji_str += \
         '    <button type="submit" class="button" name="submitSearch">' + \
-        translate['Submit'] + '</button>\n'
+        translate['Publish'] + '</button>\n'
     emoji_str += '  </form>\n'
     emoji_str += '  </center>\n'
     emoji_str += '  </div>\n'
@@ -437,7 +437,7 @@ def html_search(css_cache: {}, translate: {},
     submit_key = access_keys['submitButton']
     follow_str += '    <button type="submit" class="button" ' + \
         'name="submitSearch" accesskey="' + submit_key + '">' + \
-        translate['Submit'] + '</button>\n'
+        translate['Publish'] + '</button>\n'
     follow_str += '  </form>\n'
 
     cached_hashtag_swarm_filename = \
@@ -818,7 +818,7 @@ def html_hashtag_search(css_cache: {},
             'name="hashtagCategory" value="' + category + '">\n'
         hashtag_search_form += \
             '      <button type="submit" class="button" name="submitYes">' + \
-            translate['Submit'] + '</button>\n'
+            translate['Publish'] + '</button>\n'
         hashtag_search_form += '    </center>\n'
         hashtag_search_form += '  </form>\n'
         hashtag_search_form += '</div>\n'
diff --git a/webapp_theme_designer.py b/webapp_theme_designer.py
index d5602c0ca..f3e8d5e3f 100644
--- a/webapp_theme_designer.py
+++ b/webapp_theme_designer.py
@@ -221,7 +221,7 @@ def html_theme_designer(css_cache: {}, base_dir: str,
         translate['Reset'] + '</button>\n' + \
         '    <button type="submit" class="button" ' + \
         'name="submitThemeDesigner" accesskey="' + submit_key + '">' + \
-        translate['Submit'] + '</button>\n    </center>\n'
+        translate['Publish'] + '</button>\n    </center>\n'
 
     contrast_warning = ''
     if theme_json.get('main-bg-color'):

From dec4ade6b57ad9568a0969bcfacbd7d03c57bd52 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Mon, 23 May 2022 20:23:23 +0100
Subject: [PATCH 2/6] Paragraph

---
 webapp_create_post.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp_create_post.py b/webapp_create_post.py
index 841791022..69f8d34d3 100644
--- a/webapp_create_post.py
+++ b/webapp_create_post.py
@@ -729,9 +729,9 @@ def html_new_post(css_cache: {}, media_instance: bool, translate: {},
             '<a href="' + maps_url + '" ' + \
             'rel="nofollow noopener noreferrer" target="_blank">' + \
             translate['Location'] + '</a>'
-        date_and_location += \
+        date_and_location += '<p>\n' + \
             edit_text_field(location_label_with_link, 'location', '',
-                            'https://www.openstreetmap.org/#map=')
+                            'https://www.openstreetmap.org/#map=') + '</p>\n'
         date_and_location += end_edit_section()
 
     instance_title = get_config_param(base_dir, 'instanceTitle')

From 5b8550c68a8cb0db0699004365f6c2fc4cff16e1 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Mon, 23 May 2022 20:42:05 +0100
Subject: [PATCH 3/6] Remove unused javascript reference

---
 blog.py               | 4 ----
 webapp_create_post.py | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/blog.py b/blog.py
index 464300a34..a3fe001fa 100644
--- a/blog.py
+++ b/blog.py
@@ -919,10 +919,6 @@ def html_edit_blog(media_instance: bool, translate: {},
     edit_blog_form += '  </div>'
     edit_blog_form += '</form>'
 
-    edit_blog_form = \
-        edit_blog_form.replace('<body>',
-                               '<body onload="focusOnMessage()">')
-
     edit_blog_form += html_footer()
     return edit_blog_form
 
diff --git a/webapp_create_post.py b/webapp_create_post.py
index 69f8d34d3..47bebb36c 100644
--- a/webapp_create_post.py
+++ b/webapp_create_post.py
@@ -952,9 +952,5 @@ def html_new_post(css_cache: {}, media_instance: bool, translate: {},
         '  </div>\n' + \
         '</form>\n'
 
-    if not report_url:
-        new_post_form = \
-            new_post_form.replace('<body>', '<body onload="focusOnMessage()">')
-
     new_post_form += html_footer()
     return new_post_form

From 6550f4b817156f8c2c01078b03b25e675c1cddb8 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Mon, 23 May 2022 20:51:13 +0100
Subject: [PATCH 4/6] Remove duplicates

---
 epicyon-profile.css | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/epicyon-profile.css b/epicyon-profile.css
index b8286c3b7..1d71cbe34 100644
--- a/epicyon-profile.css
+++ b/epicyon-profile.css
@@ -1378,10 +1378,6 @@ h3 {
         background: var(--link-bg-color);
         font-family: 'Arial, Helvetica, sans-serif';
     }
-    body, html {
-        font-size: var(--font-size4);
-        font-family: 'Arial, Helvetica, sans-serif';
-    }
     .galleryContainer {
         display: grid;
         grid-template-columns: 50% 50%;
@@ -2150,10 +2146,6 @@ h3 {
         background: var(--link-bg-color);
         font-family: 'Arial, Helvetica, sans-serif';
     }
-    body, html {
-        font-size: var(--font-size3);
-        font-family: 'Arial, Helvetica, sans-serif';
-    }
     div.gallerytext {
         color: var(--gallery-text-color);
         font-size: var(--gallery-font-size-mobile);
@@ -2934,10 +2926,6 @@ h3 {
         background: var(--link-bg-color);
         font-family: 'Arial, Helvetica, sans-serif';
     }
-    body, html {
-        font-size: var(--font-size4);
-        font-family: 'Arial, Helvetica, sans-serif';
-    }
     div.gallerytext {
         color: var(--gallery-text-color);
         font-size: var(--gallery-font-size-tiny);

From 04475a6faec94ac2c2c0f597c03aee3ba7c58c5e Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Mon, 23 May 2022 21:06:17 +0100
Subject: [PATCH 5/6] Width of time entry

---
 epicyon-profile.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/epicyon-profile.css b/epicyon-profile.css
index 1d71cbe34..18524ad6a 100644
--- a/epicyon-profile.css
+++ b/epicyon-profile.css
@@ -1912,6 +1912,9 @@ h3 {
     blockquote {
         font-size: var(--quote-font-size-mobile);
     }
+    input[type=time] {
+        width: 5ch;
+    }
     figcaption img.emojiheader {
         float: none;
         width: 50px;
@@ -2692,6 +2695,9 @@ h3 {
     blockquote {
         font-size: var(--quote-font-size-tiny);
     }
+    input[type=time] {
+        width: 5ch;
+    }
     figcaption img.emojiheader {
         float: none;
         width: 50px;

From f469b7b0b11495e8b3dabbabbdc32ede9bc0feb9 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Mon, 23 May 2022 21:09:38 +0100
Subject: [PATCH 6/6] Revert "Remove duplicates"

This reverts commit 6550f4b817156f8c2c01078b03b25e675c1cddb8.
---
 epicyon-profile.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/epicyon-profile.css b/epicyon-profile.css
index 18524ad6a..72a267f2a 100644
--- a/epicyon-profile.css
+++ b/epicyon-profile.css
@@ -1378,6 +1378,10 @@ h3 {
         background: var(--link-bg-color);
         font-family: 'Arial, Helvetica, sans-serif';
     }
+    body, html {
+        font-size: var(--font-size4);
+        font-family: 'Arial, Helvetica, sans-serif';
+    }
     .galleryContainer {
         display: grid;
         grid-template-columns: 50% 50%;
@@ -2149,6 +2153,10 @@ h3 {
         background: var(--link-bg-color);
         font-family: 'Arial, Helvetica, sans-serif';
     }
+    body, html {
+        font-size: var(--font-size3);
+        font-family: 'Arial, Helvetica, sans-serif';
+    }
     div.gallerytext {
         color: var(--gallery-text-color);
         font-size: var(--gallery-font-size-mobile);
@@ -2932,6 +2940,10 @@ h3 {
         background: var(--link-bg-color);
         font-family: 'Arial, Helvetica, sans-serif';
     }
+    body, html {
+        font-size: var(--font-size4);
+        font-family: 'Arial, Helvetica, sans-serif';
+    }
     div.gallerytext {
         color: var(--gallery-text-color);
         font-size: var(--gallery-font-size-tiny);