This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/csp by this push:
new 461cc0c [OPENMEETINGS-2165] network testing is converted
461cc0c is described below
commit 461cc0c518d96749e75ec13905f0f7bd4d0d2b6f
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Feb 19 16:47:28 2020 +0700
[OPENMEETINGS-2165] network testing is converted
---
.../apache/openmeetings/web/pages/HashPage.java | 8 ---
.../web/pages/InvitationPasswordDialog.html | 4 +-
.../apache/openmeetings/web/room/NetTestPanel.html | 40 +++++++++------
.../apache/openmeetings/web/room/raw-nettest.js | 30 ++---------
.../src/main/webapp/css/raw-nettest.css | 60 +++++++++-------------
5 files changed, 54 insertions(+), 88 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index c54df52..161987b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -46,8 +46,6 @@ import org.apache.openmeetings.web.user.record.VideoInfo;
import org.apache.openmeetings.web.user.record.VideoPlayer;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.model.ResourceModel;
@@ -228,10 +226,4 @@ public class HashPage extends BaseInitedPage implements
IUpdatable {
, vp.update(target,
i.getRecording()).setVisible(true));
}
}
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forCSS(".invite.om-icon{display:
none !important;}", "no-invite-to-room"));
- }
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html
index 7ecee0f..1fb6424 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html
@@ -19,12 +19,12 @@
-->
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:panel>
+<wicket:extend>
<form wicket:id="form">
<div wicket:id="feedback"></div>
<label wicket:for="password"><wicket:message key="110"/></label>
<input wicket:id="password" type="password"
autofocus="autofocus"/>
<input type="submit" wicket:id="submit"
class="invisible-form-component"/>
</form>
-</wicket:panel>
+</wicket:extend>
</html>
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 9292964..196bfc31 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
@@ -27,31 +27,39 @@
<wicket:panel>
<noscript>Please enable JavaScript in order to use this
application.</noscript>
<div class="nettest">
- <div class="test-container" id="test-ping">
- <div class="test"
wicket:message="title:network.test.ping" data-icon="ui-icon-clock">
- <button type="button" class="test-btn
not-started" data-measure="ping" data-start="true" data-next="jitter"
wicket:message="data-lbl:network.test.ping">
- <span class="value"></span>
+ <div class="test-container card" id="test-ping">
+ <div class="card-body">
+ <h5 class="card-title"><i class="far
fa-clock"></i> <wicket:message key="network.test.ping"/></h5>
+ <p class="card-text value"></p>
+ <button class="test-btn btn btn-block
btn-outline not-started" data-measure="ping" data-start="true"
data-next="jitter" wicket:message="data-lbl:network.test.ping">
+ <i class="fas"></i>
</button>
</div>
</div>
- <div class="test-container" id="test-jitter">
- <div class="test"
wicket:message="title:network.test.jitter" data-icon="ui-icon-clock">
- <button type="button" class="test-btn
not-started" data-measure="jitter" data-next="upload"
wicket:message="data-lbl:network.test.jitter">
- <span class="value"></span>
+ <div class="test-container card" id="test-jitter">
+ <div class="card-body">
+ <h5 class="card-title"><i class="far
fa-clock"></i> <wicket:message key="network.test.jitter"/></h5>
+ <p class="card-text value"></p>
+ <button class="test-btn btn btn-block
btn-outline not-started" data-measure="jitter" data-next="upload"
wicket:message="data-lbl:network.test.jitter">
+ <i class="fas"></i>
</button>
</div>
</div>
- <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" class="test-btn
not-started" data-measure="upload" data-next="download"
wicket:message="data-lbl:network.test.upl">
- <span class="value"></span>
+ <div class="test-container card" id="test-upload">
+ <div class="card-body">
+ <h5 class="card-title"><i class="fas
fa-file-upload"></i> <wicket:message key="network.test.upl"/></h5>
+ <p class="card-text value"></p>
+ <button class="test-btn btn btn-block
btn-outline not-started" data-measure="upload" data-next="download"
wicket:message="data-lbl:network.test.upl">
+ <i class="fas"></i>
</button>
</div>
</div>
- <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" class="test-btn
not-started" data-measure="download" wicket:message="data-lbl:network.test.dwn">
- <span class="value"></span>
+ <div class="test-container card" id="test-download">
+ <div class="card-body">
+ <h5 class="card-title"><i class="fas
fa-file-download"></i> <wicket:message key="network.test.dwn"/></h5>
+ <p class="card-text value"></p>
+ <button class="test-btn btn btn-block
btn-outline not-started" data-measure="download"
wicket:message="data-lbl:network.test.dwn">
+ <i class="fas"></i>
</button>
</div>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
index 7f5560b..fccd633 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
@@ -8,42 +8,18 @@ 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() {
const btn = $(this);
btn.removeClass('complete').removeClass('not-started').addClass('started');
testLabel = btn.data('lbl');
testName = btn.data('measure');
tests[testName].start();
- btn.find('.value').html('');
+ btn.parent().find('.value').html('');
});
net = new Network();
- _initTests()
+ _initTests();
// progress can be added
net.upload
.on('start', _start)
@@ -174,7 +150,7 @@ var NetTest = (function() {
function _setResult(val) {
const btn = _btn();
btn.addClass('complete').removeClass('started');
- btn.find('.value').html(val);
+ btn.parent().find('.value').html(val);
testNext = btn.data('next');
if (!testNext) {
bulk = false;
diff --git a/openmeetings-web/src/main/webapp/css/raw-nettest.css
b/openmeetings-web/src/main/webapp/css/raw-nettest.css
index 5e4040d..e6212f0 100644
--- a/openmeetings-web/src/main/webapp/css/raw-nettest.css
+++ b/openmeetings-web/src/main/webapp/css/raw-nettest.css
@@ -1,63 +1,53 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
.hash-panel-main.app {
width: 100%;
- height: calc(100% - 50px);
+ height: calc(100% - var(--header-height));
}
.nettest {
padding: 20px;
- height: calc(100% - 100px);
+ height: 100%;
}
.nettest .test-container {
display: inline-block;
position: relative;
width: 200px;
- height: 100px;
-}
-.nettest .test-container button .value {
- display: inline-block;
- width: 80px;
- height: 40px;
-}
-.nettest .test-container button .line {
- white-space: nowrap;
-}
-.nettest .test-container button .line .value {
- width: auto;
- height: auto;
}
.nettest .test-container button.not-started
- , .nettest .test-container button.started
+, .nettest .test-container button.started
{
- background-color: #cccccc;
+ color: var(--secondary);
+ border-color: var(--secondary);
}
-.nettest .test-container button.not-started .value
- , .nettest .test-container button.started .value
+.nettest .test-container button:hover {
+ color: var(--white);
+ border-color: transparent;
+}
+.nettest .test-container button.not-started:hover
+, .nettest .test-container button.started:hover
{
- background-size: 40px;
- background-repeat: no-repeat;
- background-position-x: 20px;
+ background-color: var(--secondary);
}
-.nettest .test-container button.not-started .value {
- background-image: url(images/notrun.png);
+.nettest .test-container button.complete {
+ color: var(--success);
+ border-color: var(--success);
}
-.nettest .test-container button.started .value {
- background-image: url(images/ajax-loader.gif);
+.nettest .test-container button.complete:hover {
+ background-color: var(--success);
}
-.nettest .test-container button.complete {
- background-color: lawngreen;
+.nettest .test-container button.not-started i::before {
+ content: '\f04b';
}
-.nettest .nettest-dialog {
- padding: 0;
+.nettest .test-container button.started i::before {
+ content: '\f110';
}
-.nettest .nettest-dialog .test.ui-widget-content {
- padding: 0 35px;
- overflow: hidden;
+.nettest .test-container button.complete i::before {
+ content: '\f00c';
}
.nettest .output {
border-radius: 10px;
border: 1px solid #cccccc;
- min-height: calc(100% - 50px);
- max-height: calc(100% - 50px);
+ min-height: calc(100% - 170px);
+ max-height: calc(100% - 170px);
margin-top: 20px;
overflow: auto;
}
