Get rid of patchmetric's base.html and instead change the original base.html to suit our needs. Now there's no longer a distinction between patchwork and patchmetrics pages and their headings all link to patchmetrics' frontpage.

author: Guilherme Salgado <guilherme.salgado@linaro.org> 2011-06-09 16:15:15 -0300
committer: Guilherme Salgado <guilherme.salgado@linaro.org> 2011-06-09 16:15:15 -0300
commit: 121f607adaf8abd1f2d62e8fcffd44a2182515e4 (patch)
tree: 3523890d7adb4b52bb257ca43db61ddcae4d19db /templates
parent: c0777db745eee3a2d2401e541d8a07100f9e94c2 (diff)
4 files changed, 8 insertions, 109 deletions
diff --git a/templates/base.html b/templates/base.html
index cc6c19f..9892018 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -3,8 +3,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <title>{% block title %}Patchwork{% endblock %} - Patchwork</title>
-  <link rel="stylesheet" type="text/css" href="/css/style.css"/>
+  <title>{% block title %}Patchwork{% endblock %}</title>
+  <link rel="stylesheet" type="text/css" href="/css/patchmetrics.css"/>
   <script language="JavaScript" type="text/javascript" src="/js/common.js">
   </script>
 {% block headers %}{% endblock %}
@@ -13,7 +13,7 @@
   <div id="title">
   <h1 style="float: left;">
      <a
-      href="{% url patchwork.views.projects %}">Patchwork</a>
+      href="{% url patchmetrics.views.frontpage %}">Linaro patches</a>
     {% block heading %}{% endblock %}</h1>
   <div id="auth">
 {% if user.is_authenticated %}
@@ -35,30 +35,6 @@
    </div>
    <div style="clear: both;"></div>
   </div>
-  <div id="nav">
-   <div id="navleft">
-   {% if project %}
-    <strong>Project</strong>: {{ project.linkname }}
-     :
-     <a href="{% url patchwork.views.patch.list project_id=project.linkname %}"
-      >patches</a>
-     :
-     <a href="{% url patchwork.views.project.project project_id=project.linkname %}"
-      >project info</a>
-    {% if other_projects %}
-     :
-     <a href="{% url patchwork.views.projects %}"
-     >other projects</a>
-     {% endif %}
-    {% else %}
-     <a href="{% url patchwork.views.projects %}"
-     >project list</a>
-    {% endif %}
-   </div>
-   <div id="navright">
-    <a href="{% url patchwork.views.help path="about/" %}">about</a>
-   </div>
-   <div style="clear: both"></div>
   </div>
 {% if messages %}
   <div id="messages">
diff --git a/templates/patchmetrics/base.html b/templates/patchmetrics/base.html
deleted file mode 100644
index 227c666..0000000
--- a/templates/patchmetrics/base.html
+++ /dev/null
@@ -1,76 +0,0 @@
-{% load pwurl %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <title>{% block title %}Patchwork{% endblock %}</title>
-  <link rel="stylesheet" type="text/css" href="/css/patchmetrics.css"/>
-  <script language="JavaScript" type="text/javascript" src="/js/common.js">
-  </script>
-{% block headers %}{% endblock %}
- </head>
- <body>
-  <div id="title">
-  <h1 style="float: left;">
-    {% block heading %}{% endblock %}</h1>
-  <div id="auth">
-{% if user.is_authenticated %}
-   Logged in as
-    <a href="{% url patchwork.views.user.profile %}"
-     ><strong>{{ user.username }}</strong></a>
-    <br/>
-     <a href="{% url patchwork.views.user.todo_lists %}">todo
-      ({{ user.get_profile.n_todo_patches }})</a> ::
-     <a href="{% url patchwork.views.bundle.bundles %}">bundles</a>
-     <br/>
-     <a href="{% url patchwork.views.user.profile %}">profile</a> ::
-     <a href="{% url auth_logout %}">logout</a>
-{% else %}
-     <a href="{{ login_url }}">login</a>
-     <br/>
-     <a href="{% url patchwork.views.help path="about/" %}">about</a>
-{% endif %}
-   </div>
-   <div style="clear: both;"></div>
-  </div>
-  <div id="nav">
-   <div id="navleft">
-   {% if project %}
-    <strong>Project</strong>: {{ project.linkname }}
-     :
-     <a href="{% url patchwork.views.patch.list project_id=project.linkname %}"
-      >patches</a>
-     :
-     <a href="{% url patchwork.views.project.project project_id=project.linkname %}"
-      >project info</a>
-    {% if other_projects %}
-     :
-     <a href="{% url patchwork.views.projects %}"
-     >other projects</a>
-     {% endif %}
-    {% else %}
-     <a href="{% url patchwork.views.projects %}"
-     >project list</a>
-    {% endif %}
-   </div>
-   <div id="navright">
-    <a href="{% url patchwork.views.help path="about/" %}">about</a>
-   </div>
-   <div style="clear: both"></div>
-  </div>
-{% if messages %}
-  <div id="messages">
-  {% for message in messages %}
-   <div class="message">{{ message }}</div>
-  {% endfor %}
-  </div>
-{% endif %}
-  <div id="content">
-{% block body %}
-{% endblock %}
-  </div>
- </body>
-</html>
-
-
-
diff --git a/templates/patchmetrics/faq.html b/templates/patchmetrics/faq.html
index 72e8c67..43d18aa 100644
--- a/templates/patchmetrics/faq.html
+++ b/templates/patchmetrics/faq.html
@@ -1,7 +1,7 @@
-{% extends "patchmetrics/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}Linaro patches FAQ{% endblock %}
-{% block heading %}Linaro patches FAQ{% endblock %}
+{% block heading %}FAQ{% endblock %}
 
 {% block body %}
 
diff --git a/templates/patchmetrics/frontpage.html b/templates/patchmetrics/frontpage.html
index cec531f..47ef019 100644
--- a/templates/patchmetrics/frontpage.html
+++ b/templates/patchmetrics/frontpage.html
@@ -1,4 +1,4 @@
-{% extends "patchmetrics/base.html" %}
+{% extends "base.html" %}
 
 {% block headers %}
   <script language="JavaScript" type="text/javascript"
@@ -10,7 +10,6 @@
 {% endblock %}
 
 {% block title %}Linaro patches{% endblock %}
-{% block heading %}Linaro patches{% endblock %}
 
 {% block body %}
 
@@ -36,8 +35,8 @@ older than 30 days.</p>
   {{patch_age_distribution_chart|safe}}
 </div>
 <p>&nbsp;</p>
-<p>Check the <a href="/metrics/faq">FAQ</a> for answers to common
-questions.</p>
+<p>Check the <a href="{% url patchmetrics.views.faq %}">FAQ</a> for answers to
+common questions.</p>
 
 <div class="twocol">
   <div style="line-height: 2" class="break-after">
author	Guilherme Salgado <guilherme.salgado@linaro.org>	2011-06-09 16:15:15 -0300
committer	Guilherme Salgado <guilherme.salgado@linaro.org>	2011-06-09 16:15:15 -0300
commit	121f607adaf8abd1f2d62e8fcffd44a2182515e4 (patch)
tree	3523890d7adb4b52bb257ca43db61ddcae4d19db /templates
parent	c0777db745eee3a2d2401e541d8a07100f9e94c2 (diff)