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

2 files changed, 18 insertions, 12 deletions

diff --git a/src/lib/Server/Reports/reports/templates/config_items/index.html b/src/lib/Server/Reports/reports/templates/config_items/index.html
index 60a09fe57..32e1ed17b 100644
--- a/src/lib/Server/Reports/reports/templates/config_items/index.html
+++ b/src/lib/Server/Reports/reports/templates/config_items/index.html
@@ -3,8 +3,8 @@
 {% extends "base.html" %}
 
 {% block extra_header_info %}
-<link rel="stylesheet" type="text/css" href="/site_media/syntax-coloring.css" />
-<script type="text/javascript" src="/site_media/CalendarPopup.js"></script>
+<link rel="stylesheet" type="text/css" href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/syntax-coloring.css" />
+<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 %}Configuration Element Details{% endblock %}
@@ -17,6 +17,7 @@
 {% endblock %}
 
 {% block content %}
+
 {% ifequal mod_or_bad "bad" %}
 <div class="bad">
 <h2>Bad {{item.kind}}: {{item.name}}</h2>
@@ -56,14 +57,19 @@
 <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='/elements/{{mod_or_bad}}/{{item.id}}/'+document.forms['timestamp-select'].date1.value+'@'+document.forms['timestamp-select'].time.value;" />
- | <input type="button" name="now" value="Now" onClick="location.href='/elements/{{mod_or_bad}}/{{item.id}}';"/>
+{% ifequal mod_or_bad "modified" %}
+    <input type="button" name="go" value="Go" onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.config_item_modified eyedee=item.id%}'+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.config_item_modified eyedee=item.id%}';"/>
+{% else %}
+    <input type="button" name="go" value="Go" onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.config_item_bad eyedee=item.id%}'+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.config_item_bad eyedee=item.id%}';"/>
+{% endifequal %}
 </form>
 </span><br/><br/><br/></div>
 {% if associated_client_list %}
     <p>The following clients had this problem as of {{timestamp_date}}@{{timestamp_time}}:</p>
     {% for client in associated_client_list %}
-        <a href="/clients/{{client.name}}">{{client.name}}</a><br/>
+        <a href="{% url Bcfg2.Server.Reports.reports.views.client_detail client.name %}">{{client.name}}</a><br/>
     {% endfor %}
     <br />
     <br />
diff --git a/src/lib/Server/Reports/reports/templates/config_items/listing.html b/src/lib/Server/Reports/reports/templates/config_items/listing.html
index 8c4500258..f3be1e4d5 100644
--- a/src/lib/Server/Reports/reports/templates/config_items/listing.html
+++ b/src/lib/Server/Reports/reports/templates/config_items/listing.html
@@ -2,20 +2,20 @@
 {% load django_templating_sigh %}
 
 {% block extra_header_info %}
-<link rel="stylesheet" type="text/css" href="/site_media/yui/tabview/assets/tabview.css">
-<link rel="stylesheet" type="text/css" href="/site_media/yui/round_tabs.css">
+<link rel="stylesheet" type="text/css" href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/tabview/assets/tabview.css">
+<link rel="stylesheet" type="text/css" href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/round_tabs.css">
 
-<script type="text/javascript" src="/site_media/yui/yahoo/yahoo.js"></script>
-<script type="text/javascript" src="/site_media/yui/event/event.js"></script>
-<script type="text/javascript" src="/site_media/yui/dom/dom.js"></script>
-<script type="text/javascript" src="/site_media/yui/tabview/tabview.js"></script>
+<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/yahoo/yahoo.js"></script>
+<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/event/event.js"></script>
+<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/dom/dom.js"></script>
+<script type="text/javascript" src="{% url Bcfg2.Server.Reports.reports.views.client_index %}../site_media/yui/tabview/tabview.js"></script>
 <script type="text/javascript">
 YAHOO.example.init = function( ){
     var tabView = new YAHOO.widget.TabView( { id: 'demo' } );
     {% for item_list in item_list_pseudodict %}
     tabView.addTab( new YAHOO.widget.Tab({
         label: '{{item_list.0}}',
-        content: '<p><ul style="list-style-type:none;">{% for item in item_list.1|sortwell %}<li><strong>{{item.kind}}: </strong><tt><a href="/elements/{{mod_or_bad}}/{{item.id}}">{{item.name}}</a></tt></li>{% endfor %}</ul></p>',
+        content: '<p><ul style="list-style-type:none;">{% for item in item_list.1|sortwell %}<li><strong>{{item.kind}}: </strong><tt>{% ifequal mod_or_bad "modified" %}<a href="{%url Bcfg2.Server.Reports.reports.views.config_item_modified eyedee=item.id%}">{{item.name}}</a>{% else %}<a href="{%url Bcfg2.Server.Reports.reports.views.config_item_bad eyedee=item.id%}">{{item.name}}</a>{% endifequal %}</tt></li>{% endfor %}</ul></p>',
         active: 'True'
     }));
     {% endfor %}