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/24 17:51:53 UTC
svn commit: r1389445 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/openmeetings/css/ WebContent/openmeetings/css/images/forms/
src/org/apache/openmeetings/web/components/admin/groups/
Author: solomax
Date: Mon Sep 24 15:51:52 2012
New Revision: 1389445
URL: http://svn.apache.org/viewvc?rev=1389445&view=rev
Log:
Wicket: Group admin (not tested)
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/plus_icon_disabled.png (with props)
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/openmeetings-forms.css
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/plus_icon_disabled.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/plus_icon_disabled.png?rev=1389445&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/plus_icon_disabled.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/openmeetings-forms.css
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/openmeetings-forms.css?rev=1389445&r1=1389444&r2=1389445&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/openmeetings-forms.css (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/openmeetings-forms.css Mon Sep 24 15:51:52 2012
@@ -44,6 +44,16 @@ div.formNewButton input {
margin-top: 2px;
}
+div.formNewButton.disabled input {
+ background: url(images/forms/plus_icon_disabled.png) no-repeat;
+ float: left;
+ width: 18px;
+ height: 18px;
+ border: none;
+ margin-left: 2px;
+ margin-top: 2px;
+}
+
div.formRefreshButton input {
background: url(images/forms/arrow_refresh_small.png) no-repeat;
float: left;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java?rev=1389445&r1=1389444&r2=1389445&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java Mon Sep 24 15:51:52 2012
@@ -40,15 +40,17 @@ import org.apache.wicket.model.PropertyM
public class AddUsersForm extends Form<Void> {
private static final long serialVersionUID = -2458265250684437277L;
private String userSearchText;
+ private List<Users> usersInList = new ArrayList<Users>();
private List<Users> usersToAdd = new ArrayList<Users>();
public AddUsersForm(String id) {
super(id);
- IModel<List<Users>> usersModel = new PropertyModel<List<Users>>(AddUsersForm.this, "usersToAdd");
+ IModel<List<Users>> listUsersModel = new PropertyModel<List<Users>>(AddUsersForm.this, "usersInList");
+ IModel<List<Users>> selectedUsersModel = new PropertyModel<List<Users>>(AddUsersForm.this, "usersToAdd");
final ListMultipleChoice<Users> users = new ListMultipleChoice<Users>("users"
- , usersModel
- , usersModel
+ , selectedUsersModel
+ , listUsersModel
, new IChoiceRenderer<Users>() {
private static final long serialVersionUID = 1L;
@@ -67,7 +69,8 @@ public class AddUsersForm extends Form<V
protected void onAfterSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form<?> form) {
usersToAdd.clear();
- usersToAdd.addAll(Application.getBean(UsersDaoImpl.class).get(userSearchText));
+ usersInList.clear();
+ usersInList.addAll(Application.getBean(UsersDaoImpl.class).get(userSearchText));
target.add(users);
}
});
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html?rev=1389445&r1=1389444&r2=1389445&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html Mon Sep 24 15:51:52 2012
@@ -30,6 +30,11 @@
, width: 400
});
};
+
+ function addUsers() {
+ $('#addUsers :text').val('');
+ $('#addUsers').dialog('open');
+ };
</script>
</wicket:head>
<wicket:panel>
@@ -68,7 +73,7 @@
</tr>
<tr>
<td style="font-weight: bold;"><wicket:ommessage key="273" /></td>
- <td style="text-align: right;"><div wicket:id="addUsersBtn" class="formNewButton" onclick="$('#addUsers :text').val(''); $('#addUsers').dialog('open');"><input/></div></td>
+ <td style="text-align: right;"><div wicket:id="addUsersBtn" class="formNewButton disabled"><input/></div></td>
</tr>
<tr>
<td><wicket:ommessage key="177" /></td>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java?rev=1389445&r1=1389444&r2=1389445&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java Mon Sep 24 15:51:52 2012
@@ -39,7 +39,7 @@ public class GroupsPanel extends AdminPa
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
final WebMarkupContainer addUsersBtn = new WebMarkupContainer("addUsersBtn");
final GroupForm form = new GroupForm("form", listContainer, new Organisation());
- add(form.add(addUsersBtn.setEnabled(false).setOutputMarkupId(true)));
+ add(form.add(addUsersBtn.setOutputMarkupId(true)));
DataView<Organisation> dataView = new DataView<Organisation>("groupList", new OmDataProvider<Organisation>(OrganisationDAO.class)) {
private static final long serialVersionUID = 8715559628755439596L;
@@ -54,7 +54,8 @@ public class GroupsPanel extends AdminPa
protected void onEvent(AjaxRequestTarget target) {
form.setModelObject(organisation);
- addUsersBtn.setEnabled(true); //FIXME need to be handled differently
+ addUsersBtn.add(AttributeModifier.replace("class", "formNewButton")
+ , AttributeModifier.replace("onclick", "addUsers();")); //FIXME need to be handle 'New Record'
form.updateView(target);
target.add(form);
}