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/09/15 06:40:09 UTC
[1/2] openmeetings git commit: [OPENMEETINGS-1703] Loader animation
is displayed while panel is being loaded
Repository: openmeetings
Updated Branches:
refs/heads/master ff883a160 -> b4fe443df
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
index ceff299..5c0da15 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
@@ -40,7 +40,6 @@ import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.message.RoomMessage;
import org.apache.openmeetings.util.message.TextRoomMessage;
-import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
@@ -55,11 +54,12 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-public class ActivitiesPanel extends BasePanel {
+public class ActivitiesPanel extends Panel {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(ActivitiesPanel.class, webAppRootKey);
private static final String PARAM_ID = "id";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index 0308d02..3b72539 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -217,9 +217,9 @@ public class RoomMenuPanel extends Panel {
private Group getGroup() {
Room r = room.getRoom();
- return r.getRoomGroups() == null || r.getRoomGroups().isEmpty()
+ return r.getGroups() == null || r.getGroups().isEmpty()
? new Group()
- : r.getRoomGroups().get(0).getGroup();
+ : r.getGroups().get(0).getGroup();
}
public RoomMenuPanel(String id, final RoomPanel room) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
index 0b5b001..1633fdc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
@@ -647,7 +647,9 @@ var Room = (function() {
if (!!WbArea) {
WbArea.destroy();
}
- VideoSettings.close();
+ if (typeof VideoSettings !== 'undefined') {
+ VideoSettings.close();
+ }
$('.ui-dialog.user-video').remove();
$(window).off('keyup', _keyHandler);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
index 8e214c1..3304571 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
@@ -43,7 +43,7 @@ import org.apache.openmeetings.db.entity.calendar.OmCalendar;
import org.apache.openmeetings.service.calendar.caldav.AppointmentManager;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -69,7 +69,7 @@ import com.googlecode.wicket.jquery.ui.calendar.CalendarView;
import com.googlecode.wicket.jquery.ui.calendar.EventSource.GoogleCalendar;
import com.googlecode.wicket.jquery.ui.form.button.Button;
-public class CalendarPanel extends UserPanel {
+public class CalendarPanel extends UserBasePanel {
private static final Logger log = Red5LoggerFactory.getLogger(CalendarPanel.class, webAppRootKey);
private static final long serialVersionUID = 1L;
private static final String javaScriptMarkup = "setCalendarHeight();";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
index ffe0c53..70bab82 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
@@ -23,15 +23,15 @@ import static org.apache.openmeetings.web.user.chat.Chat.getReinit;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
-import org.apache.openmeetings.web.common.BasePanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.panel.Panel;
@AuthorizeInstantiation({"Dashboard", "Room"})
-public class ChatPanel extends BasePanel {
+public class ChatPanel extends Panel {
private static final long serialVersionUID = 1L;
private final Chat chat;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/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 e1bb111..766e1fe 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
@@ -37,7 +37,7 @@ public class ChatToolbar extends Panel implements IWysiwygToolbar {
/**
* Constructor
- *
+ *
* @param id
* the markup-id
*/
@@ -47,7 +47,7 @@ public class ChatToolbar extends Panel implements IWysiwygToolbar {
/**
* Constructor
- *
+ *
* @param id
* the markup-id
* @param model
@@ -55,11 +55,7 @@ public class ChatToolbar extends Panel implements IWysiwygToolbar {
*/
public ChatToolbar(String id, IModel<String> model) {
super(id, model);
-
- toolbar = new WebMarkupContainer("toolbar");
- toolbar.setMarkupId("bToolbar");
- add(toolbar);
-
+ add(toolbar = new WebMarkupContainer("toolbar"));
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.java
index 6a9602a..32391a6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.java
@@ -30,7 +30,7 @@ public class MyRoomsWidgetView extends WidgetView {
public MyRoomsWidgetView(String id, Model<Widget> model) {
super(id, model);
-
+
add(new RoomsPanel("rooms", getMyRooms()));
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
index c1e291e..2274add 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
@@ -20,11 +20,11 @@ package org.apache.openmeetings.web.user.dashboard;
import org.apache.openmeetings.db.util.FormatHelper;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.wicket.model.Model;
import org.wicketstuff.dashboard.web.DashboardPanel;
-public class OmDashboardPanel extends UserPanel {
+public class OmDashboardPanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
public OmDashboardPanel(String id) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
index e624f2c..3a8e1dc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
@@ -35,7 +35,7 @@
<h3><wicket:message key="281"/></h3>
<a wicket:message="href:282"><wicket:message key="286"/></a><br/>
<a wicket:message="href:283"><wicket:message key="287"/></a><br/>
- <a wicket:id="netTest" target="_blank"><wicket:message key="1527"/></a><br/>
+ <a wicket:id="netTest" target="_blank" rel="noopener"><wicket:message key="1527"/></a><br/>
</td>
</tr>
</table>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
index 6643a64..e08319b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
@@ -47,7 +47,7 @@ import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.common.NameDialog;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
-import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.openmeetings.web.data.DataViewContainer;
import org.apache.openmeetings.web.data.OmOrderByBorder;
import org.apache.openmeetings.web.data.SearchableDataProvider;
@@ -82,7 +82,7 @@ import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.plugins.fixedheadertable.FixedHeaderTableBehavior;
-public class MessagesContactsPanel extends UserPanel {
+public class MessagesContactsPanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
private final static Long MOVE_CHOOSE = Long.valueOf(-1);
private final static String SELECT_CHOOSE = "1252";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
index c3c2468..20ba1eb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
@@ -18,9 +18,9 @@
*/
package org.apache.openmeetings.web.user.profile;
-import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.openmeetings.web.common.UserBasePanel;
-public class ProfilePanel extends UserPanel {
+public class ProfilePanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
public ProfilePanel(String id) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
index 3f67c5a..19f3a6c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
@@ -37,7 +37,7 @@ import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.widget.tabs.AjaxTab;
import com.googlecode.wicket.jquery.ui.widget.tabs.TabbedPanel;
-public class SettingsPanel extends UserPanel {
+public class SettingsPanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
public static final int PROFILE_TAB_ID = 0;
public static final int MESSAGES_TAB_ID = 1;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
index 7a7725e..c1d4ab4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
@@ -27,13 +27,13 @@ import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ProfileImagePanel;
-import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.CompoundPropertyModel;
-public class UserProfilePanel extends UserPanel {
+public class UserProfilePanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
private final WebMarkupContainer address = new WebMarkupContainer("address");
private final Label addressDenied = new Label("addressDenied", "");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
index eb536de..7aaf439 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
@@ -32,7 +32,7 @@ import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.web.common.PagingNavigatorPanel;
-import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -51,7 +51,7 @@ import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
import com.googlecode.wicket.jquery.ui.plugins.fixedheadertable.FixedHeaderTableBehavior;
-public class UserSearchPanel extends UserPanel {
+public class UserSearchPanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
private final static List<Integer> itemsPerPage = Arrays.asList(10, 25, 50, 75, 100, 200, 500, 1000, 2500, 5000);
private String text;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
index de92449..2fa8e95 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
@@ -27,11 +27,11 @@ import org.apache.openmeetings.db.dto.record.RecordingContainerData;
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.NameDialog;
-import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.openmeetings.web.common.tree.FileTreePanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
-public class RecordingsPanel extends UserPanel {
+public class RecordingsPanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
private final VideoPlayer video = new VideoPlayer("video");
private final VideoInfo info = new VideoInfo("info");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
index 9bf0116..cd55012 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
@@ -18,13 +18,15 @@
*/
package org.apache.openmeetings.web.user.rooms;
+import static org.apache.openmeetings.web.common.UserPanel.getMyRooms;
+
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.openmeetings.web.util.OmUrlFragment.MenuParams;
import org.apache.wicket.markup.html.basic.Label;
-public class RoomsSelectorPanel extends UserPanel {
+public class RoomsSelectorPanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
public RoomsSelectorPanel(String id, MenuParams param) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
index 25c0058..1822148 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
@@ -130,7 +130,6 @@
<!-- End of Services -->
<!-- Interface Transactional -->
- <bean id="roommanagement" class="org.apache.openmeetings.core.data.conference.RoomManager" />
<bean id="roomDao" class="org.apache.openmeetings.db.dao.room.RoomDao"/>
<bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao">
<!-- Should be uncommented and updated with real values for Asterisk
@@ -145,24 +144,20 @@
<bean id="invitationDao" class="org.apache.openmeetings.db.dao.room.InvitationDao" />
<bean id="groupDao" class="org.apache.openmeetings.db.dao.user.GroupDao" />
<bean id="groupUserDao" class="org.apache.openmeetings.db.dao.user.GroupUserDao" />
- <bean id="pollManagement" class="org.apache.openmeetings.db.dao.room.PollDao" />
+ <bean id="pollDao" class="org.apache.openmeetings.db.dao.room.PollDao" />
<bean id="labelDao" class="org.apache.openmeetings.db.dao.label.LabelDao" />
- <bean id="configurationDaoImpl" class="org.apache.openmeetings.db.dao.basic.ConfigurationDao" />
+ <bean id="configurationDao" class="org.apache.openmeetings.db.dao.basic.ConfigurationDao" />
<bean id="appointmentDao" class="org.apache.openmeetings.db.dao.calendar.AppointmentDao" />
- <bean id="appointmentLogic" class="org.apache.openmeetings.service.calendar.AppointmentLogic" />
<bean id="sessionDao" class="org.apache.openmeetings.db.dao.server.SessiondataDao" />
- <bean id="userManagement" class="org.apache.openmeetings.service.user.UserManager" />
<bean id="roomModeratorDao" class="org.apache.openmeetings.db.dao.room.RoomModeratorDao" />
<bean id="roomGroupDao" class="org.apache.openmeetings.db.dao.room.RoomGroupDao"/>
<bean id="conferenceLogDao" class="org.apache.openmeetings.db.dao.log.ConferenceLogDao" />
- <bean id="emailManagement" class="org.apache.openmeetings.service.mail.EmailManager" />
<bean id="fileItemLogDao" class="org.apache.openmeetings.db.dao.file.FileItemLogDao" />
<bean id="fileExplorerItemDao" class="org.apache.openmeetings.db.dao.file.FileExplorerItemDao" />
<bean id="recordingDao" class="org.apache.openmeetings.db.dao.record.RecordingDao" />
<bean id="recordingMetaDataDao" class="org.apache.openmeetings.db.dao.record.RecordingMetaDataDao" />
<bean id="recordingMetaDeltaDao" class="org.apache.openmeetings.db.dao.record.RecordingMetaDeltaDao" />
<bean id="ldapConfigDao" class="org.apache.openmeetings.db.dao.server.LdapConfigDao" />
- <bean id="invitationManagement" class="org.apache.openmeetings.service.room.InvitationManager" />
<bean id="meetingMemberDao" class="org.apache.openmeetings.db.dao.calendar.MeetingMemberDao" />
<bean id="privateMessageFolderDao" class="org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao" />
<bean id="privateMessageDao" class="org.apache.openmeetings.db.dao.user.PrivateMessageDao" />
@@ -174,6 +169,11 @@
<bean id="oauth2Dao" class="org.apache.openmeetings.db.dao.server.OAuth2Dao" />
<bean id="omCalendarDao" class="org.apache.openmeetings.db.dao.calendar.OmCalendarDao" />
+ <bean id="userManager" class="org.apache.openmeetings.service.user.UserManager" />
+ <bean id="appointmentLogic" class="org.apache.openmeetings.service.calendar.AppointmentLogic" />
+ <bean id="emailManagement" class="org.apache.openmeetings.service.mail.EmailManager" />
+ <bean id="invitationManagement" class="org.apache.openmeetings.service.room.InvitationManager" />
+
<!-- No Interface -->
<bean id="imageConverter" class="org.apache.openmeetings.core.converter.ImageConverter" />
<bean id="documentConverter" class="org.apache.openmeetings.core.converter.DocumentConverter" />
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
index f54baa2..6960fc3 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
@@ -231,17 +231,17 @@ public class GroupWebService extends BaseWebService {
RoomDao roomDao = getRoomDao();
Room r = roomDao.get(roomid);
if (r != null) {
- if (r.getRoomGroups() == null) {
- r.setRoomGroups(new ArrayList<RoomGroup>());
+ if (r.getGroups() == null) {
+ r.setGroups(new ArrayList<RoomGroup>());
}
boolean found = false;
- for (RoomGroup ro : r.getRoomGroups()) {
+ for (RoomGroup ro : r.getGroups()) {
if (ro.getGroup().getId().equals(id)) {
found = true;
}
}
if (!found) {
- r.getRoomGroups().add(new RoomGroup(getDao().get(id), r));
+ r.getGroups().add(new RoomGroup(getDao().get(id), r));
roomDao.update(r, userId);
return new ServiceResult("Success", Type.SUCCESS);
}
[2/2] openmeetings git commit: [OPENMEETINGS-1703] Loader animation
is displayed while panel is being loaded
Posted by so...@apache.org.
[OPENMEETINGS-1703] Loader animation is displayed while panel is being loaded
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/b4fe443d
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/b4fe443d
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/b4fe443d
Branch: refs/heads/master
Commit: b4fe443df00ff600811fd7294f32ec6dd3287730
Parents: ff883a1
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Sep 15 13:40:00 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Sep 15 13:40:00 2017 +0700
----------------------------------------------------------------------
NOTICE | 3 +
.../core/data/conference/RoomManager.java | 399 -------------------
.../openmeetings/core/remote/MainService.java | 4 +-
.../openmeetings/db/dao/room/RoomDao.java | 4 +-
.../openmeetings/db/entity/room/Room.java | 12 +-
.../openmeetings/db/util/AuthLevelUtil.java | 4 +-
.../installation/ImportInitvalues.java | 2 +-
.../util/OpenmeetingsVariables.java | 2 +-
.../openmeetings/web/admin/AdminBasePanel.html | 39 ++
.../openmeetings/web/admin/AdminBasePanel.java | 49 +++
.../openmeetings/web/admin/AdminPanel.html | 39 --
.../openmeetings/web/admin/AdminPanel.java | 49 ---
.../web/admin/backup/BackupPanel.java | 4 +-
.../web/admin/configurations/ConfigsPanel.java | 4 +-
.../web/admin/connection/ConnectionsPanel.java | 4 +-
.../web/admin/email/EmailPanel.java | 4 +-
.../web/admin/groups/GroupsPanel.java | 4 +-
.../web/admin/labels/LangPanel.java | 4 +-
.../web/admin/ldaps/LdapsPanel.java | 6 +-
.../web/admin/oauth/OAuthPanel.java | 4 +-
.../openmeetings/web/admin/rooms/RoomForm.java | 2 +-
.../web/admin/rooms/RoomsPanel.html | 2 +-
.../web/admin/rooms/RoomsPanel.java | 4 +-
.../web/admin/users/UsersPanel.java | 4 +-
.../openmeetings/web/app/Application.java | 8 +-
.../openmeetings/web/common/BasePanel.java | 12 +-
.../web/common/FormSaveRefreshPanel.java | 3 +-
.../openmeetings/web/common/HeaderPanel.java | 3 +-
.../openmeetings/web/common/ImagePanel.java | 3 +-
.../openmeetings/web/common/MainPanel.html | 9 +-
.../openmeetings/web/common/MainPanel.java | 128 +++---
.../web/common/PagedEntityListPanel.java | 3 +-
.../openmeetings/web/common/UserBasePanel.java | 35 ++
.../openmeetings/web/common/UserPanel.java | 3 +-
.../openmeetings/web/common/menu/MenuPanel.java | 4 +-
.../openmeetings/web/pages/BaseInitedPage.java | 4 +-
.../apache/openmeetings/web/pages/BasePage.html | 61 ++-
.../apache/openmeetings/web/pages/BasePage.java | 15 +-
.../openmeetings/web/pages/BasePage.properties | 4 +-
.../apache/openmeetings/web/pages/MainPage.html | 19 +-
.../apache/openmeetings/web/pages/MainPage.java | 80 ++--
.../apache/openmeetings/web/room/RoomPanel.java | 6 +-
.../web/room/activities/ActivitiesPanel.java | 4 +-
.../web/room/menu/RoomMenuPanel.java | 4 +-
.../org/apache/openmeetings/web/room/room.js | 4 +-
.../web/user/calendar/CalendarPanel.java | 4 +-
.../openmeetings/web/user/chat/ChatPanel.java | 4 +-
.../openmeetings/web/user/chat/ChatToolbar.java | 10 +-
.../web/user/dashboard/MyRoomsWidgetView.java | 2 +-
.../web/user/dashboard/OmDashboardPanel.java | 4 +-
.../web/user/dashboard/WelcomeWidgetView.html | 2 +-
.../web/user/profile/MessagesContactsPanel.java | 4 +-
.../web/user/profile/ProfilePanel.java | 4 +-
.../web/user/profile/SettingsPanel.java | 4 +-
.../web/user/profile/UserProfilePanel.java | 4 +-
.../web/user/profile/UserSearchPanel.java | 4 +-
.../web/user/record/RecordingsPanel.java | 4 +-
.../web/user/rooms/RoomsSelectorPanel.java | 6 +-
.../WEB-INF/classes/applicationContext.xml | 14 +-
.../webservice/GroupWebService.java | 8 +-
60 files changed, 430 insertions(+), 712 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index eddf910..f41777f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -12,3 +12,6 @@ http://p.yusukekamiyamane.com/
This product includes free icons from FatCow.
http://www.fatcow.com/free-icons
+
+This product includes loading indicator animated with CSS from SpinKit
+https://github.com/tobiasahlin/SpinKit
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
deleted file mode 100644
index 840a2dd..0000000
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * 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.core.data.conference;
-
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.db.dao.server.ISessionManager;
-import org.apache.openmeetings.db.dto.basic.SearchResult;
-import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.db.entity.room.RoomGroup;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- *
- * @author swagner
- *
- */
-@Transactional
-public class RoomManager {
- private static final Logger log = Red5LoggerFactory.getLogger(RoomManager.class, webAppRootKey);
-
- @PersistenceContext
- private EntityManager em;
-
- @Autowired
- private ISessionManager sessionManager;
- @Autowired
- private RoomDao roomDao;
-
- public SearchResult<Room> getRooms(int start, int max, String orderby, boolean asc, String search) {
- try {
- SearchResult<Room> sResult = new SearchResult<>();
- sResult.setRecords(this.selectMaxFromRooms(search));
- sResult.setObjectName(Room.class.getName());
- sResult.setResult(this.getRoomsInternatlByHQL(start, max,
- orderby, asc, search));
- return sResult;
- } catch (Exception ex2) {
- log.error("[getRooms] ", ex2);
- }
- return null;
- }
-
- public SearchResult<Room> getRoomsWithCurrentUsers(int start, int max, String orderby, boolean asc) {
- try {
- SearchResult<Room> sResult = new SearchResult<>();
- sResult.setRecords(this.selectMaxFromRooms(""));
- sResult.setObjectName(Room.class.getName());
-
- List<Room> rooms = this.getRoomsInternatl(start, max, orderby,
- asc);
-
- for (Room room : rooms) {
- room.setCurrentusers(sessionManager.listByRoom(room.getId()));
- }
-
- sResult.setResult(rooms);
- return sResult;
- } catch (Exception ex2) {
- log.error("[getRooms] ", ex2);
- }
- return null;
- }
-
- public List<Room> getRoomsWithCurrentUsersByList(int start, int max, String orderby, boolean asc) {
- try {
- List<Room> rooms = this.getRoomsInternatl(start, max, orderby,
- asc);
-
- for (Room room : rooms) {
- room.setCurrentusers(sessionManager.listByRoom(room.getId()));
- }
-
- return rooms;
- } catch (Exception ex2) {
- log.error("[getRooms] ", ex2);
- }
- return null;
- }
-
- public List<Room> getRoomsWithCurrentUsersByListAndType(int start, int max, String orderby, boolean asc, String externalType) {
- try {
- List<Room> rooms = this.getRoomsInternatlbyType(start, max, orderby, asc, externalType);
-
- for (Room room : rooms) {
- room.setCurrentusers(sessionManager.listByRoom(room.getId()));
- }
-
- return rooms;
- } catch (Exception ex2) {
- log.error("[getRooms] ", ex2);
- }
- return null;
- }
-
- public Long selectMaxFromRooms(String search) {
- try {
- if (search.length() == 0) {
- search = "%";
- } else {
- search = "%" + search + "%";
- }
- // get all users
- TypedQuery<Long> query = em.createNamedQuery("selectMaxFromRooms", Long.class);
- query.setParameter("search", search);
- List<Long> ll = query.getResultList();
- log.debug("Number of records" + ll.get(0));
- return ll.get(0);
- } catch (Exception ex2) {
- log.error("[selectMaxFromRooms] ", ex2);
- }
- return null;
- }
-
- /**
- * gets a list of all availible rooms
- *
- * @param user_level
- * @param start
- * @param max
- * @param orderby
- * @param asc
- * @return
- */
- public List<Room> getRoomsInternatl(int start, int max, String orderby, boolean asc) {
- try {
- CriteriaBuilder cb = em.getCriteriaBuilder();
- CriteriaQuery<Room> cq = cb.createQuery(Room.class);
- Root<Room> c = cq.from(Room.class);
- Predicate condition = cb.equal(c.get("deleted"), false);
- cq.where(condition);
- cq.distinct(asc);
- if (asc) {
- cq.orderBy(cb.asc(c.get(orderby)));
- } else {
- cq.orderBy(cb.desc(c.get(orderby)));
- }
- TypedQuery<Room> q = em.createQuery(cq);
- q.setFirstResult(start);
- q.setMaxResults(max);
- List<Room> ll = q.getResultList();
- return ll;
- } catch (Exception ex2) {
- log.error("[getRooms ] ", ex2);
- }
- return null;
- }
-
- /**
- * gets a list of all availible rooms
- *
- * @param user_level
- * @param start
- * @param max
- * @param orderby
- * @param asc
- * @return
- */
- public List<Room> getRoomsInternatlByHQL(int start, int max,
- String orderby, boolean asc, String search) {
- try {
-
- String hql = "select c from Room c where c.deleted = false AND c.name LIKE :search ";
-
- if (search.length() == 0) {
- search = "%";
- } else {
- search = "%" + search + "%";
- }
- if (orderby != null) {
- hql += " ORDER BY " + (orderby.startsWith("c.") ? "" : "c.") + orderby;
-
- if (asc) {
- hql += " ASC";
- } else {
- hql += " DESC";
- }
- }
- TypedQuery<Room> query = em.createQuery(hql, Room.class);
- query.setParameter("search", search);
- query.setFirstResult(start);
- query.setMaxResults(max);
-
- return query.getResultList();
-
- } catch (Exception ex2) {
- log.error("[getRooms ] ", ex2);
- }
- return null;
- }
-
- public List<Room> getAllRooms() {
- try {
- CriteriaBuilder cb = em.getCriteriaBuilder();
- CriteriaQuery<Room> cq = cb.createQuery(Room.class);
- Root<Room> c = cq.from(Room.class);
- Predicate condition = cb.equal(c.get("deleted"), false);
- cq.where(condition);
- TypedQuery<Room> q = em.createQuery(cq);
- List<Room> ll = q.getResultList();
- return ll;
- } catch (Exception ex2) {
- log.error("[getAllRooms]", ex2);
- }
- return null;
- }
-
- public List<Room> getRoomsInternatlbyType(int start, int max, String orderby, boolean asc, String externalType) {
- try {
- CriteriaBuilder cb = em.getCriteriaBuilder();
- CriteriaQuery<Room> cq = cb.createQuery(Room.class);
- Root<Room> c = cq.from(Room.class);
- Predicate condition = cb.equal(c.get("deleted"), false);
- Predicate subCondition = cb.equal(c.get("externalType"), externalType);
- cq.where(condition, subCondition);
- cq.distinct(asc);
- if (asc) {
- cq.orderBy(cb.asc(c.get(orderby)));
- } else {
- cq.orderBy(cb.desc(c.get(orderby)));
- }
- TypedQuery<Room> q = em.createQuery(cq);
- q.setFirstResult(start);
- q.setMaxResults(max);
- List<Room> ll = q.getResultList();
- return ll;
- } catch (Exception ex2) {
- log.error("[getRooms ] ", ex2);
- }
- return null;
- }
-
- public List<RoomGroup> getGroupsByRoom(long roomId) {
- try {
- String hql = "select c from RoomGroup as c "
- + "where c.room.id = :id "
- + "AND c.deleted = false";
- TypedQuery<RoomGroup> q = em.createQuery(hql, RoomGroup.class);
-
- q.setParameter("id", roomId);
- List<RoomGroup> ll = q.getResultList();
- return ll;
- } catch (Exception ex2) {
- log.error("[getGroupsByRoom] ", ex2);
- }
- return null;
- }
-
- public List<Room> getRoomsByIds(List<Long> roomIds) {
- try {
- if (roomIds != null && !roomIds.isEmpty()) {
- return roomDao.get(roomIds);
- }
- } catch (Exception ex2) {
- log.error("[getRoomsByIds] ", ex2);
- }
- return new LinkedList<>();
- }
-
- // ---------------------------------------------------------------------------------------------
-
- /**
- * get List of RoomGroup by group and roomtype
- *
- * @param groupId
- * @param typeId
- * @return
- */
- public List<RoomGroup> getRoomGroupByGroupIdAndRoomType(long groupId, long typeId) {
- try {
- TypedQuery<RoomGroup> q = em.createNamedQuery("getRoomGroupByGroupIdAndRoomType", RoomGroup.class);
- q.setParameter("type", Room.Type.get(typeId));
- q.setParameter("groupId", groupId);
- return q.getResultList();
- } catch (Exception ex2) {
- log.error("[getRoomGroupByGroupIdAndRoomType] ", ex2);
- }
- return null;
- }
-
- /**
- * Gets all rooms by an group
- *
- * @param groupId
- * @return list of RoomGroup with Rooms as Sub-Objects or null
- */
- public List<RoomGroup> getRoomGroupByGroupId(long groupId) {
- try {
- TypedQuery<RoomGroup> query = em.
- createNamedQuery("getRoomGroupByGroupId", RoomGroup.class);
-
- query.setParameter("groupId", groupId);
-
- List<RoomGroup> ll = query.getResultList();
-
- return ll;
- } catch (Exception ex2) {
- log.error("[getPublicRoomsWithoutType] ", ex2);
- }
- return null;
- }
-
- public SearchResult<RoomGroup> getRoomGroupByGroupId(long groupId, int start, int max, String orderby,
- boolean asc) {
- try {
- SearchResult<RoomGroup> sResult = new SearchResult<>();
- sResult.setObjectName(RoomGroup.class.getName());
- sResult.setRecords(this.selectMaxFromRoomsByGroup(groupId).longValue());
- sResult.setResult(getRoomGroupsByGroupId(groupId, start, max, orderby, asc));
- return sResult;
- } catch (Exception ex2) {
- log.error("[getRoomGroupByGroupId] ", ex2);
- }
- return null;
- }
-
- public Integer selectMaxFromRoomsByGroup(long groupId) {
- try {
- // get all users
- TypedQuery<RoomGroup> q = em.createNamedQuery("selectMaxFromRoomsByGroup", RoomGroup.class);
-
- q.setParameter("groupId", groupId);
- List<RoomGroup> ll = q.getResultList();
-
- return ll.size();
- } catch (Exception ex2) {
- log.error("[selectMaxFromRoomsByGroup] ", ex2);
- }
- return null;
- }
-
- /**
- *
- * @param groupId
- * @param start
- * @param max
- * @param orderby
- * @param asc
- * @return
- */
- private List<RoomGroup> getRoomGroupsByGroupId(long groupId, int start, int max, String orderby, boolean asc) {
- try {
- String hql = "select c from RoomGroup as c where c.group.id = :groupId AND c.deleted = false";
- if (orderby.startsWith("c.")) {
- hql += "ORDER BY " + orderby;
- } else {
- hql += "ORDER BY " + "c." + orderby;
- }
- if (asc) {
- hql += " ASC";
- } else {
- hql += " DESC";
- }
-
- TypedQuery<RoomGroup> q = em.createQuery(hql, RoomGroup.class);
-
- q.setParameter("groupId", groupId);
- q.setFirstResult(start);
- q.setMaxResults(max);
- List<RoomGroup> ll = q.getResultList();
-
- return ll;
- } catch (Exception ex2) {
- log.error("[getRoomsByGroup] ", ex2);
- }
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
index 194ccd7..4e8735e 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
@@ -76,8 +76,8 @@ public class MainService implements IPendingServiceCallback {
} else {
allowed = r.getIspublic() || (r.getOwnerId() != null && r.getOwnerId().equals(u.getId()));
log.debug("[loginWicket] public ? " + r.getIspublic() + ", ownedId ? " + r.getOwnerId() + " " + allowed);
- if (!allowed && null != r.getRoomGroups()) {
- for (RoomGroup ro : r.getRoomGroups()) {
+ if (!allowed && null != r.getGroups()) {
+ for (RoomGroup ro : r.getGroups()) {
for (GroupUser ou : u.getGroupUsers()) {
if (ro.getGroup().getId().equals(ou.getGroup().getId())) {
allowed = true;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
index 66dbf0a..9acfabc 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
@@ -84,7 +84,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> {
q.setParameter("id", id);
@SuppressWarnings("unchecked")
OpenJPAQuery<Room> kq = OpenJPAPersistence.cast(q);
- kq.getFetchPlan().addFetchGroups("roomModerators", "roomGroups");
+ kq.getFetchPlan().addFetchGroups("roomModerators", "groups");
List<Room> l = kq.getResultList();
r = l.isEmpty() ? r : l.get(0);
} finally {
@@ -104,7 +104,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> {
TypedQuery<Room> q = oem.createNamedQuery("getBackupRooms", Room.class);
@SuppressWarnings("unchecked")
OpenJPAQuery<Room> kq = OpenJPAPersistence.cast(q);
- kq.getFetchPlan().addFetchGroups("roomModerators", "roomGroups");
+ kq.getFetchPlan().addFetchGroups("roomModerators", "groups");
return kq.getResultList();
} finally {
oem.getFetchPlan().setQueryResultCacheEnabled(qrce);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
index adff8dc..dac699e 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
@@ -60,7 +60,7 @@ import org.simpleframework.xml.Root;
@Entity
@FetchGroups({
@FetchGroup(name = "roomModerators", attributes = { @FetchAttribute(name = "moderators") })
- , @FetchGroup(name = "roomGroups", attributes = { @FetchAttribute(name = "roomGroups") })
+ , @FetchGroup(name = "roomGroups", attributes = { @FetchAttribute(name = "groups") })
})
@NamedQueries({
@NamedQuery(name = "getNondeletedRooms", query = "SELECT r FROM Room r WHERE r.deleted = false"),
@@ -299,7 +299,7 @@ public class Room implements IDataProviderEntity {
@JoinColumn(name = "room_id", insertable = true, updatable = true)
@ElementDependent
@org.simpleframework.xml.Transient
- private List<RoomGroup> roomGroups = new ArrayList<>();
+ private List<RoomGroup> groups = new ArrayList<>();
@Transient
private List<StreamClient> currentusers;
@@ -527,12 +527,12 @@ public class Room implements IDataProviderEntity {
return hiddenElements.add(e);
}
- public List<RoomGroup> getRoomGroups() {
- return roomGroups;
+ public List<RoomGroup> getGroups() {
+ return groups;
}
- public void setRoomGroups(List<RoomGroup> roomGroups) {
- this.roomGroups = roomGroups;
+ public void setGroups(List<RoomGroup> groups) {
+ this.groups = groups;
}
public boolean isChatOpened() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
index 9314ccb..b72514d 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
@@ -72,8 +72,8 @@ public class AuthLevelUtil {
}
}
//no need to loop if client is moderator
- if (result.isEmpty() && !r.getRoomGroups().isEmpty()) {
- for (RoomGroup rg : r.getRoomGroups()) {
+ if (result.isEmpty() && r.getGroups() != null && !r.getGroups().isEmpty()) {
+ for (RoomGroup rg : r.getGroups()) {
for (GroupUser gu : u.getGroupUsers()) {
if (gu.getGroup().getId().equals(rg.getGroup().getId()) && gu.isModerator()) {
result.add(Room.Right.moderator);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
index d36f026..3ef47ff 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
@@ -351,7 +351,7 @@ public class ImportInitvalues {
ro.setRoom(r);
ro.setGroup(groupDao.get(groupId));
ro.setInserted(new Date());
- r.getRoomGroups().add(ro);
+ r.getGroups().add(ro);
}
r = roomDao.update(r, null);
return r;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
index 56376ba..b8cc1f6 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
@@ -87,7 +87,7 @@ public class OpenmeetingsVariables {
public static final String CONFIG_MYROOMS_ENABLED = "personal.rooms.enabled";
public static final String HEADER_XFRAME_SAMEORIGIN = "SAMEORIGIN";
- public static final String HEADER_CSP_SELF = "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval';";
+ public static final String HEADER_CSP_SELF = "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' data:;";
public static final int RECENT_ROOMS_COUNT = 5;
public static final String WEB_DATE_PATTERN = "dd.MM.yyyy HH:mm:ss"; //FIXME need to be made locale based
public static final int USER_LOGIN_MINIMUM_LENGTH = 4;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
new file mode 100644
index 0000000..f98fa41
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
@@ -0,0 +1,39 @@
+<?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:head>
+ <script type="text/javascript">
+ function adminPanelInit() {
+ if (typeof extAdminPanelInit === 'function') {
+ extAdminPanelInit();
+ }
+ var h = $(window).height() - 5;
+ $('#adminForm').height(h - $('#adminForm').position().top);
+ $('#adminTable').height(h - $('#adminTable').position().top);
+ }
+ </script>
+</wicket:head>
+<wicket:panel>
+ <div class="adminPanel">
+ <wicket:child/>
+ </div>
+</wicket:panel>
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java
new file mode 100644
index 0000000..8b37280
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java
@@ -0,0 +1,49 @@
+/*
+ * 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.admin;
+
+import org.apache.openmeetings.web.common.BasePanel;
+import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+
+@AuthorizeInstantiation("Admin")
+public abstract class AdminBasePanel extends BasePanel {
+ private static final long serialVersionUID = 1L;
+ protected final static String BASE_ROW_CLASS = "ui-widget-content";
+ protected final static String ROW_CLASS = BASE_ROW_CLASS + " clickable";
+
+ public AdminBasePanel(String id) {
+ super(id);
+ }
+
+ @Override
+ public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
+ handler.appendJavaScript("adminPanelInit();");
+ return this;
+ }
+
+ protected StringBuilder getRowClass(Long id, Long selectedId) {
+ StringBuilder sb = new StringBuilder(ROW_CLASS);
+ if (id != null && id.equals(selectedId)) {
+ sb.append(" ui-state-default");
+ }
+ return sb;
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
deleted file mode 100644
index f98fa41..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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:head>
- <script type="text/javascript">
- function adminPanelInit() {
- if (typeof extAdminPanelInit === 'function') {
- extAdminPanelInit();
- }
- var h = $(window).height() - 5;
- $('#adminForm').height(h - $('#adminForm').position().top);
- $('#adminTable').height(h - $('#adminTable').position().top);
- }
- </script>
-</wicket:head>
-<wicket:panel>
- <div class="adminPanel">
- <wicket:child/>
- </div>
-</wicket:panel>
-</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java
deleted file mode 100644
index 5686bd9..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.admin;
-
-import org.apache.openmeetings.web.common.BasePanel;
-import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-
-@AuthorizeInstantiation("Admin")
-public abstract class AdminPanel extends BasePanel {
- private static final long serialVersionUID = 1L;
- protected final static String BASE_ROW_CLASS = "ui-widget-content";
- protected final static String ROW_CLASS = BASE_ROW_CLASS + " clickable";
-
- public AdminPanel(String id) {
- super(id);
- }
-
- @Override
- public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
- super.onMenuPanelLoad(handler);
- handler.appendJavaScript("adminPanelInit();");
- return this;
- }
-
- protected StringBuilder getRowClass(Long id, Long selectedId) {
- StringBuilder sb = new StringBuilder(ROW_CLASS);
- if (id != null && id.equals(selectedId)) {
- sb.append(" ui-state-default");
- }
- return sb;
- }
-}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
index 1a569ab..4b9e0c3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
@@ -33,7 +33,7 @@ import org.apache.openmeetings.backup.ProgressHolder;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OmFileHelper;
-import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.AdminBasePanel;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.util.upload.BootstrapFileUploadBehavior;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
@@ -64,7 +64,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
* @author swagner
*
*/
-public class BackupPanel extends AdminPanel {
+public class BackupPanel extends AdminBasePanel {
private static final Logger log = Red5LoggerFactory.getLogger(BackupPanel.class, webAppRootKey);
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
index 99de0e2..f417c49 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.web.admin.configurations;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.entity.basic.Configuration;
-import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.AdminBasePanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
@@ -39,7 +39,7 @@ import org.apache.wicket.markup.repeater.Item;
* @author swagner
*
*/
-public class ConfigsPanel extends AdminPanel {
+public class ConfigsPanel extends AdminBasePanel {
private static final long serialVersionUID = 1L;
private ConfigForm form;
private final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
index 0c3f904..ce5da41 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
@@ -31,7 +31,7 @@ import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.basic.IClient;
import org.apache.openmeetings.db.entity.room.StreamClient;
-import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.AdminBasePanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
@@ -47,7 +47,7 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import com.googlecode.wicket.jquery.ui.form.button.ButtonBehavior;
-public class ConnectionsPanel extends AdminPanel {
+public class ConnectionsPanel extends AdminBasePanel {
private static final long serialVersionUID = 1L;
public ConnectionsPanel(String id) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
index 8f9f00f..5406b4b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.web.admin.email;
import org.apache.openmeetings.db.dao.basic.MailMessageDao;
import org.apache.openmeetings.db.entity.basic.MailMessage;
-import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.AdminBasePanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
@@ -33,7 +33,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
-public class EmailPanel extends AdminPanel {
+public class EmailPanel extends AdminBasePanel {
private static final long serialVersionUID = 1L;
private final WebMarkupContainer list = new WebMarkupContainer("list");
private final EmailForm form;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
index 8fa09a3..2d85ad0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.admin.groups;
import org.apache.openmeetings.db.dao.user.GroupDao;
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
-import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.AdminBasePanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
@@ -43,7 +43,7 @@ import org.apache.wicket.markup.repeater.Item;
*
*/
@AuthorizeInstantiation({"Admin", "GroupAdmin"})
-public class GroupsPanel extends AdminPanel {
+public class GroupsPanel extends AdminBasePanel {
private static final long serialVersionUID = 1L;
private GroupForm form;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
index d72f6e5..1ba51b9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
@@ -30,7 +30,7 @@ import java.util.Map;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.entity.label.StringLabel;
-import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.AdminBasePanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
@@ -69,7 +69,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
* @author solomax, swagner
*
*/
-public class LangPanel extends AdminPanel {
+public class LangPanel extends AdminBasePanel {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(LangPanel.class, webAppRootKey);
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
index a6b1c12..97371ac 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.web.admin.ldaps;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
import org.apache.openmeetings.db.entity.server.LdapConfig;
-import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.AdminBasePanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
@@ -34,12 +34,12 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
/**
- * {@link AdminPanel} to list and modify {@link LdapConfig}
+ * {@link AdminBasePanel} to list and modify {@link LdapConfig}
*
* @author swagner
*
*/
-public class LdapsPanel extends AdminPanel {
+public class LdapsPanel extends AdminBasePanel {
private static final long serialVersionUID = 1L;
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private LdapForm form;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
index abda45a..5b0c18e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.web.admin.oauth;
import org.apache.openmeetings.db.dao.server.OAuth2Dao;
import org.apache.openmeetings.db.entity.server.OAuthServer;
-import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.AdminBasePanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
@@ -33,7 +33,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
-public class OAuthPanel extends AdminPanel {
+public class OAuthPanel extends AdminBasePanel {
private static final long serialVersionUID = 1L;
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private OAuthForm form;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
index 95f4ce1..05618a8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
@@ -146,7 +146,7 @@ public class RoomForm extends AdminBaseForm<Room> {
for (Group org : orgList) {
orgRooms.add(new RoomGroup(org, getModelObject()));
}
- add(new Select2MultiChoice<>("roomGroups", null, new RestrictiveChoiceProvider<RoomGroup>() {
+ add(new Select2MultiChoice<>("groups", null, new RestrictiveChoiceProvider<RoomGroup>() {
private static final long serialVersionUID = 1L;
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
index 1c2bc82..d63536a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
@@ -76,7 +76,7 @@
</div>
<div class="formelement">
<div class="info-text"><wicket:message key="828" /></div>
- <label wicket:for="roomGroups"><wicket:message key="126" /></label><div class="om-select2"><select class="input" wicket:id="roomGroups"></select></div>
+ <label wicket:for="groups"><wicket:message key="126" /></label><div class="om-select2"><select class="input" wicket:id="groups"></select></div>
</div>
</fieldset>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
index 773b7bb..9027c9c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
@@ -22,7 +22,7 @@ import static org.apache.openmeetings.web.app.Application.getBean;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.AdminBasePanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
@@ -37,7 +37,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@AuthorizeInstantiation({"Admin", "GroupAdmin"})
-public class RoomsPanel extends AdminPanel {
+public class RoomsPanel extends AdminBasePanel {
private static final long serialVersionUID = 1L;
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private RoomForm form;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
index df95464..2561921 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
@@ -23,7 +23,7 @@ import static org.apache.openmeetings.web.app.WebSession.getUserId;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.AdminBasePanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
@@ -45,7 +45,7 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
@AuthorizeInstantiation({"Admin", "GroupAdmin"})
-public class UsersPanel extends AdminPanel {
+public class UsersPanel extends AdminBasePanel {
private static final long serialVersionUID = 1L;
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private final MessageDialog warning = new MessageDialog("warning", Application.getString("797"), Application.getString("warn.nogroup"), DialogButtons.OK, DialogIcon.WARN) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 3097138..019e731 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -250,7 +250,13 @@ public class Application extends AuthenticatedWebApplication implements IApplica
wresp.setHeader("Strict-Transport-Security", "max-age=31536000; includeSubDomains; preload");
wresp.setHeader("X-Content-Type-Options", "nosniff");
wresp.setHeader("X-Frame-Options", xFrameOptions);
- wresp.setHeader("Content-Security-Policy", contentSecurityPolicy);
+ Url reqUrl = cycle.getRequest().getUrl();
+ wresp.setHeader("Content-Security-Policy", String.format("%s; connect-src 'self' %s://%s:%s;"
+ , contentSecurityPolicy
+ , "http".equalsIgnoreCase(reqUrl.getProtocol()) ? "ws" : "wss"
+ , reqUrl.getHost()
+ , reqUrl.getPort()
+ ));
}
}
});
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
index 71b0220..23e4770 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
@@ -22,6 +22,7 @@ import org.apache.openmeetings.db.util.FormatHelper;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.menu.MenuPanel;
import org.apache.openmeetings.web.pages.BasePage;
+import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
@@ -54,26 +55,27 @@ public abstract class BasePanel extends Panel {
/**
* Overwrite this method to execute Java code after Panel is loaded by the
* {@link MenuPanel}
- *
+ *
* @param target
*/
public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
handler.add(getBasePage().getHeader().setVisible(true), getMainPanel().getMenu().setVisible(true)
- , getMainPanel().getTopLinks().setVisible(true));
+ , getMainPanel().getTopLinks().setVisible(true)
+ , ((MainPage)getPage()).getLoader().setVisible(false));
return this;
}
/**
* This method should be overridden to perform necessary cleanup: remove timers etc.
- *
+ *
* @param handler
*/
public void cleanup(IPartialPageRequestHandler handler) {
}
-
+
/**
* This method should be overridden to perform after "new message" dialog was closed.
- *
+ *
* @param handler
*/
public void onNewMessageClose(IPartialPageRequestHandler handler) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java
index d9625ca..959be7a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java
@@ -21,11 +21,12 @@ package org.apache.openmeetings.web.common;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
-public abstract class FormSaveRefreshPanel<T> extends BasePanel {
+public abstract class FormSaveRefreshPanel<T> extends Panel {
private static final long serialVersionUID = 1L;
protected final KendoFeedbackPanel feedback;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java
index 5c1218e..92030d4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java
@@ -19,9 +19,10 @@
package org.apache.openmeetings.web.common;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.util.string.Strings;
-public class HeaderPanel extends BasePanel {
+public class HeaderPanel extends Panel {
private static final long serialVersionUID = 1L;
public HeaderPanel(String id, String appName) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java
index a9db57c..c6bceb3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java
@@ -21,8 +21,9 @@ package org.apache.openmeetings.web.common;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.Panel;
-public abstract class ImagePanel extends BasePanel {
+public abstract class ImagePanel extends Panel {
private static final long serialVersionUID = 1L;
protected final WebMarkupContainer profile = new TransparentWebMarkupContainer("profile");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
index 61222be..29229ee 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
@@ -43,10 +43,10 @@
</script>
<div wicket:id="topControls">
<div wicket:id="topLinks"><span
- id="contactsAndMessages"><a wicket:id="messages"><wicket:message key="1188"/></a></span><span
- id="profile"><a wicket:id="profile"><wicket:message key="5"/></a></span><span
- id="logout"><a wicket:id="logout" href="#"><wicket:message key="310"/></a></span><span
- id="reportBug"><a target="_blank" href="https://issues.apache.org/jira/browse/OPENMEETINGS"><wicket:message key="284"/></a></span><span><a
+ id="contactsAndMessages"><a wicket:id="messages"><wicket:message key="1188"/></a></span><span
+ id="profile"><a wicket:id="profile"><wicket:message key="5"/></a></span><span
+ id="logout"><a wicket:id="logout" href="#"><wicket:message key="310"/></a></span><span
+ id="reportBug"><a target="_blank" href="https://issues.apache.org/jira/browse/OPENMEETINGS" rel="noopener"><wicket:message key="284"/></a></span><span><a
wicket:id="about"><wicket:message key="1549"/></a></span>
</div>
<div id="busy-indicator"></div>
@@ -58,5 +58,6 @@
<div wicket:id="aboutDialog"></div>
<div wicket:id="userInfoDialog"></div>
<div wicket:id="newMessageDialog"></div>
+ <div wicket:id="invite-to-room"></div>
</wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index 5123df5..605e6e2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -53,6 +53,7 @@ import org.apache.openmeetings.web.common.menu.MenuItem;
import org.apache.openmeetings.web.common.menu.MenuPanel;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.openmeetings.web.user.AboutDialog;
+import org.apache.openmeetings.web.user.InviteUserToRoomDialog;
import org.apache.openmeetings.web.user.MessageDialog;
import org.apache.openmeetings.web.user.UserInfoDialog;
import org.apache.openmeetings.web.user.chat.ChatPanel;
@@ -103,10 +104,11 @@ public class MainPanel extends Panel {
private final WebMarkupContainer topControls = new WebMarkupContainer("topControls");
private final WebMarkupContainer topLinks = new WebMarkupContainer("topLinks");
private final MarkupContainer contents;
- private final ChatPanel chat;
- private final MessageDialog newMessage;
- private final UserInfoDialog userInfo;
+ private ChatPanel chat;
+ private MessageDialog newMessage;
+ private UserInfoDialog userInfo;
private BasePanel panel;
+ private InviteUserToRoomDialog inviteUser;
private AbstractAjaxTimerBehavior pingTimer = new AbstractAjaxTimerBehavior(Duration.seconds(30)) {
private static final long serialVersionUID = 1L;
@@ -126,10 +128,68 @@ public class MainPanel extends Panel {
this.panel = _panel;
setAuto(true);
setOutputMarkupId(true);
- add(topControls.setOutputMarkupPlaceholderTag(true).setMarkupId("topControls"));
+ setOutputMarkupPlaceholderTag(true);
menu = new MenuPanel("menu", getMainMenu());
contents = new WebMarkupContainer("contents");
- add(contents.add(getClient() == null || _panel == null ? EMPTY : _panel).setOutputMarkupId(true).setMarkupId("contents"));
+ pingTimer.stop(null);
+ add(pingTimer, new WebSocketBehavior() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onConnect(ConnectedMessage msg) {
+ super.onConnect(msg);
+ ExtendedClientProperties cp = WebSession.get().getExtendedProperties();
+ final Client client = new Client(getSession().getId(), msg.getKey().hashCode(), getUserId(), getBean(UserDao.class));
+ uid = client.getUid();
+ addOnlineUser(cp.update(client));
+ log.debug("WebSocketBehavior::onConnect [uid: {}, session: {}, key: {}]", client.getUid(), msg.getSessionId(), msg.getKey());
+ }
+
+ @Override
+ protected void onMessage(WebSocketRequestHandler handler, TextMessage msg) {
+ if ("socketConnected".equals(msg.getText())) {
+ if (panel != null) {
+ updateContents(panel, handler);
+ }
+ log.debug("WebSocketBehavior:: pingTimer is attached");
+ pingTimer.restart(handler);
+ }
+ }
+
+ @Override
+ protected void onAbort(AbortedMessage msg) {
+ super.onAbort(msg);
+ closeHandler(msg);
+ }
+
+ @Override
+ protected void onClose(ClosedMessage msg) {
+ super.onClose(msg);
+ closeHandler(msg);
+ }
+
+ @Override
+ protected void onError(WebSocketRequestHandler handler, ErrorMessage msg) {
+ super.onError(handler, msg);
+ closeHandler(msg);
+ }
+
+ private void closeHandler(AbstractClientMessage msg) {
+ //no chance to stop pingTimer here :(
+ if (uid != null) {
+ log.debug("WebSocketBehavior::closeHandler [uid: {}, session: {}, key: {}]", uid, msg.getSessionId(), msg.getKey());
+ Application.get().exit(uid);
+ uid = null;
+ }
+ }
+ });
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(topControls.setOutputMarkupPlaceholderTag(true).setMarkupId("topControls"));
+ add(contents.add(getClient() == null || panel == null ? EMPTY : panel).setOutputMarkupId(true).setMarkupId("contents"));
topControls.add(menu.setVisible(false), topLinks.setVisible(false).setOutputMarkupPlaceholderTag(true).setMarkupId("topLinks"));
topLinks.add(new AjaxLink<Void>("messages") {
private static final long serialVersionUID = 1L;
@@ -216,64 +276,22 @@ public class MainPanel extends Panel {
response.render(new PriorityHeaderItem(getNamedFunction("privateMessage", this, explicit(PARAM_USER_ID))));
}
});
- pingTimer.stop(null);
- add(pingTimer, new WebSocketBehavior() {
+ add(inviteUser = new InviteUserToRoomDialog("invite-to-room"));
+ add(new AbstractDefaultAjaxBehavior() {
private static final long serialVersionUID = 1L;
@Override
- protected void onConnect(ConnectedMessage msg) {
- super.onConnect(msg);
- ExtendedClientProperties cp = WebSession.get().getExtendedProperties();
- final Client client = new Client(getSession().getId(), msg.getKey().hashCode(), getUserId(), getBean(UserDao.class));
- uid = client.getUid();
- addOnlineUser(cp.update(client));
- log.debug("WebSocketBehavior::onConnect [uid: {}, session: {}, key: {}]", client.getUid(), msg.getSessionId(), msg.getKey());
- }
-
- @Override
- protected void onMessage(WebSocketRequestHandler handler, TextMessage msg) {
- if ("socketConnected".equals(msg.getText())) {
- if (panel != null) {
- updateContents(panel, handler);
- }
- log.debug("WebSocketBehavior:: pingTimer is attached");
- pingTimer.restart(handler);
- }
- }
-
- @Override
- protected void onAbort(AbortedMessage msg) {
- super.onAbort(msg);
- closeHandler(msg);
- }
-
- @Override
- protected void onClose(ClosedMessage msg) {
- super.onClose(msg);
- closeHandler(msg);
+ protected void respond(AjaxRequestTarget target) {
+ inviteUser.open(target, getParam(getComponent(), PARAM_USER_ID).toLong());
}
@Override
- protected void onError(WebSocketRequestHandler handler, ErrorMessage msg) {
- super.onError(handler, msg);
- closeHandler(msg);
- }
-
- private void closeHandler(AbstractClientMessage msg) {
- //no chance to stop pingTimer here :(
- if (uid != null) {
- log.debug("WebSocketBehavior::closeHandler [uid: {}, session: {}, key: {}]", uid, msg.getSessionId(), msg.getKey());
- Application.get().exit(uid);
- uid = null;
- }
+ public void renderHead(Component component, IHeaderResponse response) {
+ super.renderHead(component, response);
+ response.render(new PriorityHeaderItem(getNamedFunction("inviteUser", this, explicit(PARAM_USER_ID))));
}
});
add(new OmAjaxClientInfoBehavior());
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
topLinks.add(new ConfirmableAjaxBorder("logout", getString("310"), getString("634")) {
private static final long serialVersionUID = 1L;
@@ -345,7 +363,7 @@ public class MainPanel extends Panel {
if (isAdmin) {
l.add(getSubItem("597", "1455", MenuActions.adminModuleConnections, null));
}
- l.add(getSubItem("127", "1456", MenuActions.adminModuleOrg, null));
+ l.add(getSubItem("126", "1456", MenuActions.adminModuleOrg, null));
l.add(getSubItem("186", "1457", MenuActions.adminModuleRoom, null));
if (isAdmin) {
l.add(getSubItem("263", "1458", MenuActions.adminModuleConfiguration, null));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
index 91346f1..bbb1192 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
@@ -27,11 +27,12 @@ import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.PropertyModel;
import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
-public abstract class PagedEntityListPanel extends BasePanel {
+public abstract class PagedEntityListPanel extends Panel {
private static final long serialVersionUID = 1L;
private List<Integer> numbers = Arrays.asList(10, 25, 50, 75, 100, 200);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserBasePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserBasePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserBasePanel.java
new file mode 100644
index 0000000..16b4b2f
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserBasePanel.java
@@ -0,0 +1,35 @@
+/*
+ * 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.common;
+
+import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.model.IModel;
+
+@AuthorizeInstantiation("Dashboard")
+public abstract class UserBasePanel extends BasePanel {
+ private static final long serialVersionUID = 1L;
+
+ public UserBasePanel(String id) {
+ super(id);
+ }
+
+ public UserBasePanel(String id, IModel<?> model) {
+ super(id, model);
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
index 26c4d97..442cd2d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
@@ -28,10 +28,11 @@ import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
@AuthorizeInstantiation("Dashboard")
-public abstract class UserPanel extends BasePanel {
+public abstract class UserPanel extends Panel {
private static final long serialVersionUID = 1L;
public UserPanel(String id) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
index b15d93d..fd370e1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
@@ -20,10 +20,10 @@ package org.apache.openmeetings.web.common.menu;
import java.util.List;
-import org.apache.openmeetings.web.common.BasePanel;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.util.string.Strings;
import com.googlecode.wicket.jquery.core.Options;
@@ -36,7 +36,7 @@ import com.googlecode.wicket.jquery.ui.widget.menu.Menu;
* @author sebawagner
*
*/
-public class MenuPanel extends BasePanel {
+public class MenuPanel extends Panel {
private static final long serialVersionUID = 1L;
public MenuPanel(String id, List<IMenuItem> menus) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
index 0907acb..fd4fe5e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
@@ -31,12 +31,12 @@ public abstract class BaseInitedPage extends BasePage {
protected String getApplicationName() {
return getBean(ConfigurationDao.class).getAppName();
}
-
+
@Override
protected String getLanguageCode() {
return WebSession.get().getLocale().toLanguageTag();
}
-
+
@Override
protected boolean isRtl() {
return FormatHelper.isRtlLanguage(getLanguageCode());
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
index 219bec4..ff81973 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
@@ -19,14 +19,55 @@
-->
<html xmlns:wicket="http://wicket.apache.org" wicket:id="html">
- <head>
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
- <wicket:header-items/>
- <link rel="shortcut icon" href="public/favicon.ico" type="image/x-icon"/>
- <title wicket:id="pageTitle">[title]</title>
- </head>
- <body>
- <div wicket:id="header"></div>
- <wicket:child />
- </body>
+<head>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+ <link rel="shortcut icon" href="public/favicon.ico" type="image/x-icon"/>
+ <style type="text/css">
+ .sk-chasing-dots {
+ margin: 20% auto;
+ width: 80px;
+ height: 80px;
+ position: relative;
+ text-align: center;
+ -webkit-animation: sk-chasingDotsRotate 2s infinite linear;
+ animation: sk-chasingDotsRotate 2s infinite linear;
+ }
+ .sk-chasing-dots .sk-child {
+ width: 40%;
+ height: 40%;
+ display: inline-block;
+ position: absolute;
+ top: 0;
+ background-color: #333;
+ border-radius: 100%;
+ -webkit-animation: sk-chasingDotsBounce 2s infinite ease-in-out;
+ animation: sk-chasingDotsBounce 2s infinite ease-in-out;
+ }
+ .sk-chasing-dots .sk-dot2 {
+ top: auto;
+ bottom: 0;
+ -webkit-animation-delay: -1s;
+ animation-delay: -1s;
+ }
+ @keyframes sk-chasingDotsRotate {
+ 100% { transform: rotate(360deg); }
+ }
+ @keyframes sk-chasingDotsBounce {
+ 0%, 100% { transform: scale(0); }
+ 50% { transform: scale(1); }
+ }
+ </style>
+ <wicket:header-items/>
+ <title wicket:id="pageTitle">[title]</title>
+</head>
+<body>
+ <div wicket:id="main-loader" style="height: 100%;" class="ui-widget-header">
+ <div class="sk-chasing-dots">
+ <div class="sk-child sk-dot1"></div>
+ <div class="sk-child sk-dot2"></div>
+ </div>
+ </div>
+ <div wicket:id="header"></div>
+ <wicket:child />
+</body>
</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index 2c122d1..f46dcf7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -38,6 +38,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
@@ -48,6 +49,7 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage {
private static final long serialVersionUID = 1L;
private final Map<String, String> options;
private final HeaderPanel header;
+ private final WebMarkupContainer loader = new WebMarkupContainer("main-loader");
protected abstract boolean isRtl();
protected abstract String getLanguageCode();
@@ -66,6 +68,7 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage {
.add(new AttributeModifier("dir", isRtl() ? "rtl" : "ltr")));
add(new Label("pageTitle", appName));
add(header = new HeaderPanel("header", appName));
+ add(loader.setVisible(isMainPage()).setOutputMarkupId(true));
}
protected OmUrlFragment getUrlFragment(IRequestParameters params) {
@@ -95,8 +98,7 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage {
return false;
}
- @Override
- public void renderHead(IHeaderResponse response) {
+ protected void internalRenderHead(IHeaderResponse response) {
response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference())));
super.renderHead(response);
final String suffix = DEVELOPMENT == getApplication().getConfigurationType() ? "" : ".min";
@@ -112,4 +114,13 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage {
response.render(OnDomReadyHeaderItem.forScript(script));
}
}
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ internalRenderHead(response);
+ }
+
+ public WebMarkupContainer getLoader() {
+ return loader;
+ }
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
index 7dbc860..fc5907f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
@@ -6,9 +6,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
index aa51f10..e8c0660 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
@@ -7,30 +7,19 @@
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:head>
- <script type="text/javascript">
- function showBusyIndicator() {
- $('#busy-indicator').show();
- }
- function hideBusyIndicator() {
- $('#busy-indicator').hide();
- }
- </script>
-</wicket:head>
<wicket:extend>
- <div wicket:id="main"/>
- <div wicket:id="invite-to-room"></div>
+ <div wicket:id="main-container" style="height: 100%"><div wicket:id="main" style="height: 100%"/></div>
</wicket:extend>
</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
index 12f8b8f..92db807 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
@@ -18,63 +18,62 @@
*/
package org.apache.openmeetings.web.pages;
-import static org.apache.openmeetings.web.common.MainPanel.PARAM_USER_ID;
-import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction;
-import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getParam;
-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.MainPanel;
-import org.apache.openmeetings.web.user.InviteUserToRoomDialog;
import org.apache.openmeetings.web.util.OmUrlFragment;
-import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.PriorityHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.util.time.Duration;
@AuthorizeInstantiation({"Admin", "Dashboard", "Room"})
public class MainPage extends BaseInitedPage {
private static final long serialVersionUID = 1L;
- private final AbstractAjaxTimerBehavior areaBehavior;
- private final MainPanel main = new MainPanel("main");
- private final InviteUserToRoomDialog inviteUser;
+ private static final String MAIN_PANEL_ID = "main";
+ private final WebMarkupContainer mainContainer = new WebMarkupContainer("main-container");
+ private final AbstractAjaxTimerBehavior areaBehavior = new AbstractAjaxTimerBehavior(Duration.ONE_SECOND) {
+ private static final long serialVersionUID = 1L;
- public MainPage() {
- super();
- getHeader().setVisible(false);
- add(main, inviteUser = new InviteUserToRoomDialog("invite-to-room"));
- //load preselected content
- add(areaBehavior = new AbstractAjaxTimerBehavior(Duration.ONE_SECOND) {
- private static final long serialVersionUID = 1L;
+ @Override
+ protected void onTimer(AjaxRequestTarget target) {
+ OmUrlFragment area = WebSession.get().getArea();
+ main.updateContents(area == null ? OmUrlFragment.get() : area, target);
+ stop(target);
+ WebSession.get().setArea(null);
+ }
+ };
+ private final MainPanel main = new MainPanel(MAIN_PANEL_ID);
+ private final AbstractDefaultAjaxBehavior delayedLoad = new AbstractDefaultAjaxBehavior() {
+ private static final long serialVersionUID = 1L;
- @Override
- protected void onTimer(AjaxRequestTarget target) {
- OmUrlFragment area = WebSession.get().getArea();
- main.updateContents(area == null ? OmUrlFragment.get() : area, target);
- stop(target);
- WebSession.get().setArea(null);
- }
- });
- add(new AbstractDefaultAjaxBehavior() {
- private static final long serialVersionUID = 1L;
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ target.add(
+ mainContainer.replace(main)
+ .add(areaBehavior, new Behavior() {
+ private static final long serialVersionUID = 1L;
- @Override
- protected void respond(AjaxRequestTarget target) {
- inviteUser.open(target, getParam(getComponent(), PARAM_USER_ID).toLong());
- }
+ @Override
+ public void renderHead(org.apache.wicket.Component component, IHeaderResponse response) {
+ internalRenderHead(response);
+ }
+ }));
+ }
+ };
- @Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
- response.render(new PriorityHeaderItem(getNamedFunction("inviteUser", this, explicit(PARAM_USER_ID))));
- }
- });
+ public MainPage() {
+ super();
+ getHeader().setVisible(false);
+ add(mainContainer.add(new EmptyPanel(MAIN_PANEL_ID)).setOutputMarkupId(true));
+ add(delayedLoad);
}
public void updateContents(OmUrlFragment f, IPartialPageRequestHandler handler) {
@@ -94,4 +93,9 @@ public class MainPage extends BaseInitedPage {
main.updateContents(uf, target, false);
}
}
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ response.render(OnDomReadyHeaderItem.forScript(delayedLoad.getCallbackScript()));
+ }
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4fe443d/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 9bf9fb2..5bd2267 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -65,6 +65,7 @@ import org.apache.openmeetings.util.message.TextRoomMessage;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.BasePanel;
+import org.apache.openmeetings.web.pages.MainPage;
import org.apache.openmeetings.web.room.activities.ActivitiesPanel;
import org.apache.openmeetings.web.room.activities.Activity;
import org.apache.openmeetings.web.room.menu.RoomMenuPanel;
@@ -316,7 +317,7 @@ public class RoomPanel extends BasePanel {
log.debug("public ? " + r.getIspublic() + ", ownedId ? " + r.getOwnerId() + " " + allowed);
if (!allowed) {
User u = getClient().getUser();
- for (RoomGroup ro : r.getRoomGroups()) {
+ for (RoomGroup ro : r.getGroups()) {
for (GroupUser ou : u.getGroupUsers()) {
if (ro.getGroup().getId().equals(ou.getGroup().getId())) {
allowed = true;
@@ -683,11 +684,12 @@ public class RoomPanel extends BasePanel {
public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
getBasePage().getHeader().setVisible(false);
getMainPanel().getTopControls().setVisible(false);
+ Component loader = ((MainPage)getPage()).getLoader().setVisible(false);
if (r.isHidden(RoomElement.Chat) || !isVisible()) {
getMainPanel().getChat().toggle(handler, false);
}
if (handler != null) {
- handler.add(getBasePage().getHeader(), getMainPanel().getTopControls());
+ handler.add(loader, getBasePage().getHeader(), getMainPanel().getTopControls());
if (isVisible()) {
handler.appendJavaScript("Room.load();");
}