From 64f32082f8fc6da53af35112d535cb4b1ad1f474 Mon Sep 17 00:00:00 2001 From: Jeffrey Forman Date: Sun, 17 Apr 2011 22:32:17 -0400 Subject: [PATCH] clean up the views structure. add an area for navigation --- binder/templates/base.htm | 30 ++++++++--------------- binder/templates/bcommon/list_servers.htm | 6 ++--- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/binder/templates/base.htm b/binder/templates/base.htm index 002edfc..8b54e7d 100644 --- a/binder/templates/base.htm +++ b/binder/templates/base.htm @@ -1,18 +1,22 @@ {% block header %} - Binder DNS Admin Tool + Binder DNS Admin {% endblock header %} - -{% block errors %} -<<<<<<< HEAD -======= +{% block navigation %} +Home +
+{% endblock navigation %} ->>>>>>> 885b106... Handle errors when trying to retrieve zone list from NS server +{% block pageheader %} +{% endblock pageheader %} + + {% if errors %} +{% block errors %}
Errors were encountered:
@@ -23,23 +27,9 @@
{{ error_context }} {% endif %} -<<<<<<< HEAD
-{% endif %} {% endblock errors %} -======= - -
{% endif %} - - - -{% endblock errors %} - -
-{% block body %} ->>>>>>> 885b106... Handle errors when trying to retrieve zone list from NS server -
{% block body %} {% endblock body %} diff --git a/binder/templates/bcommon/list_servers.htm b/binder/templates/bcommon/list_servers.htm index b779c87..f3ccc8a 100644 --- a/binder/templates/bcommon/list_servers.htm +++ b/binder/templates/bcommon/list_servers.htm @@ -1,9 +1,9 @@ {% extends "base.htm" %} +{% block pageheader %} +Server List: +{% endblock pageheader %} {% block body %} -DNS Server List: -
-