Commit 5ef80d01 authored by Alain Takoudjou's avatar Alain Takoudjou

slapos_monitoring: minors changes

parent 7a838ee4
...@@ -19,23 +19,12 @@ ...@@ -19,23 +19,12 @@
.push(function (monitor_url_description) { .push(function (monitor_url_description) {
if (!monitor_url_description) { if (!monitor_url_description) {
return gadget.redirect({ return gadget.redirect({
page: 'settings_configurator' page: 'settings_configurator',
tab: 'add'
}); });
} else {
return gadget.getSetting('monitoring_display_style');
} }
})
.push(function (display_option) {
current_display = options.display || display_option;
if (current_display === undefined || current_display === '') {
current_display = 'list';
}
current_display = 'list';
return gadget.setSetting('monitoring_display_style', current_display);
})
.push(function () {
return gadget.redirect({ return gadget.redirect({
page: 'status_' + current_display page: 'hosting_subscription_list'
}); });
}); });
}) })
......
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>951.20773.46331.52377</string> </value> <value> <string>953.9448.25501.37666</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>1463745785.66</float> <float>1470906395.43</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
<div class="padding-5"> <div class="padding-5">
<h2><strong>Access links:</strong></h2> <h2><strong>Access links:</strong></h2>
<a href="#page=hosting_subscription_list" class="ui-btn ui-corner-all ui-btn-inline ui-mini" title="Access Hosting Subscriptions"> <a href="#page=hosting_subscription_list" class="ui-btn ui-corner-all ui-btn-inline ui-mini" title="Access Hosting Subscriptions">
<i class="fa fa-tachometer" aria-hidden="true"></i> Applications Monitoring</a> <i class="fa fa-tachometer" aria-hidden="true"></i> Application Monitoring</a>
<a href="#page=import_export" class="ui-btn ui-corner-all ui-btn-inline ui-mini" title="Export Settings"> <a href="#page=import_export" class="ui-btn ui-corner-all ui-btn-inline ui-mini" title="Export Settings">
<i class="fa fa-location-arrow" aria-hidden="true"></i> Export Settings</a> <i class="fa fa-location-arrow" aria-hidden="true"></i> Export Settings</a>
</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>953.429.29685.31488</string> </value> <value> <string>953.1826.20013.21060</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>1470386058.3</float> <float>1470840543.53</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -315,7 +315,8 @@ ...@@ -315,7 +315,8 @@
for (key in url_description_dict) { for (key in url_description_dict) {
opml_list.push({ opml_list.push({
key: key, key: key,
href: "#page=settings_configurator&url=" + url_description_dict[key].href, href: "#page=settings_configurator&url=" + url_description_dict[key].href +
'&tab=add',
link: url_description_dict[key].href, link: url_description_dict[key].href,
title: url_description_dict[key].title || '' title: url_description_dict[key].title || ''
}); });
......
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>952.31668.17083.22784</string> </value> <value> <string>953.36447.50256.8499</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>1468600695.1</float> <float>1472468803.41</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