Profouzors
/
boxespy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Link to self.css instead of including it in every page

This commit is contained in:
Florian Festi 2017-05-04 23:09:25 +02:00
parent 7b33c46033
commit f48fc32cf0
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/boxesserver
View File

@ -25,10 +25,6 @@ import codecs
import mimetypes import mimetypes
import re import re
csspath = os.path.join(os.path.dirname(__file__), 'self.css')
css = codecs.open(csspath, "r", "utf-8").read()
# Python 2 vs Python 3 compat # Python 2 vs Python 3 compat
try: try:
from urllib.parse import unquote_plus from urllib.parse import unquote_plus
@ -151,11 +147,8 @@ class BServer:
def args2html(self, name, box, action=""): def args2html(self, name, box, action=""):
result = ["""<html><head><title>Boxes - """, name, """</title> result = ["""<html><head><title>Boxes - """, name, """</title>
<link rel="stylesheet" href="https://necolas.github.io/normalize.css/4.1.1/normalize.css" type="text/css" /> <link rel="stylesheet" href="https://necolas.github.io/normalize.css/4.1.1/normalize.css" type="text/css" />
<style> <link rel="stylesheet" href="static/self.css" type="text/css" />
""", self.scripts % (len(box.argparser._action_groups)-3), """
""", css, """
</style>""", self.scripts % (len(box.argparser._action_groups)-3), """
<script> <script>
</script> </script>
</head> </head>
@ -226,11 +219,7 @@ class BServer:
result = ["""<html> result = ["""<html>
<head><title>Boxes.py</title> <head><title>Boxes.py</title>
<link rel="stylesheet" href="https://necolas.github.io/normalize.css/4.1.1/normalize.css" type="text/css" /> <link rel="stylesheet" href="https://necolas.github.io/normalize.css/4.1.1/normalize.css" type="text/css" />
<style> <link rel="stylesheet" href="static/self.css" type="text/css" />
""", css, """
</style>
<script> <script>
function change(img_link){ function change(img_link){
var img = img_link.firstChild.innerHTML; var img = img_link.firstChild.innerHTML;
@ -327,7 +316,7 @@ Create boxes and more with a laser cutter!
filename = environ["PATH_INFO"][len("/static/"):] filename = environ["PATH_INFO"][len("/static/"):]
path = os.path.join(self.staticdir, filename) path = os.path.join(self.staticdir, filename)
print(filename, path) print(filename, path)
if (not re.match(r"[a-zA-Z0-9_-/]+\.[a-zA-Z0-9]+", filename) or if (not re.match(r"[a-zA-Z0-9_/-]+\.[a-zA-Z0-9]+", filename) or
not os.path.exists(path)): not os.path.exists(path)):
start_response("404 Not Found", [('Content-type', 'text/plain')]) start_response("404 Not Found", [('Content-type', 'text/plain')])
return [b"Not found"] return [b"Not found"]
@ -395,7 +384,7 @@ Create boxes and more with a laser cutter!
return (l.encode("utf-8") for l in result) return (l.encode("utf-8") for l in result)
if __name__=="__main__": if __name__=="__main__":
fc = FileChecker(files=[csspath]) fc = FileChecker()
fc.start() fc.start()
boxserver = BServer() boxserver = BServer()
httpd = make_server('', 8000, boxserver.serve) httpd = make_server('', 8000, boxserver.serve)

0
scripts/self.css → static/self.css
View File