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 0ca52c6 [OPENMEETINGS-2165] A&A
0ca52c6 is described below
commit 0ca52c6e260a22aa7c9326fe3d8ba2c05fa99272
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sun Mar 8 12:29:29 2020 +0700
[OPENMEETINGS-2165] A&A
---
openmeetings-web/pom.xml | 15 ----------
.../web/pages/install/InstallWizard.java | 2 +-
.../web/room/activities/ActivitiesPanel.html | 33 +++++++++++++---------
.../openmeetings/web/room/activities/activities.js | 12 ++++----
.../src/main/webapp/css/raw-activities.css | 20 ++++++-------
5 files changed, 35 insertions(+), 47 deletions(-)
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 438b85e..df3154b 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -625,21 +625,6 @@
<version>${wicketju.version}</version>
</dependency>
<dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-kendo-ui</artifactId>
- <version>${wicketju.version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-kendo-ui-theme-default</artifactId>
- <version>${wicketju.version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-kendo-ui-culture</artifactId>
- <version>${wicketju.version}</version>
- </dependency>
- <dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-urlfragment</artifactId>
<version>${wickets.version}</version>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
index 8b664a8..9a19010 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
@@ -86,11 +86,11 @@ import
org.springframework.web.context.support.XmlWebApplicationContext;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
+import com.googlecode.wicket.jquery.ui.form.button.IndicatingAjaxButton;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import com.googlecode.wicket.jquery.ui.widget.progressbar.ProgressBar;
import com.googlecode.wicket.jquery.ui.widget.tooltip.TooltipBehavior;
import com.googlecode.wicket.jquery.ui.widget.wizard.AbstractWizard;
-import com.googlecode.wicket.kendo.ui.form.button.IndicatingAjaxButton;
import
de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
index 4ec7eac..d483842 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
@@ -21,26 +21,33 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <div class="ui-widget-header">
- <div onclick="Activities.toggle();" class="clickable control
block ui-widget-header ui-state-active">
- <div class="ui-icon ui-icon-carat-1-n sort-icon"></div>
- <span class="badge">42</span>
- <div class="label"><wicket:message key="1363"/></div>
- </div>
+ <div class="clickable control block bg-secondary"
onclick="Activities.toggle();">
+ <i class="fas ml-1 fa-angle-up"></i>
+ <span class="badge badge-secondary">42</span>
+ <div class="label"><wicket:message key="1363"/></div>
</div>
- <div class="ctrl ui-widget-content">
- <div><input type="checkbox" id="activity-auto-clean"/><label
for="activity-auto-clean"><wicket:message
key="activities.autoclean"/></label></div>
+ <div class="ctrl bg-white">
+ <input type="checkbox" id="activity-auto-clean"/>
+ <label class="m-0" for="activity-auto-clean"><wicket:message
key="activities.autoclean"/></label>
</div>
- <div class="area ui-widget-content">
+ <div class="area bg-white">
<div class="actions"></div>
<div class="activities"></div>
</div>
<div class="d-none">
<div id="activity-stub" class="activity item ui-helper-clearfix
ui-corner-all">
- <span class="activity-close ui-icon ui-icon-close
ui-corner-all clickable" wicket:message="title:85"></span>
- <span class="activity-accept ui-icon ui-icon-check
ui-corner-all clickable" wicket:message="title:1360"></span>
- <span class="activity-decline ui-icon ui-icon-cancel
ui-corner-all clickable" wicket:message="title:1361"></span>
- <span class="activity-find ui-icon crosshair
ui-corner-all clickable" wicket:message="title:find.user"></span>
+ <button class="activity-close btn btn-outline-secondary
btn-small" wicket:message="title:85">
+ <i class="fas fa-times"></i>
+ </button>
+ <button class="activity-accept btn
btn-outline-secondary btn-small" wicket:message="title:1360">
+ <i class="fas fa-check"></i>
+ </button>
+ <button class="activity-decline btn
btn-outline-secondary btn-small" wicket:message="title:1361">
+ <i class="fas fa-ban"></i>
+ </button>
+ <button class="activity-find btn btn-outline-secondary
btn-small" wicket:message="title:find.user">
+ <i class="fas fa-crosshairs"></i>
+ </button>
<div class="activity-text"></div>
</div>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
index 8208f36..f0a083d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
@@ -28,8 +28,8 @@ var Activities = function() {
}
function _open() {
if (isClosed()) {
- $('.control.block .ui-icon',
activities).removeClass('ui-icon-caret-1-n').addClass('ui-icon-caret-1-s');
- $('.control.block',
activities).removeClass('ui-state-highlight');
+ $('.control.block i',
activities).removeClass('fa-angle-up').addClass('fa-angle-down');
+ $('.control.block',
activities).removeClass('bg-warning');
activities.animate(
{
height: openedHeightPx
@@ -46,7 +46,7 @@ var Activities = function() {
}
function _close() {
if (!isClosed()) {
- $('.control.block .ui-icon',
activities).removeClass('ui-icon-caret-1-s').addClass('ui-icon-caret-1-n');
+ $('.control.block i',
activities).removeClass('fa-angle-down').addClass('fa-angle-up');
activities.animate(
{
height: closedHeight
@@ -65,12 +65,12 @@ var Activities = function() {
const m = '5px', t = 50, u = $('#user' + uid);
if (u.length === 1) {
u[0].scrollIntoView();
- u.addClass('ui-state-highlight');
+ u.addClass('bg-warning');
for(let i = 0; i < 10; i++) {
u.animate({marginTop: '-='+m}, t)
.animate({marginTop: '+='+m}, t);
}
- u.removeClass('ui-state-highlight', 1500);
+ u.removeClass('bg-warning', 1500);
}
}
function _hightlight() {
@@ -78,7 +78,7 @@ var Activities = function() {
return;
}
if (isClosed()) {
- $('.control.block',
activities).addClass('ui-state-highlight');
+ $('.control.block', activities).addClass('bg-warning');
}
}
function _getId(id) {
diff --git a/openmeetings-web/src/main/webapp/css/raw-activities.css
b/openmeetings-web/src/main/webapp/css/raw-activities.css
index af13de6..ceceaf0 100644
--- a/openmeetings-web/src/main/webapp/css/raw-activities.css
+++ b/openmeetings-web/src/main/webapp/css/raw-activities.css
@@ -3,15 +3,15 @@
height: var(--activities-height);
overflow: hidden;
}
+.room-block.small #activities {
+ font-size: 120%;
+}
#activities .ui-resizable-handle {
width: 100%;
}
-#activities .ui-widget-header {
+#activities .control.block {
white-space: nowrap;
}
-#activities .control.block .ui-icon {
- text-align: center;
-}
#activities .control.block .label {
display: inline-block;
text-overflow: ellipsis;
@@ -28,13 +28,9 @@
.activity.item {
position: relative;
padding: 5px;
- margin-bottom: 3px
-}
-.activity.item .ui-icon {
- border-width: 1px;
- border-style: solid;
- margin-left: 2px;
+ margin-bottom: 3px;
+ border-bottom: 1px solid var(--secondary);
}
-.ui-icon.crosshair {
- background-image: url(images/crosshair.png);
+.activity.item button {
+ padding: 0 5px;
}
