diff --git a/daemon.py b/daemon.py index 90e184b02..ed6278765 100644 --- a/daemon.py +++ b/daemon.py @@ -152,7 +152,6 @@ from webinterface import rssHashtagSearch from webinterface import htmlModerationInfo from webinterface import htmlSearchSharedItems from webinterface import htmlHashtagBlocked -from webinterface import htmlSendingPost from shares import getSharesFeedForPerson from shares import addShare from shares import removeShare @@ -483,16 +482,6 @@ class PubServer(BaseHTTPRequestHandler): return True return False - def _headers_without_response(self, fileFormat: str, length: int, - callingDomain: str) -> None: - self.send_header('Content-type', fileFormat) - self.send_header('Content-Length', str(length)) - self.send_header('Host', callingDomain) - self.send_header('WWW-Authenticate', - 'title="Login to Epicyon", Basic realm="epicyon"') - self.send_header('X-Robots-Tag', 'noindex') - self.end_headers() - def _login_headers(self, fileFormat: str, length: int, callingDomain: str) -> None: self.send_response(200) @@ -9711,13 +9700,6 @@ class PubServer(BaseHTTPRequestHandler): print('New post begins: ' + postType + ' ' + path) - msg = \ - htmlSendingPost(self.server.baseDir, - self.server.translate).encode('utf-8') - self._headers_without_response('text/html', len(msg), callingDomain) - self._write(msg) - self.wfile.flush() - if '?page=' in path: pageNumberStr = path.split('?page=')[1] if '?' in pageNumberStr: diff --git a/epicyon-send.css b/epicyon-send.css deleted file mode 100644 index 4a5d03304..000000000 --- a/epicyon-send.css +++ /dev/null @@ -1,86 +0,0 @@ -@charset "UTF-8"; - -:root { - --main-bg-color: #282c37; - --link-bg-color: #282c37; - --main-bg-color-darker: #232c37; - --main-bg-color-report: #221c27; - --main-header-color-roles: #282237; - --main-fg-color: #dddddd; - --main-link-color: #999; - --main-visited-color: #888; - --border-color: #505050; - --font-size-header: 18px; - --font-color-header: #ccc; - --font-size: 22px; - --text-entry-foreground: #ccc; - --text-entry-background: #111; - --time-color: #aaa; - --button-text: #FFFFFF; - --button-background: #999; - --button-selected: #666; - --focus-color: white; -} - -@font-face { - font-family: 'Bedstead'; - font-style: italic; - font-weight: normal; - font-display: block; - src: url('./fonts/bedstead.otf') format('opentype'); -} -@font-face { - font-family: 'Bedstead'; - font-style: normal; - font-weight: normal; - font-display: block; - src: url('./fonts/bedstead.otf') format('opentype'); -} - -body, html { - background-color: var(--main-bg-color); - color: var(--main-fg-color); - - height: 100%; - font-family: Arial, Helvetica, sans-serif; - max-width: 80%; - min-width: 600px; - margin: 0 auto; - font-size: var(--font-size); -} - -a, u { - color: var(--main-fg-color); -} - -a:visited{ - color: var(--main-visited-color); - background: var(--link-bg-color); - font-weight: bold; -} - -a:link { - color: var(--main-link-color); - background: var(--link-bg-color); - font-weight: bold; -} - -a:focus { - border: 2px solid var(--focus-color); -} - -.screentitle { - font-size: 30px; - font-family: Arial, Helvetica, sans-serif; -} - -div { - height: 300px; - width: 400px; - background: var(--main-bg-color); - position: fixed; - top: 50%; - left: 50%; - margin-top: -100px; - margin-left: -200px; -} diff --git a/theme.py b/theme.py index c32d64a76..1c092e630 100644 --- a/theme.py +++ b/theme.py @@ -15,7 +15,7 @@ from shutil import copyfile def getThemeFiles() -> []: return ('epicyon.css', 'login.css', 'follow.css', 'suspended.css', 'calendar.css', 'blog.css', - 'options.css', 'search.css', 'send.css') + 'options.css', 'search.css') def getThemesList() -> []: diff --git a/translations/ar.json b/translations/ar.json index 8bc009ea1..b519fa594 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "علامات التجزئة المُنشأة تلقائيًا", "Autogenerated Content Warnings": "تحذيرات المحتوى المُنشأ تلقائيًا", "Indymedia": "Indymedia", - "Hashtag Blocked": "Hashtag محظور", - "Sending Post": "إرسال آخر", - "Please wait": "ارجوك انتظر" + "Hashtag Blocked": "Hashtag محظور" } diff --git a/translations/ca.json b/translations/ca.json index 051525ec8..62736ad2d 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "Hashtags autogenerats", "Autogenerated Content Warnings": "Advertiments de contingut autogenerats", "Indymedia": "Indymedia", - "Hashtag Blocked": "Hashtag bloquejat", - "Sending Post": "S'està enviant el missatge", - "Please wait": "Espereu, si us plau" + "Hashtag Blocked": "Hashtag bloquejat" } diff --git a/translations/cy.json b/translations/cy.json index 3a04f108c..89f52d7ee 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "Hashtags awtogeneiddiedig", "Autogenerated Content Warnings": "Rhybuddion Cynnwys Autogenerated", "Indymedia": "Indymedia", - "Hashtag Blocked": "Hashtag wedi'i Blocio", - "Sending Post": "Post Anfon", - "Please wait": "Arhoswch os gwelwch yn dda" + "Hashtag Blocked": "Hashtag wedi'i Blocio" } diff --git a/translations/de.json b/translations/de.json index d3d097525..e3bc529b6 100644 --- a/translations/de.json +++ b/translations/de.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "Automatisch generierte Hashtags", "Autogenerated Content Warnings": "Warnungen vor automatisch generierten Inhalten", "Indymedia": "Indymedia", - "Hashtag Blocked": "Hashtag blockiert", - "Sending Post": "Post senden", - "Please wait": "Warten Sie mal" + "Hashtag Blocked": "Hashtag blockiert" } diff --git a/translations/en.json b/translations/en.json index 688d4d8a8..c85bbfe85 100644 --- a/translations/en.json +++ b/translations/en.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "Autogenerated Hashtags", "Autogenerated Content Warnings": "Autogenerated Content Warnings", "Indymedia": "Indymedia", - "Hashtag Blocked": "Hashtag Blocked", - "Sending Post": "Sending Post", - "Please wait": "Please wait" + "Hashtag Blocked": "Hashtag Blocked" } diff --git a/translations/es.json b/translations/es.json index fecc20223..6fe9c141b 100644 --- a/translations/es.json +++ b/translations/es.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "Hashtags autogenerados", "Autogenerated Content Warnings": "Advertencias de contenido generado automáticamente", "Indymedia": "Indymedia", - "Hashtag Blocked": "Hashtag bloqueada", - "Sending Post": "Envío de publicación", - "Please wait": "por favor espera" + "Hashtag Blocked": "Hashtag bloqueada" } diff --git a/translations/fr.json b/translations/fr.json index 53f4d7c3f..4a1fb6cb0 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "Hashtags générés automatiquement", "Autogenerated Content Warnings": "Avertissements de contenu générés automatiquement", "Indymedia": "Indymedia", - "Hashtag Blocked": "Hashtag bloqué", - "Sending Post": "Envoi du message", - "Please wait": "S'il vous plaît, attendez" + "Hashtag Blocked": "Hashtag bloqué" } diff --git a/translations/ga.json b/translations/ga.json index 90392720b..1c1266bae 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "Hashtags uathghinte", "Autogenerated Content Warnings": "Rabhaidh Ábhar Uathghinte", "Indymedia": "Indymedia", - "Hashtag Blocked": "Hashtag Blocáilte", - "Sending Post": "Post Seolta", - "Please wait": "Fán le do thoil" + "Hashtag Blocked": "Hashtag Blocáilte" } diff --git a/translations/hi.json b/translations/hi.json index 7ca0f0055..bff59966f 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "ऑटोजेनरेटेड हैशटैग", "Autogenerated Content Warnings": "स्वतः प्राप्त सामग्री चेतावनी", "Indymedia": "Indymedia", - "Hashtag Blocked": "हैशटैग अवरुद्ध", - "Sending Post": "पोस्ट भेज रहा है", - "Please wait": "कृपया प्रतीक्षा कीजिये" + "Hashtag Blocked": "हैशटैग अवरुद्ध" } diff --git a/translations/it.json b/translations/it.json index 5e9536646..08ff2618c 100644 --- a/translations/it.json +++ b/translations/it.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "Hashtag generati automaticamente", "Autogenerated Content Warnings": "Avvisi sui contenuti generati automaticamente", "Indymedia": "Indymedia", - "Hashtag Blocked": "Hashtag bloccato", - "Sending Post": "Invio di post", - "Please wait": "attendere prego" + "Hashtag Blocked": "Hashtag bloccato" } diff --git a/translations/ja.json b/translations/ja.json index 3c5cc3fc9..382b43cc3 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "自動生成されたハッシュタグ", "Autogenerated Content Warnings": "自動生成されたコンテンツの警告", "Indymedia": "Indymedia", - "Hashtag Blocked": "ハッシュタグがブロックされました", - "Sending Post": "投稿を送信する", - "Please wait": "お待ちください" + "Hashtag Blocked": "ハッシュタグがブロックされました" } diff --git a/translations/oc.json b/translations/oc.json index edf65b994..9a0cf46e9 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -283,7 +283,5 @@ "Autogenerated Hashtags": "Autogenerated Hashtags", "Autogenerated Content Warnings": "Autogenerated Content Warnings", "Indymedia": "Indymedia", - "Hashtag Blocked": "Hashtag Blocked", - "Sending Post": "Sending Post", - "Please wait": "Please wait" + "Hashtag Blocked": "Hashtag Blocked" } diff --git a/translations/pt.json b/translations/pt.json index b2c82b634..72314d67e 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "Hashtags autogeradas", "Autogenerated Content Warnings": "Avisos de conteúdo gerado automaticamente", "Indymedia": "Indymedia", - "Hashtag Blocked": "Hashtag bloqueada", - "Sending Post": "Enviando postagem", - "Please wait": "Por favor, espere" + "Hashtag Blocked": "Hashtag bloqueada" } diff --git a/translations/ru.json b/translations/ru.json index 2308cddc7..cb7a0b211 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "Автоматически сгенерированные хештеги", "Autogenerated Content Warnings": "Автоматические предупреждения о содержании", "Indymedia": "Indymedia", - "Hashtag Blocked": "Хештег заблокирован", - "Sending Post": "Отправка сообщения", - "Please wait": "пожалуйста, подождите" + "Hashtag Blocked": "Хештег заблокирован" } diff --git a/translations/zh.json b/translations/zh.json index f572b9c3f..a171135f0 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -287,7 +287,5 @@ "Autogenerated Hashtags": "自动生成的标签", "Autogenerated Content Warnings": "自动生成的内容警告", "Indymedia": "Indymedia", - "Hashtag Blocked": "标签被阻止", - "Sending Post": "发送帖子", - "Please wait": "请稍候" + "Hashtag Blocked": "标签被阻止" } diff --git a/webinterface.py b/webinterface.py index a30c232db..200ae4c1b 100644 --- a/webinterface.py +++ b/webinterface.py @@ -2006,27 +2006,6 @@ def htmlHashtagBlocked(baseDir: str, translate: {}) -> str: return blockedHashtagForm -def htmlSendingPost(baseDir: str, translate: {}) -> str: - """A wait screen while sending a post - """ - sendForm = '' - cssFilename = baseDir + '/epicyon-send.css' - if os.path.isfile(baseDir + '/send.css'): - cssFilename = baseDir + '/send.css' - with open(cssFilename, 'r') as cssFile: - sendingCSS = cssFile.read() - sendForm = htmlHeader(cssFilename, sendingCSS) - sendForm += '<div><center>\n' - sendForm += \ - ' <p class="screentitle">' + \ - translate['Sending Post'] + '</p>\n' - sendForm += \ - ' <p>' + translate['Please wait'] + '</p>\n' - sendForm += '</center></div>\n' - sendForm += htmlFooter() - return sendForm - - def htmlSuspended(baseDir: str) -> str: """Show the screen for suspended accounts """