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 e74cbe6 [OPENMEETINGS-2506] chat toolbar should look better
e74cbe6 is described below
commit e74cbe6533e1c24d184c0bfd28419e89ea83a420
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Mon Nov 2 22:48:54 2020 +0700
[OPENMEETINGS-2506] chat toolbar should look better
---
.../apache/openmeetings/web/app/Application.java | 1 +
.../openmeetings/web/user/chat/ChatToolbar.html | 111 +++++++++++----------
.../apache/openmeetings/web/user/chat/raw-chat.js | 2 +-
openmeetings-web/src/main/webapp/css/raw-chat.css | 6 +-
.../src/main/webapp/css/raw-variables.css | 2 +-
5 files changed, 66 insertions(+), 56 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index d1ba947..5a1f10f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -316,6 +316,7 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
mountPage("install", InstallWizardPage.class);
mountPage("activate", ActivatePage.class);
mountPage("reset", ResetPage.class);
+ mountPage("error", InternalErrorPage.class);
mountResource("/recordings/mp4/${id}", new
Mp4RecordingResourceReference());
mountResource("/recordings/png/${id}", new
PngRecordingResourceReference()); //should be in sync with VideoPlayer
mountResource("/room/file/${id}", new RoomResourceReference());
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
index c5df779..919d3c1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
@@ -21,59 +21,66 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <div wicket:id="toolbar" class="btn-toolbar chat-toolbar"
data-role="editor-toolbar">
- <div class="dropup">
- <a id="emoticons" class="chat btn btn-outline-secondary
emt dropdown-toggle" data-toggle="dropdown" title="Emoticons"></a>
- <ul class="chat dropdown-menu" >
- <li>
- <table id="emotMenuList">
- </table>
+ <div wicket:id="toolbar" class="btn-toolbar chat-toolbar navbar
navbar-expand navbar-light bg-light p-0" data-role="editor-toolbar">
+ <button class="navbar-toggler" type="button"
data-toggle="collapse" data-target="#navbarChatContent"
aria-controls="navbarChatContent" aria-expanded="false">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+ <div class="collapse navbar-collapse" id="navbarChatContent">
+ <ul class="navbar-nav mr-auto">
+ <li class="nav-item dropup">
+ <a id="emoticons" class="chat btn
btn-outline-secondary emt dropdown-toggle nav-link" data-toggle="dropdown"
title="Emoticons"></a>
+ <ul class="chat dropdown-menu" >
+ <li>
+ <table
id="emotMenuList">
+ </table>
+ </li>
+ </ul>
+ </li>
+ <li class="nav-item dropup">
+ <a id="fontSize" class="chat btn
btn-outline-secondary dropdown-toggle nav-link" data-toggle="dropdown"
role="button" title="Font Size"> A </a>
+ <div class="dropdown-menu">
+ <a class="dropdown-item"
data-edit="fontSize 5"><span class="font-huge text-center
clickable">Huge</span></a>
+ <a class="dropdown-item"
data-edit="fontSize 3"><span class="font-small text-center
clickable">Normal</span></a>
+ <a class="dropdown-item"
data-edit="fontSize 1"><span class="font-tiny text-center
clickable">Small</span></a>
+ </div>
+ </li>
+ <li class="nav-item dropup">
+ <a id="fontStyle" class="chat btn
btn-outline-secondary dropdown-toggle nav-link" data-toggle="dropdown"
title="Font Style">
+ <i class="fas fa-cog"></i>
+ </a>
+ <ul class="dropdown-menu btns-only">
+ <li><a class="chat-btn
chat-tool-icon btn btn-outline-secondary bold" id="bold" data-edit="bold"
title="Bold (Ctrl/Cmd+B)"> B </a></li>
+ <li><a class="chat-btn
chat-tool-icon btn btn-outline-secondary italic" id="italic" data-edit="italic"
title="Italic (Ctrl/Cmd+I)"> I </a></li>
+ <li><a class="chat-btn
chat-tool-icon btn btn-outline-secondary strike" id="strikethrough"
data-edit="strikethrough" title="Strikethrough"> S </a></li>
+ <li><a class="chat-btn
chat-tool-icon btn btn-outline-secondary under" id="underline"
data-edit="underline" title="Underline (Ctrl/Cmd+U)"> U </a></li>
+ </ul>
+ </li>
+ <li class="nav-item dropup">
+ <a id="hyperlink" class="chat btn
btn-outline-secondary dropdown-toggle nav-link" data-toggle="dropdown"
title="Hyperlink">
+ <i class="fas fa-link"></i>
+ </a>
+ <div class="dropdown-menu input-append">
+ <input class="span2 link-field"
placeholder="URL" type="text"/>
+ <button class="btn
btn-outline-secondary" type="button"><wicket:message key="1261"/></button>
+ </div>
+ </li>
+ <li class="nav-item dropup">
+ <a id="actions" class="chat btn
btn-outline-secondary dropdown-toggle nav-link" data-toggle="dropdown"
wicket:message="title:635">
+ <i class="fas fa-bars"></i>
+ </a>
+ <ul class="dropdown-menu btns-only">
+ <li><a class="chat-btn
chat-tool-icon btn btn-outline-secondary save" wicket:message="title:197"
wicket:id="save">
+ <i class="fas
fa-save"></i>
+ </a></li>
+ <li><a class="chat-btn
chat-tool-icon btn btn-outline-danger" wicket:message="title:442"
wicket:id="delete">
+ <i class="fas
fa-trash-alt"></i>
+ </a></li>
+ <li><a class="chat-btn
chat-tool-icon btn btn-outline-secondary audio"
wicket:message="data-sound-enabled:sound.mute,data-sound-muted:sound.enable">
+ <i class="fas"></i>
+ </a></li>
+ <li><a class="chat-btn
chat-tool-icon btn btn-outline-secondary send-btn"
wicket:message="data-send-enter:send.on.enter,data-send-ctrl:send.on.ctrl.enter"><strong>↵</strong></a></li>
+ </ul>
</li>
- </ul>
- </div>
- <div class="dropup">
- <a id="fontSize" class="chat btn btn-outline-secondary
dropdown-toggle" data-toggle="dropdown" role="button" title="Font Size"> A </a>
- <ul class="dropdown-menu">
- <li><a data-edit="fontSize 5"><span
class="font-huge text-center clickable">Huge</span></a></li>
- <li><a data-edit="fontSize 3"><span
class="font-small text-center clickable">Normal</span></a></li>
- <li><a data-edit="fontSize 1"><span
class="font-tiny text-center clickable">Small</span></a></li>
- </ul>
- </div>
- <div class="dropup">
- <a id="fontStyle" class="chat btn btn-outline-secondary
dropdown-toggle" data-toggle="dropdown" title="Font Style">
- <i class="fas fa-cog"></i>
- </a>
- <ul class="dropdown-menu btns-only">
- <li><a class="chat-btn chat-tool-icon btn
btn-outline-secondary bold" id="bold" data-edit="bold" title="Bold
(Ctrl/Cmd+B)"> B </a></li>
- <li><a class="chat-btn chat-tool-icon btn
btn-outline-secondary italic" id="italic" data-edit="italic" title="Italic
(Ctrl/Cmd+I)"> I </a></li>
- <li><a class="chat-btn chat-tool-icon btn
btn-outline-secondary strike" id="strikethrough" data-edit="strikethrough"
title="Strikethrough"> S </a></li>
- <li><a class="chat-btn chat-tool-icon btn
btn-outline-secondary under" id="underline" data-edit="underline"
title="Underline (Ctrl/Cmd+U)"> U </a></li>
- </ul>
- </div>
- <div class="dropup">
- <a id="hyperlink" class="chat btn btn-outline-secondary
dropdown-toggle" data-toggle="dropdown" title="Hyperlink">
- <i class="fas fa-link"></i>
- </a>
- <div class="dropdown-menu input-append">
- <input class="span2 link-field"
placeholder="URL" type="text"/>
- <button class="btn btn-outline-secondary"
type="button"><wicket:message key="1261"/></button>
- </div>
- </div>
- <div class="dropup">
- <a id="actions" class="chat btn btn-outline-secondary
dropdown-toggle" data-toggle="dropdown" wicket:message="title:635">
- <i class="fas fa-bars"></i>
- </a>
- <ul class="dropdown-menu btns-only">
- <li><a class="chat-btn chat-tool-icon btn
btn-outline-secondary save" wicket:message="title:197" wicket:id="save">
- <i class="fas fa-save"></i>
- </a></li>
- <li><a class="chat-btn chat-tool-icon btn
btn-outline-danger" wicket:message="title:442" wicket:id="delete">
- <i class="fas fa-trash-alt"></i>
- </a></li>
- <li><a class="chat-btn chat-tool-icon btn
btn-outline-secondary audio"
wicket:message="data-sound-enabled:sound.mute,data-sound-muted:sound.enable">
- <i class="fas"></i>
- </a></li>
- <li><a class="chat-btn chat-tool-icon btn
btn-outline-secondary send-btn"
wicket:message="data-send-enter:send.on.enter,data-send-ctrl:send.on.ctrl.enter"><strong>↵</strong></a></li>
</ul>
</div>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
index d4f5163..81fe2e0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
@@ -345,7 +345,7 @@ var Chat = function() {
__setCssWidth(openedWidth);
p.resizable({
handles: (Settings.isRtl ? 'e' : 'w')
- , minWidth: 120
+ , minWidth: 150
, stop: function(event, ui) {
p.css({'left': '', 'width': '', 'height': ''});
openedWidth = ui.size.width + 'px';
diff --git a/openmeetings-web/src/main/webapp/css/raw-chat.css
b/openmeetings-web/src/main/webapp/css/raw-chat.css
index fc5d844..5f7f483 100644
--- a/openmeetings-web/src/main/webapp/css/raw-chat.css
+++ b/openmeetings-web/src/main/webapp/css/raw-chat.css
@@ -13,6 +13,9 @@
#chat {
height: calc(100% - 20px);
}
+#chat .chat-toolbar.btn-toolbar .dropdown-menu {
+ min-width: unset;
+}
#chat .chat-toolbar.btn-toolbar .dropdown-menu.btns-only li {
display: inline-block;
}
@@ -139,8 +142,7 @@ html[dir="rtl"] #chat .messageArea .icons {
margin-left: 0;
}
#chat .tool-container {
- max-height: var(--chat-tools-height);
- height: var(--chat-tools-height);
+ min-height: var(--chat-tools-height);
}
/* room mode */
.main.room #chatPanel {
diff --git a/openmeetings-web/src/main/webapp/css/raw-variables.css
b/openmeetings-web/src/main/webapp/css/raw-variables.css
index d63ed6f..6286ade 100644
--- a/openmeetings-web/src/main/webapp/css/raw-variables.css
+++ b/openmeetings-web/src/main/webapp/css/raw-variables.css
@@ -11,7 +11,7 @@ body {
--chat-width: 600px;
--chat-height: 20px;
--chat-tabs-height: 26px;
- --chat-tools-height: 37px;
+ --chat-tools-height: 40px;
--chat-msg-height: 80px;
--chat-send-width: 32px;
}
