diff options
| author | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-11 21:48:29 +0200 |
|---|---|---|
| committer | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-11 21:48:29 +0200 |
| commit | 72423bd9cbe526c2d91701043498863c687f8db9 (patch) | |
| tree | 5612d313b4b395e94f1c278d621b59dee5d461d9 | |
| parent | fc40d7c22a54bf11b05b1e3e0015bc90530d66e8 (diff) | |
Moved menu, fixed login button.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | static/style.css | 16 | ||||
| -rw-r--r-- | templates/base.tmpl | 26 | ||||
| -rw-r--r-- | templates/login.tmpl | 2 |
4 files changed, 25 insertions, 21 deletions
@@ -2,3 +2,5 @@ *.pyc settings.py /files +/templates/*.py +!/templates/__init__.py diff --git a/static/style.css b/static/style.css index e16b5b7..2f6fc0a 100644 --- a/static/style.css +++ b/static/style.css @@ -1,11 +1,16 @@ * { margin: 0px; padding: 0px; font-family: sans-serif; } html, body { background-color: #fff; color: #333; height: 100%; } -div#page-header { background-color: #ccc; color: #333; padding: 1em; } -div#page-header a { color: inherit; text-decoration: none; } +div#page-header { background-color: #ccc; color: #333; } +div#page-header h1 { padding: .5em; } +div#page-header h1 a { color: inherit; text-decoration: none; } div#page { min-height: 100%; height: auto !important; height: 100%; margin: 0 auto -2em; } div#page-content { padding: 1em; } -div#page-wrapper { height: 2em; } -div#page-footer { background-color: #333; color: #666; height: 1em; padding: .5em; text-align: center; } + +div#page-menu { background-color: #333; color: #666; height: 1em; padding: .5em; } +div#page-menu ul, div#page-menu li { margin: 0; display: inline; } +div#page-menu ul { margin-left: 0; } +div#page-menu a { color: #ccc; text-decoration: none; margin: 0 .5em 0 .5em; } + ul { list-style-type: none; } li { margin-left: 1em; } p { margin-bottom: 1em; } @@ -16,6 +21,3 @@ blockquote { margin: 1em; display: block; } p.login { font-size: small; margin: .5em 0 0 1em; } form { border: 1px solid #888; display: inline-block; margin: .5em; padding: .5em; } - -div#page-footer ul, div#page-footer li { margin: 0; display: inline; } -div#page-footer a { color: #ccc; text-decoration: none; margin: 0 .5em 0 .5em; } diff --git a/templates/base.tmpl b/templates/base.tmpl index 5b710f8..b15e62f 100644 --- a/templates/base.tmpl +++ b/templates/base.tmpl @@ -12,6 +12,19 @@ <div id="page"> <div id="page-header"> <h1><a href="/">$header</a></h1> + <div id="page-menu"> + <ul> + <li><a href="/u">upload</a></li> +#if $user + <li><a href="/o">logout</a></li> + <li><a href="/m">myfiles</a></li> +#else + <li><a href="/l">login</a></li> + <li><a href="/r">register</a></li> +#end if + <li><a href="/h">help</a></li> + </ul> + </div> </div> <p class="login">#slurp #if $user @@ -26,18 +39,5 @@ Not logged in.#slurp <div id="page-wrapper"></div> </div> </div> - <div id="page-footer"> - <ul> - <li><a href="/u">upload</a></li> -#if $user - <li><a href="/o">logout</a></li> - <li><a href="/m">myfiles</a></li> -#else - <li><a href="/l">login</a></li> - <li><a href="/r">register</a></li> -#end if - <li><a href="/h">help</a></li> - </ul> - </div> </body> </html> diff --git a/templates/login.tmpl b/templates/login.tmpl index 6baee6c..306b0aa 100644 --- a/templates/login.tmpl +++ b/templates/login.tmpl @@ -9,6 +9,6 @@ <p><input type="text" id="username" name="username" /></p> <p>password</p> <p><input type="password" id="password" name="password" /></p> - <p><input type="submit" value="Upload" /></p> + <p><input type="submit" value="Login" /></p> </form> #end def |