Author: solomax
Date: Mon Apr 22 16:51:02 2013
New Revision: 1470616
URL: http://svn.apache.org/r1470616
Log:
Wicket: NotInited page is added to avoid displaying exceptions to the end user;
Tabbed list of organizational rooms is added;
code clean-up;
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/
- copied from r1469669,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsSelectorPanel.html
- copied, changed from r1469669,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsSelectorPanel.java
- copied, changed from r1469669,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsTabbedPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsTabbedPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/NotInitedPage.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/NotInitedPage.java
Removed:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/UserRoomsPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/UserRoomsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java?rev=1470616&r1=1470615&r2=1470616&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
Mon Apr 22 16:51:02 2013
@@ -85,12 +85,7 @@ public class RoomDao implements IDataPro
}
public List<Room> getOrganisationRooms(long orgId) {
- TypedQuery<Room> q = em.createQuery(
- "SELECT DISTINCT c.room FROM RoomOrganisation c
LEFT JOIN FETCH c.room "
- + "WHERE c.organisation.organisation_id =
:orgId "
- + "AND c.deleted = false AND c.room.deleted =
false AND c.room.appointment = false "
- + "AND c.organisation.deleted = false "
- + "ORDER BY c.room.name ASC", Room.class);
+ TypedQuery<Room> q =
em.createNamedQuery("getOrganisationRooms", Room.class);
q.setParameter("orgId", orgId);
return q.getResultList();
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java?rev=1470616&r1=1470615&r2=1470616&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java
Mon Apr 22 16:51:02 2013
@@ -74,6 +74,9 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "countRooms", query = "SELECT COUNT(r) FROM Room r
WHERE r.deleted = false"),
@NamedQuery(name = "getBackupRooms", query = "SELECT r FROM Room r LEFT
JOIN FETCH r.moderators WHERE r.deleted = false "),
@NamedQuery(name = "getRoomsCapacityByIds", query = "SELECT
SUM(r.numberOfPartizipants) FROM Room r WHERE r.deleted = false AND r.rooms_id
IN :ids")
+ , @NamedQuery(name = "getOrganisationRooms", query = "SELECT DISTINCT
c.room FROM RoomOrganisation c LEFT JOIN FETCH c.room "
+ + "WHERE c.organisation.organisation_id =
:orgId AND c.deleted = false AND c.room.deleted = false AND c.room.appointment
= false "
+ + "AND c.organisation.deleted = false ORDER BY
c.room.name ASC")
})
@Table(name = "room")
@Root(name = "room")
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java?rev=1470616&r1=1470615&r2=1470616&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
Mon Apr 22 16:51:02 2013
@@ -20,8 +20,10 @@ package org.apache.openmeetings.web.app;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.web.pages.MainPage;
+import org.apache.openmeetings.web.pages.NotInitedPage;
import org.apache.openmeetings.web.pages.auth.SignInPage;
import org.apache.wicket.Page;
+import org.apache.wicket.RestartResponseException;
import
org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession;
import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
@@ -62,6 +64,7 @@ public class Application extends Authent
super.init();
mountPage("signin", getSignInPageClass());
+ mountPage("notinited", NotInitedPage.class);
getRootRequestMapperAsCompound().add(new
HomePageMapper(getHomePage()) {
@Override
@@ -103,7 +106,8 @@ public class Application extends Authent
if (ScopeApplicationAdapter.initComplete) {
ApplicationContext context =
WebApplicationContextUtils.getWebApplicationContext(get().getServletContext());
return context.getBean(clazz);
+ } else {
+ throw new RestartResponseException(NotInitedPage.class);
}
- return null;
}
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java?rev=1470616&r1=1470615&r2=1470616&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
Mon Apr 22 16:51:02 2013
@@ -32,7 +32,7 @@ import org.apache.openmeetings.web.compo
import org.apache.openmeetings.web.components.admin.servers.ServersPanel;
import org.apache.openmeetings.web.components.admin.users.UsersPanel;
import org.apache.openmeetings.web.components.user.calendar.CalendarPanel;
-import org.apache.openmeetings.web.components.user.rooms.UserRoomsPanel;
+import org.apache.openmeetings.web.components.user.room.RoomsSelectorPanel;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@ -124,7 +124,7 @@ public class MenuPanel extends BasePanel
case
recordModule:
break;
case
conferenceModuleRoomList:
-
basePanel = new UserRoomsPanel("child", params);
+
basePanel = new RoomsSelectorPanel("child", params);
break;
case
eventModuleRoomList:
break;
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsPanel.html?rev=1470616&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsPanel.html
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsPanel.html
Mon Apr 22 16:51:02 2013
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+ <wicket:panel>
+ <table style="border-collapse: collapse;">
+ <tr wicket:id="list" style="background-color: rgb(248,
248, 248); border-bottom: 5px solid white;">
+ <td>
+ <span wicket:id="roomName">[room
name]</span><br/>
+ <wicket:ommessage key="398"
/> <span wicket:id="curUsers"></span> / <span
+
wicket:id="totalUsers"></span> <span wicket:id="refresh"
+ class="ui-icon
ui-icon-arrowrefresh-1-n" style="display: inline-block"></span></td>
+ <td><button><wicket:ommessage
key="131"/></button></td>
+ </tr>
+ </table>
+ </wicket:panel>
+</html>
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsPanel.java?rev=1470616&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsPanel.java
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsPanel.java
Mon Apr 22 16:51:02 2013
@@ -0,0 +1,63 @@
+/*
+ * 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.components.user.room;
+
+import java.util.List;
+
+import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.session.SessionManager;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.components.UserPanel;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+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.model.IModel;
+import org.apache.wicket.model.Model;
+
+public class RoomsPanel extends UserPanel {
+ private static final long serialVersionUID = -892281210307880052L;
+
+ public RoomsPanel(String id, List<Room> rooms) {
+ super(id);
+ add(new ListView<Room>("list", rooms) {
+ private static final long serialVersionUID =
9189085478336224890L;
+
+ @Override
+ protected void populateItem(ListItem<Room> item) {
+ final Room r = item.getModelObject();
+ item.add(new Label("roomName", r.getName()));
+ final IModel<Integer> curUsersModel = new
Model<Integer>(Application.getBean(SessionManager.class).getClientListByRoom(r.getRooms_id()).size());
+ final Label curUsers = new Label("curUsers",
curUsersModel);
+ item.add(curUsers.setOutputMarkupId(true));
+ item.add(new Label("totalUsers",
r.getNumberOfPartizipants()));
+ item.add(new AjaxLink<Void>("refresh") {
+ private static final long
serialVersionUID = -3426813755917489787L;
+
+ @Override
+ public void onClick(AjaxRequestTarget
target) {
+
curUsersModel.setObject(Application.getBean(SessionManager.class).getClientListByRoom(r.getRooms_id()).size());
+ target.add(curUsers);
+ }
+ });
+ }
+ });
+ }
+}
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsSelectorPanel.html
(from r1469669,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsSelectorPanel.html?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsSelectorPanel.html&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html&r1=1469669&r2=1470616&rev=1470616&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsSelectorPanel.html
Mon Apr 22 16:51:02 2013
@@ -22,15 +22,6 @@
<wicket:panel>
<div wicket:id="title"></div>
<div wicket:id="desc"></div>
- <table style="border-collapse: collapse;">
- <tr wicket:id="list" style="background-color: rgb(248,
248, 248); border-bottom: 5px solid white;">
- <td>
- <span wicket:id="roomName">[room
name]</span><br/>
- <wicket:ommessage key="398"
/> <span wicket:id="curUsers"></span> / <span
-
wicket:id="totalUsers"></span> <span wicket:id="refresh"
- class="ui-icon
ui-icon-arrowrefresh-1-n" style="display: inline-block"></span></td>
- <td><button><wicket:ommessage
key="131"/></button></td>
- </tr>
- </table>
+ <div wicket:id="rooms"></div>
</wicket:panel>
</html>
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsSelectorPanel.java
(from r1469669,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsSelectorPanel.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsSelectorPanel.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.java&r1=1469669&r2=1470616&rev=1470616&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsSelectorPanel.java
Mon Apr 22 16:51:02 2013
@@ -16,78 +16,47 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.user.rooms;
+package org.apache.openmeetings.web.components.user.room;
import java.util.ArrayList;
-import java.util.List;
import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.session.SessionManager;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.components.MenuPanel.MenuParams;
import org.apache.openmeetings.web.components.UserPanel;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
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.model.IModel;
-import org.apache.wicket.model.Model;
-public class UserRoomsPanel extends UserPanel {
+public class RoomsSelectorPanel extends UserPanel {
private static final long serialVersionUID = -3246259803623925341L;
- public UserRoomsPanel(String id, MenuParams param) {
+ public RoomsSelectorPanel(String id, MenuParams param) {
super(id);
long title, desc;
- List<Room> rooms;
+ RoomDao roomDao = Application.getBean(RoomDao.class);
switch (param) {
case myTabButton:
title = 781L;
desc = 782L;
//rooms =
Application.getBean(RoomDao.class).getPublicRooms();
//FIXME 2 !!!! fake rooms
appointmentLogic.getTodaysAppointmentsForUser(users_id);
- rooms = new ArrayList<Room>();
+ add(new RoomsPanel("rooms", new
ArrayList<Room>()));
break;
case privateTabButton:
title = 779L;
desc = 780L;
- //FIXME getRoomsOrganisationByOrganisationId
- rooms = new ArrayList<Room>();
+ add(new RoomsTabbedPanel("rooms"));
break;
case publicTabButton:
default:
title = 777L;
desc = 778L;
- rooms =
Application.getBean(RoomDao.class).getPublicRooms();
+ add(new RoomsPanel("rooms",
roomDao.getPublicRooms()));
break;
}
add(new Label("title", WebSession.getString(title)));
add(new Label("desc", WebSession.getString(desc)));
- add(new ListView<Room>("list", rooms) {
- private static final long serialVersionUID =
9189085478336224890L;
-
- @Override
- protected void populateItem(ListItem<Room> item) {
- final Room r = item.getModelObject();
- item.add(new Label("roomName", r.getName()));
- final IModel<Integer> curUsersModel = new
Model<Integer>(Application.getBean(SessionManager.class).getClientListByRoom(r.getRooms_id()).size());
- final Label curUsers = new Label("curUsers",
curUsersModel);
- item.add(curUsers.setOutputMarkupId(true));
- item.add(new Label("totalUsers",
r.getNumberOfPartizipants()));
- item.add(new AjaxLink<Void>("refresh") {
- private static final long
serialVersionUID = -3426813755917489787L;
-
- @Override
- public void onClick(AjaxRequestTarget
target) {
-
curUsersModel.setObject(Application.getBean(SessionManager.class).getClientListByRoom(r.getRooms_id()).size());
- target.add(curUsers);
- }
- });
- }
- });
}
}
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsTabbedPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsTabbedPanel.html?rev=1470616&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsTabbedPanel.html
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsTabbedPanel.html
Mon Apr 22 16:51:02 2013
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+ <wicket:panel>
+ <div id="orgTabs">
+ <ul>
+ <li wicket:id="orgTabs"><a
wicket:id="link"><wicket:container wicket:id="name"></wicket:container></a></li>
+ </ul>
+ <wicket:container wicket:id="orgRooms"><div
wicket:id="rooms"></div></wicket:container>
+ </div>
+ </wicket:panel>
+</html>
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsTabbedPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsTabbedPanel.java?rev=1470616&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsTabbedPanel.java
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsTabbedPanel.java
Mon Apr 22 16:51:02 2013
@@ -0,0 +1,69 @@
+/*
+ * 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.components.user.room;
+
+import org.apache.openmeetings.data.conference.dao.RoomDao;
+import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.persistence.beans.domain.Organisation;
+import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
+import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.components.UserPanel;
+import org.apache.wicket.AttributeModifier;
+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.model.Model;
+
+import com.googlecode.wicket.jquery.ui.JQueryBehavior;
+
+public class RoomsTabbedPanel extends UserPanel {
+ private static final long serialVersionUID = 3642004664480074881L;
+
+ public RoomsTabbedPanel(String id) {
+ super(id);
+
+ User u =
Application.getBean(UsersDao.class).get(WebSession.getUserId());
+ add(new ListView<Organisation_Users>("orgTabs",
u.getOrganisation_users()) {
+ private static final long serialVersionUID =
-145637079945252731L;
+
+ @Override
+ protected void
populateItem(ListItem<Organisation_Users> item) {
+ Organisation org =
item.getModelObject().getOrganisation();
+ item.add(new WebMarkupContainer("link")
+ .add(new Label("name",
Model.of(org.getName())))
+ .add(new AttributeModifier("href",
"#org" + org.getOrganisation_id())));
+ }
+ });
+ add(new ListView<Organisation_Users>("orgRooms",
u.getOrganisation_users()) {
+ private static final long serialVersionUID =
9039932126334250798L;
+
+ @Override
+ protected void
populateItem(ListItem<Organisation_Users> item) {
+ Organisation org =
item.getModelObject().getOrganisation();
+ item.add(new RoomsPanel("rooms"
+ ,
Application.getBean(RoomDao.class).getOrganisationRooms(org.getOrganisation_id()))
+ .setMarkupId("org" +
org.getOrganisation_id())).setRenderBodyOnly(true);
+ }
+ });
+ add(new JQueryBehavior("#orgTabs", "tabs"));
+ }
+}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html?rev=1470616&r1=1470615&r2=1470616&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
Mon Apr 22 16:51:02 2013
@@ -29,4 +29,4 @@
<div wicket:id="header"></div>
<wicket:child />
</body>
-</html>
\ No newline at end of file
+</html>
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/NotInitedPage.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/NotInitedPage.html?rev=1470616&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/NotInitedPage.html
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/NotInitedPage.html
Mon Apr 22 16:51:02 2013
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!--
+ 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";>
+ <head>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+ <meta http-equiv='Content-Type' content='text/html;
charset=utf-8' />
+ </head>
+ <body>
+ <!-- FIXME localized versions of this file need to be created
-->
+ <b>OpenMeetings - Loading ...</b><br />
+ The server is not yet completely initialized. Please try again
in a couple of seconds.<br/>
+ If this message persists for several minutes contact your
Sys-Administration.<br/>
+ If that message stays forever you should check the logs located
in
+ <pre>openmeetings_install_dir/log</pre> folder, probably your
database user/pwd/host is wrong!
+ </body>
+</html>
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/NotInitedPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/NotInitedPage.java?rev=1470616&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/NotInitedPage.java
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/NotInitedPage.java
Mon Apr 22 16:51:02 2013
@@ -0,0 +1,18 @@
+package org.apache.openmeetings.web.pages;
+
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.markup.html.WebPage;
+
+public class NotInitedPage extends WebPage {
+ private static final long serialVersionUID = 5002281516467955607L;
+
+ public NotInitedPage() {
+ if (ScopeApplicationAdapter.initComplete) {
+ continueToOriginalDestination();
+ // Ups, no original destination. Go to the home page
+ throw new
RestartResponseException(Application.get().getHomePage());
+ }
+ }
+}
