You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/03/25 05:51:54 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1854] UI is
improved
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 7c65c03 [OPENMEETINGS-1854] UI is improved
7c65c03 is described below
commit 7c65c039351b622b00214f2e8968bd9984da6d25
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sun Mar 25 12:51:44 2018 +0700
[OPENMEETINGS-1854] UI is improved
---
.../apache/openmeetings/web/room/NetTestPanel.html | 40 +++++++++++++---------
.../apache/openmeetings/web/room/nettest-base.js | 24 +++++++++++++
openmeetings-web/src/main/webapp/css/nettest.css | 19 ++++++++--
3 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
index 14d1850..c42b434 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
@@ -26,25 +26,33 @@
<wicket:panel>
<noscript>Please enable JavaScript in order to use this application.</noscript>
<div class="nettest">
- <div class="test">
- <button type="button" data-measure="ping" data-start="true" data-next="jitter" wicket:message="data-lbl:network.test.ping">
- <span class="ui-icon ui-icon-clock"></span> <wicket:message key="network.test.ping"/>
- </button>
+ <div class="test-container" id="test-ping">
+ <div class="test" wicket:message="title:network.test.ping" data-icon="ui-icon-clock">
+ <button type="button" data-measure="ping" data-start="true" data-next="jitter" wicket:message="data-lbl:network.test.ping">
+ <span class="value"></span>
+ </button>
+ </div>
</div>
- <div class="test">
- <button type="button" data-measure="jitter" data-start="true" data-next="upload" wicket:message="data-lbl:network.test.jitter">
- <span class="ui-icon ui-icon-clock"></span> <wicket:message key="network.test.jitter"/>
- </button>
+ <div class="test-container" id="test-jitter">
+ <div class="test" wicket:message="title:network.test.jitter" data-icon="ui-icon-clock">
+ <button type="button" data-measure="jitter" data-start="true" data-next="upload" wicket:message="data-lbl:network.test.jitter">
+ <span class="value"></span>
+ </button>
+ </div>
</div>
- <div class="test">
- <button type="button" data-measure="upload" data-next="download" wicket:message="data-lbl:network.test.upl">
- <span class="ui-icon ui-icon-arrowthickstop-1-n"></span> <wicket:message key="network.test.upl"/>
- </button>
+ <div class="test-container" id="test-upload">
+ <div class="test" wicket:message="title:network.test.upl" data-icon="ui-icon-arrowthickstop-1-n">
+ <button type="button" data-measure="upload" data-next="download" wicket:message="data-lbl:network.test.upl">
+ <span class="value"></span>
+ </button>
+ </div>
</div>
- <div class="test">
- <button type="button" data-measure="download" wicket:message="data-lbl:network.test.dwn">
- <span class="ui-icon ui-icon-arrowthickstop-1-s"></span> <wicket:message key="network.test.dwn"/>
- </button>
+ <div class="test-container" id="test-download">
+ <div class="test" wicket:message="title:network.test.dwn" data-icon="ui-icon-arrowthickstop-1-s">
+ <button type="button" data-measure="download" wicket:message="data-lbl:network.test.dwn">
+ <span class="value"></span>
+ </button>
+ </div>
</div>
<div class="output">
<output></output>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js
index 85e4a31..672d8d9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js
@@ -8,6 +8,29 @@ var NetTest = (function() {
function _init(_lbls) {
lbls = _lbls;
output = $('.nettest output');
+ $('.nettest .test-container').each(function() {
+ const cont = $(this)
+ , d = cont.find('.test');
+ d.dialog({
+ closeOnEscape: false
+ , classes: {
+ 'ui-dialog': 'ui-corner-all nettest-dialog'
+ , 'ui-dialog-titlebar': 'ui-corner-all no-close'
+ }
+ , autoOpen: true
+ , resizable: false
+ , draggable: false
+ , modal: false
+ , appendTo: '#' + cont.attr('id')
+ , position: {my: "left top", at: "left top", of: cont}
+ , minWidth: 190
+ , width: 190
+ , maxWidth: 190
+ , height: 100
+ });
+ d.parent().find('.ui-dialog-titlebar .ui-dialog-title')
+ .prepend($('<span class="ui-icon"></span>').addClass(d.data('icon')));
+ });
$('.nettest button')
.button()
.click(function() {
@@ -128,6 +151,7 @@ var NetTest = (function() {
_log($('<span></span>').append(lbls['ping.avg']).append(_value(avg, lbls['ms'])));
_log($('<span></span>').append(lbls['ping.rcv']).append(_value(_all.length, '')));
_log($('<span></span>').append(lbls['ping.lost']).append(_value(PINGS - _all.length, '')));
+ $('#test-ping .value').html(_value(avg, lbls['ms']));
}
function _restart(size) {
__start(size, false);
diff --git a/openmeetings-web/src/main/webapp/css/nettest.css b/openmeetings-web/src/main/webapp/css/nettest.css
index 034e2b3..725703a 100644
--- a/openmeetings-web/src/main/webapp/css/nettest.css
+++ b/openmeetings-web/src/main/webapp/css/nettest.css
@@ -22,10 +22,25 @@
}
.nettest {
padding: 20px;
- height: calc(100% - 50px);
+ height: calc(100% - 100px);
+}
+.nettest .test-container {
+ display: inline-block;
+ position: relative;
+ width: 200px;
+ height: 100px;
}
-.nettest .test {
+.nettest .test-container .value {
display: inline-block;
+ width: 80px;
+ height: 40px;
+}
+.nettest .nettest-dialog {
+ padding: 0;
+}
+.nettest .nettest-dialog .test.ui-widget-content {
+ padding: 0 35px;
+ overflow: hidden;
}
.nettest .output {
border-radius: 10px;
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.