Author: solomax
Date: Wed Sep 5 14:41:29 2012
New Revision: 1381201
URL: http://svn.apache.org/viewvc?rev=1381201&view=rev
Log:
Versionless URL is added to the main page;
Menu items are now generating unique URLs;
code clenup
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/pages/admin/
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/app/Application.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/MenuPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/pages/auth/SignInPage.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/app/Application.java?rev=1381201&r1=1381200&r2=1381201&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/app/Application.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/app/Application.java
Wed Sep 5 14:41:29 2012
@@ -21,15 +21,16 @@ package org.openmeetings.web.app;
import org.apache.wicket.Page;
import
org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession;
import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
+import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
+import org.apache.wicket.core.request.mapper.HomePageMapper;
import org.apache.wicket.markup.MarkupFactory;
import org.apache.wicket.markup.MarkupParser;
import org.apache.wicket.markup.MarkupResourceStream;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.IRequestMapper;
-import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.mapper.info.PageComponentInfo;
import org.apache.wicket.settings.IPageSettings;
import org.openmeetings.web.pages.MainPage;
import org.openmeetings.web.pages.auth.SignInPage;
@@ -52,26 +53,22 @@ public class Application extends Authent
});
super.init();
mountPage("signin", getSignInPageClass());
- //TODO custom mapper to hack URL
- /*
- getRootRequestMapperAsCompound().add(new IRequestMapper() {
-
- public IRequestHandler mapRequest(Request request) {
- // TODO Auto-generated method stub
- return null;
+
+ getRootRequestMapperAsCompound().add(new
HomePageMapper(getHomePage()) {
+ @Override
+ protected void encodePageComponentInfo(Url url,
PageComponentInfo info) {
+ //Does nothing
}
+ @Override
public Url mapHandler(IRequestHandler requestHandler) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public int getCompatibilityScore(Request request) {
- // TODO Auto-generated method stub
- return 0;
+ if (requestHandler instanceof
ListenerInterfaceRequestHandler) {
+ return null;
+ } else {
+ return super.mapHandler(requestHandler);
+ }
}
});
- */
}
@Override
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/MenuPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/MenuPanel.java?rev=1381201&r1=1381200&r2=1381201&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/MenuPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/MenuPanel.java
Wed Sep 5 14:41:29 2012
@@ -21,6 +21,7 @@ package org.openmeetings.web.components;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.core.util.string.JavaScriptUtils;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
@@ -83,6 +84,7 @@ public class MenuPanel extends BasePanel
}
public void
onClick(AjaxRequestTarget target) {
+ String hash =
"#";
switch(action) {
case
dashboardModuleStartScreen:
break;
@@ -101,7 +103,7 @@ public class MenuPanel extends BasePanel
break;
case
adminModuleUser:
target.add(contents.replace(new UsersPanel("child")));
-
//link = new BookmarkablePageLink<Void>("link", UsersPanel.class);
+
hash = "#admin/users";
break;
case
adminModuleConnections:
break;
@@ -120,6 +122,7 @@ public class MenuPanel extends BasePanel
case
adminModuleServers:
break;
}
+
target.appendJavaScript("window.location.hash = '" +
JavaScriptUtils.escapeQuotes(hash) + "';");
};
});
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/pages/auth/SignInPage.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/pages/auth/SignInPage.java?rev=1381201&r1=1381200&r2=1381201&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/pages/auth/SignInPage.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/pages/auth/SignInPage.java
Wed Sep 5 14:41:29 2012
@@ -85,11 +85,4 @@ public class SignInPage extends BasePage
}
}
}
-/*
- @Override
- protected void configureResponse(WebResponse response) {
- super.configureResponse(response);
- response.setHeader("Cache-Control", "no-cache, max-age=0,
must-revalidate, no-store");
- }
-*/
}
