You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/11/29 17:09:24 UTC
openmeetings git commit: [OPENMEETINGS-1769] save button is added
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x ec8aae3c5 -> bc3e5aa35
[OPENMEETINGS-1769] save button is added
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/bc3e5aa3
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/bc3e5aa3
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/bc3e5aa3
Branch: refs/heads/4.0.x
Commit: bc3e5aa35cbf264e9d90eb61e36b5e4b95d80eb2
Parents: ec8aae3
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Nov 30 00:09:15 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Nov 30 00:09:15 2017 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/openmeetings/web/user/chat/Chat.java | 2 +-
.../java/org/apache/openmeetings/web/user/chat/ChatToolbar.html | 1 +
.../java/org/apache/openmeetings/web/user/chat/ChatToolbar.java | 1 +
openmeetings-web/src/main/webapp/css/chat.css | 3 +++
4 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bc3e5aa3/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index 5b5f8fd..b3cc7d6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -87,7 +87,7 @@ public class Chat extends Panel {
}
} else if (type != null && type.indexOf("typing") > -1) {
WebSocketHelper.sendRoom(roomId
- , new JSONObject().put("type", "typing")
+ , new JSONObject().put(PARAM_TYPE, "typing")
.put("active", type.indexOf("start") > -1)
.put("uid", getUid()));
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bc3e5aa3/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 17a79b4..f605384 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
@@ -70,6 +70,7 @@
<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="ajax-cancel-button"></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>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bc3e5aa3/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
index 2e4f759..be6a789 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
@@ -117,5 +117,6 @@ public class ChatToolbar extends Panel implements IWysiwygToolbar {
}
};
toolbar.add(delBtn.setVisible(hasAdminLevel(getRights())));
+ toolbar.add(new WebMarkupContainer("save").setVisible(hasAdminLevel(getRights())));
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bc3e5aa3/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 9804e75..6a5f10f 100644
--- a/openmeetings-web/src/main/webapp/css/chat.css
+++ b/openmeetings-web/src/main/webapp/css/chat.css
@@ -99,6 +99,9 @@
.delete.chat-tool-icon {
background-image: url(images/cancel_icon.png);
}
+.save.chat-tool-icon {
+ background-image: url(images/file_save_as.png);
+}
#chat #hyperlink {
background-image: url(images/link.png);
}