From 3f1134a665925748b13dc3832e1cfd5722b9c9e8 Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Mon, 11 Sep 2006 16:55:45 +0000 Subject: modifying web templates git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2239 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Hostbase/hostbase/views.py | 9 +- .../Hostbase/hostbase/webtemplates/base.html | 35 +++++ .../Hostbase/hostbase/webtemplates/search.html | 154 ++++----------------- src/lib/Server/Hostbase/settings.py | 1 + 4 files changed, 64 insertions(+), 135 deletions(-) create mode 100644 src/lib/Server/Hostbase/hostbase/webtemplates/base.html (limited to 'src') diff --git a/src/lib/Server/Hostbase/hostbase/views.py b/src/lib/Server/Hostbase/hostbase/views.py index c3b850442..76eed63c0 100644 --- a/src/lib/Server/Hostbase/hostbase/views.py +++ b/src/lib/Server/Hostbase/hostbase/views.py @@ -93,11 +93,10 @@ def search(request): return render_to_response('%s/results.html' % templatedir, {'hosts': results}) else: - temp = Template(open('%s/search.html' % templatedir).read()) - temp.TYPE_CHOICES = Interface.TYPE_CHOICES - temp.DNS_CHOICES = Name.DNS_CHOICES - temp.yesno = [(1, 'yes'), (0, 'no')] - return HttpResponse(str(temp)) + return render_to_response('%s/search.html' % templatedir, + {'TYPE_CHOICES': Interface.TYPE_CHOICES, + 'DNS_CHOICES': Name.DNS_CHOICES, + 'yesno': [(1, 'yes'), (0, 'no')]}) def look(request, host_id): """Displays general host information""" diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/base.html b/src/lib/Server/Hostbase/hostbase/webtemplates/base.html new file mode 100644 index 000000000..04c519717 --- /dev/null +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/base.html @@ -0,0 +1,35 @@ + + + + {% block title %}BCFG2 - Hostbase{% endblock %} + + + + {% block extra_header_info %}{% endblock %} + + + + + + +
+
+ {% block pagebanner %}{% endblock %} + {% block content %}{% endblock %} + +
+
+ + diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html index 29a684b1a..f8053e229 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html @@ -1,91 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
Argonne National Laboratory - Mathematics - and Computer Science
- - - - - - - - - - - - - - - - - - - - - - - - - -
About - Us Research Facilities Staff - Software - Collaborations - - Information -
-
MCS - Home > - -
- - - - - - -
-

Welcome to the hostbase database!

+{% extends "base.html" %} + +{% block pagebanner %} +
+

Welcome to Hostbase!

+
+
+{% endblock %} +{% block content %} Find hosts using one or more of the searchable fields below.
-#*...or go to this - page to enter hostinfo-like queries

*# +
@@ -108,15 +32,15 @@ Find hosts using one or more of the searchable fields below.
@@ -127,9 +51,9 @@ Find hosts using one or more of the searchable fields below.
@@ -138,9 +62,9 @@ Find hosts using one or more of the searchable fields below.
@@ -150,34 +74,4 @@ Find hosts using one or more of the searchable fields below.

- - -

dhcp - #for $choice in $yesno - $choice[1] - #end for + {% for choice in yesno %} + {{ choice.1 }} + {% endfor %}
outbound_smtp - #for $choice in $yesno - $choice[1] - #end for + {% for choice in yesno %} + {{ choice.1 }} + {% endfor %}
primary_user
expiration_date YYYY-MM-DD

Interface
- #for $choice in $TYPE_CHOICES - $choice[1] - #end for + {% for choice in TYPE_CHOICES %} + {{ choice.1 }} + {% endfor %}
mac_addr
name
dns_view - #for $choice in $DNS_CHOICES - $choice[1] - #end for + {% for choice in DNS_CHOICES %} + {{ choice.1 }} + {% endfor %}
cname
- - - - - - - - - -
- - - - - - -
U.S. Department of EnergyThe University of ChicagoOffice of Science - Department of Energy
- - - -
Privacy & Security Notice | Contact Us
- - +{% endblock %} \ No newline at end of file diff --git a/src/lib/Server/Hostbase/settings.py b/src/lib/Server/Hostbase/settings.py index 330c99f3b..604195622 100644 --- a/src/lib/Server/Hostbase/settings.py +++ b/src/lib/Server/Hostbase/settings.py @@ -62,6 +62,7 @@ ROOT_URLCONF = 'Hostbase.urls' TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates". # Always use forward slashes, even on Windows. + '/disks/bcfg2/Hostbase/hostbase/webtemplates' ) INSTALLED_APPS = ( -- cgit v1.2.3-1-g7c22