git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add sorting tables to the pcu view.
[monitor.git]
/
web
/
MonitorWeb
/
monitorweb
/
templates
/
pculist.kid
diff --git
a/web/MonitorWeb/monitorweb/templates/pculist.kid
b/web/MonitorWeb/monitorweb/templates/pculist.kid
index
fc1b835
..
d37be12
100644
(file)
--- a/
web/MonitorWeb/monitorweb/templates/pculist.kid
+++ b/
web/MonitorWeb/monitorweb/templates/pculist.kid
@@
-5,17
+5,18
@@
from pcucontrol.reboot import pcu_name, model_to_object
from monitor import config
def plc_site_link(pcu):
from monitor import config
def plc_site_link(pcu):
- return "https://" + config.
MONITOR
_HOSTNAME + "/db/sites/index.php?id=" + str(pcu['site_id'])
+ return "https://" + config.
PLC_WEB
_HOSTNAME + "/db/sites/index.php?id=" + str(pcu['site_id'])
def pcu_link(pcu):
def pcu_link(pcu):
- return "https://" + config.
MONITOR
_HOSTNAME + "/db/sites/pcu.php?id=" + str(pcu['pcu_id'])
+ return "https://" + config.
PLC_WEB
_HOSTNAME + "/db/sites/pcu.php?id=" + str(pcu['pcu_id'])
?>
<html py:layout="'sitemenu.kid'"
?>
<html py:layout="'sitemenu.kid'"
- xmlns:py="http://purl.org/kid/ns#">
+ xmlns:py="http://purl.org/kid/ns#"
+ xmlns:mochi="http://www.mochi.org">
<div py:match="item.tag == 'content'">
<div py:match="item.tag == 'content'">
- <table width="100%">
+ <table
id="sub-table"
width="100%">
<thead>
<tr>
<th><a href="${tg.url('pcu', filter='ok')}">Ok(${fc['ok']})</a></th>
<thead>
<tr>
<th><a href="${tg.url('pcu', filter='ok')}">Ok(${fc['ok']})</a></th>
@@
-28,10
+29,11
@@
def pcu_link(pcu):
<tbody>
<tr>
<td colspan="5">
<tbody>
<tr>
<td colspan="5">
- <table
border="1
">
+ <table
id="sortable_table" class="datagrid" border="1" width="100%
">
<thead>
<tr>
<thead>
<tr>
- <th>Site</th>
+ <th mochi:format="int"></th>
+ <th mochi:format="str">Site</th>
<th>PCU Name</th>
<th>Missing Fields</th>
<th>DNS Status</th>
<th>PCU Name</th>
<th>Missing Fields</th>
<th>DNS Status</th>
@@
-43,7
+45,8
@@
def pcu_link(pcu):
</thead>
<tbody>
<tr py:for="i,node in enumerate(query)" class="${i%2 and 'odd' or 'even'}" >
</thead>
<tbody>
<tr py:for="i,node in enumerate(query)" class="${i%2 and 'odd' or 'even'}" >
- <td><a href="${plc_site_link(node.plc_pcu_stats)}">sitename</a></td>
+ <td></td>
+ <td><a href="${plc_site_link(node.plc_pcu_stats)}">${node.loginbase}</a></td>
<td nowrap="true" >
<a href="${pcu_link(node.plc_pcu_stats)}">${pcu_name(node.plc_pcu_stats)}</a></td>
<td py:content="node.entry_complete"></td>
<td nowrap="true" >
<a href="${pcu_link(node.plc_pcu_stats)}">${pcu_name(node.plc_pcu_stats)}</a></td>
<td py:content="node.entry_complete"></td>
@@
-52,7
+55,7
@@
def pcu_link(pcu):
<span py:for="port,state in node.ports"
id="port${state}" py:content="'%s, ' % port">80</span>
</td>
<span py:for="port,state in node.ports"
id="port${state}" py:content="'%s, ' % port">80</span>
</td>
- <td id="status-${node.status}" py:content="node.reboot_trial_status"></td>
+ <td
width="40"
id="status-${node.status}" py:content="node.reboot_trial_status"></td>
<td py:content="node.plc_pcu_stats['model']"></td>
<td py:content="len(node.plc_pcu_stats['node_ids'])"></td>
</tr>
<td py:content="node.plc_pcu_stats['model']"></td>
<td py:content="len(node.plc_pcu_stats['node_ids'])"></td>
</tr>