Author: solomax
Date: Mon Jan 20 08:17:34 2014
New Revision: 1559643
URL: http://svn.apache.org/r1559643
Log:
[OPENMEETINGS-873] User info dialog is displayed as expected
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.html
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1559643&r1=1559642&r2=1559643&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
Mon Jan 20 08:17:34 2014
@@ -111,7 +111,7 @@ public class MessageDialog extends Abstr
super.onOpen(target);
}
- public MessageDialog(String id, CompoundPropertyModel<PrivateMessage>
model ) {
+ public MessageDialog(String id, CompoundPropertyModel<PrivateMessage>
model) {
super(id, WebSession.getString(1209), model);
form = new Form<PrivateMessage>("form", getModel());
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.html?rev=1559643&r1=1559642&r2=1559643&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.html
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.html
Mon Jan 20 08:17:34 2014
@@ -20,8 +20,8 @@
-->
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <wicket:container wicket:id="container">
- <wicket:container wicket:id="body"></wicket:container>
- </wicket:container>
+ <div wicket:id="container">
+ <div wicket:id="body"></div>
+ </div>
</wicket:panel>
</html>
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java?rev=1559643&r1=1559642&r2=1559643&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
Mon Jan 20 08:17:34 2014
@@ -35,7 +35,7 @@ import com.googlecode.wicket.jquery.ui.w
public class UserInfoDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 6393565468567393270L;
- private WebMarkupContainer container;
+ private WebMarkupContainer container = new
WebMarkupContainer("container");
private DialogButton cancel = new
DialogButton(WebSession.getString(61));
private String messageLbl = WebSession.getString(1253);
private DialogButton message = new DialogButton(messageLbl);
@@ -46,10 +46,7 @@ public class UserInfoDialog extends Abst
public UserInfoDialog(String id, MessageDialog newMessage) {
super(id, WebSession.getString(1235));
- setOutputMarkupId(true);
-
- add(container = new WebMarkupContainer("container"));
- container.add(new
WebMarkupContainer("body")).setOutputMarkupId(true);
+ add(container.add(new
WebMarkupContainer("body")).setOutputMarkupId(true));
this.newMessage = newMessage;
}
