]> git.ipfire.org Git - people/ms/webapp.git/commitdiff
projects / people / ms / webapp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cb4eb4c)
template: Created base layout and substitute only required areas. master
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 3 Dec 2009 09:40:42 +0000 (10:40 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 3 Dec 2009 09:40:42 +0000 (10:40 +0100)
application/handlers.py patch | blob | blame | history
templates/base.html [moved from templates/template.html with 64% similarity] patch | blob | blame | history
templates/login.html patch | blob | blame | history
templates/logout.html patch | blob | blame | history

diff --git a/application/handlers.py b/application/handlers.py
index b808eab3946c57f4a874f9775c40cd0aec351828..393ad0cc6b0d200e0b06b71723d6847ab9bbccf6 100644 (file)
--- a/application/handlers.py
+++ b/application/handlers.py
@@ -26,5 +26,5 @@ class MainHandler(BaseHandler):
 
 class HomeHandler(BaseHandler):
        def get(self):
 
 class HomeHandler(BaseHandler):
        def get(self):
-               self.render("template.html", title="Testsite", slogan="Security now!",
+               self.render("base.html", title="Testsite", slogan="Security now!",
                        footer=self.footer(), user=self.current_user)
                        footer=self.footer(), user=self.current_user)
diff --git a/templates/template.html b/templates/base.html
similarity index 64%
rename from templates/template.html
rename to templates/base.html
index 86bab6f3b7ea94127e77ecc13bb44837c9633f03..40f57416951fa2c87b5aac53bb22fb825fc54cf3 100644 (file)
--- a/templates/template.html
+++ b/templates/base.html
@@ -4,7 +4,7 @@
        <head>
                <meta http-equiv="content-type" content="text/html; charset=utf-8;charset=utf-8" />
                <link rel="stylesheet" type="text/css" href="{{ static_url("templates/template/style.css") }}" />
        <head>
                <meta http-equiv="content-type" content="text/html; charset=utf-8;charset=utf-8" />
                <link rel="stylesheet" type="text/css" href="{{ static_url("templates/template/style.css") }}" />
-               <title>{{ _("IPFire Webconsole") }} - {{ title }}</title>
+               <title>{% block title %}{{ _("IPFire Webconsole") }} - {{ title }}{% end block %}</title>
        </head>
 
        <body>
        </head>
 
        <body>
@@ -17,24 +17,26 @@
                                        </a>
                                </div>
                                <div class="line1">
                                        </a>
                                </div>
                                <div class="line1">
-                                       <div class="menu">
-                                               <ul>
-                                                       <li><a href="#" class="active">Menu Item 1</a></li>
-                                                       <li><a href="#">Menu Item 2</a></li>
-                                                       <li><a href="#">Menu Item 3</a></li>
-                                                       <li><a href="#">Menu Item 4</a></li>
-                                               </ul>
-                                       </div>
-                                       <div class="lang">
-                                               {{ _("Logged in as:") }} {{ user }}
-                                               <a href="/logout">{{ _("Logout") }}</a>
-                                       </div>
+                                       {% block menu %}
+                                               <div class="menu">
+                                                       <ul>
+                                                               <li><a href="#" class="active">Menu Item 1</a></li>
+                                                               <li><a href="#">Menu Item 2</a></li>
+                                                               <li><a href="#">Menu Item 3</a></li>
+                                                               <li><a href="#">Menu Item 4</a></li>
+                                                       </ul>
+                                               </div>
+                                               <div class="lang">
+                                                       {{ _("Logged in as:") }} {{ user }}
+                                                       <a href="/logout">{{ _("Logout") }}</a>
+                                               </div>
+                                       {% end block %}
                                </div>
                                <div class="line2">
                                        <h1>{{ _("IPFire Webconsole") }}</h1>
                                </div>
                                <div class="line3">
                                </div>
                                <div class="line2">
                                        <h1>{{ _("IPFire Webconsole") }}</h1>
                                </div>
                                <div class="line3">
-                                       <h2>{{ slogan }}</h2>
+                                       <h2>{% block slogan %}{{ slogan }}{% end block %}</h2>
                                </div>
                        </div>
                </div>
                                </div>
                        </div>
                </div>
@@ -52,7 +54,11 @@
                        <div class="sh-l">
                                <div class="sh-r">
                                        <div class="main">
                        <div class="sh-l">
                                <div class="sh-r">
                                        <div class="main">
-                                               <!-- The place where containers go -->
+                                               {% block main %}
+                                                       <div id="tabs">
+                                                               <!-- The place where containers go. -->
+                                                       </div>
+                                               {% end block %}
                                                <br />
                                        </div>
                                </div>
                                                <br />
                                        </div>
                                </div>
diff --git a/templates/login.html b/templates/login.html
index a341946b51a2d2c598df9ae2fb615dfd61632faa..4711e4150049eaf57382f81e8e41dae5b6ec1b1a 100644 (file)
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,76 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">
-       <head>
-               <meta http-equiv="content-type" content="text/html; charset=utf-8;charset=utf-8" />
-               <link rel="stylesheet" type="text/css" href="{{ static_url("templates/template/style.css") }}" />
-               <title>{{ _("Login") }}</title>
-       </head>
+{% extends "base.html" %}
 
 
-       <body>
-               <div class="topmenu">                   
-                       <div class="header_inner">
-                               <div class="logo">
-                                       <a href="/">
-                                               <img src="{{ static_url("templates/template/images/menu_tux.png") }}" class="symbol" alt="IPFire" />
-                                       </a>
-                               </div>
-                               <div class="line1">
-                               </div>
-                               <div class="line2">
-                                       <h1>{{ _("IPFire Webconsole") }}</h1>
-                               </div>
-                               <div class="line3">
-                                       <h2>{{ _("Please login") }}</h2>
-                               </div>
-                       </div>
-               </div>
+{% block title %}{{ _("Login") }}{% end block %}
+{% block slogan %}{{ _("Please login") }}{% end block %}
 
 
-               <div class="wrapper">
-                       <div class="sh-ul">
-                               <div class="sh-ur">
-                                       <div class="sh-top">
-                                       </div>
-                                       <div class="top-bgcolor">
-                                       </div>
-                               </div>
-                       </div>
+{% block menu %}{% end block %}
 
 
-                       <div class="sh-l">
-                               <div class="sh-r">
-                                       <div class="main">
-                                               <form action="/login" method="post">
-                                                       {{ xsrf_form_html() }}
-                                                       <table>
-                                                               <tr>
-                                                                       <td>{{ _("User") }}</td>
-                                                                       <td><input type="text" name="user" /></td>
-                                                               </tr>
-                                                               <tr>
-                                                                       <td>{{ _("Password") }}</td>
-                                                                       <td><input type="password" name="password" /></td>
-                                                               </tr>
-                                                               <tr>
-                                                                       <td class="right">
-                                                                               <input class="login" type="submit" value="{{ _("Sign in") }}" />
-                                                                       </td>
-                                                               </tr>
-                                                       </table>
-                                               </form>
-                                               <br />
-                                       </div>
-                               </div>
-                       </div>
-
-                       <div class="sh-bl">
-                               <div class="sh-br">
-                                       <div class="footer">
-                                               {{ footer }}
-                                       </div>
-                                       <div class="sh-btn">
-                                       </div>
-                               </div>
-                       </div>
-               </div>
-       </body>
-</html>
+{% block main %}
+       <form action="/login" method="post">
+               {{ xsrf_form_html() }}
+               <table>
+                       <tr>
+                               <td>{{ _("User") }}</td>
+                               <td><input type="text" name="user" /></td>
+                       </tr>
+                       <tr>
+                               <td>{{ _("Password") }}</td>
+                               <td><input type="password" name="password" /></td>
+                       </tr>
+                       <tr>
+                               <td class="right">
+                                       <input class="login" type="submit" value="{{ _("Sign in") }}" />
+                               </td>
+                       </tr>
+               </table>
+       </form>
+{% end block %}
diff --git a/templates/logout.html b/templates/logout.html
index d70689fef709d34dea9f52b7c06bae6e931bbc76..04d9e006f4f370b8af0fd4f7e81eb872138c884d 100644 (file)
--- a/templates/logout.html
+++ b/templates/logout.html
@@ -1,60 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">
-       <head>
-               <meta http-equiv="content-type" content="text/html; charset=utf-8;charset=utf-8" />
-               <link rel="stylesheet" type="text/css" href="{{ static_url("templates/template/style.css") }}" />
-               <title>{{ _("Logout") }}</title>
-       </head>
+{% extends "base.html" %}
 
 
-       <body>
-               <div class="topmenu">                   
-                       <div class="header_inner">
-                               <div class="logo">
-                                       <a href="/">
-                                               <img src="{{ static_url("templates/template/images/menu_tux.png") }}" class="symbol" alt="IPFire" />
-                                       </a>
-                               </div>
-                               <div class="line1">
-                               </div>
-                               <div class="line2">
-                                       <h1>{{ _("IPFire Webconsole") }}</h1>
-                               </div>
-                               <div class="line3">
-                                       <h2>{{ _("Logout") }}</h2>
-                               </div>
-                       </div>
-               </div>
+{% block title %}{{ _("Logout") }}{% end block %}
+{% block slogan %}{{ _("Logout") }}{% end block %}
 
 
-               <div class="wrapper">
-                       <div class="sh-ul">
-                               <div class="sh-ur">
-                                       <div class="sh-top">
-                                       </div>
-                                       <div class="top-bgcolor">
-                                       </div>
-                               </div>
-                       </div>
+{% block menu %}{% end block %}
 
 
-                       <div class="sh-l">
-                               <div class="sh-r">
-                                       <div class="main">
-                                               <p>{{ _("You have been sucessfully logged out.") }}</p>
-                                               <br />
-                                               <p><a href="/">{{ _("Relogin" ) }}</a></p>
-                                       </div>
-                               </div>
-                       </div>
-
-                       <div class="sh-bl">
-                               <div class="sh-br">
-                                       <div class="footer">
-                                               {{ footer }}
-                                       </div>
-                                       <div class="sh-btn">
-                                       </div>
-                               </div>
-                       </div>
-               </div>
-       </body>
-</html>
+{% block main %}
+       <p>{{ _("You have been sucessfully logged out.") }}</p>
+       <br />
+       <p><a href="/">{{ _("Relogin" ) }}</a></p>
+{% end block %}
Michael's tree of the new webapp.