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
Cédric Le Ninivin
slapos.core
Commits
e07ab550
Commit
e07ab550
authored
May 11, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_monitoring: show loading progression in hosting and instance overview
parent
d2561621
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
104 additions
and
26 deletions
+104
-26
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_appcache.xml
...mplateItem/web_page_module/gadget_monitoring_appcache.xml
+4
-4
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_custom_css.css
...lateItem/web_page_module/gadget_monitoring_custom_css.css
+65
-0
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_custom_css.xml
...lateItem/web_page_module/gadget_monitoring_custom_css.xml
+3
-3
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_header_html.xml
...ateItem/web_page_module/gadget_monitoring_header_html.xml
+2
-2
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_header_js.xml
...plateItem/web_page_module/gadget_monitoring_header_js.xml
+2
-2
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_hosting_overview_html.html
..._page_module/gadget_monitoring_hosting_overview_html.html
+2
-1
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_hosting_overview_html.xml
...b_page_module/gadget_monitoring_hosting_overview_html.xml
+3
-3
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_hosting_overview_js.html
...eb_page_module/gadget_monitoring_hosting_overview_js.html
+4
-1
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_hosting_overview_js.xml
...web_page_module/gadget_monitoring_hosting_overview_js.xml
+3
-3
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_import_export_js.html
...m/web_page_module/gadget_monitoring_import_export_js.html
+5
-0
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_import_export_js.xml
...em/web_page_module/gadget_monitoring_import_export_js.xml
+2
-2
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_widget_overview_html.html
...b_page_module/gadget_monitoring_widget_overview_html.html
+2
-1
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_widget_overview_html.xml
...eb_page_module/gadget_monitoring_widget_overview_html.xml
+2
-2
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_widget_overview_js.js
...m/web_page_module/gadget_monitoring_widget_overview_js.js
+3
-0
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_widget_overview_js.xml
.../web_page_module/gadget_monitoring_widget_overview_js.xml
+2
-2
No files found.
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_appcache.xml
View file @
e07ab550
...
@@ -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,
29 April
2016 15:47:33 +0000\n
# generated on Fri,
11 Mai
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
...
@@ -313,7 +313,7 @@ NETWORK:\n
...
@@ -313,7 +313,7 @@ NETWORK:\n
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
superalain
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -327,7 +327,7 @@ NETWORK:\n
...
@@ -327,7 +327,7 @@ NETWORK:\n
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
0.54525.37134.26453
</string>
</value>
<value>
<string>
95
1.6586.44195.10240
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -345,7 +345,7 @@ NETWORK:\n
...
@@ -345,7 +345,7 @@ NETWORK:\n
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
146
1945469.4
</float>
<float>
146
2958448.28
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_custom_css.css
View file @
e07ab550
...
@@ -744,6 +744,71 @@ margin-bottom: 0;
...
@@ -744,6 +744,71 @@ margin-bottom: 0;
margin-top
:
5px
;
margin-top
:
5px
;
}
}
/******** LOADER *******************/
.loader
{
height
:
4px
;
width
:
100%
;
position
:
relative
;
overflow
:
hidden
;
background-color
:
#ddd
;
}
.loader
:before
{
display
:
block
;
position
:
absolute
;
content
:
""
;
left
:
-200px
;
width
:
200px
;
height
:
4px
;
background-color
:
#2980b9
;
animation
:
loading
2s
linear
infinite
;
}
@keyframes
loading
{
from
{
left
:
-200px
;
width
:
30%
;}
50
%
{
width
:
30%
;}
70
%
{
width
:
70%
;}
80
%
{
left
:
50%
;}
95
%
{
left
:
120%
;}
to
{
left
:
100%
;}
}
.signal
{
border
:
4px
solid
#024352
;
border-radius
:
50px
;
height
:
50px
;
left
:
50%
;
margin
:
-15px
0
0
-15px
;
/*opacity: 0;*/
position
:
absolute
;
top
:
90px
;
width
:
50px
;
/*animation: pulsate .5s ease-out;
animation-iteration-count: infinite;*/
animation
:
rotate
0.8s
infinite
linear
;
border-right-color
:
transparent
;
}
@keyframes
rotate
{
0
%
{
transform
:
rotate
(
0deg
);
}
100
%
{
transform
:
rotate
(
360deg
);
}
}
@keyframes
pulsate
{
0
%
{
transform
:
scale
(
.1
);
opacity
:
0.0
;
}
50
%
{
opacity
:
1
;
}
100
%
{
transform
:
scale
(
1.2
);
opacity
:
0
;
}
}
/************** Media @ **********************/
/************** Media @ **********************/
@media
all
and
(
max-width
:
62em
)
{
@media
all
and
(
max-width
:
62em
)
{
form
.search
.ui-block-a
{
form
.search
.ui-block-a
{
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_custom_css.xml
View file @
e07ab550
...
@@ -225,7 +225,7 @@
...
@@ -225,7 +225,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
superalain
</string>
</value>
<value>
<string>
zope
</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>
95
0.54665.64561.63931
</string>
</value>
<value>
<string>
95
1.7640.35673.52906
</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>
146
1939565.36
</float>
<float>
146
2957037.05
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_header_html.xml
View file @
e07ab550
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
49.47051.37391.64290
</string>
</value>
<value>
<string>
9
50.63263.62080.55091
</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
57543803.27
</float>
<float>
14
62896137.92
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_header_js.xml
View file @
e07ab550
...
@@ -235,7 +235,7 @@
...
@@ -235,7 +235,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
0.28768.11607.28996
</string>
</value>
<value>
<string>
95
1.6822.36434.34560
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -253,7 +253,7 @@
...
@@ -253,7 +253,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
146
0450584.75
</float>
<float>
146
2954238.66
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_hosting_overview_html.html
View file @
e07ab550
...
@@ -166,7 +166,8 @@
...
@@ -166,7 +166,8 @@
</div>
</div>
</div>
</div>
<div
class=
"ui-block-b"
>
<div
class=
"ui-block-b"
style=
"position: relative"
>
<div
class=
"signal ui-content-hidden"
></div>
<div
class=
"ui-panel-overview ui-content-hidden"
>
<div
class=
"ui-panel-overview ui-content-hidden"
>
<div
class=
"overview-header"
>
<div
class=
"overview-header"
>
<div
class=
'content-title ui-instance-title'
>
<div
class=
'content-title ui-instance-title'
>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_hosting_overview_html.xml
View file @
e07ab550
...
@@ -229,7 +229,7 @@
...
@@ -229,7 +229,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
superalain
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -243,7 +243,7 @@
...
@@ -243,7 +243,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
0.52007.35517.18278
</string>
</value>
<value>
<string>
95
1.7634.20557.47701
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -261,7 +261,7 @@
...
@@ -261,7 +261,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
146
1847634.36
</float>
<float>
146
2956704.34
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_hosting_overview_js.html
View file @
e07ab550
...
@@ -67,6 +67,7 @@
...
@@ -67,6 +67,7 @@
gadget.props =
{};
gadget.props =
{};
gadget.props.hosting_list =
[];
gadget.props.hosting_list =
[];
gadget.props.opml_key_list =
[];
gadget.props.opml_key_list =
[];
gadget.props.title =
'Monitoring Registered Applications'
;
return
gadget
.
getDeclaredGadget
("
login_gadget
")
return
gadget
.
getDeclaredGadget
("
login_gadget
")
.
push
(
function
(
login_gadget
)
{
.
push
(
function
(
login_gadget
)
{
gadget.props.login_gadget =
login_gadget;
gadget.props.login_gadget =
login_gadget;
...
@@ -102,7 +103,7 @@
...
@@ -102,7 +103,7 @@
//
return
gadget
.
props
.
jio_gadget
.
getMonitorUrlList
()
//
return
gadget
.
props
.
jio_gadget
.
getMonitorUrlList
()
gadget.props.options =
options;
gadget.props.options =
options;
return
gadget
.
updateHeader
({
return
gadget
.
updateHeader
({
title:
'
Monitoring
Registered
Applications
'
title:
gadget
.
props
.
title
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
getSetting
('
monitor_url_description
');
return
gadget
.
getSetting
('
monitor_url_description
');
...
@@ -373,6 +374,7 @@
...
@@ -373,6 +374,7 @@
if (old_element) {
if (old_element) {
old_element.removeClass('selected');
old_element.removeClass('selected');
}
}
$(".ui-block-b .signal").removeClass("ui-content-hidden");
return $(element.querySelector('td:first-child > a')).addClass('selected');
return $(element.querySelector('td:first-child > a')).addClass('selected');
})
})
.push(function () {
.push(function () {
...
@@ -443,6 +445,7 @@
...
@@ -443,6 +445,7 @@
return
'';
return
'';
})
})
.
push
(
function
()
{
.
push
(
function
()
{
$(".
ui-block-b
.
signal
").
addClass
("
ui-content-hidden
");
return
$(
gadget
.
props
.
element
.
querySelectorAll
('.
ui-block-b
.
ui-listview-outer
')).
listview
().
listview
("
refresh
");
return
$(
gadget
.
props
.
element
.
querySelectorAll
('.
ui-block-b
.
ui-listview-outer
')).
listview
().
listview
("
refresh
");
})
})
.
push
(
function
()
{
.
push
(
function
()
{
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_hosting_overview_js.xml
View file @
e07ab550
...
@@ -225,7 +225,7 @@
...
@@ -225,7 +225,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
superalain
</string>
</value>
<value>
<string>
zope
</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>
95
0.53037.35338.8209
</string>
</value>
<value>
<string>
95
1.7620.46241.55705
</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>
146
1861381.81
</float>
<float>
146
2957229.65
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_import_export_js.html
View file @
e07ab550
...
@@ -70,6 +70,11 @@
...
@@ -70,6 +70,11 @@
"description": "hash string",
"description": "hash string",
"type": "string"
"type": "string"
},
},
"login": {
"description": "login",
"type": "string",
"default": ""
},
"url": {
"url": {
"description": "url of monitor instance",
"description": "url of monitor instance",
"type": "string"
"type": "string"
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_import_export_js.xml
View file @
e07ab550
...
@@ -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
0.14162.28880.43042
</string>
</value>
<value>
<string>
95
1.6586.6078.25975
</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
59502615.34
</float>
<float>
14
62894491.67
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_widget_overview_html.html
View file @
e07ab550
...
@@ -190,7 +190,8 @@
...
@@ -190,7 +190,8 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"ui-block-b"
>
<div
class=
"ui-block-b"
style=
"position: relative"
>
<div
class=
"signal ui-content-hidden"
></div>
<div
class=
"ui-panel-overview"
>
<div
class=
"ui-panel-overview"
>
<div
class=
"overview-details"
>
<div
class=
"overview-details"
>
</div>
</div>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_widget_overview_html.xml
View file @
e07ab550
...
@@ -243,7 +243,7 @@
...
@@ -243,7 +243,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
49.64074.33189.21691
</string>
</value>
<value>
<string>
9
51.7643.51909.61422
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -261,7 +261,7 @@
...
@@ -261,7 +261,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
58566491.46
</float>
<float>
14
62957858.82
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_widget_overview_js.js
View file @
e07ab550
...
@@ -257,6 +257,7 @@
...
@@ -257,6 +257,7 @@
}
}
return
new
RSVP
.
Queue
()
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
.
push
(
function
()
{
$
(
"
.ui-block-b .signal
"
).
removeClass
(
"
ui-content-hidden
"
);
return
gadget
.
setSetting
(
'
instance_overview_selection
'
,
private_link
);
return
gadget
.
setSetting
(
'
instance_overview_selection
'
,
private_link
);
})
})
.
push
(
function
()
{
.
push
(
function
()
{
...
@@ -365,10 +366,12 @@
...
@@ -365,10 +366,12 @@
.
innerHTML
=
content
;
.
innerHTML
=
content
;
gadget
.
property_dict
.
element
.
querySelector
(
"
.promise-list
"
)
gadget
.
property_dict
.
element
.
querySelector
(
"
.promise-list
"
)
.
innerHTML
=
promise_content
;
.
innerHTML
=
promise_content
;
$
(
"
.ui-block-b .signal
"
).
addClass
(
"
ui-content-hidden
"
);
return
$
(
element
.
querySelectorAll
(
'
fieldset[data-role="controlgroup"]
'
))
return
$
(
element
.
querySelectorAll
(
'
fieldset[data-role="controlgroup"]
'
))
.
controlgroup
().
controlgroup
(
'
refresh
'
);
.
controlgroup
().
controlgroup
(
'
refresh
'
);
});
});
}
}
$
(
"
.ui-block-b .signal
"
).
addClass
(
"
ui-content-hidden
"
);
return
false
;
return
false
;
});
});
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_widget_overview_js.xml
View file @
e07ab550
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
49.64078.48455.55876
</string>
</value>
<value>
<string>
9
51.7653.61879.51080
</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
58566498.07
</float>
<float>
14
62958298.9
</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