Repository: openmeetings Updated Branches: refs/heads/4.0.x e326cffdf -> 53d809d09
[OPENMEETINGS-1742] 'Add URL' button is added to the chat Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/b37e8b34 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/b37e8b34 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/b37e8b34 Branch: refs/heads/4.0.x Commit: b37e8b3446d67715e07b75d955e2644da770ff39 Parents: efcb629 Author: Maxim Solodovnik <[email protected]> Authored: Tue Nov 7 16:27:29 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Nov 7 16:27:29 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/web/user/chat/ChatToolbar.html | 7 +++++++ openmeetings-web/src/main/webapp/css/chat.css | 5 +++++ openmeetings-web/src/main/webapp/css/images/link.png | Bin 0 -> 343 bytes 3 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b37e8b34/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 2fc75db..e4e49b7 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 @@ -55,6 +55,13 @@ id="strikethrough" class="chat btn btn-default" data-edit="strikethrough" title="Strikethrough" style="text-decoration: line-through;"> S </a> <a id="underline" class="chat btn btn-default" data-edit="underline" title="Underline (Ctrl/Cmd+U)" style="text-decoration: underline;"> U </a> </div> + <div class="btn-group"> + <a id="hyperlink" class="chat btn btn-default dropdown-toggle" data-toggle="dropdown" title="Hyperlink"> </a> + <div class="dropdown-menu input-append"> + <input class="span2" placeholder="URL" type="text" data-edit="createLink"/> + <button class="btn btn-default" type="button"><wicket:message key="1261"/></button> + </div> + </div> </div> </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b37e8b34/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 38923ce..6f88821 100644 --- a/openmeetings-web/src/main/webapp/css/chat.css +++ b/openmeetings-web/src/main/webapp/css/chat.css @@ -86,6 +86,11 @@ .sound-mute.om-icon { background-image: url(images/sound_mute.png); } +#chat #hyperlink { + background-repeat: no-repeat; + background-image: url(images/link.png); + background-position: center; +} #chat .chat-btn { display: inline-block; float: right; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b37e8b34/openmeetings-web/src/main/webapp/css/images/link.png ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/images/link.png b/openmeetings-web/src/main/webapp/css/images/link.png new file mode 100644 index 0000000..25eacb7 Binary files /dev/null and b/openmeetings-web/src/main/webapp/css/images/link.png differ
