Added UI to disable old hosts, hopefully made it possible to install app in non-root of webserver

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3365 ce84e21b-d406-0410-9b95-82705330c041

4 files changed, 17 insertions, 17 deletions

diff --git a/src/lib/Server/Reports/reports/templates/displays/index.html b/src/lib/Server/Reports/reports/templates/displays/index.html
index 5d1d3bf76..c078539b6 100644
--- a/src/lib/Server/Reports/reports/templates/displays/index.html
+++ b/src/lib/Server/Reports/reports/templates/displays/index.html
@@ -11,8 +11,8 @@
 
 {% block content %}
 <ul>
-<li><a href="/displays/sys-view/">System View</a></li>
-<li><a href="/displays/summary/">Summary Only</a></li>
-<li><a href="/displays/timing/">Timing</a></li>
+<li><a href="{% url Bcfg2.Server.Reports.reports.views.display_sys_view %}">System View</a></li>
+<li><a href="{% url Bcfg2.Server.Reports.reports.views.display_summary %}">Summary Only</a></li>
+<li><a href="{% url Bcfg2.Server.Reports.reports.views.display_timing %}">Timing</a></li>
 </ul>
 {% endblock %}
diff --git a/src/lib/Server/Reports/reports/templates/displays/summary-block-direct-links.html b/src/lib/Server/Reports/reports/templates/displays/summary-block-direct-links.html
index a218e12b6..60f97eadc 100644
--- a/src/lib/Server/Reports/reports/templates/displays/summary-block-direct-links.html
+++ b/src/lib/Server/Reports/reports/templates/displays/summary-block-direct-links.html
@@ -1,7 +1,7 @@
 {% extends "displays/summary-block.html" %}
-{% block linkprefix1 %}/clients/{% endblock %}
-{% block linkprefix2 %}/clients/{% endblock %}
-{% block linkprefix3 %}/clients/{% endblock %}
-{% block linkprefix4 %}/clients/{% endblock %}
-{% block linkprefix5 %}/clients/{% endblock %}
-{% block linkprefix6 %}/clients/{% endblock %}
\ No newline at end of file
+{% block linkprefix1 %}{% url Bcfg2.Server.Reports.reports.views.client_index %}{% endblock %}
+{% block linkprefix2 %}{% url Bcfg2.Server.Reports.reports.views.client_index %}{% endblock %}
+{% block linkprefix3 %}{% url Bcfg2.Server.Reports.reports.views.client_index %}{% endblock %}
+{% block linkprefix4 %}{% url Bcfg2.Server.Reports.reports.views.client_index %}{% endblock %}
+{% block linkprefix5 %}{% url Bcfg2.Server.Reports.reports.views.client_index %}{% endblock %}
+{% block linkprefix6 %}{% url Bcfg2.Server.Reports.reports.views.client_index %}{% endblock %}
\ No newline at end of file
diff --git a/src/lib/Server/Reports/reports/templates/displays/summary.html b/src/lib/Server/Reports/reports/templates/displays/summary.html
index cf253c25c..8c83bd501 100644
--- a/src/lib/Server/Reports/reports/templates/displays/summary.html
+++ b/src/lib/Server/Reports/reports/templates/displays/summary.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block extra_header_info %}
-<script type="text/javascript" src="/site_media/CalendarPopup.js"></script>
+<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/CalendarPopup.js"></script>
 <script language="JavaScript">var cal = new CalendarPopup();</script>
 {% endblock%}
 {% block title %}Display Index Listing{% endblock %}
@@ -21,8 +21,8 @@
 <input type="text" name="time" value="{{timestamp_time}}" size=8>
 <a href="" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;"
    name="anchor1" ID="anchor1">Calendar</A>
-<input type="button" name="go" value="Go" onClick="location.href='/displays/summary/'+document.forms['timestamp-select'].date1.value+'@'+document.forms['timestamp-select'].time.value;" />
- | <input type="button" name="now" value="Now" onClick="location.href='/displays/summary/';"/>
+<input type="button" name="go" value="Go" onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.display_summary %}'+document.forms['timestamp-select'].date1.value+'@'+document.forms['timestamp-select'].time.value;" />
+ | <input type="button" name="now" value="Now" onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.display_summary %}';"/>
 </form>
 </span><br/><br/><br/></div>
   {% include "displays/summary-block-direct-links.html" %}
diff --git a/src/lib/Server/Reports/reports/templates/displays/timing.html b/src/lib/Server/Reports/reports/templates/displays/timing.html
index e9020b8ef..8586de2cf 100644
--- a/src/lib/Server/Reports/reports/templates/displays/timing.html
+++ b/src/lib/Server/Reports/reports/templates/displays/timing.html
@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 
 {% block extra_header_info %}
-<script type="text/javascript" src="/site_media/sorttable.js"></script>
-<script type="text/javascript" src="/site_media/CalendarPopup.js"></script>
+<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/sorttable.js"></script>
+<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/CalendarPopup.js"></script>
 <script language="JavaScript">var cal = new CalendarPopup();</script>
 {% endblock%}
 {% block title %}Display Index Listing{% endblock %}
@@ -21,8 +21,8 @@
 <input type="text" name="time" value="{{timestamp_time}}" size=8>
 <a href="" onClick="cal.select(document.forms['timestamp-select'].date1,'anchor1','yyyy-MM-dd'); return false;"
    name="anchor1" ID="anchor1">Calendar</A>
-<input type="button" name="go" value="Go" onClick="location.href='/displays/timing/'+document.forms['timestamp-select'].date1.value+'@'+document.forms['timestamp-select'].time.value;" />
- | <input type="button" name="now" value="Now" onClick="location.href='/displays/timing/';"/>
+<input type="button" name="go" value="Go" onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.display_timing %}'+document.forms['timestamp-select'].date1.value+'@'+document.forms['timestamp-select'].time.value;" />
+ | <input type="button" name="now" value="Now" onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.display_timing %}';"/>
 </form>
 </span><br/><br/><br/></div>
   <center>
@@ -38,7 +38,7 @@
           </tr>                     
 	  {% for dict_unit in stats_list %}
 	  <tr>
-              <td class="sortable"><a href="/clients/{{dict_unit.name}}/">{{dict_unit.name}}</a></td>
+              <td class="sortable"><a href="{% url Bcfg2.Server.Reports.reports.views.client_detail dict_unit.name%}/">{{dict_unit.name}}</a></td>
               <td class="sortable">{{dict_unit.parse}}</td>
               <td class="sortable">{{dict_unit.probe}}</td>
               <td class="sortable">{{dict_unit.inventory}}</td>