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, 37 insertions, 7 deletions

diff --git a/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html b/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html
index dade598cf..77621cace 100644
--- a/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html
+++ b/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html
@@ -7,7 +7,7 @@
             
             <table class="invisitable">
             <tr><td width="43%"><h2>Node: <span class="nodename">
-	    <a href="/clients/{{client.name}}/{{interaction.id}}">{{client.name}}</a></span></h2></td>
+	    <a href="{% url Bcfg2.Server.Reports.reports.views.client_detail client.name,pk=i.id %}">{{client.name}}</a></span></h2></td>
             <td width="23%">
 	    {% if interaction.repo_revision %}Revision: {{interaction.repo_revision}}{% endif %}
 	    </td>
@@ -32,7 +32,7 @@
 		<span class="nodelisttitle"><a href="javascript:toggleLayer('{{client.name}}-bad');" title="Click to expand" class="commentLink">{{interaction.bad_items.count}}</a> items did not verify and are considered Dirty.<br /></span>
 		<div class="items" id="{{client.name}}-bad"><ul class="plain">
 		{% for bad in interaction.bad_items.all|sortwell %}
-		    <li><strong>{{bad.kind}}: </strong><tt><a href="/elements/bad/{{bad.id}}">{{bad.name}}</a></tt></li>
+		    <li><strong>{{bad.kind}}: </strong><tt><a href="{% url Bcfg2.Server.Reports.reports.views.config_item_bad bad.id%}">{{bad.name}}</a></tt></li>
 		{% endfor %}
 		</ul></div>
 	    </div>
@@ -42,7 +42,7 @@
 		<span class="nodelisttitle"><a href="javascript:toggleLayer('{{client.name}}-modified');" title="Click to expand" class="commentLink">{{interaction.modified_items.count}}</a> items were modified in the last run.<br /></span>
 		<div class="items" id="{{client.name}}-modified"><ul class="plain">
 		{% for modified in interaction.modified_items.all|sortwell %}
-		    <li><strong>{{modified.kind}}: </strong><tt><a href="/elements/modified/{{modified.id}}">{{modified.name}}</a></tt></li>
+		    <li><strong>{{modified.kind}}: </strong><tt><a href="{% url Bcfg2.Server.Reports.reports.views.config_item_modified modified.id %}">{{modified.name}}</a></tt></li>
 		{% endfor %}
 		</ul></div>
 	    </div>
diff --git a/src/lib/Server/Reports/reports/templates/clients/detail.html b/src/lib/Server/Reports/reports/templates/clients/detail.html
index 4ac2123c1..dd992547c 100644
--- a/src/lib/Server/Reports/reports/templates/clients/detail.html
+++ b/src/lib/Server/Reports/reports/templates/clients/detail.html
@@ -3,12 +3,15 @@
 {% block title %}Info for: {{client.name}}{% endblock %}
 
 {% block content %}
+<h2>Client Status Detail page for {{client.name}}</h2><br/>
 <b>Select time: </b>
 <select name=quick onChange="MM_jumpMenu('parent',this,0)">
     {% for i in client.interactions.all %}
-        <option {% ifequal i.id interaction.id %}selected {% endifequal %} value="/clients/{{client.name}}/{{i.id}}/"> {{i.timestamp}}
+        <option {% ifequal i.id interaction.id %}selected {% endifequal %} value="{% url Bcfg2.Server.Reports.reports.views.client_detail client.name,pk=i.id %}"> {{i.timestamp}}
     {% endfor %}
 </select>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="{% url Bcfg2.Server.Reports.reports.views.client_manage client.name %}">Manage</a> {{client.name}} options.<br/>
 
 {% include "clients/client-nodebox.html" %}
 {% endblock %}
diff --git a/src/lib/Server/Reports/reports/templates/clients/index.html b/src/lib/Server/Reports/reports/templates/clients/index.html
index 9870e2942..f8dd9167c 100644
--- a/src/lib/Server/Reports/reports/templates/clients/index.html
+++ b/src/lib/Server/Reports/reports/templates/clients/index.html
@@ -15,7 +15,7 @@
     <ul style="list-style-type:none;">
     {% for client in client_list_a %}
         <li><div class="{{client.current_interaction.state}}-lineitem">
-		<a href="{{client.name}}/">{{ client.name }}</a>
+		<a href="{% url Bcfg2.Server.Reports.reports.views.client_detail client.name %}">{{ client.name }}</a>
 		</div></li>
     {% endfor %}
     </ul>
@@ -24,12 +24,12 @@
     {% if client_list_b %}
       {% for client in client_list_b %}
 	    <li><div class="{{client.current_interaction.state}}-lineitem">
-		<a href="{{client.name}}/">{{ client.name }}</a>
+		<a href="{% url Bcfg2.Server.Reports.reports.views.client_detail client.name %}">{{ client.name }}</a>
 		</div></li>
       {% endfor %}
     {% endif %}
     </ul>
-</tr></tab.e>
+</tr></table>
 {% else %}
     <p>No client records are available.</p>
 {% endif %}
diff --git a/src/lib/Server/Reports/reports/templates/clients/manage.html b/src/lib/Server/Reports/reports/templates/clients/manage.html
new file mode 100644
index 000000000..6b7cd2ee0
--- /dev/null
+++ b/src/lib/Server/Reports/reports/templates/clients/manage.html
@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+{% block extra_header_info %}
+<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 %}{{client.name}}{% endblock %}
+
+{% block content %}
+<h2>Client Options Management page for {{client.name}}</h2><br/>
+<p>Client status detail page: <a href="{% url Bcfg2.Server.Reports.reports.views.client_detail client.name %}">{{client.name}}</a>.</p>
+<p>Hosts may be prevented from showing up in the reporting system if they have been retired, are no longer managed by bcfg2 :(, etc. </p>
+<b>Select deactivation date: </b>
+<div>
+<span class="mini-date">
+<b>Enter date or use calendar popup: </b>
+<form name="timestamp-select" action="{% url Bcfg2.Server.Reports.reports.views.client_manage client.name %}" method="post">
+<input type="text" name="date1" value="{{timestamp_date}}" size=10>@
+<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="submit" value="Submit">
+</form>
+</span><br/><br/><br/></div>
+<br/><br/>
+<p>{{message}}</p>
+
+{% endblock %}