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 2020/03/13 17:05:28 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2165] quick-poll
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 14a249f [OPENMEETINGS-2165] quick-poll
14a249f is described below
commit 14a249ff3033e6c19490a951f3fe878dd3460bed
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Mar 14 00:05:14 2020 +0700
[OPENMEETINGS-2165] quick-poll
---
.../openmeetings/web/admin/email/EmailPanel.html | 2 +-
.../web/admin/groups/GroupUsersPanel.html | 2 +-
.../openmeetings/web/common/tree/filetree.js | 2 +-
.../apache/openmeetings/web/pages/BasePage.html | 2 +-
.../apache/openmeetings/web/room/RoomPanel.html | 24 +++++-----
.../openmeetings/web/room/menu/RoomMenuPanel.html | 12 +++--
.../openmeetings/web/room/menu/RoomMenuPanel.java | 6 +--
.../org/apache/openmeetings/web/room/raw-room.js | 40 +++++------------
.../apache/openmeetings/web/room/wb/WbPanel.html | 46 +++++++++++++------
.../openmeetings/web/room/wb/raw-wb-board.js | 52 +++++++---------------
openmeetings-web/src/main/webapp/css/raw-menu.css | 24 ++++++----
openmeetings-web/src/main/webapp/css/raw-room.css | 35 ++++++++-------
openmeetings-web/src/main/webapp/css/raw-wb.css | 3 --
13 files changed, 126 insertions(+), 124 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
index d1baa66..09fc08d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
@@ -42,7 +42,7 @@
</div>
<div class="adminPanelColumnForm">
<form wicket:id="form" class="adminForm">
- <div class="actions ui-widget-header">
+ <div class="actions">
<div class="btn btn-outline-warning btn-sm" wicket:id="btn-delete" wicket:message="title:157">
<i class="fas fa-times"></i>
</div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
index 0eb0142..3c5c12d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
@@ -31,7 +31,7 @@
</tr>
</thead>
<tbody>
- <tr wicket:id="userList" class="ui-widget-content">
+ <tr wicket:id="userList" class="">
<td class="col-1"><input type="checkbox" wicket:id="isModerator"/></td>
<td class="col-10"><div class="col-wrapper"><span wicket:id="new"/><span wicket:id="label"></span></div></td>
<td class="col-1">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
index 88d1479..1d8584e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
@@ -7,7 +7,7 @@ var OmFileTree = (function() {
s = $('.file.active.ui-draggable.ui-draggable-handle, .recording.active.ui-draggable.ui-draggable-handle');
}
const c = $('<div/>').attr('id', 'draggingContainer').addClass('drag-container').width(80).height(36)
- , h = $('<div class="border ui-widget-header"/>').append(s.clone()).width(s.width());
+ , h = $('<div class="border"/>').append(s.clone()).width(s.width());
return c.append(h);
}
, treeRevert: function(dropped) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
index 6af7f7d..686579b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
@@ -28,7 +28,7 @@
<wicket:container wicket:id="customCSS"></wicket:container>
</head>
<body>
- <div wicket:id="main-loader" class="main-loader ui-widget-header">
+ <div wicket:id="main-loader" class="main-loader">
<div class="sk-chasing-dots">
<div class="sk-child sk-dot1"></div>
<div class="sk-child sk-dot2"></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
index fdb1b41..2c32a60 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
@@ -62,9 +62,9 @@
<canvas width="10" class="level-meter" wicket:message="title:767"></canvas>
<div class="mute-others" wicket:message="title:video.muteothers"></div>
</div>
- <div class="footer ui-state-highlight">
+ <div class="footer bg-warning">
<div class="on"><wicket:message key="video.mic.on"/></div>
- <div class="off" hidden="hidden"><wicket:message key="video.mic.off"/></div>
+ <div class="off"><wicket:message key="video.mic.off"/></div>
</div>
</div>
<div id="video-refresh-btn">
@@ -95,19 +95,23 @@
<p><span class="ui-icon ui-icon-alert align-left mr-2 mt-2 mb-3 ml-0"></span><span class="text"></span></p>
</div>
<div id="quick-vote-template">
- <div class="close clickable"><wicket:message key="85"/></div>
- <div class="control pro">
- <span class="badge">0</span>
+ <div class="close-btn btn btn-outline-secondary btn-sm"
+ wicket:message="title:85,data-btn-ok-label:54,data-btn-cancel-label:lbl.cancel,data-title:832,data-content:1419"
+ data-btn-ok-class="btn btn-sm btn-danger"
+ data-btn-ok-icon-class="fas fa-exclamation-triangle">
+ <i class="fas fa-times"></i>
+ </div>
+ <div class="control pro clickable">
+ <i class="fas fa-plus-circle"></i>
+ <span class="badge badge-primary">0</span>
</div>
<div class="control con">
- <span class="badge">0</span>
+ <i class="fas fa-times-circle"></i>
+ <span class="badge badge-primary">0</span>
</div>
</div>
- <div id="quick-confirmation" wicket:message="title:832, data-btn-ok:54, data-btn-cancel:lbl.cancel">
- <wicket:message key="1419"/>
- </div>
<div id="sharer" wicket:message="title:730">
- <h2 class="alert" hidden="hidden">Screen-sharing is not supported in your browser</h2>
+ <h2 class="alert">Screen-sharing is not supported in your browser</h2>
<div class="container p-0 m-0">
<div>
<span class="label"><wicket:message key="734"/></span>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
index a15d257..1233c4b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
@@ -23,12 +23,16 @@
<wicket:panel>
<div wicket:id="menu"></div>
<div class="details">
- <span class="icon shared ui-button ui-corner-all ui-widget d-none" wicket:message="data-user:692, data-text:850, data-view:848"
- role="button"></span>
- <span wicket:id="ask" class="btn btn-outline-secondary ask">
+ <span class="detail-btn btn btn-outline-secondary shared" wicket:message="data-user:692, data-text:850, data-view:848">
+ <i class="fas fa-desktop m-0"></i>
+ <i class="fas fa-hand-holding add-on"></i>
+ </span>
+ <span wicket:id="ask" class="detail-btn btn btn-outline-secondary ask">
<i class="fas fa-hand-paper m-0"></i>
</span>
- <span wicket:id="share" class="icon share" wicket:message="title:732" onclick="Sharer.open();"></span>
+ <span wicket:id="share" class="detail-btn btn btn-outline-secondary share" wicket:message="title:732" onclick="Sharer.open();">
+ <i class="fas fa-desktop m-0"></i>
+ </span>
<span wicket:id="roomName" class="room name"></span>
<span wicket:id="tag" class="room name"></span>
<span wicket:id="logo" class="icon"></span>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index 8c20436..c686842 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -55,6 +55,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
@@ -63,7 +64,6 @@ import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.string.Strings;
import com.github.openjson.JSONObject;
-import com.googlecode.wicket.jquery.ui.form.button.Button;
import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.INavbarComponent;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType;
@@ -71,7 +71,7 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5I
public class RoomMenuPanel extends Panel {
private static final long serialVersionUID = 1L;
private MenuPanel menuPanel;
- private final Button shareBtn;
+ private final WebMarkupContainer shareBtn;
private final Label roomName;
private static final FastDateFormat df = FastDateFormat.getInstance("dd.MM.yyyy HH:mm");
private final AjaxLink<Void> askBtn = new AjaxLink<>("ask") {
@@ -123,7 +123,7 @@ public class RoomMenuPanel extends Panel {
add((roomName = new Label("roomName", r.getName())).setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
String tag = getGroup().getTag();
add(logo, new Label("tag", tag).setVisible(!Strings.isEmpty(tag)));
- add(shareBtn = new Button("share"));
+ add(shareBtn = new WebMarkupContainer("share"));
shareBtn.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true);
pollsSubMenu = new PollsSubMenu(room, this);
actionsSubMenu = new ActionsSubMenu(room, this);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
index 1036e9e..f267c95 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
@@ -162,10 +162,6 @@ var Room = (function() {
if (typeof(VideoManager) === 'object') {
VideoManager.destroy();
}
- const _qconf = $('#quick-confirmation');
- if (_qconf.dialog('instance')) {
- _qconf.dialog('destroy');
- }
$('.ui-dialog.user-video').remove();
$(window).off('keyup.openmeetings');
$(window).off('keydown.openmeetings');
@@ -201,34 +197,20 @@ var Room = (function() {
return false;
}
function _setQuickPollRights() {
- const close = $('#quick-vote .close');
+ const close = $('#quick-vote .close-btn');
if (close.length === 1) {
- close.off();
if (_hasRight(['SUPER_MODERATOR', 'MODERATOR', 'PRESENTER'])) {
- close.show().click(function() {
- const _qconf = $('#quick-confirmation');
- _qconf.dialog({
- resizable: false
- , height: "auto"
- , width: 400
- , modal: true
- , buttons: [
- {
- text: _qconf.data('btn-ok')
- , click: function() {
- quickPollAction('close');
- $(this).dialog('close');
- }
- }
- , {
- text: _qconf.data('btn-cancel')
- , click: function() {
- $(this).dialog('close');
- }
- }
- ]
+ close.show();
+ if (typeof(close.data('bs.confirmation')) === 'object') {
+ return;
+ }
+ close
+ .confirmation({
+ confirmationEvent: 'bla'
+ , onConfirm: function() {
+ quickPollAction('close');
+ }
});
- });
} else {
close.hide();
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
index dc6d7a1..7a077f6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
@@ -208,25 +208,45 @@
</div>
<div class="status"></div>
</div>
- <div id="wb-settings" class="wb-settings" wicket:message="title:4, data-btn-ok:54, data-btn-cancel:lbl.cancel">
- <div class="om-tbl">
- <div class="om-tbl-row">
- <div class="om-tbl-cell"><wicket:message key="740"/></div>
- <div class="om-tbl-cell"><input class="wbs-width" type="number" min="100"/></div>
- </div>
- <div class="om-tbl-row">
- <div class="om-tbl-cell"><wicket:message key="741"/></div>
- <div class="om-tbl-cell"><input class="wbs-height" type="number" min="100"/></div>
- </div>
- </div>
- </div>
<div id="download-png" wicket:message="title:867">
<img width="320" height="240"/>
<div><wicket:message key="download.image.steps"/></div>
</div>
</div>
+ <div id="wb-settings" class="wb-settings modal fade" tabindex="-1" role="dialog" data-backdrop="false" aria-hidden="true">
+ <div class="modal-dialog modal-sm" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title"><wicket:message key="4"/></h5>
+ <button type="button" class="close" data-dismiss="modal" wicket:message="aria-label:85">
+ <span aria-hidden="true">×</span>
+ </button>
+ </div>
+ <div class="modal-body">
+ <div class="om-tbl">
+ <div class="om-tbl-row">
+ <div class="om-tbl-cell"><wicket:message key="740"/></div>
+ <div class="om-tbl-cell"><input class="wbs-width" type="number" min="100"/></div>
+ </div>
+ <div class="om-tbl-row">
+ <div class="om-tbl-cell"><wicket:message key="741"/></div>
+ <div class="om-tbl-cell"><input class="wbs-height" type="number" min="100"/></div>
+ </div>
+ </div>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-primary">
+ <wicket:message key="54"/>
+ </button>
+ <button type="button" class="btn btn-secondary" data-dismiss="modal">
+ <wicket:message key="lbl.cancel"/>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
<ul id="wb-rename-menu" class="position-absolute">
- <li class="wb-rename"><div><span class="ui-icon ui-icon-pencil"></span><wicket:message key="711"/></div></li>
+ <li class="wb-rename"><div><i class="fas fa-pencil-alt"></i><wicket:message key="711"/></div></li>
</ul>
<div wicket:id="filename"></div>
</wicket:panel>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
index 8ab0a26..1852f2f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
@@ -251,14 +251,12 @@ var Wb = function() {
let _firstToolItem = true;
switch (role) {
case PRESENTER:
- clearAll
- .confirmation('destroy')
- .confirmation({
- confirmationEvent: 'bla'
- , onConfirm: function() {
- OmUtil.wbAction({action: 'clearAll', data: {wbId: wb.id}});
- }
- }).removeClass('disabled');
+ clearAll.confirmation({
+ confirmationEvent: 'bla'
+ , onConfirm: function() {
+ OmUtil.wbAction({action: 'clearAll', data: {wbId: wb.id}});
+ }
+ }).removeClass('disabled');
zoomBar.find('.curr-slide').change(function() {
_setSlide($(this).val() - 1);
showCurrentSlide();
@@ -278,28 +276,16 @@ var Wb = function() {
function isNumeric(n) {
return !isNaN(parseInt(n)) && isFinite(n);
}
- wbs.dialog({
- buttons: [
- {
- text: wbs.data('btn-ok')
- , click: function() {
- const __w = wbsw.val(), __h = wbsh.val();
- if (isNumeric(__w) && isNumeric(__h)) {
- width = parseInt(__w);
- height = parseInt(__h);
- _sendSetSize();
- }
- $(this).dialog("close");
- }
- }
- , {
- text: wbs.data('btn-cancel')
- , click: function() {
- $(this).dialog("close");
- }
- }
- ]
- });
+ wbs.modal('show');
+ wbs.find('.btn-primary').off().click(function() {
+ const __w = wbsw.val(), __h = wbsh.val();
+ if (isNumeric(__w) && isNumeric(__h)) {
+ width = parseInt(__w);
+ height = parseInt(__h);
+ _sendSetSize();
+ }
+ wbs.modal('hide');
+ })
});
case WHITEBOARD:
if (role === WHITEBOARD) {
@@ -318,7 +304,6 @@ var Wb = function() {
math.show();
});
tools.find('.om-icon.clear-slide')
- .confirmation('destroy')
.confirmation({
confirmationEvent: 'bla'
, onConfirm: function() {
@@ -757,10 +742,7 @@ var Wb = function() {
}
}
function __destroySettings() {
- const wbs = $('#wb-settings');
- if (wbs.dialog('instance')) {
- wbs.dialog('destroy');
- }
+ $('#wb-settings').modal('dispose');
}
wb.setRole = function(_role) {
diff --git a/openmeetings-web/src/main/webapp/css/raw-menu.css b/openmeetings-web/src/main/webapp/css/raw-menu.css
index b1abb55..080cdff 100644
--- a/openmeetings-web/src/main/webapp/css/raw-menu.css
+++ b/openmeetings-web/src/main/webapp/css/raw-menu.css
@@ -6,10 +6,6 @@
.room-block .menu {
height: var(--room-menu-height);
}
-.room-block .menu .ui-menu .ui-menu-item {
- padding-left: 5px;
- padding-right: 0;
-}
.room-block .menu .top.exit {
padding-left: 0;
}
@@ -43,11 +39,23 @@
float: right;
padding: 0;
}
-.room-block .menu .details .icon.share {
- background-image: url(images/monitor_go.png);
+.room-block .menu .details .detail-btn {
+ padding: 0.1rem 0.4rem;
+ float: right;
+ position: relative;
+}
+.room-block .menu .details .detail-btn i::before {
+ font-size: 2.2em;
+ line-height: 1.2em;
}
-.room-block .menu .details .icon.shared {
- background-image: url(images/shared.png);
+.room-block .menu .details .detail-btn.shared {
+ display: none;
+}
+.room-block .menu .details .detail-btn i.add-on {
+ position: absolute;
+ left: 5px;
+ color: var(--warning);
+ bottom: 0;
}
.room-block .menu .details .icon .profile {
margin-top: 3px;
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css b/openmeetings-web/src/main/webapp/css/raw-room.css
index fa69c8e..3556894 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -200,14 +200,6 @@ html[dir="rtl"] .room-block .sidebar {
.audio-activity.om-icon.speaking {
opacity: 1;
}
-.room-block .menu .details .ask {
- padding: 0.1rem 0.4rem;
- float: right;
-}
-.room-block .menu .details .ask i::before {
- font-size: 2.2em;
- line-height: 1.2em;
-}
.right.om-icon {
position: relative;
}
@@ -574,12 +566,26 @@ html[dir="rtl"] .room-block .sidebar {
background-repeat: no-repeat;
background-size: 35px;
position: relative;
+ font-size: 1.5em;
+}
+#quick-vote .control .badge {
+ position: absolute;
+ right: 0;
+ bottom: 0;
}
-#quick-vote .control.pro {
- background-image: url(images/add.png);
+#quick-vote .control i::before {
+ font-size: 2.2em;
+ line-height: 1.2em;
+}
+#quick-vote .control.pro i::before {
+ color: var(--success);
+}
+#quick-vote .control.con i::before {
+ color: var(--danger);
}
-#quick-vote .control.con {
- background-image: url(images/cancel.png);
+#quick-vote .close-btn {
+ float: right;
+ padding: 0 0.4rem;
}
.main.room.INTERVIEW #quick-vote {
z-index: 100;
@@ -588,9 +594,8 @@ html[dir="rtl"] .room-block .sidebar {
padding: 0px 5px 0px 5px;
height: 40px;
}
-.main.room.INTERVIEW #quick-vote .close {
- display: inline-block;
- float: right;
+#sharer .alert {
+ display: none;
}
#sharer .label {
width: 215px;
diff --git a/openmeetings-web/src/main/webapp/css/raw-wb.css b/openmeetings-web/src/main/webapp/css/raw-wb.css
index aacc112..8b9cbdf 100644
--- a/openmeetings-web/src/main/webapp/css/raw-wb.css
+++ b/openmeetings-web/src/main/webapp/css/raw-wb.css
@@ -88,9 +88,6 @@ html[dir="rtl"] .room-block .wb-block {
vertical-align: bottom;
margin-right: 0.1rem;
}
-.room-block .wb-block .tools .om-icon.big.settings {
- border: 0 !important;
-}
.room-block .wb-block .tools .dropdown-menu .om-icon.big {
float: none;
}