You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/09/06 15:39:33 UTC

svn commit: r1381596 - in /incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components: MenuPanel.java admin/UsersPanel.html admin/UsersPanel.java admin/user/ admin/user/UserForm.java admin/user/UsersPanel.html admin/user/UsersPanel.java

Author: sebawagner
Date: Thu Sep  6 13:39:33 2012
New Revision: 1381596

URL: http://svn.apache.org/viewvc?rev=1381596&view=rev
Log:
Tiny form components using Wicket

Added:
    incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/
    incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java
    incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html
      - copied, changed from r1381561, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/UsersPanel.html
    incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.java
      - copied, changed from r1381561, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/UsersPanel.java
Removed:
    incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/UsersPanel.html
    incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/UsersPanel.java
Modified:
    incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/MenuPanel.java

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=1381596&r1=1381595&r2=1381596&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 Thu Sep  6 13:39:33 2012
@@ -30,7 +30,7 @@ import org.openmeetings.app.persistence.
 import org.openmeetings.app.persistence.beans.basic.Navimain;
 import org.openmeetings.web.app.Application;
 import org.openmeetings.web.app.WebSession;
-import org.openmeetings.web.components.admin.UsersPanel;
+import org.openmeetings.web.components.admin.user.UsersPanel;
 
 public class MenuPanel extends BasePanel {
 	private static final long serialVersionUID = 6626039612808753514L;

Added: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java?rev=1381596&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java (added)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java Thu Sep  6 13:39:33 2012
@@ -0,0 +1,43 @@
+package org.openmeetings.web.components.admin.user;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.openmeetings.app.persistence.beans.user.Users;
+
+public class UserForm extends Form<Users> {
+
+	public UserForm(String id, Users user) {
+		super(id, new CompoundPropertyModel(user));
+		
+		add(new TextField("login"));
+		
+        //add(new SimpleFormComponentLabel("login-label", fc));
+        
+        // add a button that can be used to submit the form via ajax
+        add(new AjaxButton("ajax-button", this)
+        {
+            @Override
+            protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+            {
+                // repaint the feedback panel so that it is hidden
+                // target.add(feedback);
+            }
+
+            @Override
+            protected void onError(AjaxRequestTarget target, Form<?> form)
+            {
+                // repaint the feedback panel so errors are shown
+                // target.add(feedback);
+            }
+        });
+	}
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+}

Copied: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html (from r1381561, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/UsersPanel.html)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html?p2=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/UsersPanel.html&r1=1381561&r2=1381596&rev=1381596&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/UsersPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html Thu Sep  6 13:39:33 2012
@@ -42,6 +42,13 @@
 				</td>
 				<td>
 					<span wicket:id="selected"></span>
+					<br/>
+					<form wicket:id="form">
+			            <wicket:ommessage key="132" />: <input type="text" wicket:id="login"/>
+			            <br/>
+			            <br/>
+			            <input type="submit" value="submit via ajax" wicket:id="ajax-button"/>
+			        </form>
 				</td>
 			</tr>
 		</table>

Copied: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.java (from r1381561, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/UsersPanel.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/UsersPanel.java&r1=1381561&r2=1381596&rev=1381596&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/UsersPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.java Thu Sep  6 13:39:33 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.web.components.admin;
+package org.openmeetings.web.components.admin.user;
 
 import java.util.Iterator;
 
@@ -33,12 +33,14 @@ import org.apache.wicket.model.PropertyM
 import org.openmeetings.app.data.user.dao.UsersDaoImpl;
 import org.openmeetings.app.persistence.beans.user.Users;
 import org.openmeetings.web.app.Application;
+import org.openmeetings.web.components.admin.AdminPanel;
 
 public class UsersPanel extends AdminPanel {
 	private static final long serialVersionUID = -4463107742579790120L;
 	@SuppressWarnings("unused")
 	private String selectedText = "Click on the table to change the user";
 	private Label selected = null;
+	private UserForm form = null;
 	
 	public UsersPanel(String id) {
 		super(id);
@@ -66,7 +68,7 @@ public class UsersPanel extends AdminPan
 
 			@Override
 			protected void populateItem(Item<Users> item) {
-				Users u = item.getModelObject();
+				final Users u = item.getModelObject();
 				item.add(new Label("userId", "" + u.getUser_id()));
 				item.add(new Label("login", u.getLogin()));
 				final String fName = u.getFirstname();
@@ -77,8 +79,11 @@ public class UsersPanel extends AdminPan
 					private static final long serialVersionUID = -8069413566800571061L;
 
 					protected void onEvent(AjaxRequestTarget target) {
-						selectedText = fName + " " + lName + " selected.";
-						target.add(selected);
+						//selectedText = fName + " " + lName + " selected.";
+						//target.add(selected);
+						//form = new UserForm("form", u);
+						form.setModelObject(u);
+						target.add(form);
 					}
 				});
 			}
@@ -89,5 +94,10 @@ public class UsersPanel extends AdminPan
 		dataView.setItemsPerPage(8); //FIXME need to be parametrized
 		add(dataView);
 		add(new AjaxPagingNavigator("navigator", dataView));
+		
+		Users user = new Users();
+		form = new UserForm("form", user);
+        add(form);
+        form.setOutputMarkupId(true);
 	}
 }