Author: solomax
Date: Fri Oct 12 13:52:57 2012
New Revision: 1397566
URL: http://svn.apache.org/viewvc?rev=1397566&view=rev
Log:
Wicket: stabs for room panels are added
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_2e83ff_256x240.png
(with props)
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_2e83ff_256x240.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_2e83ff_256x240.png?rev=1397566&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_2e83ff_256x240.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java?rev=1397566&r1=1397565&r2=1397566&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
Fri Oct 12 13:52:57 2012
@@ -31,6 +31,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.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@ -66,6 +67,12 @@ public class MenuPanel extends BasePanel
, adminModuleServers
}
+ public enum MenuParams {
+ publicTabButton
+ , privateTabButton
+ , myTabButton
+ }
+
public MenuPanel(String id, final MarkupContainer contents) {
super(id);
setMarkupId(id);
@@ -88,7 +95,8 @@ public class MenuPanel extends BasePanel
final String name =
m.getLabel().getValue();
final String desc =
m.getTooltip().getValue();
final MenuActions action =
MenuActions.valueOf(m.getAction());
- final String hash =
getHash(action);
+ final MenuParams params =
m.getParams() != null ? MenuParams.valueOf(m.getParams()) :
MenuParams.publicTabButton;
+ final String hash =
getHash(action, params);
item.add(new
AjaxLink<Void>("link") {
private static final
long serialVersionUID = 5632618935550133709L;
{
@@ -106,7 +114,7 @@ public class MenuPanel extends BasePanel
case
recordModule:
break;
case
conferenceModuleRoomList:
-
//requires params
+
target.add(contents.replace(new UserRoomsPanel("child", params)));
break;
case
eventModuleRoomList:
break;
@@ -165,7 +173,7 @@ public class MenuPanel extends BasePanel
});
}
- private String getHash(MenuActions action) {
+ private String getHash(MenuActions action, MenuParams params) {
String hash = "#";
switch(action) {
case dashboardModuleStartScreen:
@@ -176,7 +184,19 @@ public class MenuPanel extends BasePanel
case recordModule:
break;
case conferenceModuleRoomList:
- //requires params
+ String zone = "public";
+ switch (params) {
+ case myTabButton:
+ zone = "my";
+ break;
+ case privateTabButton:
+ zone = "group";
+ break;
+ case publicTabButton:
+ default:
+ break;
+ }
+ hash = "#rooms/" + zone;
break;
case eventModuleRoomList:
break;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java?rev=1397566&r1=1397565&r2=1397566&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
Fri Oct 12 13:52:57 2012
@@ -51,7 +51,6 @@ public class CalendarPanel extends UserP
public CalendarPanel(String id) {
super(id);
- setOutputMarkupId(true);
WebMarkupContainer calendar = new
WebMarkupContainer("calendar");
calendar.setOutputMarkupId(true);
calendar.setMarkupId("calendar");
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html?rev=1397566&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html
Fri Oct 12 13:52:57 2012
@@ -0,0 +1,28 @@
+<?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="http://www.w3.org/1999/xhtml";
+
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
+ <wicket:head>
+ </wicket:head>
+ <wicket:panel>
+ <div wicket:id="title"></div>
+ </wicket:panel>
+</html>
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.java?rev=1397566&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.java
Fri Oct 12 13:52:57 2012
@@ -0,0 +1,46 @@
+/*
+ * 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.rooms;
+
+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.markup.html.basic.Label;
+
+public class UserRoomsPanel extends UserPanel {
+ private static final long serialVersionUID = -3246259803623925341L;
+
+ public UserRoomsPanel(String id, MenuParams param) {
+ super(id);
+
+ long title = 777L;
+ switch (param) {
+ case myTabButton:
+ title = 781L;
+ break;
+ case privateTabButton:
+ title = 779L;
+ break;
+ case publicTabButton:
+ default:
+ break;
+ }
+ add(new Label("title", WebSession.getString(title)));
+ }
+}
