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 e3f5967 [OPENMEETINGS-2165] disconnect-dlg and tools
e3f5967 is described below
commit e3f59679545666774065baaa106329a1a1c1caa3
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sun Mar 8 19:27:04 2020 +0700
[OPENMEETINGS-2165] disconnect-dlg and tools
---
.../apache/openmeetings/web/room/RoomPanel.html | 21 ++++++++++++++--
.../org/apache/openmeetings/web/room/raw-room.js | 18 +++-----------
.../apache/openmeetings/web/room/wb/WbPanel.html | 27 ++++++++++----------
.../openmeetings/web/room/wb/raw-wb-board.js | 29 +++-------------------
openmeetings-web/src/main/webapp/css/raw-wb.css | 8 ++++++
5 files changed, 48 insertions(+), 55 deletions(-)
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 5ab8826..fdb1b41 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
@@ -36,8 +36,25 @@
<div wicket:id="client-kicked"></div>
<div wicket:id="wait-moderator" class="wait-moder"></div>
</div>
- <div id="disconnected-dlg" wicket:message="title:204, data-reload:753"
hidden="hidden">
- <wicket:message key="556"/>
+ <div id="disconnected-dlg" class="modal fade" tabindex="-1"
role="dialog" data-backdrop="static" 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="204"/></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">
+ <wicket:message key="556"/>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn
btn-secondary" data-dismiss="modal">
+ <i class="fas
fa-sync-alt"></i> <wicket:message key="753"/>
+ </button>
+ </div>
+ </div>
+ </div>
</div>
<div hidden="hidden">
<div id="user-video">
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 ba10294..01560b4 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
@@ -127,20 +127,10 @@ var Room = (function() {
_unload();
$(".room-block").remove();
$("#chatPanel").remove();
- const dlg = $('#disconnected-dlg');
- dlg.dialog({
- modal: true
- , close: _reload
- , buttons: [
- {
- text: dlg.data('reload')
- , icons: {primary: "ui-icon-refresh"}
- , click: function() {
- $(this).dialog("close");
- }
- }
- ]
- });
+ $('#disconnected-dlg')
+ .modal('show')
+ .off('hide.bs.modal')
+ .on('hide.bs.modal', _reload);
}
function _sbAddResizable() {
sb.resizable({
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 5ba44dc..647a9f0 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
@@ -93,6 +93,7 @@
<div class="canvases"></div>
<div class="bottom-bumper"></div>
</div>
+ <div class="tools"></div>
</div>
<div id="wb-zoom" class="wb-zoom">
<div class="doc-group btn-group btn-group-xs block"
role="group" aria-label="...">
@@ -132,21 +133,19 @@
</button>
</div>
</div>
- <div id="wb-tools" class="tools ui-state-active vertical clear">
- <div class="bumper"></div>
- <div wicket:message="title:62" class="ui-widget-header
clickable om-icon big clear-all"></div>
- <div wicket:message="title:1005"
class="ui-widget-header clickable om-icon big clear-slide"></div>
- <div wicket:message="title:199" class="ui-widget-header
clickable om-icon big save"></div>
- <div wicket:message="title:70" class="ui-widget-header
clickable om-icon big undo"></div>
+ <div id="wb-tools">
+ <div wicket:message="title:62" class="clickable om-icon
big clear-all"></div>
+ <div wicket:message="title:1005" class="clickable
om-icon big clear-slide"></div>
+ <div wicket:message="title:199" class="clickable
om-icon big save"></div>
+ <div wicket:message="title:70" class="clickable om-icon
big undo"></div>
- <div wicket:message="title:72" class="ui-widget-header
clickable om-icon big pointer"></div>
- <div wicket:message="title:557" class="ui-widget-header
clickable om-icon big apointer"></div>
- <div wicket:message="title:wb.tool.math.formula"
class="ui-widget-header clickable om-icon big math"></div>
- <div wicket:message="title:843" class="ui-widget-header
clickable om-icon big settings"></div>
- </div>
- <div id="wb-tools-readonly" class="tools readonly
ui-state-active vertical clear">
- <div class="bumper"></div>
- <div wicket:message="title:557" class="ui-widget-header
clickable om-icon big apointer"></div>
+ <div wicket:message="title:72" class="clickable om-icon
big pointer"></div>
+ <div wicket:message="title:557" class="clickable
om-icon big apointer"></div>
+ <div wicket:message="title:wb.tool.math.formula"
class="clickable om-icon big math"></div>
+ <div wicket:message="title:843" class="clickable
om-icon big settings"></div>
+ </div>
+ <div id="wb-tools-readonly">
+ <div wicket:message="title:557" class="clickable big
apointer"></div>
</div>
<div id="wb-tool-settings" class="wb-tool-settings
ui-corner-all ui-widget-content">
<div wicket:message="title:843" class="header
ui-dialog-titlebar ui-corner-all ui-widget-header ui-helper-clearfix
ui-draggable-handle">
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 103e8e5..3207bb8 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
@@ -246,19 +246,6 @@ var Wb = function() {
});
}
function internalInit() {
- t.draggable({
- snap: 'parent'
- , containment: 'parent'
- , scroll: false
- , stop: function(event, ui) {
- const pos = ui.helper.position();
- if (pos.left === 0 || pos.left +
ui.helper.width() === ui.helper.parent().width()) {
-
ui.helper.removeClass('horisontal').addClass('vertical');
- } else if (pos.top === 0 || pos.top +
ui.helper.height() === ui.helper.parent().height()) {
-
ui.helper.removeClass('vertical').addClass('horisontal');
- }
- }
- });
z.draggable({
snap: 'parent'
, containment: 'parent'
@@ -777,7 +764,7 @@ var Wb = function() {
if (__validBtn(btn)) {
btn.data().deactivate();
}
- wbEl.find('.tools').remove();
+ wbEl.find('.tools div').remove();
wbEl.find('.wb-tool-settings').remove();
wbEl.find('.wb-zoom').remove();
role = _role;
@@ -800,10 +787,10 @@ var Wb = function() {
wbEl.append(s, f);
sc.on('scroll', scrollHandler);
}
- t.attr('style', 'position: absolute; top: 20px; ' +
(Settings.isRtl ? 'left' : 'right') + ': 20px;');
- wbEl.append(t).append(z);
+ wbEl.find('.tools').append(t);
+ wbEl.append(z);
showCurrentSlide();
- t = wbEl.find('.tools'), s =
wbEl.find('.wb-tool-settings');
+ t = wbEl.find('.tools div'), s =
wbEl.find('.wb-tool-settings');
wb.eachCanvas(function(canvas) {
setHandlers(canvas);
canvas.forEachObject(function(__o) {
@@ -834,14 +821,6 @@ var Wb = function() {
_setSize();
}
wb.resize = function() {
- if (t.length === 1 && t.position().left + t.width() >
a.width()) {
- t.position({
- my: (Settings.isRtl ? 'left' : 'right')
- , at: (Settings.isRtl ? 'left' : 'right') +
'-20'
- , of: '#' + a[0].id
- , collision: 'fit'
- });
- }
if (z.position().left + z.width() > a.width()) {
z.position({
my: (Settings.isRtl ? 'right' : 'left') + ' top'
diff --git a/openmeetings-web/src/main/webapp/css/raw-wb.css
b/openmeetings-web/src/main/webapp/css/raw-wb.css
index d38d236..afd5d5c 100644
--- a/openmeetings-web/src/main/webapp/css/raw-wb.css
+++ b/openmeetings-web/src/main/webapp/css/raw-wb.css
@@ -317,6 +317,14 @@ html[dir="rtl"] .room-block .wb-block {
.room-block .wb-block .tabs .wb-tab-content .scroll-container {
overflow: auto;
height: 100%;
+ width: calc(100% - 40px);
+ display: inline-block;
+}
+.room-block .wb-block .tabs .wb-tab-content .tools {
+ width: 35px;
+ height: 100%;
+ display: inline-block;
+ vertical-align: top;
}
.room-block .wb-block .tabs .wb-tab-content .scroll-container
.canvas-container {
margin-top: 5px;
