Author: sebawagner
Date: Wed Sep 12 17:58:46 2012
New Revision: 1384061
URL: http://svn.apache.org/viewvc?rev=1384061&view=rev
Log:
OPENMEETINGS-428, OPENMEETINGS-433, OPENMEETINGS-434 list view for groups,
configurations, ldaps, servers, some minor modifications on users and rooms
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupForm.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
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Configurationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Configurationmanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Configurationmanagement.java?rev=1384061&r1=1384060&r2=1384061&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Configurationmanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Configurationmanagement.java
Wed Sep 12 17:58:46 2012
@@ -218,7 +218,7 @@ public class Configurationmanagement {
*
* @return
*/
- private Long selectMaxFromConfigurations() {
+ public Long selectMaxFromConfigurations() {
try {
log.debug("selectMaxFromConfigurations ");
// get all users
@@ -364,4 +364,11 @@ public class Configurationmanagement {
}
return appName;
}
+
+ public List<Configuration> getNondeletedConfiguration(int first, int
count) {
+ TypedQuery<Configuration> q =
em.createNamedQuery("getNondeletedConfiguration", Configuration.class);
+ q.setFirstResult(first);
+ q.setMaxResults(count);
+ return q.getResultList();
+ }
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java?rev=1384061&r1=1384060&r2=1384061&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
Wed Sep 12 17:58:46 2012
@@ -257,6 +257,14 @@ public class LdapConfigDaoImpl {
log.error("[getActiveLdapConfigs] ",ex2);
}
return null;
- }
+ }
+
+
+ public List<LdapConfig> getNondeletedLdapConfig(int first, int count) {
+ TypedQuery<LdapConfig> q =
em.createNamedQuery("getNondeletedLdapConfigs", LdapConfig.class);
+ q.setFirstResult(first);
+ q.setMaxResults(count);
+ return q.getResultList();
+ }
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java?rev=1384061&r1=1384060&r2=1384061&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java
Wed Sep 12 17:58:46 2012
@@ -203,7 +203,7 @@ public class Organisationmanagement {
*
* @return
*/
- private Long selectMaxFromOrganisations() {
+ public Long selectMaxFromOrganisations() {
try {
// get all users
TypedQuery<Long> query = em
@@ -824,4 +824,11 @@ public class Organisationmanagement {
return null;
}
+ public List<Organisation> getNondeletedOrganisation(int first, int
count) {
+ TypedQuery<Organisation> q =
em.createNamedQuery("getNondeletedOrganisations", Organisation.class);
+ q.setFirstResult(first);
+ q.setMaxResults(count);
+ return q.getResultList();
+ }
+
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java?rev=1384061&r1=1384060&r2=1384061&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
Wed Sep 12 17:58:46 2012
@@ -21,11 +21,6 @@ package org.apache.openmeetings.persiste
import java.io.Serializable;
import java.util.Date;
-import org.apache.openmeetings.persistence.beans.user.Users;
-import org.simpleframework.xml.Element;
-import org.simpleframework.xml.Root;
-
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -37,10 +32,15 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Transient;
+import org.apache.openmeetings.persistence.beans.user.Users;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+
@Entity
@NamedQueries({
@NamedQuery(name = "getConfigurationByKey", query = "SELECT c FROM
Configuration c WHERE c.conf_key = :conf_key and c.deleted = false")
, @NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c FROM
Configuration c WHERE c.conf_key IN :conf_keys and c.deleted = false")
+ , @NamedQuery(name="getNondeletedConfiguration", query="SELECT u FROM
Configuration u WHERE u.deleted = false")
})
@Table(name = "configuration")
@Root(name="config")
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java?rev=1384061&r1=1384060&r2=1384061&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
Wed Sep 12 17:58:46 2012
@@ -21,11 +21,6 @@ package org.apache.openmeetings.persiste
import java.io.Serializable;
import java.util.Date;
-import org.apache.openmeetings.persistence.beans.user.Users;
-import org.simpleframework.xml.Element;
-import org.simpleframework.xml.Root;
-
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -34,9 +29,18 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openmeetings.persistence.beans.user.Users;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+
@Entity
+@NamedQueries({
+ @NamedQuery(name="getNondeletedLdapConfigs", query="SELECT u FROM
LdapConfig u WHERE u.deleted = false")
+})
@Table(name = "ldapconfig")
@Root(name="ldapconfig")
public class LdapConfig implements Serializable {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java?rev=1384061&r1=1384060&r2=1384061&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java
Wed Sep 12 17:58:46 2012
@@ -21,7 +21,6 @@ package org.apache.openmeetings.persiste
import java.io.Serializable;
import java.util.Date;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -42,6 +41,7 @@ import org.simpleframework.xml.Root;
query="SELECT c FROM Organisation AS c WHERE c.organisation_id
= :organisation_id")
, @NamedQuery(name="getOrganisationsByUserId",
query="SELECT ou.organisation FROM Users u,
IN(u.organisation_users) ou WHERE u.deleted = false AND u.user_id = :user_id")
+ , @NamedQuery(name="getNondeletedOrganisations", query="SELECT u FROM
Organisation u WHERE u.deleted = false")
})
@Table(name = "organisation")
@Root(name="organisation")
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=1384061&r1=1384060&r2=1384061&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
Wed Sep 12 17:58:46 2012
@@ -23,7 +23,11 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.basic.Navimain;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
+import
org.apache.openmeetings.web.components.admin.configurations.ConfigsPanel;
+import org.apache.openmeetings.web.components.admin.groups.GroupsPanel;
+import org.apache.openmeetings.web.components.admin.ldaps.LdapsPanel;
import org.apache.openmeetings.web.components.admin.rooms.RoomsPanel;
+import org.apache.openmeetings.web.components.admin.servers.ServersPanel;
import org.apache.openmeetings.web.components.admin.user.UsersPanel;
import org.apache.openmeetings.web.components.lang.LangPanel;
import org.apache.wicket.MarkupContainer;
@@ -110,22 +114,30 @@ public class MenuPanel extends BasePanel
case
adminModuleConnections:
break;
case
adminModuleOrg:
+
target.add(contents.replace(new GroupsPanel("child")));
+
hash = "#admin/groups";
break;
case
adminModuleRoom:
target.add(contents.replace(new RoomsPanel("child")));
hash = "#admin/rooms";
break;
case
adminModuleConfiguration:
+
target.add(contents.replace(new ConfigsPanel("child")));
+
hash = "#admin/configs";
break;
case
adminModuleLanguages:
target.add(contents.replace(new LangPanel("child")));
hash = "#admin/lang";
break;
case
adminModuleLDAP:
+
target.add(contents.replace(new LdapsPanel("child")));
+
hash = "#admin/ldaps";
break;
case
adminModuleBackup:
break;
case
adminModuleServers:
+
target.add(contents.replace(new ServersPanel("child")));
+
hash = "#admin/ldaps";
break;
}
target.appendJavaScript("window.location.hash = '" +
JavaScriptUtils.escapeQuotes(hash) + "';");
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java?rev=1384061&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java
Wed Sep 12 17:58:46 2012
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.components.admin.configurations;
+
+import org.apache.openmeetings.persistence.beans.basic.Configuration;
+import org.apache.openmeetings.web.components.admin.AdminBaseForm;
+import org.apache.wicket.model.CompoundPropertyModel;
+
+public class ConfigForm extends AdminBaseForm<Configuration> {
+
+ private static final long serialVersionUID = 1L;
+
+ public ConfigForm(String id, final Configuration configuration) {
+ super(id, new
CompoundPropertyModel<Configuration>(configuration));
+ setOutputMarkupId(true);
+
+ }
+}
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html?rev=1384061&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
Wed Sep 12 17:58:46 2012
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns="http://www.w3.org/1999/xhtml";
+
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
+ <wicket:panel>
+ <table>
+ <tr>
+ <td>
+ <span wicket:id="navigator">[dataview
navigator]</span>
+ <table>
+ <tr>
+ <th><wicket:ommessage
key="264" /></th>
+ <th><wicket:ommessage
key="265" /></th>
+ <th><wicket:ommessage
key="598" /></th>
+ </tr>
+ <tr wicket:id="configList">
+ <td><span
wicket:id="configuration_id"></span></td>
+ <td><span
wicket:id="conf_key"></span></td>
+ <td><span
wicket:id="conf_value"></span></td>
+ </tr>
+ </table>
+ </td>
+ <td>
+ <br/>
+ <form wicket:id="form">
+ <div class="formSaveBar">
+ <div class="formSaveButton">
+ <input type="submit" value=""
wicket:id="ajax-save-button"/>
+ </div>
+ <div class="formNewButton">
+ <input type="submit" value=""
wicket:id="ajax-new-button"/>
+ </div>
+ <div class="formRefreshButton">
+ <input type="submit" value=""
wicket:id="ajax-refresh-button"/>
+ </div>
+ <div class="formCancelButton">
+ <input type="submit" value=""
wicket:id="ajax-cancel-button"/>
+ </div>
+ </div>
+ <br/>
+ <div wicket:id="feedback">[[
feedback ]]</div>
+ </form>
+ </td>
+ </tr>
+ </table>
+ </wicket:panel>
+</html>
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java?rev=1384061&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
Wed Sep 12 17:58:46 2012
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.components.admin.configurations;
+
+import java.util.Iterator;
+
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.persistence.beans.basic.Configuration;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.components.admin.AdminPanel;
+import org.apache.wicket.ajax.AjaxEventBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import
org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.DataView;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.IModel;
+
+public class ConfigsPanel extends AdminPanel {
+
+ private static final long serialVersionUID = -1L;
+ private ConfigForm form;
+
+ public ConfigsPanel(String id) {
+ super(id);
+ DataView<Configuration> dataView = new
DataView<Configuration>("configList", new IDataProvider<Configuration>(){
+ private static final long serialVersionUID = -1L;
+
+ public void detach() {
+ //empty
+ }
+
+ public Iterator<? extends Configuration> iterator(long
first, long count) {
+ return
Application.getBean(Configurationmanagement.class).getNondeletedConfiguration((int)first,
(int)count).iterator();
+ }
+
+ public long size() {
+ return
Application.getBean(Configurationmanagement.class).selectMaxFromConfigurations();
+ }
+
+ public IModel<Configuration> model(Configuration
object) {
+ return new
CompoundPropertyModel<Configuration>(object);
+ }
+
+ }) {
+ private static final long serialVersionUID =
8715559628755439596L;
+
+ @Override
+ protected void populateItem(Item<Configuration> item) {
+ final Configuration configuration =
item.getModelObject();
+ item.add(new Label("configuration_id", "" +
configuration.getConfiguration_id()));
+ item.add(new Label("conf_key", "" +
configuration.getConf_key()));
+ item.add(new Label("conf_value", "" +
configuration.getConf_value()));
+ item.add(new AjaxEventBehavior("onclick") {
+ private static final long
serialVersionUID = -8069413566800571061L;
+
+ protected void
onEvent(AjaxRequestTarget target) {
+
form.setModelObject(configuration);
+ target.add(form);
+ }
+ });
+ }
+ };
+ dataView.setItemsPerPage(8); //FIXME need to be parametrized
+ add(dataView);
+ add(new AjaxPagingNavigator("navigator", dataView));
+
+ Configuration configuration = new Configuration();
+ form = new ConfigForm("form", configuration);
+ add(form);
+
+ }
+}
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupForm.java?rev=1384061&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupForm.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupForm.java
Wed Sep 12 17:58:46 2012
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.components.admin.groups;
+
+import org.apache.openmeetings.persistence.beans.domain.Organisation;
+import org.apache.openmeetings.web.components.admin.AdminBaseForm;
+import org.apache.wicket.model.CompoundPropertyModel;
+
+public class GroupForm extends AdminBaseForm<Organisation> {
+
+ private static final long serialVersionUID = 1L;
+
+ public GroupForm(String id, final Organisation organisation) {
+ super(id, new
CompoundPropertyModel<Organisation>(organisation));
+ setOutputMarkupId(true);
+
+ }
+}
Added:
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=1384061&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
Wed Sep 12 17:58:46 2012
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns="http://www.w3.org/1999/xhtml";
+
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
+ <wicket:panel>
+ <table>
+ <tr>
+ <td>
+ <span wicket:id="navigator">[dataview
navigator]</span>
+ <table>
+ <tr>
+ <th><wicket:ommessage
key="164" /></th>
+ <th><wicket:ommessage
key="165" /></th>
+ </tr>
+ <tr wicket:id="groupList">
+ <td><span
wicket:id="organisation_id"></span></td>
+ <td><span
wicket:id="name"></span></td>
+ </tr>
+ </table>
+ </td>
+ <td>
+ <br/>
+ <form wicket:id="form">
+ <div class="formSaveBar">
+ <div class="formSaveButton">
+ <input type="submit" value=""
wicket:id="ajax-save-button"/>
+ </div>
+ <div class="formNewButton">
+ <input type="submit" value=""
wicket:id="ajax-new-button"/>
+ </div>
+ <div class="formRefreshButton">
+ <input type="submit" value=""
wicket:id="ajax-refresh-button"/>
+ </div>
+ <div class="formCancelButton">
+ <input type="submit" value=""
wicket:id="ajax-cancel-button"/>
+ </div>
+ </div>
+ <br/>
+ <div wicket:id="feedback">[[
feedback ]]</div>
+ </form>
+ </td>
+ </tr>
+ </table>
+ </wicket:panel>
+</html>
Added:
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=1384061&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
Wed Sep 12 17:58:46 2012
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.components.admin.groups;
+
+import java.util.Iterator;
+
+import org.apache.openmeetings.data.user.Organisationmanagement;
+import org.apache.openmeetings.persistence.beans.domain.Organisation;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.components.admin.AdminPanel;
+import org.apache.wicket.ajax.AjaxEventBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import
org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.DataView;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.IModel;
+
+public class GroupsPanel extends AdminPanel {
+
+ private static final long serialVersionUID = -1L;
+ @SuppressWarnings("unused")
+ private String selectedText = "Click on the table to change the room";
+ private GroupForm form;
+
+ public GroupsPanel(String id) {
+ super(id);
+ DataView<Organisation> dataView = new
DataView<Organisation>("groupList", new IDataProvider<Organisation>(){
+ private static final long serialVersionUID = -1L;
+
+ public void detach() {
+ //empty
+ }
+
+ public Iterator<? extends Organisation> iterator(long
first, long count) {
+ return
Application.getBean(Organisationmanagement.class).getNondeletedOrganisation((int)first,
(int)count).iterator();
+ }
+
+ public long size() {
+ return
Application.getBean(Organisationmanagement.class).selectMaxFromOrganisations();
+ }
+
+ public IModel<Organisation> model(Organisation object) {
+ return new
CompoundPropertyModel<Organisation>(object);
+ }
+
+ }) {
+ private static final long serialVersionUID =
8715559628755439596L;
+
+ @Override
+ protected void populateItem(Item<Organisation> item) {
+ final Organisation organisation =
item.getModelObject();
+ item.add(new Label("organisation_id", "" +
organisation.getOrganisation_id()));
+ item.add(new Label("name", "" +
organisation.getName()));
+ item.add(new AjaxEventBehavior("onclick") {
+ private static final long
serialVersionUID = -8069413566800571061L;
+
+ protected void
onEvent(AjaxRequestTarget target) {
+
form.setModelObject(organisation);
+ target.add(form);
+ }
+ });
+ }
+ };
+ dataView.setItemsPerPage(8); //FIXME need to be parametrized
+ add(dataView);
+ add(new AjaxPagingNavigator("navigator", dataView));
+
+ Organisation organisation = new Organisation();
+ form = new GroupForm("form", organisation);
+ add(form);
+
+ }
+}
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapForm.java?rev=1384061&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapForm.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapForm.java
Wed Sep 12 17:58:46 2012
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.components.admin.ldaps;
+
+import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
+import org.apache.openmeetings.web.components.admin.AdminBaseForm;
+import org.apache.wicket.model.CompoundPropertyModel;
+
+public class LdapForm extends AdminBaseForm<LdapConfig> {
+
+ private static final long serialVersionUID = 1L;
+
+ public LdapForm(String id, final LdapConfig ldapConfig) {
+ super(id, new CompoundPropertyModel<LdapConfig>(ldapConfig));
+ setOutputMarkupId(true);
+
+ }
+}
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html?rev=1384061&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
Wed Sep 12 17:58:46 2012
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns="http://www.w3.org/1999/xhtml";
+
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
+ <wicket:panel>
+ <table>
+ <tr>
+ <td>
+ <span wicket:id="navigator">[dataview
navigator]</span>
+ <table>
+ <tr>
+ <th><wicket:ommessage
key="1104" /></th>
+ <th><wicket:ommessage
key="1105" /></th>
+ <th><wicket:ommessage
key="1106" /></th>
+ </tr>
+ <tr wicket:id="ldapList">
+ <td><span
wicket:id="ldapConfigId"></span></td>
+ <td><span
wicket:id="name"></span></td>
+ <td><span
wicket:id="configFileName"></span></td>
+ </tr>
+ </table>
+ </td>
+ <td>
+ <br/>
+ <form wicket:id="form">
+ <div class="formSaveBar">
+ <div class="formSaveButton">
+ <input type="submit" value=""
wicket:id="ajax-save-button"/>
+ </div>
+ <div class="formNewButton">
+ <input type="submit" value=""
wicket:id="ajax-new-button"/>
+ </div>
+ <div class="formRefreshButton">
+ <input type="submit" value=""
wicket:id="ajax-refresh-button"/>
+ </div>
+ <div class="formCancelButton">
+ <input type="submit" value=""
wicket:id="ajax-cancel-button"/>
+ </div>
+ </div>
+ <br/>
+ <div wicket:id="feedback">[[
feedback ]]</div>
+ </form>
+ </td>
+ </tr>
+ </table>
+ </wicket:panel>
+</html>
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java?rev=1384061&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
Wed Sep 12 17:58:46 2012
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.components.admin.ldaps;
+
+import java.util.Iterator;
+
+import org.apache.openmeetings.data.basic.dao.LdapConfigDaoImpl;
+import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.components.admin.AdminPanel;
+import org.apache.wicket.ajax.AjaxEventBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import
org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.DataView;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.IModel;
+
+public class LdapsPanel extends AdminPanel {
+
+ private static final long serialVersionUID = -1L;
+ private LdapForm form;
+
+ public LdapsPanel(String id) {
+ super(id);
+ DataView<LdapConfig> dataView = new
DataView<LdapConfig>("ldapList", new IDataProvider<LdapConfig>(){
+ private static final long serialVersionUID = -1L;
+
+ public void detach() {
+ //empty
+ }
+
+ public Iterator<? extends LdapConfig> iterator(long
first, long count) {
+ return
Application.getBean(LdapConfigDaoImpl.class).getNondeletedLdapConfig((int)first,
(int)count).iterator();
+ }
+
+ public long size() {
+ return
Application.getBean(LdapConfigDaoImpl.class).selectMaxFromLdapConfig();
+ }
+
+ public IModel<LdapConfig> model(LdapConfig object) {
+ return new
CompoundPropertyModel<LdapConfig>(object);
+ }
+
+ }) {
+ private static final long serialVersionUID =
8715559628755439596L;
+
+ @Override
+ protected void populateItem(Item<LdapConfig> item) {
+ final LdapConfig ldapConfig =
item.getModelObject();
+ item.add(new Label("ldapConfigId", "" +
ldapConfig.getLdapConfigId()));
+ item.add(new Label("name", "" +
ldapConfig.getName()));
+ item.add(new Label("configFileName", "" +
ldapConfig.getConfigFileName()));
+ item.add(new AjaxEventBehavior("onclick") {
+ private static final long
serialVersionUID = -8069413566800571061L;
+
+ protected void
onEvent(AjaxRequestTarget target) {
+ form.setModelObject(ldapConfig);
+ target.add(form);
+ }
+ });
+ }
+ };
+ dataView.setItemsPerPage(8); //FIXME need to be parametrized
+ add(dataView);
+ add(new AjaxPagingNavigator("navigator", dataView));
+
+ LdapConfig ldapConfig = new LdapConfig();
+ form = new LdapForm("form", ldapConfig);
+ add(form);
+
+ }
+}
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.java?rev=1384061&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.java
Wed Sep 12 17:58:46 2012
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.components.admin.servers;
+
+import org.apache.openmeetings.persistence.beans.basic.Server;
+import org.apache.openmeetings.web.components.admin.AdminBaseForm;
+import org.apache.wicket.model.CompoundPropertyModel;
+
+public class ServerForm extends AdminBaseForm<Server> {
+
+ private static final long serialVersionUID = 1L;
+
+ public ServerForm(String id, final Server server) {
+ super(id, new CompoundPropertyModel<Server>(server));
+ setOutputMarkupId(true);
+
+ }
+}
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html?rev=1384061&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
Wed Sep 12 17:58:46 2012
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns="http://www.w3.org/1999/xhtml";
+
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
+ <wicket:panel>
+ <table>
+ <tr>
+ <td>
+ <span wicket:id="navigator">[dataview
navigator]</span>
+ <table>
+ <tr>
+ <th><wicket:ommessage
key="188" /></th>
+ <th><wicket:ommessage
key="1500" /></th>
+ <th><wicket:ommessage
key="1501" /></th>
+ </tr>
+ <tr wicket:id="serverList">
+ <td><span
wicket:id="id"></span></td>
+ <td><span
wicket:id="name"></span></td>
+ <td><span
wicket:id="address"></span></td>
+ </tr>
+ </table>
+ </td>
+ <td>
+ <br/>
+ <form wicket:id="form">
+ <div class="formSaveBar">
+ <div class="formSaveButton">
+ <input type="submit" value=""
wicket:id="ajax-save-button"/>
+ </div>
+ <div class="formNewButton">
+ <input type="submit" value=""
wicket:id="ajax-new-button"/>
+ </div>
+ <div class="formRefreshButton">
+ <input type="submit" value=""
wicket:id="ajax-refresh-button"/>
+ </div>
+ <div class="formCancelButton">
+ <input type="submit" value=""
wicket:id="ajax-cancel-button"/>
+ </div>
+ </div>
+ <br/>
+ <div wicket:id="feedback">[[
feedback ]]</div>
+ </form>
+ </td>
+ </tr>
+ </table>
+ </wicket:panel>
+</html>
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java?rev=1384061&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
Wed Sep 12 17:58:46 2012
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.components.admin.servers;
+
+import java.util.Iterator;
+
+import org.apache.openmeetings.data.basic.dao.ServerDaoImpl;
+import org.apache.openmeetings.persistence.beans.basic.Server;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.components.admin.AdminPanel;
+import org.apache.wicket.ajax.AjaxEventBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import
org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.DataView;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.IModel;
+
+public class ServersPanel extends AdminPanel {
+
+ private static final long serialVersionUID = -1L;
+ private ServerForm form;
+
+ public ServersPanel(String id) {
+ super(id);
+ DataView<Server> dataView = new DataView<Server>("serverList",
new IDataProvider<Server>(){
+ private static final long serialVersionUID = -1L;
+
+ public void detach() {
+ //empty
+ }
+
+ public Iterator<? extends Server> iterator(long first,
long count) {
+ return
Application.getBean(ServerDaoImpl.class).getServerList((int)first,
(int)count).iterator();
+ }
+
+ public long size() {
+ return
Application.getBean(ServerDaoImpl.class).getServerCount();
+ }
+
+ public IModel<Server> model(Server object) {
+ return new
CompoundPropertyModel<Server>(object);
+ }
+
+ }) {
+ private static final long serialVersionUID =
8715559628755439596L;
+
+ @Override
+ protected void populateItem(Item<Server> item) {
+ final Server Server = item.getModelObject();
+ item.add(new Label("id", "" + Server.getId()));
+ item.add(new Label("name", "" +
Server.getName()));
+ item.add(new Label("address", "" +
Server.getAddress()));
+ item.add(new AjaxEventBehavior("onclick") {
+ private static final long
serialVersionUID = -8069413566800571061L;
+
+ protected void
onEvent(AjaxRequestTarget target) {
+ form.setModelObject(Server);
+ target.add(form);
+ }
+ });
+ }
+ };
+ dataView.setItemsPerPage(8); //FIXME need to be parametrized
+ add(dataView);
+ add(new AjaxPagingNavigator("navigator", dataView));
+
+ Server Server = new Server();
+ form = new ServerForm("form", Server);
+ add(form);
+
+ }
+}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html?rev=1384061&r1=1384060&r2=1384061&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html
Wed Sep 12 17:58:46 2012
@@ -41,7 +41,6 @@
</table>
</td>
<td>
- <span wicket:id="selected"></span>
<br/>
<form wicket:id="form">
<div class="formSaveBar">
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java?rev=1384061&r1=1384060&r2=1384061&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
Wed Sep 12 17:58:46 2012
@@ -34,13 +34,10 @@ import org.apache.wicket.markup.repeater
import org.apache.wicket.markup.repeater.data.IDataProvider;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
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) {
@@ -86,9 +83,6 @@ public class UsersPanel extends AdminPan
});
}
};
- selected = new Label("selected", new
PropertyModel<String>(this, "selectedText"));
- selected.setOutputMarkupId(true);
- add(selected);
final WebMarkupContainer userListContainer = new
WebMarkupContainer("userListContainer");
add(userListContainer.add(dataView).setOutputMarkupId(true));
add(new PagedEntityListPanel("navigator", dataView) {
