diff options
author | Sol Jerome <solj@ices.utexas.edu> | 2010-04-10 17:59:54 -0500 |
---|---|---|
committer | Sol Jerome <solj@ices.utexas.edu> | 2010-04-10 18:02:29 -0500 |
commit | 7ca192157134ce83abd1ad426fddfb17caf41bc5 (patch) | |
tree | 06c353d15bcddc6680cffc1199553a87511b507e /src/lib/Server/Hostbase/hostbase/webtemplates | |
parent | 37b8717f178aa7b4037d9607ef567a7c85014fc9 (diff) | |
download | bcfg2-7ca192157134ce83abd1ad426fddfb17caf41bc5.tar.gz bcfg2-7ca192157134ce83abd1ad426fddfb17caf41bc5.tar.bz2 bcfg2-7ca192157134ce83abd1ad426fddfb17caf41bc5.zip |
Hostbase: Fix a bug that caused setup.py to bail
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
Diffstat (limited to 'src/lib/Server/Hostbase/hostbase/webtemplates')
20 files changed, 35 insertions, 35 deletions
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html b/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html index bc3e7f447..ca8b0cc07 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html @@ -8,8 +8,8 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} -{% include "logout" %} +{% include "navbar.tmpl" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html b/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html index 8ee143b15..400ef58f2 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html @@ -9,7 +9,7 @@ {% block sidebar %} <a href="/hostbase/" class="sidebar">search hostbase</a> -{% include "logout" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html b/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html index 87c858a85..da179e5a1 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html @@ -8,14 +8,14 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} +{% include "navbar.tmpl" %} <ul class="sidebar"> <li><a href="/hostbase/{{ host.id }}/" class="sidebar">host info</a></li> <li><a href="/hostbase/{{ host.id }}/edit/" class="sidebar">edit host info</a></li> <li><a href="edit/" class="sidebar">edit dns info</a></li> <li><a href="/hostbase/{{ host.id }}/logs/" class="sidebar">change logs</a></li> </ul> -{% include "logout" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html index 2b10e5221..18bd7ab83 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html @@ -8,14 +8,14 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} +{% include "navbar.tmpl" %} <ul class="sidebar"> <li><a href="/hostbase/{{ host.id }}/" class="sidebar">host info</a></li> <li><a href="/hostbase/{{ host.id }}/edit/" class="sidebar">edit host info</a></li> <li><a href="/hostbase/{{ host.id }}/dns/" class="sidebar">see dns info</a></li> <li><a href="/hostbase/{{ host.id }}/logs/" class="sidebar">change logs</a></li> </ul> -{% include "logout" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html index 37cd3e515..961c9d143 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html @@ -8,14 +8,14 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} +{% include "navbar.tmpl" %} <ul class="sidebar"> <li><a href="/hostbase/{{ host.id }}/" class="sidebar">host info</a></li> <li><a href="/hostbase/{{ host.id }}/dns/" class="sidebar">detailed dns info</a></li> <li><a href="/hostbase/{{ host.id }}/dns/edit/" class="sidebar">edit dns info</a></li> <li><a href="/hostbase/{{ host.id }}/logs/" class="sidebar">change logs</a></li> </ul> -{% include "logout" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html b/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html index a57e858cb..e5429b86c 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html @@ -8,8 +8,8 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} -{% include "logout" %} +{% include "navbar.tmpl" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} @@ -28,4 +28,4 @@ There were errors in the following fields<br><br> <br> Press the back button on your browser and edit those field(s) -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html index 18054fc9b..d6b8873bc 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html @@ -8,14 +8,14 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} +{% include "navbar.tmpl" %} <ul class="sidebar"> <li><a href="dns/" class="sidebar">detailed dns info</a></li> <li><a href="edit/" class="sidebar">edit host info</a></li> <li><a href="dns/edit/" class="sidebar">edit dns info</a></li> <li><a href="logs/" class="sidebar">change logs</a></li> </ul> -{% include "logout" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html b/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html index 3f4c32aa1..551bf3254 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html @@ -8,13 +8,13 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} +{% include "navbar.tmpl" %} <ul class="sidebar"> <li><a href="dns/" class="sidebar">detailed dns info</a></li> <li><a href="edit/" class="sidebar">edit host info</a></li> <li><a href="dns/edit/" class="sidebar">edit dns info</a></li> </ul> -{% include "logout" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/log_detail.html b/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/log_detail.html index 8cd074742..aa9679cbd 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/log_detail.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/log_detail.html @@ -8,8 +8,8 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} -{% include "logout" %} +{% include "navbar.tmpl" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/logout b/src/lib/Server/Hostbase/hostbase/webtemplates/logout.tmpl index e71e90e76..e71e90e76 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/logout +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/logout.tmpl diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/logviewer.html b/src/lib/Server/Hostbase/hostbase/webtemplates/logviewer.html index 8f614ef76..806ccd63d 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/logviewer.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/logviewer.html @@ -8,8 +8,8 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} -{% include "logout" %} +{% include "navbar.tmpl" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/navbar b/src/lib/Server/Hostbase/hostbase/webtemplates/navbar.tmpl index 877d427d0..877d427d0 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/navbar +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/navbar.tmpl diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html index 4b4150ea8..2dcd6271f 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html @@ -9,7 +9,7 @@ {% block sidebar %} <a href="/hostbase/" class="sidebar">search hostbase</a> -{% include "logout" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html b/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html index 2920a7816..4329200dd 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html @@ -8,13 +8,13 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} +{% include "navbar.tmpl" %} <ul class="sidebar"> <li><a href="dns/" class="sidebar">detailed dns info</a></li> <li><a href="edit/" class="sidebar">edit host info</a></li> <li><a href="dns/edit/" class="sidebar">edit dns info</a></li> </ul> -{% include "logout" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html index e68afe969..45b22058d 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html @@ -8,8 +8,8 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} -{% include "logout" %} +{% include "navbar.tmpl" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html index e5bd0a6b3..409d418fe 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html @@ -11,7 +11,7 @@ {% block sidebar %} <a href="/hostbase/new" class="sidebar">add a new host</a><br> <a href="/hostbase/zones" class="sidebar">zone file information</a><br> -{% include "logout" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} @@ -54,4 +54,4 @@ <p> <input type="submit" value="Search"> </form> -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html index ceb4cc3b3..ee355ee87 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html @@ -9,12 +9,12 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} +{% include "navbar.tmpl" %} <ul> <li><a href="/hostbase/zones/{{ zone_id }}/" class="sidebar">view zone</a><br> </li> </ul> -{% include "logout" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html index 8a31e0dde..b59fa9e3c 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html @@ -9,8 +9,8 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} -{% include "logout" %} +{% include "navbar.tmpl" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html index 405b748f9..c773e7922 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html @@ -9,8 +9,8 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} -{% include "logout" %} +{% include "navbar.tmpl" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html index c65735f10..fa12e3ec5 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html @@ -9,12 +9,12 @@ {% endblock %} {% block sidebar %} -{% include "navbar" %} +{% include "navbar.tmpl" %} <ul class="sidebar"> <li><a href="/hostbase/zones/{{ zone.id }}/edit/" class="sidebar">edit zone</a><br> </li> </ul> -{% include "logout" %} +{% include "logout.tmpl" %} {% endblock %} {% block content %} |