From 6631c04551dc41a3c3f5bfb2269be90f67093115 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 3 Nov 2020 21:53:29 +0000 Subject: [PATCH 001/160] Save only if newswire exists --- newsdaemon.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/newsdaemon.py b/newsdaemon.py index c0a6e8120..695eaef71 100644 --- a/newsdaemon.py +++ b/newsdaemon.py @@ -725,8 +725,9 @@ def runNewswireDaemon(baseDir: str, httpd, mergeWithPreviousNewswire(httpd.newswire, newNewswire) httpd.newswire = newNewswire - saveJson(httpd.newswire, newswireStateFilename) - print('Newswire updated') + if newNewswire: + saveJson(httpd.newswire, newswireStateFilename) + print('Newswire updated') convertRSStoActivityPub(baseDir, httpPrefix, domain, port, From 60067cc894aca5459de9dc8e3b5021127bd832c7 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 4 Nov 2020 09:47:06 +0000 Subject: [PATCH 002/160] Remove newlines for dropdown options --- webinterface.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/webinterface.py b/webinterface.py index 9509450b0..beee723b2 100644 --- a/webinterface.py +++ b/webinterface.py @@ -2799,12 +2799,12 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {}, '
  • ' + translate['Shares'] + \ - '
    ' + translate['Describe a shared item'] + '
  • \n' + '
    ' + translate['Describe a shared item'] + '' questionOptionOnDropdown = \ '
  • ' + translate['Question'] + \ - '
    ' + translate['Ask a question'] + '
  • \n' + '
    ' + translate['Ask a question'] + '' mentionsStr = '' for m in mentions: @@ -2876,7 +2876,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {}, dropDownContent += " \n" dropDownContent += "
    \n" dropDownContent += " \n' + dropDownContent += ' ' dropDownContent += '
    \n' dropDownContent += ' \n' dropDownContent += ' \n' From c37f3ca16f5a135d59d59d5c21938ba55cb62fc7 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 4 Nov 2020 10:01:53 +0000 Subject: [PATCH 003/160] Remove spaces from dropdown content --- webinterface.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/webinterface.py b/webinterface.py index beee723b2..9fad3b41c 100644 --- a/webinterface.py +++ b/webinterface.py @@ -2859,23 +2859,23 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {}, dropDownContent = '' if not reportUrl: dropDownContent += "\n' dropDownContent = \ - htmlNewPostDropDown(replyStr, + htmlNewPostDropDown(scopeIcon, scopeDescription, + replyStr, translate, iconsDir, showPublicOnDropdown, From 010a8484b8026050d793454cf017be2eeafcd502 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 4 Nov 2020 12:43:07 +0000 Subject: [PATCH 008/160] Dropdown style --- epicyon-profile.css | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/epicyon-profile.css b/epicyon-profile.css index c50ea41d1..d829cb071 100644 --- a/epicyon-profile.css +++ b/epicyon-profile.css @@ -727,10 +727,11 @@ input[type=submit]:hover { .newPostDropdown > a[role="button"] { display: inline-block; padding: 6px 15px; - color: #333; + color: var(--dropdown-fg-color); + font-size: var(--font-size) line-height: 1.5em; text-decoration: none; - border: 1px solid #8c8c8c; + border: 0; cursor: pointer; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -740,7 +741,7 @@ input[type=submit]:hover { .newPostDropdown > label:hover, .newPostDropdown > a[role="button"]:hover, .newPostDropdown > a[role="button"]:focus { - border-color: #333; + border-color: var(--dropdown-fg-color); } .newPostDropdown > label:after, @@ -757,8 +758,8 @@ input[type=submit]:hover { display: block; left: -100vw; top: calc(1.5em + 14px); - border: 1px solid #8c8c8c; - background: #fff; + border: 0; + background: var(--dropdown-bg-color); padding: 6px 0; margin: 0; list-style: none; @@ -775,12 +776,12 @@ input[type=submit]:hover { display: block; padding: 6px 15px; text-decoration: none; - color: #333; + color: var(--main-fg-color); } .newPostDropdown > ul a:hover, .newPostDropdown > ul a:focus { - background: #ececec; + background: var(--dropdown-bg-color-hover); } .newPostDropdown > input[type="checkbox"]:checked ~ ul, From 36fa7c2cb927de73bb5c2d90c92a47265d251b34 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 4 Nov 2020 12:55:41 +0000 Subject: [PATCH 009/160] Remove spaces --- webinterface.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/webinterface.py b/webinterface.py index 5fe869bd5..ecc2c41be 100644 --- a/webinterface.py +++ b/webinterface.py @@ -2437,8 +2437,7 @@ def htmlNewPostDropDown(scopeIcon: str, scopeDescription: str, dropDownContent += ' data-toggle="newPostDropdown">\n' dropDownContent += ' ' + \ - scopeDescription + '\n' - dropDownContent += ' \n' + scopeDescription + '\n' dropDownContent += '