Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lu Xu
slapos.core
Commits
5ef80d01
Commit
5ef80d01
authored
Aug 29, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_monitoring: minors changes
parent
7a838ee4
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
22 deletions
+12
-22
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_main_js.html
...mplateItem/web_page_module/gadget_monitoring_main_js.html
+3
-14
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_main_js.xml
...emplateItem/web_page_module/gadget_monitoring_main_js.xml
+2
-2
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_settings_configurator_html.html
..._module/gadget_monitoring_settings_configurator_html.html
+1
-1
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_settings_configurator_html.xml
...e_module/gadget_monitoring_settings_configurator_html.xml
+2
-2
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_static_js.html
...lateItem/web_page_module/gadget_monitoring_static_js.html
+2
-1
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_static_js.xml
...plateItem/web_page_module/gadget_monitoring_static_js.xml
+2
-2
No files found.
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_main_js.html
View file @
5ef80d01
...
@@ -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'
});
});
});
});
})
})
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_main_js.xml
View file @
5ef80d01
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
1.20773.46331.52377
</string>
</value>
<value>
<string>
95
3.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>
14
63745785.66
</float>
<float>
14
70906395.43
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_settings_configurator_html.html
View file @
5ef80d01
...
@@ -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>
Application
s
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>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_settings_configurator_html.xml
View file @
5ef80d01
...
@@ -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>
1470
386058.
3
</float>
<float>
1470
840543.5
3
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_static_js.html
View file @
5ef80d01
...
@@ -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 || ''
});
});
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_static_js.xml
View file @
5ef80d01
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
2.31668.17083.22784
</string>
</value>
<value>
<string>
95
3.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>
14
68600695.
1
</float>
<float>
14
72468803.4
1
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment