Commit b992c34e authored by Alain Takoudjou's avatar Alain Takoudjou

slapos_monitoring: fix monitor instance registration

parent 8d66b2e4
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
CACHE MANIFEST\n CACHE MANIFEST\n
# generated on Fri, 28 April 2016 11:47:33 +0000\n # generated on Fri, 29 April 2016 15:47:33 +0000\n
# XXX + fonts\n # XXX + fonts\n
# images/ajax-loader.gif\n # images/ajax-loader.gif\n
CACHE:\n CACHE:\n
...@@ -126,6 +126,7 @@ gadget_jio.html\n ...@@ -126,6 +126,7 @@ gadget_jio.html\n
gadget_jio.js\n gadget_jio.js\n
gadget_translate.html\n gadget_translate.html\n
gadget_translate.js\n gadget_translate.js\n
gadget_translation.html\n
handlebars.js\n handlebars.js\n
i18next.js\n i18next.js\n
jiodev.js\n jiodev.js\n
...@@ -326,7 +327,7 @@ NETWORK:\n ...@@ -326,7 +327,7 @@ NETWORK:\n
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>950.53381.7699.19968</string> </value> <value> <string>950.54525.37134.26453</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -344,7 +345,7 @@ NETWORK:\n ...@@ -344,7 +345,7 @@ NETWORK:\n
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1461861221.53</float> <float>1461945469.4</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -691,6 +691,59 @@ html table.instance-overview td:first-child > a, html table.instance-overview td ...@@ -691,6 +691,59 @@ html table.instance-overview td:first-child > a, html table.instance-overview td
margin: 20px auto; margin: 20px auto;
} }
/* Alert box custom */
.alert {
padding: 8px 35px 8px 14px;
margin-bottom: 8px;
margin-top: 8px;
color: #c09853;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #fcf8e3;
border: 1px solid #fbeed5;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.alert-heading {
color: inherit;
}
.alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: 18px;
}
.alert-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
.alert-danger,
.alert-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
.alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
.alert-block > p,
.alert-block > ul {
margin-bottom: 0;
}
.alert-block p + p {
margin-top: 5px;
}
/************** Media @ **********************/ /************** Media @ **********************/
@media all and (max-width: 62em) { @media all and (max-width: 62em) {
form.search .ui-block-a { form.search .ui-block-a {
......
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>superalain</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>950.11464.24567.15445</string> </value> <value> <string>950.54665.64561.63931</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1459341758.63</float> <float>1461939565.36</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -60,9 +60,11 @@ ...@@ -60,9 +60,11 @@
if (doc.hasOwnProperty(key)) { if (doc.hasOwnProperty(key)) {
doc[key].hash = btoa(login + ':' + password); doc[key].hash = btoa(login + ':' + password);
doc[key].url = url; doc[key].url = url;
doc[key].login = login;
} else { } else {
doc[key] = { doc[key] = {
hash: btoa(login + ':' + password), hash: btoa(login + ':' + password),
login: login,
url: url, url: url,
parent_url: ''}; parent_url: ''};
} }
......
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>950.51968.20423.17902</string> </value> <value> <string>950.54785.50611.22596</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1461832953.11</float> <float>1461942642.99</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -107,9 +107,7 @@ ...@@ -107,9 +107,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="padding-5"> <div class="alert alert-error ui-content-hidden"></div>
<span class="ui-text-error"></span>
</div>
<div class="ui-grid-b ui-responsive"> <div class="ui-grid-b ui-responsive">
<div class="ui-block-a"></div> <div class="ui-block-a"></div>
<div class="ui-block-b"> <div class="ui-block-b">
...@@ -164,6 +162,7 @@ ...@@ -164,6 +162,7 @@
</div> </div>
<div class="padding-5"> <div class="padding-5">
<a href="#page=hosting_overview">Access Applications</a> <a href="#page=hosting_overview">Access Applications</a>
<a href="#page=import_export">Export Settings</a>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>950.53466.15484.25019</string> </value> <value> <string>950.54736.61765.9915</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1461860815.17</float> <float>1461937944.7</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>950.53470.24267.49032</string> </value> <value> <string>950.54797.54715.48554</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1461861122.87</float> <float>1461942058.71</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment