Repository: openmeetings Updated Branches: refs/heads/master bccd24a4a -> 29274d1dd
[OPENMEETINGS-1642] panel with all styles is added Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/29274d1d Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/29274d1d Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/29274d1d Branch: refs/heads/master Commit: 29274d1ddb1e1e527c276dc7f92835a25b769c83 Parents: bccd24a Author: Maxim Solodovnik <[email protected]> Authored: Tue Jul 4 23:06:55 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Jul 4 23:06:55 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/web/room/wb/WbPanel.html | 31 ++++++++++++++ .../openmeetings/web/room/wb/WbPanel.java | 41 +++++++++++-------- .../org/apache/openmeetings/web/room/wb/wb.js | 3 ++ .../apache/openmeetings/web/user/chat/chat.js | 3 ++ .../src/main/webapp/css/images/page_down.png | Bin 0 -> 238 bytes .../src/main/webapp/css/images/page_up.png | Bin 0 -> 246 bytes openmeetings-web/src/main/webapp/css/room.css | 30 ++++++++++++++ 7 files changed, 92 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/29274d1d/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html ---------------------------------------------------------------------- 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 e0eb3fa..0ddb55c 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 @@ -56,6 +56,37 @@ <div class="canvases"></div> </div> </div> + <div id="wb-zoom" class="wb-zoom"> + <div class="btn-group btn-group-xs block" role="group" aria-label="..."> + <button type="button" class="btn btn-default up"> </button> + <button type="button" class="btn btn-default down"> </button> + </div> + <div class="input-group input-group-xs block"> + <input type="number" /> + <span class="input-group-addon">of</span> + <span class="input-group-addon">14</span> + </div> + + <div class="btn-group btn-group-xs block" role="group" aria-label="..."> + <button type="button" class="btn btn-default"><span class="ui-icon ui-icon-minusthick"></span></button> + <button type="button" class="btn btn-default"><span class="ui-icon ui-icon-plusthick"></span></button> + </div> + <select> + <option value="auto">Automatic Zoom</option> + <option value="page-actual">Actual Size</option> + <option value="page-fit">Page Fit</option> + <option value="page-width">Page Width</option> + <option value="custom" disabled="disabled">120%</option> + <option value="0.5">50%</option> + <option value="0.75">75%</option> + <option value="1">100%</option> + <option value="1.25">125%</option> + <option value="1.5">150%</option> + <option value="2">200%</option> + <option value="3">300%</option> + <option value="4">400%</option> + </select> + </div> <div id="wb-tools" class="tools ui-state-active vertical clear" style="position: absolute; top: 20px; right: 0px;"> <div class="bumper"></div> <div wicket:message="title:62" class="ui-widget-header clickable om-icon big clear-all"></div> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/29274d1d/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java index 3bd23a9..85424fb 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java @@ -314,12 +314,36 @@ public class WbPanel extends Panel { return Application.getString("203"); } }; + private final AbstractDefaultAjaxBehavior wbLoad = new AbstractDefaultAjaxBehavior() { + private static final long serialVersionUID = 1L; + + @Override + protected void respond(AjaxRequestTarget target) { + StringBuilder sb = new StringBuilder("WbArea.init();"); + WhiteboardCache cache = getBean(WhiteboardCache.class); + Whiteboards wbs = cache.get(roomId); + for (Entry<Long, Whiteboard> entry : cache.list(roomId, rp.getClient().getUser().getLanguageId())) { + sb.append(new StringBuilder("WbArea.create(") + .append(getAddWbJson(entry.getKey(), entry.getValue().getName()).toString()) + .append(");")); + JSONArray arr = new JSONArray(); + for (Entry<String, JSONObject> wbEntry : entry.getValue().entrySet()) { + JSONObject o = wbEntry.getValue(); + arr.put(addFileUrl(wbs.getUid(), o)); + } + sb.append("WbArea.load(").append(getObjWbJson(entry.getKey(), arr).toString(new NullStringer())).append(");"); + } + sb.append("WbArea.activateWb({wbId: ").append(wbs.getActiveWb()).append("});"); + target.appendJavaScript(sb); + } + }; public WbPanel(String id, RoomPanel rp) { super(id); this.rp = rp; this.roomId = rp.getRoom().getId(); setOutputMarkupId(true); + add(wbLoad); if (rp.getRoom().isHidden(RoomElement.Whiteboard)) { setVisible(false); } else { @@ -343,22 +367,7 @@ public class WbPanel extends Panel { response.render(JavaScriptHeaderItem.forReference(FABRIC_JS_REFERENCE)); response.render(JavaScriptHeaderItem.forReference(WB_JS_REFERENCE)); response.render(new PriorityHeaderItem(getNamedFunction(FUNC_ACTION, wbAction, explicit(PARAM_ACTION), explicit(PARAM_OBJ)))); - StringBuilder sb = new StringBuilder("WbArea.init();"); - WhiteboardCache cache = getBean(WhiteboardCache.class); - Whiteboards wbs = cache.get(roomId); - for (Entry<Long, Whiteboard> entry : cache.list(roomId, rp.getClient().getUser().getLanguageId())) { - sb.append(new StringBuilder("WbArea.create(") - .append(getAddWbJson(entry.getKey(), entry.getValue().getName()).toString()) - .append(");")); - JSONArray arr = new JSONArray(); - for (Entry<String, JSONObject> wbEntry : entry.getValue().entrySet()) { - JSONObject o = wbEntry.getValue(); - arr.put(addFileUrl(wbs.getUid(), o)); - } - sb.append("WbArea.load(").append(getObjWbJson(entry.getKey(), arr).toString(new NullStringer())).append(");"); - } - sb.append("WbArea.activateWb({wbId: ").append(wbs.getActiveWb()).append("});"); - response.render(OnDomReadyHeaderItem.forScript(sb)); + response.render(OnDomReadyHeaderItem.forScript(wbLoad.getCallbackScript())); } private void sendWbAll(Action meth, JSONObject obj) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/29274d1d/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js index bf0074d..4cf6481 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js @@ -1323,6 +1323,9 @@ var WbArea = (function() { $(function() { Wicket.Event.subscribe("/websocket/message", function(jqEvent, msg) { try { + if (msg instanceof Blob) { + return; //ping + } var m = jQuery.parseJSON(msg); if (m) { switch(m.type) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/29274d1d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js index 626aae8..6eee3b4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js @@ -258,6 +258,9 @@ var Chat = function() { $(function() { Wicket.Event.subscribe("/websocket/message", function(jqEvent, msg) { try { + if (msg instanceof Blob) { + return; //ping + } var m = jQuery.parseJSON(msg); if (m) { switch(m.type) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/29274d1d/openmeetings-web/src/main/webapp/css/images/page_down.png ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/images/page_down.png b/openmeetings-web/src/main/webapp/css/images/page_down.png new file mode 100644 index 0000000..8219ecf Binary files /dev/null and b/openmeetings-web/src/main/webapp/css/images/page_down.png differ http://git-wip-us.apache.org/repos/asf/openmeetings/blob/29274d1d/openmeetings-web/src/main/webapp/css/images/page_up.png ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/images/page_up.png b/openmeetings-web/src/main/webapp/css/images/page_up.png new file mode 100644 index 0000000..fb9daa3 Binary files /dev/null and b/openmeetings-web/src/main/webapp/css/images/page_up.png differ http://git-wip-us.apache.org/repos/asf/openmeetings/blob/29274d1d/openmeetings-web/src/main/webapp/css/room.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/room.css b/openmeetings-web/src/main/webapp/css/room.css index 075344b..2ae24f3 100644 --- a/openmeetings-web/src/main/webapp/css/room.css +++ b/openmeetings-web/src/main/webapp/css/room.css @@ -595,6 +595,36 @@ border: 1px solid #888888; box-shadow: 5px 5px 5px #888888; } +.wb-area .wb-zoom { + display: inline-block; + padding: 1px 10px; + border-radius: 2px; + position: absolute; + z-index: 1000; +} +.wb-area .wb-zoom, .wb-area .wb-zoom .btn-group button { + background-color: grey; + line-height: 12px; + font-size: 12px; +} +.wb-area .wb-zoom .block { + display: inline-block; +} +.wb-area .wb-zoom button { + width: 28px; + height: 20px; + background-repeat: no-repeat; + background-position: 5px 0px; +} +.wb-area .wb-zoom input { + width: 50px +} +.wb-area .wb-zoom button.down { + background-image: url(images/page_down.png); +} +.wb-area .wb-zoom button.up { + background-image: url(images/page_up.png); +} .room.box .user-video { display: inline-block !important; }
