[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777

Fri Jul 30 02:52:33 UTC 2010

The following commit has been merged in the master branch:
commit cfa3a7cbaa3fe176cfa34e8bc4fe3ba49b09d601
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Jul 28 16:38:15 2010 -0400

    Add a base template and make it a little shiny.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/templates/base.html b/templates/base.html
new file mode 100644
index 0000000..e76001c
--- /dev/null
+++ b/templates/base.html
@@ -0,0 +1,30 @@
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>Debian Live Studio</title>
+  <link rel="stylesheet" href="{% static "css/stylesheet.css" %}" type="text/css" />
+</head>
+
+<body>
+
+<h1 id="title"><a href="{% url static:welcome %}">Debian Live Studio</a></h1>
+<h2 id="subtitle"><a href="{% url static:welcome %}">Live Debian systems!</a></h2>
+
+<div id="body">
+<div id="content">
+  {% block content %}{% endblock %}
+</div>
+
+<hr />
+
+</div>
+
+<div class="footer">
+  <p>
+    <a href="http://live.debian.net/">Debian Live Project</a>
+    &lt;<a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>&gt;
+  </p>
+</div>
+
+</body>
+</html>
diff --git a/templates/static/welcome.html b/templates/static/welcome.html
index 57e6edb..3fa212b 100644
--- a/templates/static/welcome.html
+++ b/templates/static/welcome.html
@@ -1 +1,7 @@
+{% extends "base.html" %}
+
+{% block content %}
+
 <h1>Welcome</h1>
+
+{% endblock %}

-- 
live-studio

