indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Merge branch 'main' of gitlab.com:bashrc2/epicyon

merge-requests/30/head
Bob Mottram 2022-05-23 21:36:51 +01:00
parent be8f3e02ee f469b7b0b1
commit 232a4d6069
11 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blog.py
View File

@ -892,7 +892,7 @@ def html_edit_blog(media_instance: bool, translate: {},
translate['Cancel'] + '</button></a>' translate['Cancel'] + '</button></a>'
edit_blog_form += \ edit_blog_form += \
' <input type="submit" name="submitPost" value="' + \ ' <input type="submit" name="submitPost" value="' + \
translate['Submit'] + '">' translate['Publish'] + '">'
edit_blog_form += ' </center></div>' edit_blog_form += ' </center></div>'
if media_instance: if media_instance:
edit_blog_form += edit_blog_image_section edit_blog_form += edit_blog_image_section
@ -919,10 +919,6 @@ def html_edit_blog(media_instance: bool, translate: {},
edit_blog_form += ' </div>' edit_blog_form += ' </div>'
edit_blog_form += '</form>' edit_blog_form += '</form>'
edit_blog_form = \
edit_blog_form.replace('<body>',
'<body onload="focusOnMessage()">')
edit_blog_form += html_footer() edit_blog_form += html_footer()
return edit_blog_form return edit_blog_form

2
daemon.py
View File

@ -18806,7 +18806,7 @@ class PubServer(BaseHTTPRequestHandler):
not fields.get('pinToProfile'): not fields.get('pinToProfile'):
print('WARN: no message, image description or pin') print('WARN: no message, image description or pin')
return -1 return -1
submit_text = self.server.translate['Submit'] submit_text = self.server.translate['Publish']
custom_submit_text = \ custom_submit_text = \
get_config_param(self.server.base_dir, 'customSubmitText') get_config_param(self.server.base_dir, 'customSubmitText')
if custom_submit_text: if custom_submit_text:

6
epicyon-profile.css
View File

@ -1916,6 +1916,9 @@ h3 {
blockquote { blockquote {
font-size: var(--quote-font-size-mobile); font-size: var(--quote-font-size-mobile);
} }
input[type=time] {
width: 5ch;
}
figcaption img.emojiheader { figcaption img.emojiheader {
float: none; float: none;
width: 50px; width: 50px;
@ -2700,6 +2703,9 @@ h3 {
blockquote { blockquote {
font-size: var(--quote-font-size-tiny); font-size: var(--quote-font-size-tiny);
} }
input[type=time] {
width: 5ch;
}
figcaption img.emojiheader { figcaption img.emojiheader {
float: none; float: none;
width: 50px; width: 50px;

2
webapp_accesskeys.py
View File

@ -98,7 +98,7 @@ def html_access_keys(css_cache: {}, base_dir: str,
translate['Go Back'] + '</button>\n' + \ translate['Go Back'] + '</button>\n' + \
' <button type="submit" class="button" ' + \ ' <button type="submit" class="button" ' + \
'name="submitAccessKeys" accesskey="' + submit_key + '">' + \ '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 += ' <table class="accesskeys">\n'
access_keys_form += ' <colgroup>\n' access_keys_form += ' <colgroup>\n'

2
webapp_column_left.py
View File

@ -476,7 +476,7 @@ def html_edit_links(css_cache: {}, translate: {}, base_dir: str, path: str,
' <h1>' + translate['Edit Links'] + '</h1>' ' <h1>' + translate['Edit Links'] + '</h1>'
edit_links_form += \ edit_links_form += \
' <input type="submit" name="submitLinks" value="' + \ ' <input type="submit" name="submitLinks" value="' + \
translate['Submit'] + '" ' + \ translate['Publish'] + '" ' + \
'accesskey="' + access_keys['submitButton'] + '">\n' 'accesskey="' + access_keys['submitButton'] + '">\n'
edit_links_form += \ edit_links_form += \
' </div>\n' ' </div>\n'

6
webapp_column_right.py
View File

@ -418,7 +418,7 @@ def html_citations(base_dir: str, nickname: str, domain: str,
# submit button # submit button
html_str += \ html_str += \
' <input type="submit" name="submitCitations" value="' + \ ' <input type="submit" name="submitCitations" value="' + \
translate['Submit'] + '">\n' translate['Publish'] + '">\n'
html_str += ' </center>\n' html_str += ' </center>\n'
citations_separator = '#####' citations_separator = '#####'
@ -596,7 +596,7 @@ def html_edit_newswire(css_cache: {}, translate: {}, base_dir: str, path: str,
' <div class="containerSubmitNewPost">\n' ' <div class="containerSubmitNewPost">\n'
edit_newswire_form += \ edit_newswire_form += \
' <input type="submit" name="submitNewswire" value="' + \ ' <input type="submit" name="submitNewswire" value="' + \
translate['Submit'] + '" ' + \ translate['Publish'] + '" ' + \
'accesskey="' + access_keys['submitButton'] + '">\n' 'accesskey="' + access_keys['submitButton'] + '">\n'
edit_newswire_form += \ edit_newswire_form += \
' </div>\n' ' </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' '<button class="cancelbtn">' + translate['Go Back'] + '</button></a>\n'
edit_news_post_form += \ edit_news_post_form += \
' <input type="submit" name="submitEditedNewsPost" value="' + \ ' <input type="submit" name="submitEditedNewsPost" value="' + \
translate['Submit'] + '">\n' translate['Publish'] + '">\n'
edit_news_post_form += \ edit_news_post_form += \
' </div>\n' ' </div>\n'

10
webapp_create_post.py
View File

@ -729,9 +729,9 @@ def html_new_post(css_cache: {}, media_instance: bool, translate: {},
'<a href="' + maps_url + '" ' + \ '<a href="' + maps_url + '" ' + \
'rel="nofollow noopener noreferrer" target="_blank">' + \ 'rel="nofollow noopener noreferrer" target="_blank">' + \
translate['Location'] + '</a>' translate['Location'] + '</a>'
date_and_location += \ date_and_location += '<p>\n' + \
edit_text_field(location_label_with_link, 'location', '', 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() date_and_location += end_edit_section()
instance_title = get_config_param(base_dir, 'instanceTitle') instance_title = get_config_param(base_dir, 'instanceTitle')
@ -870,7 +870,7 @@ def html_new_post(css_cache: {}, media_instance: bool, translate: {},
' <td><input type="submit" name="submitCitations" value="' + \ ' <td><input type="submit" name="submitCitations" value="' + \
translate['Citations'] + '"></td>\n' translate['Citations'] + '"></td>\n'
submit_text = translate['Submit'] submit_text = translate['Publish']
if custom_submit_text: if custom_submit_text:
submit_text = custom_submit_text submit_text = custom_submit_text
new_post_form += \ new_post_form += \
@ -952,9 +952,5 @@ def html_new_post(css_cache: {}, media_instance: bool, translate: {},
' </div>\n' + \ ' </div>\n' + \
'</form>\n' '</form>\n'
if not report_url:
new_post_form = \
new_post_form.replace('<body>', '<body onload="focusOnMessage()">')
new_post_form += html_footer() new_post_form += html_footer()
return new_post_form return new_post_form

14
webapp_person_options.py
View File

@ -272,7 +272,7 @@ def html_person_options(default_timeline: str,
'accesskey="' + access_keys['enterPetname'] + '">\n' \ 'accesskey="' + access_keys['enterPetname'] + '">\n' \
' <button type="submit" class="buttonsmall" ' + \ ' <button type="submit" class="buttonsmall" ' + \
'name="submitPetname">' + \ 'name="submitPetname">' + \
translate['Submit'] + '</button><br>\n' translate['Publish'] + '</button><br>\n'
# Notify when a post arrives from this person # Notify when a post arrives from this person
if is_following_actor(base_dir, nickname, domain, options_actor): 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'] + \ translate['Notify me when this account posts'] + \
'\n <button type="submit" class="buttonsmall" ' + \ '\n <button type="submit" class="buttonsmall" ' + \
'name="submitNotifyOnPost">' + \ 'name="submitNotifyOnPost">' + \
translate['Submit'] + '</button><br>\n' translate['Publish'] + '</button><br>\n'
if not notify_when_person_posts(base_dir, nickname, domain, if not notify_when_person_posts(base_dir, nickname, domain,
options_nickname, options_nickname,
options_domain_full): options_domain_full):
@ -295,7 +295,7 @@ def html_person_options(default_timeline: str,
translate['Receive calendar events from this account'] + \ translate['Receive calendar events from this account'] + \
'\n <button type="submit" class="buttonsmall" ' + \ '\n <button type="submit" class="buttonsmall" ' + \
'name="submitOnCalendar">' + \ 'name="submitOnCalendar">' + \
translate['Submit'] + '</button><br>\n' translate['Publish'] + '</button><br>\n'
if not receiving_calendar_events(base_dir, nickname, domain, if not receiving_calendar_events(base_dir, nickname, domain,
options_nickname, options_nickname,
options_domain_full): options_domain_full):
@ -320,7 +320,7 @@ def html_person_options(default_timeline: str,
translate['Allow news posts'] + \ translate['Allow news posts'] + \
'\n <button type="submit" class="buttonsmall" ' + \ '\n <button type="submit" class="buttonsmall" ' + \
'name="submitPostToNews">' + \ 'name="submitPostToNews">' + \
translate['Submit'] + '</button><br>\n' translate['Publish'] + '</button><br>\n'
if os.path.isfile(newswire_blocked_filename): if os.path.isfile(newswire_blocked_filename):
checkbox_str = checkbox_str.replace(' checked>', '>') checkbox_str = checkbox_str.replace(' checked>', '>')
else: else:
@ -340,7 +340,7 @@ def html_person_options(default_timeline: str,
translate['News posts are moderated'] + \ translate['News posts are moderated'] + \
'\n <button type="submit" class="buttonsmall" ' + \ '\n <button type="submit" class="buttonsmall" ' + \
'name="submitModNewsPosts">' + \ 'name="submitModNewsPosts">' + \
translate['Submit'] + '</button><br>\n' translate['Publish'] + '</button><br>\n'
if not os.path.isfile(moderated_filename): if not os.path.isfile(moderated_filename):
checkbox_str = checkbox_str.replace(' checked>', '>') checkbox_str = checkbox_str.replace(' checked>', '>')
options_str += checkbox_str options_str += checkbox_str
@ -358,7 +358,7 @@ def html_person_options(default_timeline: str,
translate['Featured writer'] + \ translate['Featured writer'] + \
'\n <button type="submit" class="buttonsmall" ' + \ '\n <button type="submit" class="buttonsmall" ' + \
'name="submitPostToFeatures">' + \ 'name="submitPostToFeatures">' + \
translate['Submit'] + '</button><br>\n' translate['Publish'] + '</button><br>\n'
if not is_featured_writer(base_dir, options_nickname, if not is_featured_writer(base_dir, options_nickname,
options_domain): options_domain):
checkbox_str = checkbox_str.replace(' checked>', '>') checkbox_str = checkbox_str.replace(' checked>', '>')
@ -434,7 +434,7 @@ def html_person_options(default_timeline: str,
' <br><br>' + translate['Notes'] + ': \n' ' <br><br>' + translate['Notes'] + ': \n'
options_str += ' <button type="submit" class="buttonsmall" ' + \ options_str += ' <button type="submit" class="buttonsmall" ' + \
'name="submitPersonNotes">' + \ 'name="submitPersonNotes">' + \
translate['Submit'] + '</button><br>\n' translate['Publish'] + '</button><br>\n'
options_str += \ options_str += \
' <textarea id="message" ' + \ ' <textarea id="message" ' + \
'name="optionnotes" style="height:400px" spellcheck="true" ' + \ 'name="optionnotes" style="height:400px" spellcheck="true" ' + \

4
webapp_profile.py
View File

@ -2168,7 +2168,7 @@ def _html_edit_profile_top_banner(base_dir: str,
' <center>\n' + \ ' <center>\n' + \
' <input type="submit" name="submitProfile" ' + \ ' <input type="submit" name="submitProfile" ' + \
'accesskey="' + access_keys['submitButton'] + '" ' + \ 'accesskey="' + access_keys['submitButton'] + '" ' + \
'value="' + translate['Submit'] + '">\n' + \ 'value="' + translate['Publish'] + '">\n' + \
' </center>\n' ' </center>\n'
edit_profile_form += ' </div>\n' edit_profile_form += ' </div>\n'
@ -2431,7 +2431,7 @@ def html_edit_profile(server, css_cache: {}, translate: {},
edit_profile_form += \ edit_profile_form += \
' <center>\n' + \ ' <center>\n' + \
' <input type="submit" name="submitProfile" value="' + \ ' <input type="submit" name="submitProfile" value="' + \
translate['Submit'] + '">\n' + \ translate['Publish'] + '">\n' + \
' </center>\n' ' </center>\n'
edit_profile_form += ' </div>\n' edit_profile_form += ' </div>\n'

6
webapp_search.py
View File

@ -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 += ' <input type="text" name="searchtext" autofocus><br>\n'
emoji_str += \ emoji_str += \
' <button type="submit" class="button" name="submitSearch">' + \ ' <button type="submit" class="button" name="submitSearch">' + \
translate['Submit'] + '</button>\n' translate['Publish'] + '</button>\n'
emoji_str += ' </form>\n' emoji_str += ' </form>\n'
emoji_str += ' </center>\n' emoji_str += ' </center>\n'
emoji_str += ' </div>\n' emoji_str += ' </div>\n'
@ -437,7 +437,7 @@ def html_search(css_cache: {}, translate: {},
submit_key = access_keys['submitButton'] submit_key = access_keys['submitButton']
follow_str += ' <button type="submit" class="button" ' + \ follow_str += ' <button type="submit" class="button" ' + \
'name="submitSearch" accesskey="' + submit_key + '">' + \ 'name="submitSearch" accesskey="' + submit_key + '">' + \
translate['Submit'] + '</button>\n' translate['Publish'] + '</button>\n'
follow_str += ' </form>\n' follow_str += ' </form>\n'
cached_hashtag_swarm_filename = \ cached_hashtag_swarm_filename = \
@ -818,7 +818,7 @@ def html_hashtag_search(css_cache: {},
'name="hashtagCategory" value="' + category + '">\n' 'name="hashtagCategory" value="' + category + '">\n'
hashtag_search_form += \ hashtag_search_form += \
' <button type="submit" class="button" name="submitYes">' + \ ' <button type="submit" class="button" name="submitYes">' + \
translate['Submit'] + '</button>\n' translate['Publish'] + '</button>\n'
hashtag_search_form += ' </center>\n' hashtag_search_form += ' </center>\n'
hashtag_search_form += ' </form>\n' hashtag_search_form += ' </form>\n'
hashtag_search_form += '</div>\n' hashtag_search_form += '</div>\n'

2
webapp_theme_designer.py
View File

@ -221,7 +221,7 @@ def html_theme_designer(css_cache: {}, base_dir: str,
translate['Reset'] + '</button>\n' + \ translate['Reset'] + '</button>\n' + \
' <button type="submit" class="button" ' + \ ' <button type="submit" class="button" ' + \
'name="submitThemeDesigner" accesskey="' + submit_key + '">' + \ 'name="submitThemeDesigner" accesskey="' + submit_key + '">' + \
translate['Submit'] + '</button>\n </center>\n' translate['Publish'] + '</button>\n </center>\n'
contrast_warning = '' contrast_warning = ''
if theme_json.get('main-bg-color'): if theme_json.get('main-bg-color'):