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 2014/02/02 15:19:01 UTC
svn commit: r1563618 - in /openmeetings/trunk/singlewebapp/src:
main/webapp/css/ web/java/org/apache/openmeetings/web/common/
web/java/org/apache/openmeetings/web/pages/
web/java/org/apache/openmeetings/web/room/
web/java/org/apache/openmeetings/web/us...
Author: solomax
Date: Sun Feb 2 14:19:00 2014
New Revision: 1563618
URL: http://svn.apache.org/r1563618
Log:
[OPENMEETINGS-896] initial basic implementation (incomplete)
Added:
openmeetings/trunk/singlewebapp/src/main/webapp/css/room.css
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuFunctionsBehavior.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/menu-functions.js
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/SwfRoomPanel.html
- copied, changed from r1562827, openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.html
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/SwfRoomPanel.java
- copied, changed from r1562827, openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/swf-functions.js
- copied unchanged from r1562827, openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/rooms/swf-functions.js
Removed:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.html
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/rooms/swf-functions.js
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/BasePanel.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/HeaderPanel.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuPanel.html
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/BasePage.html
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/BasePage.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.html
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/SwfPage.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java
Added: openmeetings/trunk/singlewebapp/src/main/webapp/css/room.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/css/room.css?rev=1563618&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/css/room.css (added)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/css/room.css Sun Feb 2 14:19:00 2014
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+.room.container {
+ width: 100%;
+}
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/BasePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/BasePanel.java?rev=1563618&r1=1563617&r2=1563618&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/BasePanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/BasePanel.java Sun Feb 2 14:19:00 2014
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.common;
+import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.panel.Panel;
@@ -29,6 +30,10 @@ public abstract class BasePanel extends
setOutputMarkupId(true);
}
+ protected MainPage getMainPage() {
+ return (MainPage)super.getPage();
+ }
+
/**
* Overwrite this method to execute Java code after Panel is loaded by the
* {@link MenuPanel}
@@ -36,6 +41,8 @@ public abstract class BasePanel extends
* @param target
*/
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ target.add(getMainPage().getHeader().setVisible(true), getMainPage().getMenu().setVisible(true)
+ , getMainPage().getTopLinks().setVisible(true));
}
/**
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/HeaderPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/HeaderPanel.java?rev=1563618&r1=1563617&r2=1563618&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/HeaderPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/HeaderPanel.java Sun Feb 2 14:19:00 2014
@@ -25,6 +25,7 @@ public class HeaderPanel extends BasePan
public HeaderPanel(String id, String appName) {
super(id);
+ setOutputMarkupPlaceholderTag(true);
add(new Label("appName", appName));
}
}
Added: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuFunctionsBehavior.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuFunctionsBehavior.java?rev=1563618&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuFunctionsBehavior.java (added)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuFunctionsBehavior.java Sun Feb 2 14:19:00 2014
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+/**
+ * @author Sebastien Briquet
+ */
+package org.apache.openmeetings.web.common;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
+
+public class MenuFunctionsBehavior extends Behavior {
+ private static final long serialVersionUID = 1L;
+ private final static JavaScriptResourceReference MENU_FUNCTIONS = new JavaScriptResourceReference(MenuFunctionsBehavior.class, "menu-functions.js");
+ private final String menuContainerId;
+ private final String menuId;
+
+ public MenuFunctionsBehavior(String menuContainerId, String menuId) {
+ this.menuContainerId = menuContainerId;
+ this.menuId = menuId;
+ }
+
+ @Override
+ public void renderHead(Component component, IHeaderResponse response) {
+ super.renderHead(component, response);
+ response.render(JavaScriptHeaderItem.forReference(MENU_FUNCTIONS));
+ response.render(OnDomReadyHeaderItem.forScript(String.format("initMenu('%s', '%s');", menuContainerId, menuId)));
+ }
+}
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuPanel.html?rev=1563618&r1=1563617&r2=1563618&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuPanel.html Sun Feb 2 14:19:00 2014
@@ -19,36 +19,19 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
- <wicket:head>
- <link media="screen" type="text/css" rel="stylesheet" href="css/jquery.ui.menubar.css"/>
- </wicket:head>
- <wicket:panel>
- <script type="text/javascript" src="js/jquery.ui.menubar.js"></script>
- <script type="text/javascript">
- $(function() {
- $("#jMenu").menubar({
- autoExpand: true
- , menuIcon: true
- , buttons: true
- , position: {
- within: $("#menu").add(window).first()
- }
- //, select: select
- });
- });
- </script>
- <ul id="jMenu">
- <li wicket:id="mainItem">
- <a class="fNiv" href="#" onclick="return false;"><span wicket:id="label"></span></a>
- <ul wicket:enclosure="childItem">
- <li wicket:id="childItem">
- <a wicket:id="link" href="#">
- <span class="menuName" wicket:id="name"></span><br />
- <span class="menuDesc" wicket:id="description"></span>
- </a>
- </li>
- </ul>
- </li>
- </ul>
- </wicket:panel>
+<wicket:panel>
+ <ul wicket:id="menuContainer">
+ <li wicket:id="mainItem">
+ <a href="#" onclick="return false;"><span wicket:id="label"></span></a>
+ <ul wicket:enclosure="childItem">
+ <li wicket:id="childItem">
+ <a wicket:id="link" href="#">
+ <span class="menuName" wicket:id="name"></span><br />
+ <span class="menuDesc" wicket:id="description"></span>
+ </a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+</wicket:panel>
</html>
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java?rev=1563618&r1=1563617&r2=1563618&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java Sun Feb 2 14:19:00 2014
@@ -23,12 +23,12 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.basic.Navimain;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.pages.MainPage;
import org.apache.openmeetings.web.util.OmUrlFragment;
import org.apache.openmeetings.web.util.OmUrlFragment.MenuActions;
import org.apache.openmeetings.web.util.OmUrlFragment.MenuParams;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+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;
@@ -40,14 +40,17 @@ import org.apache.wicket.markup.html.lis
*
*/
public class MenuPanel extends BasePanel {
- private static final long serialVersionUID = 6626039612808753514L;
+ private static final long serialVersionUID = 1L;
+ private WebMarkupContainer menuContainer = new WebMarkupContainer("menuContainer");
public MenuPanel(String id) {
super(id);
+ setOutputMarkupPlaceholderTag(true);
setMarkupId(id);
+ add(menuContainer.setOutputMarkupId(true));
final NavigationDao man = Application.getBean(NavigationDao.class);
- add(new ListView<Naviglobal>("mainItem", man.getMainMenu(WebSession.getUserLevel(), WebSession.getUserId(), WebSession.getLanguage())) {
+ menuContainer.add(new ListView<Naviglobal>("mainItem", man.getMainMenu(WebSession.getUserLevel(), WebSession.getUserId(), WebSession.getLanguage())) {
private static final long serialVersionUID = 2173926553418745231L;
@Override
@@ -73,12 +76,13 @@ public class MenuPanel extends BasePanel
}
public void onClick(AjaxRequestTarget target) {
- ((MainPage)getPage()).updateContents(new OmUrlFragment(action, params), target);
+ getMainPage().updateContents(new OmUrlFragment(action, params), target);
}
});
}
}.setReuseItems(true));
}
}.setReuseItems(true));
+ add(new MenuFunctionsBehavior(menuContainer.getMarkupId(), id));
}
}
Added: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/menu-functions.js
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/menu-functions.js?rev=1563618&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/menu-functions.js (added)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/menu-functions.js Sun Feb 2 14:19:00 2014
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+function initMenu(menuContainerId, menuId) {
+ $("#" + menuContainerId).menubar({
+ autoExpand: true
+ , menuIcon: true
+ , buttons: true
+ , position: {
+ within: $("#" + menuId).add(window).first()
+ }
+ //, select: select
+ });
+}
\ No newline at end of file
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/BasePage.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/BasePage.html?rev=1563618&r1=1563617&r2=1563618&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/BasePage.html (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/BasePage.html Sun Feb 2 14:19:00 2014
@@ -28,6 +28,7 @@
<link media="screen" type="text/css" rel="stylesheet" href="css/forms.css"/>
<link media="screen" type="text/css" rel="stylesheet" href="css/calendar.css"/>
<link media="screen" type="text/css" rel="stylesheet" href="css/admin.css"/>
+ <link media="screen" type="text/css" rel="stylesheet" href="css/room.css"/>
</head>
<body>
<div wicket:id="header"></div>
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/BasePage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/BasePage.java?rev=1563618&r1=1563617&r2=1563618&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/BasePage.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/BasePage.java Sun Feb 2 14:19:00 2014
@@ -39,6 +39,7 @@ import org.wicketstuff.urlfragment.Async
public abstract class BasePage extends AsyncUrlFragmentAwarePage {
private static final long serialVersionUID = -6237917782433412496L;
private final Map<String, String> options;
+ private final HeaderPanel header;
protected abstract FieldLanguage getLanguage();
protected abstract String getApplicationName();
@@ -56,7 +57,7 @@ public abstract class BasePage extends A
.add(new AttributeModifier("lang", code))
.add(new AttributeModifier("dir", Boolean.TRUE.equals(lang.getRtl()) ? "rtl" : "ltr")));
add(new Label("pageTitle", appName));
- add(new HeaderPanel("header", appName));
+ add(header = new HeaderPanel("header", appName));
}
protected OmUrlFragment getUrlFragment(IRequestParameters params) {
@@ -69,6 +70,10 @@ public abstract class BasePage extends A
return null;
}
+ public HeaderPanel getHeader() {
+ return header;
+ }
+
@Override
protected Map<String, String> getOptions() {
return options;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.html?rev=1563618&r1=1563617&r2=1563618&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.html (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.html Sun Feb 2 14:19:00 2014
@@ -19,39 +19,41 @@
-->
<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>
- <script type="text/javascript">
- $(function() {
- Wicket.Event.subscribe('/ajax/call/failure', hideBusyIndicator);
- Wicket.Event.subscribe('/ajax/call/before', showBusyIndicator);
- Wicket.Event.subscribe('/ajax/call/success', hideBusyIndicator);
- Wicket.Event.subscribe('/ajax/call/complete', hideBusyIndicator);
- });
- </script>
- <div id="topControls">
- <div id="topLinks"><span
- id="contactsAndMessages"><a wicket:id="messages"><wicket:ommessage key="1188"/></a></span><span
- id="profile"><a wicket:id="profile"><wicket:ommessage key="5"/></a></span><span
- id="logout"><a wicket:id="logout"><wicket:ommessage key="310"/></a></span><span
- id="reportBug"><a target="_blank" wicket:id="bug"><wicket:ommessage key="284"/></a></span><span><a
- wicket:id="about"><wicket:ommessage key="1549"/></a></span>
- </div>
- <div wicket:id="dev" id="devMenu"/>
- <div id="busy_indicator"><wicket:ommessage key="1554"/></div>
- <div wicket:id="menu"></div>
+<wicket:head>
+ <link media="screen" type="text/css" rel="stylesheet" href="css/jquery.ui.menubar.css"/>
+ <script type="text/javascript" src="js/jquery.ui.menubar.js"></script>
+ <script type="text/javascript">
+ function showBusyIndicator() {
+ $('#busy_indicator').show();
+ }
+ function hideBusyIndicator() {
+ $('#busy_indicator').hide();
+ }
+ </script>
+</wicket:head>
+<wicket:extend>
+ <script type="text/javascript">
+ $(function() {
+ Wicket.Event.subscribe('/ajax/call/failure', hideBusyIndicator);
+ Wicket.Event.subscribe('/ajax/call/before', showBusyIndicator);
+ Wicket.Event.subscribe('/ajax/call/success', hideBusyIndicator);
+ Wicket.Event.subscribe('/ajax/call/complete', hideBusyIndicator);
+ });
+ </script>
+ <div id="topControls">
+ <div wicket:id="topLinks"><span
+ id="contactsAndMessages"><a wicket:id="messages"><wicket:ommessage key="1188"/></a></span><span
+ id="profile"><a wicket:id="profile"><wicket:ommessage key="5"/></a></span><span
+ id="logout"><a wicket:id="logout"><wicket:ommessage key="310"/></a></span><span
+ id="reportBug"><a target="_blank" wicket:id="bug"><wicket:ommessage key="284"/></a></span><span><a
+ wicket:id="about"><wicket:ommessage key="1549"/></a></span>
</div>
- <div wicket:id="contents"><div wicket:id="child"></div></div>
- <div wicket:id="chatPanel"></div>
- <div wicket:id="aboutDialog"></div>
- </wicket:extend>
+ <div wicket:id="dev" id="devMenu"/>
+ <div id="busy_indicator"><wicket:ommessage key="1554"/></div>
+ <div wicket:id="menu"></div>
+ </div>
+ <div wicket:id="contents"><div wicket:id="child"></div></div>
+ <div wicket:id="chatPanel"></div>
+ <div wicket:id="aboutDialog"></div>
+</wicket:extend>
</html>
\ No newline at end of file
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1563618&r1=1563617&r2=1563618&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.java Sun Feb 2 14:19:00 2014
@@ -61,18 +61,19 @@ import org.wicketstuff.urlfragment.UrlFr
public class MainPage extends BaseInitedPage {
private static final long serialVersionUID = 6421960759218157999L;
private static final Logger log = Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey);
- private final MenuPanel menu;
+ private final MenuPanel menu = new MenuPanel("menu");
+ private final WebMarkupContainer topLinks = new WebMarkupContainer("topLinks");
private final MarkupContainer contents;
private final AbstractAjaxTimerBehavior areaBehavior;
private DebugBar dev = null;
public MainPage(PageParameters pp) {
super();
+ getHeader().setVisible(false);
contents = new WebMarkupContainer("contents");
add(contents.add(new WebMarkupContainer(CHILD_ID)).setOutputMarkupId(true).setMarkupId("contents"));
- menu = new MenuPanel("menu");
- add(menu);
- add(new AjaxLink<Void>("messages") {
+ add(menu.setVisible(false), topLinks.setVisible(false).setOutputMarkupPlaceholderTag(true).setMarkupId("topLinks"));
+ topLinks.add(new AjaxLink<Void>("messages") {
private static final long serialVersionUID = 4065339709905366840L;
@Override
@@ -80,7 +81,7 @@ public class MainPage extends BaseInited
updateContents(PROFILE_MESSAGES, target);
}
});
- add(new ConfirmableAjaxLink("logout", 634L) {
+ topLinks.add(new ConfirmableAjaxLink("logout", 634L) {
private static final long serialVersionUID = -2994610981053570537L;
@Override
@@ -89,7 +90,7 @@ public class MainPage extends BaseInited
setResponsePage(Application.get().getSignInPageClass());
}
});
- add(new AjaxLink<Void>("profile") {
+ topLinks.add(new AjaxLink<Void>("profile") {
private static final long serialVersionUID = 4065339709905366840L;
@Override
@@ -98,7 +99,7 @@ public class MainPage extends BaseInited
}
});
final AboutDialog about = new AboutDialog("aboutDialog");
- add(new AjaxLink<Void>("about") {
+ topLinks.add(new AjaxLink<Void>("about") {
private static final long serialVersionUID = 4065339709905366840L;
@Override
@@ -113,7 +114,7 @@ public class MainPage extends BaseInited
} else {
add(new EmptyPanel("dev").setVisible(false));
}
- add(new ExternalLink("bug", "https://issues.apache.org/jira/browse/OPENMEETINGS"));//FIXME hardcoded
+ topLinks.add(new ExternalLink("bug", "https://issues.apache.org/jira/browse/OPENMEETINGS"));//FIXME hardcoded
add(new ChatPanel("chatPanel"));
add(new WebSocketBehavior() {
@@ -174,4 +175,12 @@ public class MainPage extends BaseInited
updateContents(uf, target);
}
}
+
+ public MenuPanel getMenu() {
+ return menu;
+ }
+
+ public WebMarkupContainer getTopLinks() {
+ return topLinks;
+ }
}
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/SwfPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/SwfPage.java?rev=1563618&r1=1563617&r2=1563618&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/SwfPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/SwfPage.java Sun Feb 2 14:19:00 2014
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.page
import static org.apache.openmeetings.web.app.Application.getBean;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.openmeetings.web.user.rooms.RoomPanel;
+import org.apache.openmeetings.web.room.SwfRoomPanel;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -34,7 +34,7 @@ public class SwfPage extends BaseNotInit
public SwfPage(PageParameters pp) {
add(new Label("titleAppName", getBean(ConfigurationDao.class).getAppName()));
- add(new RoomPanel("room", pp));
+ add(new SwfRoomPanel("room", pp));
}
}
Added: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1563618&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/RoomPanel.html (added)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/RoomPanel.html Sun Feb 2 14:19:00 2014
@@ -0,0 +1,40 @@
+<?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 class="room container">
+ <ul wicket:id="menuContainer">
+ <li wicket:id="mainItem">
+ <a class="fNiv" href="#" onclick="return false;"><span wicket:id="label"></span></a>
+ <ul wicket:enclosure="childItem">
+ <li wicket:id="childItem">
+ <a wicket:id="link" href="#">
+ <span class="menuName" wicket:id="name"></span><br />
+ <span class="menuDesc" wicket:id="description"></span>
+ </a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ AA
+ </div>
+</wicket:panel>
+</html>
Added: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1563618&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/RoomPanel.java (added)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/RoomPanel.java Sun Feb 2 14:19:00 2014
@@ -0,0 +1,24 @@
+package org.apache.openmeetings.web.room;
+
+import org.apache.openmeetings.web.common.BasePanel;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+public class RoomPanel extends BasePanel {
+ private static final long serialVersionUID = 1L;
+
+ public RoomPanel(String id, long roomId) {
+ super(id);
+ }
+
+ @Override
+ public void onMenuPanelLoad(AjaxRequestTarget target) {
+ target.add(getMainPage().getHeader().setVisible(false), getMainPage().getMenu().setVisible(false)
+ , getMainPage().getTopLinks().setVisible(false));
+ }
+
+ @Override
+ public void cleanup(AjaxRequestTarget target) {
+ target.add(getMainPage().getHeader().setVisible(true), getMainPage().getMenu().setVisible(true)
+ , getMainPage().getTopLinks().setVisible(true));
+ }
+}
Copied: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/SwfRoomPanel.html (from r1562827, openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.html)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/SwfRoomPanel.html?p2=openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/SwfRoomPanel.html&p1=openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.html&r1=1562827&r2=1563618&rev=1563618&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/SwfRoomPanel.html Sun Feb 2 14:19:00 2014
@@ -27,4 +27,4 @@
<noscript>Please enable JavaScript in order to use this application.</noscript>
<script type="text/javascript" wicket:id="init"></script>
</wicket:panel>
-</html>
\ No newline at end of file
+</html>
Copied: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/SwfRoomPanel.java (from r1562827, openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/SwfRoomPanel.java?p2=openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/SwfRoomPanel.java&p1=openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.java&r1=1562827&r2=1563618&rev=1563618&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/room/SwfRoomPanel.java Sun Feb 2 14:19:00 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.user.rooms;
+package org.apache.openmeetings.web.room;
import org.apache.openmeetings.web.common.BasePanel;
@@ -32,10 +32,10 @@ import org.apache.wicket.request.resourc
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.StringValue;
-public class RoomPanel extends BasePanel {
+public class SwfRoomPanel extends BasePanel {
private static final long serialVersionUID = 2308988314987829510L;
- public RoomPanel(String id) {
+ public SwfRoomPanel(String id) {
this(id, new PageParameters());
}
@@ -44,7 +44,7 @@ public class RoomPanel extends BasePanel
? "maindebug.as3.swf11.swf" : "main.as3.swf11.swf";
}
- public RoomPanel(String id, PageParameters pp) {
+ public SwfRoomPanel(String id, PageParameters pp) {
super(id);
StringValue swfVal = pp.get("swf");
@@ -54,7 +54,7 @@ public class RoomPanel extends BasePanel
}
private ResourceReference newResourceReference() {
- return new JavaScriptResourceReference(RoomPanel.class, "swf-functions.js");
+ return new JavaScriptResourceReference(SwfRoomPanel.class, "swf-functions.js");
}
@Override
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java?rev=1563618&r1=1563617&r2=1563618&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java Sun Feb 2 14:19:00 2014
@@ -35,7 +35,7 @@ import org.apache.wicket.resource.TextTe
import org.apache.wicket.util.collections.MicroMap;
public class CalendarFunctionsBehavior extends Behavior {
- private static final long serialVersionUID = 5455085536095081262L;
+ private static final long serialVersionUID = 1L;
private final String markupId;
public CalendarFunctionsBehavior(String markupId) {