Dyomedea
/
binder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle errors when trying to retrieve zone list from NS server 

Conflicts:

	binder/templates/base.htm
This commit is contained in:
Jeffrey Forman 2011-04-17 10:10:23 -04:00
parent b2b849d1f0
commit 5c7d18deb7
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
binder/templates/base.htm
View File

@ -8,6 +8,10 @@
<body> <body>
{% block errors %} {% block errors %}
<<<<<<< HEAD
=======
>>>>>>> 885b106... Handle errors when trying to retrieve zone list from NS server
{% if errors %} {% if errors %}
<div class="errors"> <div class="errors">
Errors were encountered: Errors were encountered:
@ -19,9 +23,22 @@
<br> <br>
{{ error_context }} {{ error_context }}
{% endif %} {% endif %}
<<<<<<< HEAD
<hr> <hr>
{% endif %} {% endif %}
{% endblock errors %} {% endblock errors %}
=======
<hr>
{% endif %}
{% endblock errors %}
<br>
{% block body %}
>>>>>>> 885b106... Handle errors when trying to retrieve zone list from NS server
<br> <br>
{% block body %} {% block body %}