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 2017/05/18 05:36:11 UTC
[04/26] openmeetings git commit: Normalize all the line endings
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
index 4dbebe3..e9c1073 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
@@ -1,49 +1,49 @@
-/*
- * 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.user.dashboard.admin;
-
-import org.apache.openmeetings.web.app.Application;
-import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.AbstractWidget;
-import org.wicketstuff.dashboard.Widget;
-import org.wicketstuff.dashboard.WidgetLocation;
-import org.wicketstuff.dashboard.web.WidgetView;
-
-public class AdminWidget extends AbstractWidget {
- private static final long serialVersionUID = 1L;
- public static final String WIDGET_ID_ADMIN = "AdminWidget";
-
- public AdminWidget() {
- super();
- location = new WidgetLocation(0, 2);
- init();
- }
-
- @Override
- public void init() {
- super.init();
- title = Application.getString("dashboard.widget.admin.title");
- id = WIDGET_ID_ADMIN;
- }
-
- @Override
- public WidgetView createView(String viewId) {
- return new AdminWidgetView(viewId, new Model<Widget>(this));
- }
-}
+/*
+ * 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.user.dashboard.admin;
+
+import org.apache.openmeetings.web.app.Application;
+import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.AbstractWidget;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.WidgetLocation;
+import org.wicketstuff.dashboard.web.WidgetView;
+
+public class AdminWidget extends AbstractWidget {
+ private static final long serialVersionUID = 1L;
+ public static final String WIDGET_ID_ADMIN = "AdminWidget";
+
+ public AdminWidget() {
+ super();
+ location = new WidgetLocation(0, 2);
+ init();
+ }
+
+ @Override
+ public void init() {
+ super.init();
+ title = Application.getString("dashboard.widget.admin.title");
+ id = WIDGET_ID_ADMIN;
+ }
+
+ @Override
+ public WidgetView createView(String viewId) {
+ return new AdminWidgetView(viewId, new Model<Widget>(this));
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
index 3d418de..f57583e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
@@ -1,51 +1,51 @@
-/*
- * 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.user.dashboard.admin;
-
-import org.apache.openmeetings.web.app.Application;
-import org.wicketstuff.dashboard.WidgetDescriptor;
-
-public class AdminWidgetDescriptor implements WidgetDescriptor {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getName() {
- return Application.getString("dashboard.widget.admin.title");
- }
-
- @Override
- public String getProvider() {
- return "Apache Openmeetings";
- }
-
- @Override
- public String getDescription() {
- return Application.getString("dashboard.widget.admin.desc");
- }
-
- @Override
- public String getWidgetClassName() {
- return AdminWidget.class.getName();
- }
-
- @Override
- public String getTypeName() {
- return "om.widget.admin";
- }
-}
+/*
+ * 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.user.dashboard.admin;
+
+import org.apache.openmeetings.web.app.Application;
+import org.wicketstuff.dashboard.WidgetDescriptor;
+
+public class AdminWidgetDescriptor implements WidgetDescriptor {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getName() {
+ return Application.getString("dashboard.widget.admin.title");
+ }
+
+ @Override
+ public String getProvider() {
+ return "Apache Openmeetings";
+ }
+
+ @Override
+ public String getDescription() {
+ return Application.getString("dashboard.widget.admin.desc");
+ }
+
+ @Override
+ public String getWidgetClassName() {
+ return AdminWidget.class.getName();
+ }
+
+ @Override
+ public String getTypeName() {
+ return "om.widget.admin";
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
index feb8a3d..1912617 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
@@ -1,29 +1,29 @@
-<?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:wicket="http://wicket.apache.org">
-<wicket:panel>
- <h3><wicket:message key="dashboard.widget.admin.title"/></h3>
- <form wicket:id="form">
- <button wicket:id="show-cleanup-dialog"><wicket:message key="dashboard.widget.admin.cleanup.show"/></button>
- <div wicket:id="cleanup-dialog"></div>
- </form>
-</wicket:panel>
-</html>
+<?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:wicket="http://wicket.apache.org">
+<wicket:panel>
+ <h3><wicket:message key="dashboard.widget.admin.title"/></h3>
+ <form wicket:id="form">
+ <button wicket:id="show-cleanup-dialog"><wicket:message key="dashboard.widget.admin.cleanup.show"/></button>
+ <div wicket:id="cleanup-dialog"></div>
+ </form>
+</wicket:panel>
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
index 2efeeac..8d95d20 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
@@ -1,54 +1,54 @@
-/*
- * 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.user.dashboard.admin;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.Widget;
-import org.wicketstuff.dashboard.web.WidgetView;
-
-import com.googlecode.wicket.jquery.ui.form.button.IndicatingAjaxButton;
-
-@AuthorizeInstantiation("Admin")
-public class AdminWidgetView extends WidgetView {
- private static final long serialVersionUID = 1L;
- private final AdminCleanupInfoDialog cleanupDialog;
- final Form<Void> form = new Form<>("form");
-
- public AdminWidgetView(String id, Model<Widget> model) {
- super(id, model);
- add(form);
- form.add(cleanupDialog = new AdminCleanupInfoDialog("cleanup-dialog"));
- form.add(new IndicatingAjaxButton("show-cleanup-dialog") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected boolean isDisabledOnClick() {
- return true;
- }
-
- @Override
- protected void onSubmit(AjaxRequestTarget target) {
- cleanupDialog.show(target);
- }
- });
- }
-}
+/*
+ * 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.user.dashboard.admin;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.web.WidgetView;
+
+import com.googlecode.wicket.jquery.ui.form.button.IndicatingAjaxButton;
+
+@AuthorizeInstantiation("Admin")
+public class AdminWidgetView extends WidgetView {
+ private static final long serialVersionUID = 1L;
+ private final AdminCleanupInfoDialog cleanupDialog;
+ final Form<Void> form = new Form<>("form");
+
+ public AdminWidgetView(String id, Model<Widget> model) {
+ super(id, model);
+ add(form);
+ form.add(cleanupDialog = new AdminCleanupInfoDialog("cleanup-dialog"));
+ form.add(new IndicatingAjaxButton("show-cleanup-dialog") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected boolean isDisabledOnClick() {
+ return true;
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ cleanupDialog.show(target);
+ }
+ });
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
index c376953..7df1978 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
@@ -1,87 +1,87 @@
-<?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:wicket="http://wicket.apache.org">
-<wicket:panel>
- <div class="user info panel">
- <table>
- <tr>
- <td><div wicket:id="img"></div></td>
- <td>
- <table>
- <tr>
- <td><wicket:message key="1164"/></td><td><span wicket:id="firstname"></span> <span wicket:id="lastname"></span></td>
- </tr>
- <tr>
- <td><wicket:message key="1165"/></td><td><span wicket:id="timeZoneId"></span></td>
- </tr>
- <tr>
- <td><wicket:message key="1296"/></td><td><span wicket:id="regdate"></span></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- <div>
- <fieldset class="ui-widget-content">
- <legend class="ui-widget-header"><wicket:message key="1166"/></legend>
- <table>
- <tr>
- <td><wicket:message key="1162"/></td>
- <td><textarea wicket:id="userOffers"></textarea></td>
- </tr>
- <tr>
- <td><wicket:message key="1163"/></td>
- <td><textarea wicket:id="userSearchs"></textarea></td>
- </tr>
- </table>
- </fieldset>
- </div>
- <div>
- <fieldset class="ui-widget-content">
- <legend class="ui-widget-header"><wicket:message key="1167"/></legend>
- <table wicket:id="address">
- <tr>
- <td><wicket:message key="607" /></td>
- <td><span wicket:id="address.phone"></span></td>
- </tr>
- <tr>
- <td><wicket:message key="139" /></td>
- <td><span wicket:id="address.street"></span> <span wicket:id="address.additionalname"></span></td>
- </tr>
- <tr>
- <td><wicket:message key="140" /></td>
- <td><span wicket:id="address.zip"></span> <span wicket:id="address.town"></span></td>
- </tr>
- <tr>
- <td><wicket:message key="141" /></td>
- <td><span wicket:id="country"></span></td>
- </tr>
- <tr>
- <td><wicket:message key="142" /></td>
- <td><span wicket:id="address.comment"></span></td>
- </tr>
- </table>
- <div wicket:id="addressDenied"></div>
- </fieldset>
- </div>
- </div>
-</wicket:panel>
-</html>
+<?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:wicket="http://wicket.apache.org">
+<wicket:panel>
+ <div class="user info panel">
+ <table>
+ <tr>
+ <td><div wicket:id="img"></div></td>
+ <td>
+ <table>
+ <tr>
+ <td><wicket:message key="1164"/></td><td><span wicket:id="firstname"></span> <span wicket:id="lastname"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="1165"/></td><td><span wicket:id="timeZoneId"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="1296"/></td><td><span wicket:id="regdate"></span></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <div>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:message key="1166"/></legend>
+ <table>
+ <tr>
+ <td><wicket:message key="1162"/></td>
+ <td><textarea wicket:id="userOffers"></textarea></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="1163"/></td>
+ <td><textarea wicket:id="userSearchs"></textarea></td>
+ </tr>
+ </table>
+ </fieldset>
+ </div>
+ <div>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:message key="1167"/></legend>
+ <table wicket:id="address">
+ <tr>
+ <td><wicket:message key="607" /></td>
+ <td><span wicket:id="address.phone"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="139" /></td>
+ <td><span wicket:id="address.street"></span> <span wicket:id="address.additionalname"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="140" /></td>
+ <td><span wicket:id="address.zip"></span> <span wicket:id="address.town"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="141" /></td>
+ <td><span wicket:id="country"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="142" /></td>
+ <td><span wicket:id="address.comment"></span></td>
+ </tr>
+ </table>
+ <div wicket:id="addressDenied"></div>
+ </fieldset>
+ </div>
+ </div>
+</wicket:panel>
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
index 63dd237..56713fb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
@@ -1,73 +1,73 @@
-/*
- * 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.user.profile;
-
-import static org.apache.openmeetings.db.util.LocaleHelper.getCountryName;
-import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.WebSession.getUserId;
-
-import org.apache.openmeetings.db.dao.user.UserContactDao;
-import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.common.ProfileImagePanel;
-import org.apache.openmeetings.web.common.UserPanel;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.TextArea;
-import org.apache.wicket.model.CompoundPropertyModel;
-
-public class UserProfilePanel extends UserPanel {
- private static final long serialVersionUID = 1L;
- private final WebMarkupContainer address = new WebMarkupContainer("address");
- private final Label addressDenied = new Label("addressDenied", "");
-
- public UserProfilePanel(String id, long userId) {
- this(id, new CompoundPropertyModel<>(getBean(UserDao.class).get(userId)));
- }
-
- public UserProfilePanel(String id, CompoundPropertyModel<User> model) {
- super(id, model);
-
- add(new ProfileImagePanel("img", model.getObject().getId()));
- add(new Label("firstname"));
- add(new Label("lastname"));
- add(new Label("timeZoneId"));
- add(new Label("regdate"));
- add(new TextArea<String>("userOffers").setEnabled(false));
- add(new TextArea<String>("userSearchs").setEnabled(false));
- if (getUserId().equals(model.getObject().getId()) || model.getObject().isShowContactData()
- || (model.getObject().isShowContactDataToContacts() && getBean(UserContactDao.class).isContact(model.getObject().getId(), getUserId())))
- {
- addressDenied.setVisible(false);
- address.add(new Label("address.phone"));
- address.add(new Label("address.street"));
- address.add(new Label("address.additionalname"));
- address.add(new Label("address.zip"));
- address.add(new Label("address.town"));
- address.add(new Label("country", getCountryName(model.getObject().getAddress().getCountry(), getLocale())));
- address.add(new Label("address.comment"));
- } else {
- address.setVisible(false);
- addressDenied.setDefaultModelObject(Application.getString(model.getObject().isShowContactDataToContacts() ? 1269 : 1268));
- }
- add(address.setDefaultModel(model));
- add(addressDenied);
- }
-}
+/*
+ * 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.user.profile;
+
+import static org.apache.openmeetings.db.util.LocaleHelper.getCountryName;
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+
+import org.apache.openmeetings.db.dao.user.UserContactDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.common.ProfileImagePanel;
+import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.model.CompoundPropertyModel;
+
+public class UserProfilePanel extends UserPanel {
+ private static final long serialVersionUID = 1L;
+ private final WebMarkupContainer address = new WebMarkupContainer("address");
+ private final Label addressDenied = new Label("addressDenied", "");
+
+ public UserProfilePanel(String id, long userId) {
+ this(id, new CompoundPropertyModel<>(getBean(UserDao.class).get(userId)));
+ }
+
+ public UserProfilePanel(String id, CompoundPropertyModel<User> model) {
+ super(id, model);
+
+ add(new ProfileImagePanel("img", model.getObject().getId()));
+ add(new Label("firstname"));
+ add(new Label("lastname"));
+ add(new Label("timeZoneId"));
+ add(new Label("regdate"));
+ add(new TextArea<String>("userOffers").setEnabled(false));
+ add(new TextArea<String>("userSearchs").setEnabled(false));
+ if (getUserId().equals(model.getObject().getId()) || model.getObject().isShowContactData()
+ || (model.getObject().isShowContactDataToContacts() && getBean(UserContactDao.class).isContact(model.getObject().getId(), getUserId())))
+ {
+ addressDenied.setVisible(false);
+ address.add(new Label("address.phone"));
+ address.add(new Label("address.street"));
+ address.add(new Label("address.additionalname"));
+ address.add(new Label("address.zip"));
+ address.add(new Label("address.town"));
+ address.add(new Label("country", getCountryName(model.getObject().getAddress().getCountry(), getLocale())));
+ address.add(new Label("address.comment"));
+ } else {
+ address.setVisible(false);
+ addressDenied.setDefaultModelObject(Application.getString(model.getObject().isShowContactDataToContacts() ? 1269 : 1268));
+ }
+ add(address.setDefaultModel(model));
+ add(addressDenied);
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
index dc1cc3c..33b62b6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
@@ -1,69 +1,69 @@
-<?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:wicket="http://wicket.apache.org">
-<wicket:panel>
- <!-- FIXME move styles into CSS -->
- <table style="width: 100%; height: 100%;">
- <tr>
- <td valign="top" style="width: 200px;">
- <form wicket:id="form">
- <div><wicket:message key="1179"/></div>
- <input type="text" wicket:id="text"/><br/>
- <div><wicket:message key="1177"/></div>
- <input type="text" wicket:id="offer"/><br/>
- <div><wicket:message key="1178"/></div>
- <input type="text" wicket:id="search"/><br/>
- <br/>
- <button wicket:id="submit" type="button"><wicket:message key="1176"/></button>
- </form>
- </td>
- <td valign="top">
- <div wicket:id="container" style="height: 100%; min-height: 400px;">
- <div><strong><wicket:message key="1184"/></strong> <span wicket:id="navigator"></span></div>
- <table id="searchUsersTable" style="width: 100%;">
- <thead>
- <tr>
- <th><wicket:message key="1180"/></th>
- <th><wicket:message key="1181"/></th>
- <th><wicket:message key="1182"/></th>
- <th><wicket:message key="1183"/></th>
- <th><wicket:message key="1185"/></th>
- </tr>
- </thead>
- <tbody>
- <tr wicket:id="users">
- <td><span class="om-icon" wicket:id="status"></span><span wicket:id="name"></span></td>
- <td wicket:id="tz"></td>
- <td wicket:id="offer"></td>
- <td wicket:id="search"></td>
- <td style="white-space: nowrap;"><div wicket:id="add" class="add om-icon clickable" wicket:message="title:1186"
- ></div><div wicket:id="message" class="new-email om-icon clickable" wicket:message="title:1253"
- ></div><div wicket:id="view" class="user om-icon clickable" wicket:message="title:1236"
- ></div><div wicket:id="invite" class="invite om-icon clickable" wicket:message="title:1131"></div></td>
- </tr>
- </tbody>
- </table>
- </div>
- </td>
- </tr>
- </table>
-</wicket:panel>
+<?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:wicket="http://wicket.apache.org">
+<wicket:panel>
+ <!-- FIXME move styles into CSS -->
+ <table style="width: 100%; height: 100%;">
+ <tr>
+ <td valign="top" style="width: 200px;">
+ <form wicket:id="form">
+ <div><wicket:message key="1179"/></div>
+ <input type="text" wicket:id="text"/><br/>
+ <div><wicket:message key="1177"/></div>
+ <input type="text" wicket:id="offer"/><br/>
+ <div><wicket:message key="1178"/></div>
+ <input type="text" wicket:id="search"/><br/>
+ <br/>
+ <button wicket:id="submit" type="button"><wicket:message key="1176"/></button>
+ </form>
+ </td>
+ <td valign="top">
+ <div wicket:id="container" style="height: 100%; min-height: 400px;">
+ <div><strong><wicket:message key="1184"/></strong> <span wicket:id="navigator"></span></div>
+ <table id="searchUsersTable" style="width: 100%;">
+ <thead>
+ <tr>
+ <th><wicket:message key="1180"/></th>
+ <th><wicket:message key="1181"/></th>
+ <th><wicket:message key="1182"/></th>
+ <th><wicket:message key="1183"/></th>
+ <th><wicket:message key="1185"/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr wicket:id="users">
+ <td><span class="om-icon" wicket:id="status"></span><span wicket:id="name"></span></td>
+ <td wicket:id="tz"></td>
+ <td wicket:id="offer"></td>
+ <td wicket:id="search"></td>
+ <td style="white-space: nowrap;"><div wicket:id="add" class="add om-icon clickable" wicket:message="title:1186"
+ ></div><div wicket:id="message" class="new-email om-icon clickable" wicket:message="title:1253"
+ ></div><div wicket:id="view" class="user om-icon clickable" wicket:message="title:1236"
+ ></div><div wicket:id="invite" class="invite om-icon clickable" wicket:message="title:1131"></div></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </td>
+ </tr>
+ </table>
+</wicket:panel>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
index 02be695..eb536de 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
@@ -1,154 +1,154 @@
-/*
- * 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.user.profile;
-
-import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.Application.isUserOnline;
-import static org.apache.openmeetings.web.app.WebSession.getUserId;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.openmeetings.db.dao.user.UserContactDao;
-import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.db.util.TimezoneUtil;
-import org.apache.openmeetings.web.common.PagingNavigatorPanel;
-import org.apache.openmeetings.web.common.UserPanel;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-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;
-import org.apache.wicket.model.PropertyModel;
-
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
-import com.googlecode.wicket.jquery.ui.plugins.fixedheadertable.FixedHeaderTableBehavior;
-
-public class UserSearchPanel extends UserPanel {
- private static final long serialVersionUID = 1L;
- private final static List<Integer> itemsPerPage = Arrays.asList(10, 25, 50, 75, 100, 200, 500, 1000, 2500, 5000);
- private String text;
- private String search;
- private String offer;
- private String orderBy = "u.firstname";
- private boolean asc = true;
- private boolean searched = false;
- private final WebMarkupContainer container = new WebMarkupContainer("container");
- private final FixedHeaderTableBehavior fixedHeader = new FixedHeaderTableBehavior("#searchUsersTable", new Options("height", 400));
-
- private void refresh(IPartialPageRequestHandler handler) {
- handler.add(container.add(fixedHeader));
- }
-
- public UserSearchPanel(String id) {
- super(id);
-
- add(new Form<Void>("form") {
- private static final long serialVersionUID = 1L;
- {
- add(new TextField<>("text", new PropertyModel<String>(UserSearchPanel.this, "text")));
- add(new TextField<>("offer", new PropertyModel<String>(UserSearchPanel.this, "offer")));
- add(new TextField<>("search", new PropertyModel<String>(UserSearchPanel.this, "search")));
- add(new AjaxButton("submit") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onSubmit(AjaxRequestTarget target) {
- searched = true;
- refresh(target);
- }
- });
- }
- });
- IDataProvider<User> dp = new IDataProvider<User>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void detach() {
- }
-
- @Override
- public Iterator<? extends User> iterator(long first, long count) {
- return searched ? getBean(UserDao.class).searchUserProfile(getUserId(), text, offer, search, orderBy, (int)first, (int)count, asc).iterator()
- : new ArrayList<User>().iterator();
- }
-
- @Override
- public long size() {
- return searched ? getBean(UserDao.class).searchCountUserProfile(getUserId(), text, offer, search) : 0;
- }
-
- @Override
- public IModel<User> model(User object) {
- return new CompoundPropertyModel<>(object);
- }
-
- };
- final DataView<User> dw = new DataView<User>("users", dp) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(Item<User> item) {
- final UserContactDao contactsDao = getBean(UserContactDao.class);
- User u = item.getModelObject();
- final long userId = u.getId();
- item.add(new WebMarkupContainer("status").add(AttributeModifier.append("class", isUserOnline(userId) ? "online" : "offline")));
- item.add(new Label("name", getName(u)));
- item.add(new Label("tz", getBean(TimezoneUtil.class).getTimeZone(u).getID()));
- item.add(new Label("offer", u.getUserOffers()));
- item.add(new Label("search", u.getUserSearchs()));
- item.add(new WebMarkupContainer("view").add(AttributeModifier.append("onclick", String.format("showUserInfo(%s);", userId))));
- item.add(new WebMarkupContainer("add").setVisible(userId != getUserId() && !contactsDao.isContact(userId, getUserId()))
- .add(AttributeModifier.append("onclick", String.format("addContact(%s);", userId))));
- item.add(new WebMarkupContainer("message").setVisible(userId != getUserId()).add(AttributeModifier.append("onclick", String.format("privateMessage(%s);", userId))));
- item.add(new WebMarkupContainer("invite").setVisible(userId != getUserId()).add(AttributeModifier.append("onclick", String.format("inviteUser(%s);", userId))));
- //item.add(new TooltipBehavior(new Options("content", "TODO:: Picture will be displayed"))); //FIXME
- }
- };
-
- add(container.add(dw, new PagingNavigatorPanel("navigator", dw, itemsPerPage, 100) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onEvent(AjaxRequestTarget target) {
- refresh(target);
- }
- }).setOutputMarkupId(true));
- }
-
- private static String getName(User u) {
- return "" + u.getFirstname() + " " + u.getLastname() + " [" + u.getLogin() + "]"; //FIXME salutation
- }
-
- @Override
- public void onNewMessageClose(IPartialPageRequestHandler handler) {
- refresh(handler);
- }
-}
+/*
+ * 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.user.profile;
+
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.Application.isUserOnline;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.openmeetings.db.dao.user.UserContactDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.db.util.TimezoneUtil;
+import org.apache.openmeetings.web.common.PagingNavigatorPanel;
+import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+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;
+import org.apache.wicket.model.PropertyModel;
+
+import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
+import com.googlecode.wicket.jquery.ui.plugins.fixedheadertable.FixedHeaderTableBehavior;
+
+public class UserSearchPanel extends UserPanel {
+ private static final long serialVersionUID = 1L;
+ private final static List<Integer> itemsPerPage = Arrays.asList(10, 25, 50, 75, 100, 200, 500, 1000, 2500, 5000);
+ private String text;
+ private String search;
+ private String offer;
+ private String orderBy = "u.firstname";
+ private boolean asc = true;
+ private boolean searched = false;
+ private final WebMarkupContainer container = new WebMarkupContainer("container");
+ private final FixedHeaderTableBehavior fixedHeader = new FixedHeaderTableBehavior("#searchUsersTable", new Options("height", 400));
+
+ private void refresh(IPartialPageRequestHandler handler) {
+ handler.add(container.add(fixedHeader));
+ }
+
+ public UserSearchPanel(String id) {
+ super(id);
+
+ add(new Form<Void>("form") {
+ private static final long serialVersionUID = 1L;
+ {
+ add(new TextField<>("text", new PropertyModel<String>(UserSearchPanel.this, "text")));
+ add(new TextField<>("offer", new PropertyModel<String>(UserSearchPanel.this, "offer")));
+ add(new TextField<>("search", new PropertyModel<String>(UserSearchPanel.this, "search")));
+ add(new AjaxButton("submit") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ searched = true;
+ refresh(target);
+ }
+ });
+ }
+ });
+ IDataProvider<User> dp = new IDataProvider<User>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Iterator<? extends User> iterator(long first, long count) {
+ return searched ? getBean(UserDao.class).searchUserProfile(getUserId(), text, offer, search, orderBy, (int)first, (int)count, asc).iterator()
+ : new ArrayList<User>().iterator();
+ }
+
+ @Override
+ public long size() {
+ return searched ? getBean(UserDao.class).searchCountUserProfile(getUserId(), text, offer, search) : 0;
+ }
+
+ @Override
+ public IModel<User> model(User object) {
+ return new CompoundPropertyModel<>(object);
+ }
+
+ };
+ final DataView<User> dw = new DataView<User>("users", dp) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(Item<User> item) {
+ final UserContactDao contactsDao = getBean(UserContactDao.class);
+ User u = item.getModelObject();
+ final long userId = u.getId();
+ item.add(new WebMarkupContainer("status").add(AttributeModifier.append("class", isUserOnline(userId) ? "online" : "offline")));
+ item.add(new Label("name", getName(u)));
+ item.add(new Label("tz", getBean(TimezoneUtil.class).getTimeZone(u).getID()));
+ item.add(new Label("offer", u.getUserOffers()));
+ item.add(new Label("search", u.getUserSearchs()));
+ item.add(new WebMarkupContainer("view").add(AttributeModifier.append("onclick", String.format("showUserInfo(%s);", userId))));
+ item.add(new WebMarkupContainer("add").setVisible(userId != getUserId() && !contactsDao.isContact(userId, getUserId()))
+ .add(AttributeModifier.append("onclick", String.format("addContact(%s);", userId))));
+ item.add(new WebMarkupContainer("message").setVisible(userId != getUserId()).add(AttributeModifier.append("onclick", String.format("privateMessage(%s);", userId))));
+ item.add(new WebMarkupContainer("invite").setVisible(userId != getUserId()).add(AttributeModifier.append("onclick", String.format("inviteUser(%s);", userId))));
+ //item.add(new TooltipBehavior(new Options("content", "TODO:: Picture will be displayed"))); //FIXME
+ }
+ };
+
+ add(container.add(dw, new PagingNavigatorPanel("navigator", dw, itemsPerPage, 100) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ refresh(target);
+ }
+ }).setOutputMarkupId(true));
+ }
+
+ private static String getName(User u) {
+ return "" + u.getFirstname() + " " + u.getLastname() + " [" + u.getLogin() + "]"; //FIXME salutation
+ }
+
+ @Override
+ public void onNewMessageClose(IPartialPageRequestHandler handler) {
+ refresh(handler);
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
index acb81c9..4a57ffe 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
@@ -1,62 +1,62 @@
-<?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:wicket="http://wicket.apache.org">
-<wicket:panel>
- <table>
- <tr>
- <td style="vertical-align: top">
- <div wicket:id="list"></div>
- </td>
- <td style="vertical-align: top">
- <!-- Users in this Room -->
- <fieldset class="ui-widget-content" wicket:id="details">
- <div class="formelement" style="font-style: italic;">
- <label><wicket:message key="404" /></label>
- </div>
- <div class="formelement">
- <label style="font-weight: bold;"><wicket:message key="406" /></label>
- <span wicket:id="roomName"></span> #<span wicket:id="roomId"></span>
- </div>
- <div class="formelement">
- <label style="font-weight: bold;"><wicket:message key="270" /></label>
- <span wicket:id="roomComment"></span>
- </div>
- <div class="formelement">
- <label><wicket:message key="407" /></label>
- </div>
- <div class="tableWrapper" id="adminTable">
- <table class="adminListTable">
- <tbody wicket:id="clientsContainer">
- <tr wicket:id="clients">
- <td style="width: 50px;"><img wicket:id="clientImage" style="min-width: 50px; height:50px" /></td>
- <td style="width: 350px; height:50px">
- <div style="width: 350px; height:50px"><span wicket:id="clientLogin"></span> <wicket:message key="408"/> <span wicket:id="from"></span></div>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </fieldset>
- </td>
- </tr>
- </table>
-</wicket:panel>
-</html>
+<?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:wicket="http://wicket.apache.org">
+<wicket:panel>
+ <table>
+ <tr>
+ <td style="vertical-align: top">
+ <div wicket:id="list"></div>
+ </td>
+ <td style="vertical-align: top">
+ <!-- Users in this Room -->
+ <fieldset class="ui-widget-content" wicket:id="details">
+ <div class="formelement" style="font-style: italic;">
+ <label><wicket:message key="404" /></label>
+ </div>
+ <div class="formelement">
+ <label style="font-weight: bold;"><wicket:message key="406" /></label>
+ <span wicket:id="roomName"></span> #<span wicket:id="roomId"></span>
+ </div>
+ <div class="formelement">
+ <label style="font-weight: bold;"><wicket:message key="270" /></label>
+ <span wicket:id="roomComment"></span>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="407" /></label>
+ </div>
+ <div class="tableWrapper" id="adminTable">
+ <table class="adminListTable">
+ <tbody wicket:id="clientsContainer">
+ <tr wicket:id="clients">
+ <td style="width: 50px;"><img wicket:id="clientImage" style="min-width: 50px; height:50px" /></td>
+ <td style="width: 350px; height:50px">
+ <div style="width: 350px; height:50px"><span wicket:id="clientLogin"></span> <wicket:message key="408"/> <span wicket:id="from"></span></div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </fieldset>
+ </td>
+ </tr>
+ </table>
+</wicket:panel>
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
index 6399fd0..1bd414c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
@@ -1,137 +1,137 @@
-/*
- * 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.user.rooms;
-
-import static org.apache.openmeetings.web.app.Application.getBean;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.basic.Client;
-import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.util.OmFileHelper;
-import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.common.UserPanel;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.image.Image;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.resource.ByteArrayResource;
-import org.apache.wicket.util.io.IOUtils;
-
-public class RoomsPanel extends UserPanel {
- private static final long serialVersionUID = 1L;
- private final WebMarkupContainer clientsContainer = new WebMarkupContainer("clientsContainer");
- private final WebMarkupContainer details = new WebMarkupContainer("details");
- private final ListView<Client> clients;
- private IModel<Long> roomID = Model.of((Long)null);
- private IModel<String> roomName = Model.of((String)null);
- private IModel<String> roomComment = Model.of((String)null);
- private List<Client> clientsInRoom = null;
- private Long roomId = 0L;
-
- public RoomsPanel(String id, List<Room> rooms) {
- super(id);
- add(new RoomListPanel("list", rooms, Application.getString(131)) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onContainerClick(AjaxRequestTarget target, Room r) {
- roomId = r.getId();
- updateRoomDetails(target);
- }
-
- @Override
- public void onRefreshClick(AjaxRequestTarget target, Room r) {
- super.onRefreshClick(target, r);
- roomId = r.getId();
- updateRoomDetails(target);
- }
- });
-
- // Users in this Room
- add(details.setOutputMarkupId(true).setVisible(rooms.size() > 0));
- details.add(new Label("roomId", roomID));
- details.add(new Label("roomName", roomName));
- details.add(new Label("roomComment", roomComment));
- clients = new ListView<Client>("clients", clientsInRoom){
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(final ListItem<Client> item) {
- Client client = item.getModelObject();
- final Long userId = client.getUserId();
- item.add(new Image("clientImage", new ByteArrayResource("image/jpeg") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected ResourceResponse newResourceResponse(Attributes attributes) {
- ResourceResponse rr = super.newResourceResponse(attributes);
- rr.disableCaching();
- return rr;
- }
-
- @Override
- protected byte[] getData(Attributes attributes) {
- String uri = null;
- if (userId != null) {
- uri = getBean(UserDao.class).get(userId > 0 ? userId : -userId).getPictureuri();
- }
- File img = OmFileHelper.getUserProfilePicture(userId, uri);
- try (InputStream is = new FileInputStream(img)) {
- return IOUtils.toByteArray(is);
- } catch (Exception e) {
- //no-op
- }
- return null;
- }
- }));
- item.add(new Label("clientLogin", client.getUser().getLogin()));
- item.add(new Label("from", client.getConnectedSince()));
- }
- };
- details.add(clientsContainer.add(clients.setOutputMarkupId(true)).setOutputMarkupId(true));
- }
-
- void updateRoomDetails(AjaxRequestTarget target) {
- final List<Client> clientsInRoom = Application.getRoomClients(roomId);
- clients.setDefaultModelObject(clientsInRoom);
- Room room = getBean(RoomDao.class).get(roomId);
- roomID.setObject(room.getId());
- roomName.setObject(room.getName());
- roomComment.setObject(room.getComment());
- target.add(clientsContainer, details);
- }
-
- @Override
- protected void onDetach() {
- roomID.detach();
- roomName.detach();
- roomComment.detach();
- super.onDetach();
- }
-}
+/*
+ * 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.user.rooms;
+
+import static org.apache.openmeetings.web.app.Application.getBean;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.List;
+
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.basic.Client;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.image.Image;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.resource.ByteArrayResource;
+import org.apache.wicket.util.io.IOUtils;
+
+public class RoomsPanel extends UserPanel {
+ private static final long serialVersionUID = 1L;
+ private final WebMarkupContainer clientsContainer = new WebMarkupContainer("clientsContainer");
+ private final WebMarkupContainer details = new WebMarkupContainer("details");
+ private final ListView<Client> clients;
+ private IModel<Long> roomID = Model.of((Long)null);
+ private IModel<String> roomName = Model.of((String)null);
+ private IModel<String> roomComment = Model.of((String)null);
+ private List<Client> clientsInRoom = null;
+ private Long roomId = 0L;
+
+ public RoomsPanel(String id, List<Room> rooms) {
+ super(id);
+ add(new RoomListPanel("list", rooms, Application.getString(131)) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onContainerClick(AjaxRequestTarget target, Room r) {
+ roomId = r.getId();
+ updateRoomDetails(target);
+ }
+
+ @Override
+ public void onRefreshClick(AjaxRequestTarget target, Room r) {
+ super.onRefreshClick(target, r);
+ roomId = r.getId();
+ updateRoomDetails(target);
+ }
+ });
+
+ // Users in this Room
+ add(details.setOutputMarkupId(true).setVisible(rooms.size() > 0));
+ details.add(new Label("roomId", roomID));
+ details.add(new Label("roomName", roomName));
+ details.add(new Label("roomComment", roomComment));
+ clients = new ListView<Client>("clients", clientsInRoom){
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(final ListItem<Client> item) {
+ Client client = item.getModelObject();
+ final Long userId = client.getUserId();
+ item.add(new Image("clientImage", new ByteArrayResource("image/jpeg") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected ResourceResponse newResourceResponse(Attributes attributes) {
+ ResourceResponse rr = super.newResourceResponse(attributes);
+ rr.disableCaching();
+ return rr;
+ }
+
+ @Override
+ protected byte[] getData(Attributes attributes) {
+ String uri = null;
+ if (userId != null) {
+ uri = getBean(UserDao.class).get(userId > 0 ? userId : -userId).getPictureuri();
+ }
+ File img = OmFileHelper.getUserProfilePicture(userId, uri);
+ try (InputStream is = new FileInputStream(img)) {
+ return IOUtils.toByteArray(is);
+ } catch (Exception e) {
+ //no-op
+ }
+ return null;
+ }
+ }));
+ item.add(new Label("clientLogin", client.getUser().getLogin()));
+ item.add(new Label("from", client.getConnectedSince()));
+ }
+ };
+ details.add(clientsContainer.add(clients.setOutputMarkupId(true)).setOutputMarkupId(true));
+ }
+
+ void updateRoomDetails(AjaxRequestTarget target) {
+ final List<Client> clientsInRoom = Application.getRoomClients(roomId);
+ clients.setDefaultModelObject(clientsInRoom);
+ Room room = getBean(RoomDao.class).get(roomId);
+ roomID.setObject(room.getId());
+ roomName.setObject(room.getName());
+ roomComment.setObject(room.getComment());
+ target.add(clientsContainer, details);
+ }
+
+ @Override
+ protected void onDetach() {
+ roomID.detach();
+ roomName.detach();
+ roomComment.detach();
+ super.onDetach();
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
index dde60ba..f433301 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
@@ -1,27 +1,27 @@
-<?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:wicket="http://wicket.apache.org">
-<wicket:panel>
- <div wicket:id="title" class="rooms title"></div>
- <div wicket:id="desc" class="rooms desc info-text"></div>
- <div wicket:id="rooms"></div>
-</wicket:panel>
-</html>
+<?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:wicket="http://wicket.apache.org">
+<wicket:panel>
+ <div wicket:id="title" class="rooms title"></div>
+ <div wicket:id="desc" class="rooms desc info-text"></div>
+ <div wicket:id="rooms"></div>
+</wicket:panel>
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
index eb0ef24..b931e24 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
@@ -1,56 +1,56 @@
-/*
- * 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.user.rooms;
-
-import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.common.UserPanel;
-import org.apache.openmeetings.web.util.OmUrlFragment.MenuParams;
-import org.apache.wicket.markup.html.basic.Label;
-
-public class RoomsSelectorPanel extends UserPanel {
- private static final long serialVersionUID = 1L;
-
- public RoomsSelectorPanel(String id, MenuParams param) {
- super(id);
-
- long title, desc;
- RoomDao roomDao = Application.getBean(RoomDao.class);
- switch (param) {
- case myTabButton:
- title = 781L;
- desc = 782L;
- add(new RoomsPanel("rooms", getMyRooms()));
- break;
- case privateTabButton:
- title = 779L;
- desc = 780L;
- add(new RoomsTabbedPanel("rooms"));
- break;
- case publicTabButton:
- default:
- title = 777L;
- desc = 778L;
- add(new RoomsPanel("rooms", roomDao.getPublicRooms()));
- break;
- }
- add(new Label("title", Application.getString(title)));
- add(new Label("desc", Application.getString(desc)));
- }
-}
+/*
+ * 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.user.rooms;
+
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.openmeetings.web.util.OmUrlFragment.MenuParams;
+import org.apache.wicket.markup.html.basic.Label;
+
+public class RoomsSelectorPanel extends UserPanel {
+ private static final long serialVersionUID = 1L;
+
+ public RoomsSelectorPanel(String id, MenuParams param) {
+ super(id);
+
+ long title, desc;
+ RoomDao roomDao = Application.getBean(RoomDao.class);
+ switch (param) {
+ case myTabButton:
+ title = 781L;
+ desc = 782L;
+ add(new RoomsPanel("rooms", getMyRooms()));
+ break;
+ case privateTabButton:
+ title = 779L;
+ desc = 780L;
+ add(new RoomsTabbedPanel("rooms"));
+ break;
+ case publicTabButton:
+ default:
+ title = 777L;
+ desc = 778L;
+ add(new RoomsPanel("rooms", roomDao.getPublicRooms()));
+ break;
+ }
+ add(new Label("title", Application.getString(title)));
+ add(new Label("desc", Application.getString(desc)));
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html
index b8aa48b..a92599d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html
@@ -1,30 +1,30 @@
-<?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:wicket="http://wicket.apache.org">
- <wicket:panel>
- <div id="orgTabs">
- <ul>
- <li wicket:id="orgTabs"><a wicket:id="link"><wicket:container wicket:id="name"></wicket:container></a></li>
- </ul>
- <wicket:container wicket:id="orgRooms"><div wicket:id="rooms"></div></wicket:container>
- </div>
- </wicket:panel>
-</html>
+<?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:wicket="http://wicket.apache.org">
+ <wicket:panel>
+ <div id="orgTabs">
+ <ul>
+ <li wicket:id="orgTabs"><a wicket:id="link"><wicket:container wicket:id="name"></wicket:container></a></li>
+ </ul>
+ <wicket:container wicket:id="orgRooms"><div wicket:id="rooms"></div></wicket:container>
+ </div>
+ </wicket:panel>
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1cb3518f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
index 89eaa24..f73a2d9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
@@ -1,70 +1,70 @@
-/*
- * 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.user.rooms;
-
-import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.WebSession.getUserId;
-
-import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.user.Group;
-import org.apache.openmeetings.db.entity.user.GroupUser;
-import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.web.common.UserPanel;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-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.model.Model;
-
-import com.googlecode.wicket.jquery.core.JQueryBehavior;
-
-public class RoomsTabbedPanel extends UserPanel {
- private static final long serialVersionUID = 3642004664480074881L;
-
- public RoomsTabbedPanel(String id) {
- super(id);
-
- User u = getBean(UserDao.class).get(getUserId());
- add(new ListView<GroupUser>("orgTabs", u.getGroupUsers()) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(ListItem<GroupUser> item) {
- Group org = item.getModelObject().getGroup();
- item.add(new WebMarkupContainer("link")
- .add(new Label("name", Model.of(org.getName())))
- .add(new AttributeModifier("href", "#org" + org.getId())));
- }
- });
- add(new ListView<GroupUser>("orgRooms", u.getGroupUsers()) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(ListItem<GroupUser> item) {
- Group org = item.getModelObject().getGroup();
- item.add(new RoomsPanel("rooms"
- , getBean(RoomDao.class).getGroupRooms(org.getId()))
- .setMarkupId("org" + org.getId())).setRenderBodyOnly(true);
- }
- });
- add(new JQueryBehavior("#orgTabs", "tabs"));
- }
-}
+/*
+ * 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.user.rooms;
+
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.Group;
+import org.apache.openmeetings.db.entity.user.GroupUser;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+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.model.Model;
+
+import com.googlecode.wicket.jquery.core.JQueryBehavior;
+
+public class RoomsTabbedPanel extends UserPanel {
+ private static final long serialVersionUID = 3642004664480074881L;
+
+ public RoomsTabbedPanel(String id) {
+ super(id);
+
+ User u = getBean(UserDao.class).get(getUserId());
+ add(new ListView<GroupUser>("orgTabs", u.getGroupUsers()) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(ListItem<GroupUser> item) {
+ Group org = item.getModelObject().getGroup();
+ item.add(new WebMarkupContainer("link")
+ .add(new Label("name", Model.of(org.getName())))
+ .add(new AttributeModifier("href", "#org" + org.getId())));
+ }
+ });
+ add(new ListView<GroupUser>("orgRooms", u.getGroupUsers()) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(ListItem<GroupUser> item) {
+ Group org = item.getModelObject().getGroup();
+ item.add(new RoomsPanel("rooms"
+ , getBean(RoomDao.class).getGroupRooms(org.getId()))
+ .setMarkupId("org" + org.getId())).setRenderBodyOnly(true);
+ }
+ });
+ add(new JQueryBehavior("#orgTabs", "tabs"));
+ }
+}