Repository: openmeetings Updated Branches: refs/heads/4.0.x b4060659c -> 4a9a75230
[OPENMEETINGS-1775] chat actions are redesigned Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/4a9a7523 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/4a9a7523 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/4a9a7523 Branch: refs/heads/4.0.x Commit: 4a9a752302fed091d6e8a3caa41ad317597b5566 Parents: b406065 Author: Maxim Solodovnik <[email protected]> Authored: Mon Dec 25 22:20:45 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Dec 25 22:20:45 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/web/user/chat/ChatToolbar.html | 24 ++++++++++++------- openmeetings-web/src/main/webapp/css/chat.css | 10 ++++++++ .../src/main/webapp/css/images/list.png | Bin 0 -> 345 bytes 3 files changed, 26 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4a9a7523/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html ---------------------------------------------------------------------- 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 b31bce3..f06be00 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 @@ -56,11 +56,11 @@ <span class="chat-tool-icon"> </span> <b class="caret"></b> </a> - <ul class="dropdown-menu"> - <li><a id="bold" data-edit="bold" title="Bold (Ctrl/Cmd+B)" style="font-weight: bold;"> B </a></li> - <li><a id="italic" data-edit="italic" title="Italic (Ctrl/Cmd+I)" style="font-style: italic;"> I </a></li> - <li><a id="strikethrough" data-edit="strikethrough" title="Strikethrough" style="text-decoration: line-through;"> S </a></li> - <li><a id="underline" data-edit="underline" title="Underline (Ctrl/Cmd+U)" style="text-decoration: underline;"> U </a></li> + <ul class="dropdown-menu btns-only"> + <li><a class="chat-btn chat-tool-icon btn btn-default" id="bold" data-edit="bold" title="Bold (Ctrl/Cmd+B)" style="font-weight: bold;"> B </a></li> + <li><a class="chat-btn chat-tool-icon btn btn-default" id="italic" data-edit="italic" title="Italic (Ctrl/Cmd+I)" style="font-style: italic;"> I </a></li> + <li><a class="chat-btn chat-tool-icon btn btn-default" id="strikethrough" data-edit="strikethrough" title="Strikethrough" style="text-decoration: line-through;"> S </a></li> + <li><a class="chat-btn chat-tool-icon btn btn-default" id="underline" data-edit="underline" title="Underline (Ctrl/Cmd+U)" style="text-decoration: underline;"> U </a></li> </ul> </div> <div class="btn-group"> @@ -70,9 +70,17 @@ <button class="btn btn-default" type="button"><wicket:message key="1261"/></button> </div> </div> - <a class="chat-btn chat-tool-icon btn btn-default save" wicket:message="title:197" wicket:id="save"></a> - <a class="chat-btn chat-tool-icon btn btn-default delete" wicket:message="title:442" wicket:id="delete"></a> - <a class="chat-btn chat-tool-icon btn btn-default audio" wicket:message="data-sound-enabled:sound.mute,data-sound-muted:sound.enable"> </a> + <div class="btn-group dropup"> + <a id="actions" class="chat btn btn-default dropdown-toggle" data-toggle="dropdown" wicket:message="title:635"> + <span class="list chat-tool-icon"> </span> + <b class="caret"></b> + </a> + <ul class="dropdown-menu btns-only"> + <li><a class="chat-btn chat-tool-icon btn btn-default save" wicket:message="title:197" wicket:id="save"></a></li> + <li><a class="chat-btn chat-tool-icon btn btn-default delete" wicket:message="title:442" wicket:id="delete"></a></li> + <li><a class="chat-btn chat-tool-icon btn btn-default audio" wicket:message="data-sound-enabled:sound.mute,data-sound-muted:sound.enable"> </a></li> + </ul> + </div> </div> </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4a9a7523/openmeetings-web/src/main/webapp/css/chat.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/chat.css b/openmeetings-web/src/main/webapp/css/chat.css index b0799ba..83b4787 100644 --- a/openmeetings-web/src/main/webapp/css/chat.css +++ b/openmeetings-web/src/main/webapp/css/chat.css @@ -102,6 +102,9 @@ height: 20px; display: inline-block; } +.list.chat-tool-icon { + background-image: url(images/list.png); +} .sound.chat-tool-icon { background-image: url(images/sound.png); } @@ -156,3 +159,10 @@ #chatPanel.room.closed #chatPopup #chat { display: none; } +ul.dropdown-menu.btns-only, ul.dropdown-menu.btns-only li { + max-width: 62px; + min-width: 62px; +} +ul.dropdown-menu.btns-only li .chat-btn { + float: none !important; +} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4a9a7523/openmeetings-web/src/main/webapp/css/images/list.png ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/images/list.png b/openmeetings-web/src/main/webapp/css/images/list.png new file mode 100644 index 0000000..d7f1637 Binary files /dev/null and b/openmeetings-web/src/main/webapp/css/images/list.png differ
