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 9ff0ee6 [OPENMEETINGS-2165] start widget, busy indicator
9ff0ee6 is described below
commit 9ff0ee6a55650f8af04761bf9f3e112d8a02c5ca
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sun Mar 15 16:24:56 2020 +0700
[OPENMEETINGS-2165] start widget, busy indicator
---
.../apache/openmeetings/web/common/MainPanel.html | 2 +-
.../openmeetings/web/room/sidebar/RoomSidebar.html | 2 +-
.../web/user/dashboard/StartWidgetView.html | 23 +++++++++++++++++-----
.../src/main/webapp/css/raw-general.css | 19 ++----------------
4 files changed, 22 insertions(+), 24 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
index 83c995f..72953c5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
@@ -28,7 +28,7 @@
<span id="reportBug"><a target="_blank"
href="https://issues.apache.org/jira/browse/OPENMEETINGS"; rel="noopener
noreferrer"><wicket:message key="284"/></a></span>
<span><a wicket:id="about"><wicket:message
key="1549"/></a></span>
</div>
- <div id="busy-indicator"></div>
+ <div id="busy-indicator"><i class="fas fa-spinner
fa-spin"></i></div>
<div wicket:id="menu"></div>
</div>
<div wicket:id="dev" id="devMenu"/>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
index afa8c6f..7d6f8ad 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
@@ -20,7 +20,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <div id="busy-indicator"></div>
+ <div id="busy-indicator"><i class="fas fa-spinner fa-spin"></i></div>
<div class="tabs" id="room-sidebar-tabs">
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
index fcdca64..5228ede 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
@@ -22,11 +22,24 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<h3><wicket:message key="widget.start.header"/></h3>
- <div><div wicket:id="step1" class="clickable
start_step1"><wicket:message key="768"/></div></div>
- <div><div wicket:id="step2" class="clickable
start_step2"><wicket:message key="771"/></div></div>
- <div><div wicket:id="step3" class="start_step3"><a wicket:id="avTest"
- target="_blank" rel="noopener noreferrer"><wicket:message
key="772"/></a></div></div>
- <div><div wicket:id="step4" class="clickable
start_step4"><wicket:message key="773"/></div></div>
+ <div wicket:id="step1" class="clickable start_step1">
+ <span class="badge badge-pill badge-secondary">1</span>
+ <wicket:message key="768"/>
+ </div>
+ <div wicket:id="step2" class="clickable start_step2">
+ <span class="badge badge-pill badge-secondary">2</span>
+ <wicket:message key="771"/>
+ </div>
+ <div wicket:id="step3" class="start_step3">
+ <a wicket:id="avTest" target="_blank" rel="noopener noreferrer">
+ <span class="badge badge-pill badge-secondary">3</span>
+ <wicket:message key="772"/>
+ </a>
+ </div>
+ <div wicket:id="step4" class="clickable start_step4">
+ <span class="badge badge-pill badge-secondary">4</span>
+ <wicket:message key="773"/>
+ </div>
<table>
<tr>
<td><div wicket:id="123msg"></div></td>
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css
b/openmeetings-web/src/main/webapp/css/raw-general.css
index 04bd5eb..221eaed 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -70,15 +70,11 @@ html, body {
#busy-indicator {
display: none;
z-index: 1000;
- width: 30px;
- height: 30px;
- border: 0;
position: absolute;
right: 0;
margin: 2px;
- background-image: url(images/ajax-loader.gif);
- background-repeat: no-repeat;
- background-size: 28px 28px;
+ font-size: 2em;
+ line-height: 1.2em;
}
.clickable {
cursor: pointer;
@@ -169,26 +165,15 @@ html, body {
box-shadow: 3px 3px 4px #000;
}
.start_step1, .start_step2, .start_step3, .start_step4 {
- padding-left: 30px;
- background-position: left top;
margin: 5px 0px 5px 0px;
- background-size: contain;
- background-repeat: no-repeat;
- display: inline-block;
-}
-.start_step1 {
- background-image: url(images/wizzard_button_1.png);
}
.start_step2 {
- background-image: url(images/wizzard_button_2.png);
margin-left: 20px;
}
.start_step3 {
- background-image: url(images/wizzard_button_3.png);
margin-left: 40px;
}
.start_step4 {
- background-image: url(images/wizzard_button_4.png);
margin-left: 60px;
}
.widget {
