Skip to content

S
slapos.core
Commit e07ab550 authored by Alain Takoudjou's avatar Alain Takoudjou
Browse files
Options

slapos_monitoring: show loading progression in hosting and instance overview

parent d2561621
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 26 deletions
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>950.54525.37134.26453</string> </value> <value> <string>951.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>1461945469.4</float> <float>1462958448.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>950.54665.64561.63931</string> </value> <value> <string>951.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>1461939565.36</float> <float>1462957037.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>949.47051.37391.64290</string> </value> <value> <string>950.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>1457543803.27</float> <float>1462896137.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>950.28768.11607.28996</string> </value> <value> <string>951.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>1460450584.75</float> <float>1462954238.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>950.52007.35517.18278</string> </value> <value> <string>951.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>1461847634.36</float> <float>1462956704.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>950.53037.35338.8209</string> </value> <value> <string>951.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>1461861381.81</float> <float>1462957229.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>950.14162.28880.43042</string> </value> <value> <string>951.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>1459502615.34</float> <float>1462894491.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>949.64074.33189.21691</string> </value> <value> <string>951.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>1458566491.46</float> <float>1462957858.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>949.64078.48455.55876</string> </value> <value> <string>951.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>1458566498.07</float> <float>1462958298.9</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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7