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 2016/04/26 20:26:19 UTC
svn commit: r1741067 - in /openmeetings/application:
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
branches/3.2.x/openmeetings-flash/src/main/swf/base/
branches/3.2.x/openmeetings-flash/src/main/swf/modules/confere...
Author: solomax
Date: Tue Apr 26 18:26:18 2016
New Revision: 1741067
URL: http://svn.apache.org/viewvc?rev=1741067&view=rev
Log:
[OPENMEETINGS-895] appointment details are added; file drop to WB is added
Added:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java
Removed:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java Tue Apr 26 18:26:18 2016
@@ -176,34 +176,6 @@ public class ConferenceService {
// --------------------------------------------------------------------------------------------
- /**
- *
- * retrieving Appointment for Room
- *
- * @param roomId
- * @return - Appointment in case the room is appointment, null otherwise
- */
- public Appointment getAppointMentDataForRoom(Long roomId) {
- log.debug("getAppointMentDataForRoom");
-
- Room room = roomDao.get(roomId);
-
- if (room.isAppointment() == false)
- return null;
-
- try {
- Appointment ment = appointmentDao.getByRoom(roomId);
-
- return ment;
- } catch (Exception e) {
- log.error("getAppointMentDataForRoom " + e.getMessage());
- return null;
- }
-
- }
-
- // --------------------------------------------------------------------------------------------
-
public List<Room> getAppointedMeetingRoomsWithoutType(String SID) {
log.debug("ConferenceService.getAppointedMeetings");
try {
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx Tue Apr 26 18:26:18 2016
@@ -355,8 +355,6 @@ and some more references to temp-objects
<!-- item to focus on after rpcErrorDialog has been shown-->
<attribute name="focusOnItem" value="null"/>
-<attribute name="appointmentNotificationPopUp" value="null"/>
-
<attribute name="conferenceBrowserIsinited" value="false" type="boolean" />
<attribute name="isAllowedToScreenShare" value="false" type="boolean" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Tue Apr 26 18:26:18 2016
@@ -71,13 +71,6 @@
canvas.currentBaseConferenceRoom = this;
- if ($debug) Debug.write("this.roomobj ",this.roomobj);
- if (roomobj.appointment) {
- canvas.appointmentNotificationPopUp = new lz.appointmentNotificationPopUp(this,{name:'appDetail', roomobj:this.roomobj });
- } else {
- if ($debug) Debug.write("no appointed meeting");
- }
-
if ($debug) Debug.write("canvas._videocontainer ", canvas._videocontainer);
canvas._videocontainer.setAttribute("allowUserQuestions",this.roomobj.allowUserQuestions);
]]>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx Tue Apr 26 18:26:18 2016
@@ -64,7 +64,6 @@
</resource>
<include href="roomSidebar/" />
- <include href="appointmentNotificationPopUp.lzx" />
<include href="baseConferenceRoom.lzx" />
<include href="flexibleConferenceRoom.lzx" />
<include href="restrictedConferenceRoom.lzx" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html Tue Apr 26 18:26:18 2016
@@ -27,7 +27,7 @@
return !dropped;
}
</script>
- <div class="file tree">
+ <div class="file tree item drop area">
<div class="icons clear trash-toolbar" wicket:id="trash-toolbar">
<span wicket:id="upload" class="add om-icon align-left clickable" wicket:message="title:702"></span>
<span wicket:id="create" class="folder-create om-icon align-left clickable" wicket:message="title:703"></span>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java Tue Apr 26 18:26:18 2016
@@ -154,6 +154,10 @@ public abstract class FileTreePanel exte
add(errorsDialog);
}
+ protected String getContainment() {
+ return ".file.item.drop.area";
+ }
+
protected Component getUpload(String id) {
return new WebMarkupContainer(id).setVisible(false);
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java Tue Apr 26 18:26:18 2016
@@ -88,7 +88,7 @@ public class FolderPanel extends Panel {
if (r.getId() < 1) {
drag = new WebMarkupContainer("drag");
} else {
- Draggable<? extends FileItem> d = new Draggable<FileItem>("drag", Model.of(r)) {
+ drag = new Draggable<FileItem>("drag", Model.of(r)) {
private static final long serialVersionUID = 1L;
@Override
@@ -97,10 +97,8 @@ public class FolderPanel extends Panel {
behavior.setOption("revert", "treeRevert");
behavior.setOption("cursor", Options.asString("move"));
}
- };
- d.setContainment(".file.tree");
- d.add(AttributeAppender.append("class", r instanceof Recording ? "recorditem" : "fileitem"));
- drag = d;
+ }.setContainment(treePanel.getContainment());
+ drag.add(AttributeAppender.append("class", r instanceof Recording ? "recorditem" : "fileitem"));
}
drag.add(r.getId() < 1 ? new Label("name", r.getName()) : new AjaxEditableLabel<String>("name", Model.of(model.getObject().getName())) {
private static final long serialVersionUID = 1L;
Added: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html?rev=1741067&view=auto
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html (added)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html Tue Apr 26 18:26:18 2016
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+ <table style="width: 100%">
+ <tr>
+ <td><wicket:message key="1145"/></td>
+ <td wicket:id="title"></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="1146"/></td>
+ <td wicket:id="description"></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="1143"/></td>
+ <td wicket:id="owner.timeZoneId"></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="570"/></td>
+ <td wicket:id="start"></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="571"/></td>
+ <td wicket:id="end"></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="1147"/></td>
+ <td><span wicket:id="owner.firstname"></span> <span wicket:id="owner.lastname"></span></td>
+ </tr>
+ </table>
+</wicket:panel>
+</html>
Added: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java?rev=1741067&view=auto
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java (added)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java Tue Apr 26 18:26:18 2016
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.room;
+
+import static org.apache.openmeetings.web.app.WebSession.getDateFormat;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.Model;
+
+import com.googlecode.wicket.jquery.core.JQueryBehavior;
+import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+
+public class EventDetailDialog extends AbstractDialog<Appointment> {
+ private static final long serialVersionUID = 1L;
+
+ public EventDetailDialog(String id, final Appointment a) {
+ super(id, "", new CompoundPropertyModel<>(a), false);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ setTitle(Model.of(getString("1144")));
+ add(new Label("title"));
+ add(new Label("description"));
+ add(new Label("owner.timeZoneId"));
+ add(new Label("start", getDateFormat().format(getModelObject().getStart())));
+ add(new Label("end", getDateFormat().format(getModelObject().getStart())));
+ add(new Label("owner.firstname"));
+ add(new Label("owner.lastname"));
+ }
+
+ @Override
+ public void onConfigure(JQueryBehavior behavior) {
+ super.onConfigure(behavior);
+ behavior.setOption("autoOpen", true);
+ behavior.setOption("position", "{my: 'right top', at: 'right bottom', of: '.room.menu' }");
+ }
+
+ @Override
+ public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
+ }
+
+ @Override
+ protected List<DialogButton> getButtons() {
+ return Arrays.asList(new DialogButton("cancel", Model.of(getString("1130"))));
+ }
+}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Tue Apr 26 18:26:18 2016
@@ -30,11 +30,12 @@
<div wicket:id="roomContainer" style="height: 100%">
<div class="room menu" wicket:id="menu"></div>
<div class="room sidebar left" wicket:id="sidebar"></div>
- <div class="room wb area">
+ <div wicket:id="wb-area" class="room wb area">
<div class="wb" wicket:id="whiteboard"></div>
</div>
<div wicket:id="activities"></div>
</div>
+ <div wicket:id="event-details"></div>
<div wicket:id="access-denied"></div>
<div wicket:id="room-closed"></div>
<div wicket:id="wait-for-recording"></div>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Tue Apr 26 18:26:18 2016
@@ -32,6 +32,7 @@ import org.apache.openmeetings.db.dao.ca
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
+import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.entity.room.RoomGroup;
@@ -73,6 +74,8 @@ import org.red5.logging.Red5LoggerFactor
import org.slf4j.Logger;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
+import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.interaction.droppable.Droppable;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
@@ -83,6 +86,7 @@ public class RoomPanel extends BasePanel
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(RoomPanel.class, webAppRootKey);
private static final String ACCESS_DENIED_ID = "access-denied";
+ private static final String EVENT_DETAILS_ID = "event-details";
public enum Action {
kick
, refresh
@@ -130,8 +134,27 @@ public class RoomPanel extends BasePanel
getClient().setRoomId(r.getId());
super.onInitialize();
Component accessDenied = new WebMarkupContainer(ACCESS_DENIED_ID).setVisible(false);
+ Component eventDetail = new WebMarkupContainer(EVENT_DETAILS_ID).setVisible(false);
+
room.add(menu = new RoomMenuPanel("menu", this));
- room.add(new SwfPanel("whiteboard", getClient()));
+ Droppable<FileItem> wbArea = new Droppable<FileItem>("wb-area") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onConfigure(JQueryBehavior behavior) {
+ super.onConfigure(behavior);
+ behavior.setOption("hoverClass", Options.asString("ui-state-hover"));
+ behavior.setOption("accept", Options.asString(".recorditem, .fileitem"));
+ }
+
+ @Override
+ public void onDrop(AjaxRequestTarget target, Component component) {
+ Object o = component.getDefaultModelObject();
+ if (o instanceof FileItem) {
+ }
+ }
+ };
+ room.add(wbArea.add(new SwfPanel("whiteboard", getClient())));
room.add(aab);
room.add(sidebar = new RoomSidebar("sidebar", this));
room.add(activities = new ActivitiesPanel("activities", this));
@@ -146,6 +169,7 @@ public class RoomPanel extends BasePanel
String deniedMessage = null;
if (r.isAppointment()) {
Appointment a = getBean(AppointmentDao.class).getByRoom(r.getId());
+ eventDetail = new EventDetailDialog(EVENT_DETAILS_ID, a);
if (a != null && !a.isDeleted()) {
allowed = a.getOwner().getId().equals(getUserId());
log.debug("appointed room, isOwner ? " + allowed);
@@ -194,7 +218,7 @@ public class RoomPanel extends BasePanel
room.setVisible(false);
}
}
- add(room, accessDenied);
+ add(room, accessDenied, eventDetail);
if (r.isWaitForRecording()) {
add(new MessageDialog("wait-for-recording", getString("1316"), getString("1315"), DialogButtons.OK, DialogIcon.LIGHT) {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java Tue Apr 26 18:26:18 2016
@@ -68,6 +68,11 @@ public class RoomFilePanel extends FileT
}
@Override
+ protected String getContainment() {
+ return "";
+ }
+
+ @Override
protected Component getUpload(String id) {
Component u = super.getUpload(id);
u.setVisible(true);
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java Tue Apr 26 18:26:18 2016
@@ -176,34 +176,6 @@ public class ConferenceService {
// --------------------------------------------------------------------------------------------
- /**
- *
- * retrieving Appointment for Room
- *
- * @param roomId
- * @return - Appointment in case the room is appointment, null otherwise
- */
- public Appointment getAppointMentDataForRoom(Long roomId) {
- log.debug("getAppointMentDataForRoom");
-
- Room room = roomDao.get(roomId);
-
- if (room.isAppointment() == false)
- return null;
-
- try {
- Appointment ment = appointmentDao.getByRoom(roomId);
-
- return ment;
- } catch (Exception e) {
- log.error("getAppointMentDataForRoom " + e.getMessage());
- return null;
- }
-
- }
-
- // --------------------------------------------------------------------------------------------
-
public List<Room> getAppointedMeetingRoomsWithoutType(String SID) {
log.debug("ConferenceService.getAppointedMeetings");
try {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html Tue Apr 26 18:26:18 2016
@@ -27,7 +27,7 @@
return !dropped;
}
</script>
- <div class="file tree">
+ <div class="file tree item drop area">
<div class="icons clear trash-toolbar" wicket:id="trash-toolbar">
<span wicket:id="upload" class="add om-icon align-left clickable" wicket:message="title:702"></span>
<span wicket:id="create" class="folder-create om-icon align-left clickable" wicket:message="title:703"></span>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java Tue Apr 26 18:26:18 2016
@@ -154,6 +154,10 @@ public abstract class FileTreePanel exte
add(errorsDialog);
}
+ protected String getContainment() {
+ return ".file.item.drop.area";
+ }
+
protected Component getUpload(String id) {
return new WebMarkupContainer(id).setVisible(false);
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java Tue Apr 26 18:26:18 2016
@@ -88,7 +88,7 @@ public class FolderPanel extends Panel {
if (r.getId() < 1) {
drag = new WebMarkupContainer("drag");
} else {
- Draggable<? extends FileItem> d = new Draggable<FileItem>("drag", Model.of(r)) {
+ drag = new Draggable<FileItem>("drag", Model.of(r)) {
private static final long serialVersionUID = 1L;
@Override
@@ -97,10 +97,8 @@ public class FolderPanel extends Panel {
behavior.setOption("revert", "treeRevert");
behavior.setOption("cursor", Options.asString("move"));
}
- };
- d.setContainment(".file.tree");
- d.add(AttributeAppender.append("class", r instanceof Recording ? "recorditem" : "fileitem"));
- drag = d;
+ }.setContainment(treePanel.getContainment());
+ drag.add(AttributeAppender.append("class", r instanceof Recording ? "recorditem" : "fileitem"));
}
drag.add(r.getId() < 1 ? new Label("name", r.getName()) : new AjaxEditableLabel<String>("name", Model.of(model.getObject().getName())) {
private static final long serialVersionUID = 1L;
Added: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html?rev=1741067&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html (added)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html Tue Apr 26 18:26:18 2016
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+ <table style="width: 100%">
+ <tr>
+ <td><wicket:message key="1145"/></td>
+ <td wicket:id="title"></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="1146"/></td>
+ <td wicket:id="description"></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="1143"/></td>
+ <td wicket:id="owner.timeZoneId"></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="570"/></td>
+ <td wicket:id="start"></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="571"/></td>
+ <td wicket:id="end"></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="1147"/></td>
+ <td><span wicket:id="owner.firstname"></span> <span wicket:id="owner.lastname"></span></td>
+ </tr>
+ </table>
+</wicket:panel>
+</html>
Added: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java?rev=1741067&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java (added)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java Tue Apr 26 18:26:18 2016
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.room;
+
+import static org.apache.openmeetings.web.app.WebSession.getDateFormat;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.Model;
+
+import com.googlecode.wicket.jquery.core.JQueryBehavior;
+import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+
+public class EventDetailDialog extends AbstractDialog<Appointment> {
+ private static final long serialVersionUID = 1L;
+
+ public EventDetailDialog(String id, final Appointment a) {
+ super(id, "", new CompoundPropertyModel<>(a), false);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ setTitle(Model.of(getString("1144")));
+ add(new Label("title"));
+ add(new Label("description"));
+ add(new Label("owner.timeZoneId"));
+ add(new Label("start", getDateFormat().format(getModelObject().getStart())));
+ add(new Label("end", getDateFormat().format(getModelObject().getStart())));
+ add(new Label("owner.firstname"));
+ add(new Label("owner.lastname"));
+ }
+
+ @Override
+ public void onConfigure(JQueryBehavior behavior) {
+ super.onConfigure(behavior);
+ behavior.setOption("autoOpen", true);
+ behavior.setOption("position", "{my: 'right top', at: 'right bottom', of: '.room.menu' }");
+ }
+
+ @Override
+ public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
+ }
+
+ @Override
+ protected List<DialogButton> getButtons() {
+ return Arrays.asList(new DialogButton("cancel", Model.of(getString("1130"))));
+ }
+}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Tue Apr 26 18:26:18 2016
@@ -30,11 +30,12 @@
<div wicket:id="roomContainer" style="height: 100%">
<div class="room menu" wicket:id="menu"></div>
<div class="room sidebar left" wicket:id="sidebar"></div>
- <div class="room wb area">
+ <div wicket:id="wb-area" class="room wb area">
<div class="wb" wicket:id="whiteboard"></div>
</div>
<div wicket:id="activities"></div>
</div>
+ <div wicket:id="event-details"></div>
<div wicket:id="access-denied"></div>
<div wicket:id="room-closed"></div>
<div wicket:id="wait-for-recording"></div>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Tue Apr 26 18:26:18 2016
@@ -32,6 +32,7 @@ import org.apache.openmeetings.db.dao.ca
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
+import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.entity.room.RoomGroup;
@@ -78,6 +79,8 @@ import org.slf4j.Logger;
import org.wicketstuff.whiteboard.WhiteboardBehavior;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
+import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.interaction.droppable.Droppable;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
@@ -88,6 +91,7 @@ public class RoomPanel extends BasePanel
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(RoomPanel.class, webAppRootKey);
private static final String ACCESS_DENIED_ID = "access-denied";
+ private static final String EVENT_DETAILS_ID = "event-details";
public enum Action {
kick
, refresh
@@ -147,9 +151,28 @@ public class RoomPanel extends BasePanel
getClient().setRoomId(r.getId());
super.onInitialize();
Component accessDenied = new WebMarkupContainer(ACCESS_DENIED_ID).setVisible(false);
+ Component eventDetail = new WebMarkupContainer(EVENT_DETAILS_ID).setVisible(false);
+
room.add(menu = new RoomMenuPanel("menu", this));
+ Droppable<FileItem> wbArea = new Droppable<FileItem>("wb-area") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onConfigure(JQueryBehavior behavior) {
+ super.onConfigure(behavior);
+ behavior.setOption("hoverClass", Options.asString("ui-state-hover"));
+ behavior.setOption("accept", Options.asString(".recorditem, .fileitem"));
+ }
+
+ @Override
+ public void onDrop(AjaxRequestTarget target, Component component) {
+ Object o = component.getDefaultModelObject();
+ if (o instanceof FileItem) {
+ }
+ }
+ };
WebMarkupContainer wb = new WebMarkupContainer("whiteboard");
- room.add(wb.setOutputMarkupId(true));
+ room.add(wbArea.add(wb.setOutputMarkupId(true)));
room.add(new WhiteboardBehavior("1", wb.getMarkupId(), null, null, null));
room.add(aab);
room.add(sidebar = new RoomSidebar("sidebar", this));
@@ -165,6 +188,7 @@ public class RoomPanel extends BasePanel
String deniedMessage = null;
if (r.isAppointment()) {
Appointment a = getBean(AppointmentDao.class).getByRoom(r.getId());
+ eventDetail = new EventDetailDialog(EVENT_DETAILS_ID, a);
if (a != null && !a.isDeleted()) {
allowed = a.getOwner().getId().equals(getUserId());
log.debug("appointed room, isOwner ? " + allowed);
@@ -213,7 +237,7 @@ public class RoomPanel extends BasePanel
room.setVisible(false);
}
}
- add(room, accessDenied);
+ add(room, accessDenied, eventDetail);
if (r.isWaitForRecording()) {
add(new MessageDialog("wait-for-recording", getString("1316"), getString("1315"), DialogButtons.OK, DialogIcon.LIGHT) {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java?rev=1741067&r1=1741066&r2=1741067&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java Tue Apr 26 18:26:18 2016
@@ -68,6 +68,11 @@ public class RoomFilePanel extends FileT
}
@Override
+ protected String getContainment() {
+ return "";
+ }
+
+ @Override
protected Component getUpload(String id) {
Component u = super.getUpload(id);
u.setVisible(true);