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 2012/09/14 15:28:57 UTC
svn commit: r1384761 - in
/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web:
components/MenuPanel.java pages/MainPage.java pages/auth/SignInPage.html
pages/auth/SignInPage.java
Author: solomax
Date: Fri Sep 14 13:28:56 2012
New Revision: 1384761
URL: http://svn.apache.org/viewvc?rev=1384761&view=rev
Log:
Wicket: area bookmarking is partially implemented
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
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=1384761&r1=1384760&r2=1384761&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 Sep 14 13:28:56 2012
@@ -38,6 +38,7 @@ import org.apache.wicket.core.util.strin
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.request.mapper.parameter.PageParameters;
public class MenuPanel extends BasePanel {
private static final long serialVersionUID = 6626039612808753514L;
@@ -61,7 +62,7 @@ public class MenuPanel extends BasePanel
, adminModuleServers
}
- public MenuPanel(String id, final MarkupContainer contents) {
+ public MenuPanel(String id, final MarkupContainer contents, PageParameters pp) {
super(id);
setMarkupId(id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java?rev=1384761&r1=1384760&r2=1384761&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java Fri Sep 14 13:28:56 2012
@@ -27,6 +27,7 @@ import org.apache.wicket.MarkupContainer
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
@AuthorizeInstantiation("USER")
public class MainPage extends BasePage {
@@ -34,10 +35,14 @@ public class MainPage extends BasePage {
private final MenuPanel menu;
public MainPage() {
+ this(new PageParameters());
+ }
+
+ public MainPage(PageParameters pp) {
MarkupContainer contents = new WebMarkupContainer("contents");
contents.add(new WebMarkupContainer("child")).setOutputMarkupId(true);
add(contents);
- menu = new MenuPanel("menu", contents);
+ menu = new MenuPanel("menu", contents, pp);
add(menu);
add(new ConfirmableAjaxLink("logout", WebSession.getString(634L)) {
private static final long serialVersionUID = -2994610981053570537L;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html?rev=1384761&r1=1384760&r2=1384761&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html Fri Sep 14 13:28:56 2012
@@ -41,6 +41,7 @@
$(".ui-dialog-titlebar-close").hide();
}
});
+ $('#area').val(location.hash);
});
</script>
</wicket:head>
@@ -61,6 +62,7 @@
</tr>
</table>
<span wicket:id="feedback"></span>
+ <input wicket:id="area" type="hidden" value="" />
</form>
</div>
</wicket:extend>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1384761&r1=1384760&r2=1384761&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java Fri Sep 14 13:28:56 2012
@@ -22,11 +22,12 @@ import org.apache.openmeetings.web.app.A
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.pages.BasePage;
import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.markup.html.form.HiddenField;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.StatelessForm;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
public class SignInPage extends BasePage {
@@ -47,45 +48,21 @@ public class SignInPage extends BasePage
private static final long serialVersionUID = 4079939497154278822L;
private String password;
private String login;
+ private String area = "";
public SignInForm(String id) {
super(id);
add(new FeedbackPanel("feedback"));
- add(new RequiredTextField<String>("login", new Model<String>(){
- private static final long serialVersionUID = -1335578251793516071L;
-
- @Override
- public String getObject() {
- return SignInForm.this.login;
- }
-
- @Override
- public void setObject(String object) {
- SignInForm.this.login = object;
- }
- }));
- add(new PasswordTextField("pass", new Model<String>(){
- private static final long serialVersionUID = 4751494320421393717L;
-
- @Override
- public String getObject() {
- return SignInForm.this.password;
- }
-
- @Override
- public void setObject(String object) {
- SignInForm.this.password = object;
- }
- }).setResetPassword(true));
+ add(new RequiredTextField<String>("login", new PropertyModel<String>(this, "login")));
+ add(new PasswordTextField("pass", new PropertyModel<String>(this, "password")).setResetPassword(true));
+ add(new HiddenField<String>("area", new PropertyModel<String>(this, "area")));
}
@Override
protected void onSubmit() {
if (WebSession.get().signIn(login, password)) {
- continueToOriginalDestination();
- // if we reach this line there was no intercept page, so go to home page
- setResponsePage(Application.get().getHomePage());
+ setResponsePage(Application.get().getHomePage(), new PageParameters().add("area", area));
}
}
}