mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify html header

main
Bob Mottram 2020-06-19 10:13:41 +01:00
parent 8ca30c6e0e
commit 27b8a77729
2 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deploy/i2p
View File

@ -345,6 +345,7 @@ echo "Creating nginx virtual host for http://${I2P_DOMAIN}"
echo " proxy_set_header X-Forward-For \$proxy_add_x_forwarded_for;"; echo " proxy_set_header X-Forward-For \$proxy_add_x_forwarded_for;";
echo ' proxy_set_header X-Forward-Proto http;'; echo ' proxy_set_header X-Forward-Proto http;';
echo ' proxy_set_header X-Nginx-Proxy true;'; echo ' proxy_set_header X-Nginx-Proxy true;';
echo ' proxy_set_header Upgrade-Insecure-Requests false;';
echo ' expires epoch;'; echo ' expires epoch;';
echo ' proxy_no_cache 1;'; echo ' proxy_no_cache 1;';
echo ' proxy_temp_file_write_size 64k;'; echo ' proxy_temp_file_write_size 64k;';

34
webinterface.py
View File

@ -1660,8 +1660,7 @@ def htmlHashtagBlocked(baseDir: str) -> str:
cssFilename = baseDir + '/suspended.css' cssFilename = baseDir + '/suspended.css'
with open(cssFilename, 'r') as cssFile: with open(cssFilename, 'r') as cssFile:
blockedHashtagCSS = cssFile.read() blockedHashtagCSS = cssFile.read()
blockedHashtagForm = htmlHeader(cssFilename, blockedHashtagForm = htmlHeader(cssFilename, blockedHashtagCSS)
blockedHashtagCSS)
blockedHashtagForm += '<div><center>' blockedHashtagForm += '<div><center>'
blockedHashtagForm += ' <p class="screentitle">Hashtag Blocked</p>' blockedHashtagForm += ' <p class="screentitle">Hashtag Blocked</p>'
blockedHashtagForm += \ blockedHashtagForm += \
@ -2078,31 +2077,12 @@ def htmlNewPost(mediaInstance: bool, translate: {},
return newPostForm return newPostForm
def htmlHeader(cssFilename: str, css=None, refreshSec=0, lang='en') -> str: def htmlHeader(cssFilename: str, css: str, lang='en') -> str:
if refreshSec == 0: htmlStr = '<!DOCTYPE html>\n'
meta = ' <meta charset="utf-8">\n' htmlStr += '<html lang="' + lang + '">\n'
else: htmlStr += ' <meta charset="utf-8">\n'
meta = \ htmlStr += ' <style>\n' + css + '</style>\n'
' <meta http-equiv="Refresh" content="' + \ htmlStr += ' <body>\n'
str(refreshSec) + '" charset="utf-8">\n'
if not css:
if '/' in cssFilename:
cssFilename = cssFilename.split('/')[-1]
htmlStr = '<!DOCTYPE html>\n'
htmlStr += '<html lang="' + lang + '">\n'
htmlStr += meta
htmlStr += ' <style>\n'
htmlStr += ' @import url("' + cssFilename + '");\n'
htmlStr += ' background-color: #282c37'
htmlStr += ' </style>\n'
htmlStr += ' <body>\n'
else:
htmlStr = '<!DOCTYPE html>\n'
htmlStr += '<html lang="' + lang + '">\n'
htmlStr += meta
htmlStr += ' <style>\n' + css + '</style>\n'
htmlStr += ' <body>\n'
return htmlStr return htmlStr