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
commit 8c9799fcfa6bb7f95110f4ef73de90844f6e4573
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sun May 3 15:37:57 2020 +0700
[OPENMEETINGS-2275] code clean-up
---
.../apache/openmeetings/web/room/wb/WbPanel.html | 90 +++++++++++-----------
.../apache/openmeetings/web/room/wb/raw-wb-area.js | 1 -
openmeetings-web/src/main/webapp/css/raw-wb.css | 17 ++--
3 files changed, 54 insertions(+), 54 deletions(-)
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 4e5f7fb..290e716 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
@@ -89,57 +89,53 @@
</div>
<div class="tools"></div>
</div>
- <div id="wb-zoom" class="wb-zoom row no-gutters">
- <div class="col-auto">
- <div class="doc-group input-group
input-group-sm" aria-label="...">
- <div class="input-group-prepend">
- <button type="button"
class="btn btn-outline-secondary up" wicket:message="title:256">
- <i class="fas
fa-reply"></i>
- </button>
- </div>
- <input class="curr-slide" type="number"
min="1" max="1"/>
- <div class="input-group-append">
- <div
class="input-group-text"><wicket:message key="254"/></div>
- </div>
- <div class="input-group-append">
- <div class="last-page
input-group-text">1</div>
- </div>
- <div class="input-group-append">
- <button type="button"
class="btn-outline-secondary down" wicket:message="title:257">
- <i class="fas
fa-share"></i>
- </button>
- </div>
+ <div id="wb-zoom" class="wb-zoom">
+ <div class="doc-group input-group input-group-sm">
+ <div class="input-group-prepend">
+ <button type="button" class="btn
btn-outline-secondary up" wicket:message="title:256">
+ <i class="fas fa-reply"></i>
+ </button>
+ </div>
+ <input class="curr-slide" type="number" min="1"
max="1"/>
+ <div class="input-group-append">
+ <div
class="input-group-text"><wicket:message key="254"/></div>
+ </div>
+ <div class="input-group-append">
+ <div class="last-page
input-group-text">1</div>
+ </div>
+ <div class="input-group-append">
+ <button type="button" class="btn
btn-outline-secondary down" wicket:message="title:257">
+ <i class="fas fa-share"></i>
+ </button>
</div>
</div>
- <div class="col-auto">
- <div class="zoom-group input-group
input-group-sm" aria-label="...">
- <div class="input-group-prepend">
- <button type="button"
class="btn btn-outline-secondary zoom-out" wicket:message="title:259">
- <i class="fas
fa-search-minus"></i>
- </button>
- </div>
- <select class="zoom text-dark"
data-custom-val="1.20">
- <option
value="FULL_FIT"><wicket:message key="zoom.FULL_FIT"/></option>
- <option
value="PAGE_WIDTH"><wicket:message key="zoom.PAGE_WIDTH"/></option>
- <option
value="custom">120%</option>
- <option
value="0.50">50%</option>
- <option
value="0.75">75%</option>
- <option
value="1.00">100%</option>
- <option
value="1.25">125%</option>
- <option
value="1.50">150%</option>
- <option
value="2.00">200%</option>
- <option
value="3.00">300%</option>
- <option
value="4.00">400%</option>
- </select>
- <div class="input-group-append">
- <button type="button"
class="btn btn-outline-secondary zoom-in" wicket:message="title:260">
- <i class="fas
fa-search-plus"></i>
- </button>
- </div>
+ <div class="zoom-group input-group input-group-sm">
+ <div class="input-group-prepend">
+ <button type="button" class="btn
btn-outline-secondary zoom-out" wicket:message="title:259">
+ <i class="fas
fa-search-minus"></i>
+ </button>
+ </div>
+ <select class="zoom text-dark"
data-custom-val="1.20">
+ <option
value="FULL_FIT"><wicket:message key="zoom.FULL_FIT"/></option>
+ <option
value="PAGE_WIDTH"><wicket:message key="zoom.PAGE_WIDTH"/></option>
+ <option value="custom">120%</option>
+ <option value="0.50">50%</option>
+ <option value="0.75">75%</option>
+ <option value="1.00">100%</option>
+ <option value="1.25">125%</option>
+ <option value="1.50">150%</option>
+ <option value="2.00">200%</option>
+ <option value="3.00">300%</option>
+ <option value="4.00">400%</option>
+ </select>
+ <div class="input-group-append">
+ <button type="button" class="btn
btn-outline-secondary zoom-in" wicket:message="title:260">
+ <i class="fas
fa-search-plus"></i>
+ </button>
</div>
</div>
- <div class="col-auto settings-group">
- <button type="button"
class="btn-outline-secondary btn-sm settings"
wicket:message="title:lbl.settings.whiteboard">
+ <div class="settings-group">
+ <button type="button" class="btn
btn-outline-secondary btn-sm settings"
wicket:message="title:lbl.settings.whiteboard">
<i class="fas fa-cog"></i>
</button>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
index f3d7ed6..0770af9 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
@@ -232,7 +232,6 @@ var DrawWbArea = function() {
self.removeDeleteHandler();
}
__initTab(tabsNav.find('li'));
- console.log("this", tabs, tabs.find('.wb-tab-content .wb-tab'));
tabs.find('.wb-tab-content .wb-tab').each(function() {
$(this).data().setRole(role);
});
diff --git a/openmeetings-web/src/main/webapp/css/raw-wb.css
b/openmeetings-web/src/main/webapp/css/raw-wb.css
index f53d23e..e4dcbb8 100644
--- a/openmeetings-web/src/main/webapp/css/raw-wb.css
+++ b/openmeetings-web/src/main/webapp/css/raw-wb.css
@@ -323,12 +323,20 @@ html[dir="rtl"] .room-block .sb-wb .wb-block {
border: 1px solid #888888;
box-shadow: 5px 5px 5px #888888;
}
-.wb-area .wb-zoom input {
- width: 50px
-}
.wb-area .wb-zoom {
+ display: flex;
+ padding-top: 2px;
min-width: 360px
}
+.wb-area .wb-zoom .doc-group
+, .wb-area .wb-zoom .zoom-group
+, .wb-area .wb-zoom .settings-group
+{
+ width: auto;
+}
+.wb-area .wb-zoom input {
+ width: 50px
+}
.wb-area .wb-zoom .settings-group {
display: none;
margin-left: 2px;
@@ -339,9 +347,6 @@ html[dir="rtl"] .room-block .sb-wb .wb-block {
.wb-area .wb-zoom .zoom-group {
margin-left: 2px;
}
-.wb-area .wb-zoom {
- padding-top: 2px;
-}
#wb-rename-menu {
display: none;
}
