diff options
author | Cédric Picard <cedric.picard@efrei.net> | 2014-11-29 00:21:32 +0100 |
---|---|---|
committer | Cédric Picard <cedric.picard@efrei.net> | 2014-11-29 00:21:32 +0100 |
commit | ed1f1912d8352efd0f4c5dd19140dd15733182f6 (patch) | |
tree | d7b64f0a2421141cc9693ea5d553968e8786e04f | |
parent | 27e56e46a13c442fd00eaa7eebf684d69241f2df (diff) | |
parent | 15ae36b56a3b7fefc2f55777f79aa1c02ff30b1a (diff) | |
download | pasteme-ed1f1912d8352efd0f4c5dd19140dd15733182f6.tar.gz pasteme-ed1f1912d8352efd0f4c5dd19140dd15733182f6.tar.bz2 pasteme-ed1f1912d8352efd0f4c5dd19140dd15733182f6.zip |
Merge branch 'dev' of git://git.devys.org/pasteme into dev
-rwxr-xr-x | pasteme.py | 2 | ||||
-rw-r--r-- | static/base.css | 12 | ||||
-rw-r--r-- | views/paste.tpl | 4 |
3 files changed, 17 insertions, 1 deletions
@@ -54,7 +54,7 @@ def route_paste_get(pid, pformat='colored'): content = pygments.highlight(content, lexer, pygment_formater) except pygments.util.ClassNotFound: pass - return bottle.template('paste', content=content) + return bottle.template('paste', content=content, pid=pid) bottle.response.content_type = 'text/plain; charset=UTF8' # HTTP header bottle.response.charset = 'utf-8' # used to encode response return content diff --git a/static/base.css b/static/base.css index 5dc464e..9569be1 100644 --- a/static/base.css +++ b/static/base.css @@ -1,3 +1,15 @@ html { background-color: #002b36; } + +#floatingmenu { + border: 1px solid #000; + width: 200px; + height: 50px; + background-color: #002D38; + display: block; + position: absolute; + right: 0px; + top: 0px; + position: absolute; +} diff --git a/views/paste.tpl b/views/paste.tpl index 6867e11..56902a4 100644 --- a/views/paste.tpl +++ b/views/paste.tpl @@ -1,2 +1,6 @@ % rebase('base.tpl', title='Paste snippets') {{!content}} +<div id="floatingmenu"> +<a href="/">Paste something again</a><br /> +<a href="/{{pid}}/raw">Raw format</a><br /> +</div> |