Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java Fri Mar 10 14:33:11 2017 @@ -29,11 +29,11 @@ import java.util.List; import org.apache.openmeetings.db.dao.server.ISessionManager; import org.apache.openmeetings.db.dao.user.IUserService; +import org.apache.openmeetings.db.entity.basic.IClient; import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.web.admin.AdminPanel; import org.apache.openmeetings.web.admin.SearchableDataView; import org.apache.openmeetings.web.app.Application; -import org.apache.openmeetings.web.app.WebSession; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder; import org.apache.openmeetings.web.common.PagedEntityListPanel; import org.apache.openmeetings.web.data.SearchableDataProvider; @@ -51,55 +51,80 @@ public class ConnectionsPanel extends Ad public ConnectionsPanel(String id) { super(id); - SearchableDataProvider<Client> sdp = new SearchableDataProvider<Client>(null) { + SearchableDataProvider<IClient> sdp = new SearchableDataProvider<IClient>(null) { private static final long serialVersionUID = 1L; //FIXME add search + private List<IClient> list() { + List<IClient> l = new ArrayList<>(); + l.addAll(getBean(ISessionManager.class).getClientsWithServer()); + l.addAll(Application.getClients()); + return l; + } + @Override - public Iterator<? extends Client> iterator(long first, long count) { + public Iterator<? extends IClient> iterator(long first, long count) { //FIXME add grouping by public SID - List<Client> l = new ArrayList<>(getBean(ISessionManager.class).getClientsWithServer()); + List<IClient> l = list(); return l.subList((int)Math.max(0, first), (int)Math.min(first + count, l.size())).iterator(); } @Override public long size() { - return getBean(ISessionManager.class).getClients().size(); + return list().size(); } }; final WebMarkupContainer container = new WebMarkupContainer("container"); final WebMarkupContainer details = new WebMarkupContainer("details"); - SearchableDataView<Client> dataView = new SearchableDataView<Client>("clientList", sdp) { + SearchableDataView<IClient> dataView = new SearchableDataView<IClient>("clientList", sdp) { private static final long serialVersionUID = 1L; @Override - protected void populateItem(final Item<Client> item) { - Client c = item.getModelObject(); - item.add(new Label("streamid")); - item.add(new Label("username")); - item.add(new Label("connectedSince")); - item.add(new Label("scope")); - item.add(new Label("server", c.getServer() == null ? "no cluster" : c.getServer().getAddress())); //FIXME localization - item.add(new ConfirmableAjaxBorder("kick", getString("603"), getString("605")) { + protected void populateItem(final Item<IClient> item) { + IClient _c = item.getModelObject(); + ConfirmableAjaxBorder confirm = new ConfirmableAjaxBorder("kick", getString("603"), getString("605")) { private static final long serialVersionUID = 1L; @Override protected void onSubmit(AjaxRequestTarget target) { - Client c = item.getModelObject(); - getBean(IUserService.class).kickUserByStreamId(getSid(), c.getStreamid() - , c.getServer() == null ? 0 : c.getServer().getId()); + IClient _c = item.getModelObject(); + if (_c instanceof Client) { + Client c = (Client)_c; + getBean(IUserService.class).kickUserByStreamId(getSid(), c.getStreamid() + , c.getServer() == null ? 0 : c.getServer().getId()); + } else { + org.apache.openmeetings.db.entity.basic.Client c = (org.apache.openmeetings.db.entity.basic.Client)_c; + getBean(IUserService.class).kickUserBySessionId(getSid(), c.getUserId(), c.getSessionId()); + } target.add(container, details.setVisible(false)); } - }.setEnabled(!c.isScreenClient())); + }; + if (_c instanceof Client) { + Client c = (Client)_c; + item.add(new Label("streamid")); + item.add(new Label("login", c.getUsername())); + item.add(new Label("since", c.getConnectedSince())); + item.add(new Label("scope")); + item.add(new Label("server", c.getServer() == null ? "no cluster" : c.getServer().getAddress())); //FIXME localization + confirm.setEnabled(!c.isScreenClient()); + } else { + org.apache.openmeetings.db.entity.basic.Client c = (org.apache.openmeetings.db.entity.basic.Client)_c; + item.add(new Label("streamid", "")); + item.add(new Label("login", c.getUser().getLogin())); + item.add(new Label("since", c.getConnectedSince())); + item.add(new Label("scope", c.getRoomId() == null ? "html5" : "" + c.getRoomId())); + item.add(new Label("server", "")); + } + item.add(confirm); item.add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; @Override protected void onEvent(AjaxRequestTarget target) { - Field[] ff = Client.class.getDeclaredFields(); + Field[] ff = item.getModelObject().getClass().getDeclaredFields(); RepeatingView lines = new RepeatingView("line"); - Client c = item.getModelObject(); + IClient c = item.getModelObject(); for (Field f : ff) { int mod = f.getModifiers(); if (Modifier.isStatic(mod) || Modifier.isTransient(mod)) { @@ -125,82 +150,12 @@ public class ConnectionsPanel extends Ad } }; add(container.add(dataView).setOutputMarkupId(true), details.setVisible(false).setOutputMarkupPlaceholderTag(true)); - - SearchableDataProvider<org.apache.openmeetings.db.entity.basic.Client> sdpWeb = new SearchableDataProvider<org.apache.openmeetings.db.entity.basic.Client>(null) { - private static final long serialVersionUID = 1L; - - @Override - public Iterator<? extends org.apache.openmeetings.db.entity.basic.Client> iterator(long first, long count) { - List<org.apache.openmeetings.db.entity.basic.Client> l = Application.getClients(); - return l.subList((int)Math.max(0, first), (int)Math.min(first + count, l.size())).iterator(); - } - - @Override - public long size() { - return Application.getClientsSize(); - } - }; - - final WebMarkupContainer containerWeb = new WebMarkupContainer("containerWeb"); - SearchableDataView<org.apache.openmeetings.db.entity.basic.Client> dataViewWeb = new SearchableDataView<org.apache.openmeetings.db.entity.basic.Client>("clientListWeb", sdpWeb) { - private static final long serialVersionUID = 1L; - - @Override - protected void populateItem(final Item<org.apache.openmeetings.db.entity.basic.Client> item) { - org.apache.openmeetings.db.entity.basic.Client c = item.getModelObject(); - item.add(new Label("id", "")); - item.add(new Label("login", c.getUser().getLogin())); - item.add(new Label("since", c.getConnectedSince())); - item.add(new Label("scope", c.getRoomId() == null ? "html5" : "" + c.getRoomId())); - item.add(new ConfirmableAjaxBorder("kick", getString("603"), getString("605")) { - private static final long serialVersionUID = 1L; - - @Override - protected void onSubmit(AjaxRequestTarget target) { - org.apache.openmeetings.db.entity.basic.Client c = item.getModelObject(); - getBean(IUserService.class).kickUserBySessionId(getSid(), c.getUserId(), c.getSessionId()); - target.add(containerWeb, details.setVisible(false)); - } - }.setEnabled(!c.getSessionId().equals(WebSession.get().getId()))); - item.add(new AjaxEventBehavior("click") { - private static final long serialVersionUID = 1L; - - @Override - protected void onEvent(AjaxRequestTarget target) { - Field[] ff = org.apache.openmeetings.db.entity.basic.Client.class.getDeclaredFields(); - RepeatingView lines = new RepeatingView("line"); - org.apache.openmeetings.db.entity.basic.Client c = item.getModelObject(); - for (Field f : ff) { - int mod = f.getModifiers(); - if (Modifier.isStatic(mod) || Modifier.isTransient(mod)) { - continue; - } - WebMarkupContainer line = new WebMarkupContainer(lines.newChildId()); - line.add(new Label("name", f.getName())); - String val = ""; - try { - f.setAccessible(true); - val = "" + f.get(c); - } catch (Exception e) { - } - line.add(new Label("value", val)); - lines.add(line); - } - details.addOrReplace(lines); - target.add(details.setVisible(true)); - } - }); - item.add(AttributeModifier.append("class", ROW_CLASS)); - } - }; - - add(containerWeb.add(dataViewWeb).setOutputMarkupId(true), details.setVisible(false).setOutputMarkupPlaceholderTag(true)); add(new PagedEntityListPanel("navigator", dataView) { private static final long serialVersionUID = 1L; @Override protected void onEvent(AjaxRequestTarget target) { - target.add(container, containerWeb); + target.add(container); } }); }
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html Fri Mar 10 14:33:11 2017 @@ -7,66 +7,64 @@ 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="adminPanel"> - <div class="adminPanelColumnTable"> - <span wicket:id="navigator">[dataview navigator]</span> +<wicket:extend> + <div class="adminPanelColumnTable"> + <span wicket:id="navigator">[dataview navigator]</span> + <table class="adminListTable"> + <thead> + <tr> + <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="188" /></th> + <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByStatus"></span><wicket:message key="996" /></th> + <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderBySubject"></span><wicket:message key="215" /></th> + </tr> + </thead> + </table> + <div class="tableWrapper" id="adminTable"> <table class="adminListTable"> - <thead> - <tr> - <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="188" /></th> - <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByStatus"></span><wicket:message key="996" /></th> - <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderBySubject"></span><wicket:message key="215" /></th> + <tbody wicket:id="list"> + <tr wicket:id="email"> + <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td> + <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="status"></span></div></td> + <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="subject"></span></div></td> </tr> - </thead> + </tbody> </table> - <div class="tableWrapper" id="adminTable"> - <table class="adminListTable"> - <tbody wicket:id="list"> - <tr wicket:id="email"> - <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td> - <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="status"></span></div></td> - <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="subject"></span></div></td> - </tr> - </tbody> - </table> - </div> - </div> - <div class="adminPanelColumnForm"> - <form wicket:id="form" class="adminForm"> - <div class="formSaveBar ui-widget-header"> - <div class="formCancelButton" wicket:id="ajax-cancel-button" wicket:message="title:157"></div> - </div> - <div class="scrollcontent" id="adminForm"> - <fieldset class="ui-widget-content"> - <legend class="ui-widget-header"><wicket:message key="admin.email.group.label" /></legend> - <div class="formelement"> - <label><wicket:message key="996" /></label><span class="input" wicket:id="status"></span> - <label><wicket:message key="admin.email.recipients" /></label><span class="input" wicket:id="recipients"></span> - <label><wicket:message key="215" /></label><span class="input" wicket:id="subject"></span> - <label><wicket:message key="admin.email.body" /></label><span class="input" wicket:id="body"></span> - <label><wicket:message key="1110" /></label><span class="input" wicket:id="inserted"></span> - <label><wicket:message key="1112" /></label><span class="input" wicket:id="updated"></span> - <label><wicket:message key="admin.email.errorCount" /></label><span class="input" wicket:id="errorCount"></span> - <label><wicket:message key="admin.email.lastError" /></label><span style="white-space: pre;" class="input" wicket:id="lastError"></span> - </div> - </fieldset> - </div> - <button wicket:id="reset" style="float: right; margin-right: 20px;"><wicket:message key="admin.email.reset.status"/></button> - </form> </div> </div> -</wicket:panel> + <div class="adminPanelColumnForm"> + <form wicket:id="form" class="adminForm"> + <div class="formSaveBar ui-widget-header"> + <div class="formCancelButton" wicket:id="ajax-cancel-button" wicket:message="title:157"></div> + </div> + <div class="scrollcontent" id="adminForm"> + <fieldset class="ui-widget-content"> + <legend class="ui-widget-header"><wicket:message key="admin.email.group.label" /></legend> + <div class="formelement"> + <label><wicket:message key="996" /></label><span class="input" wicket:id="status"></span> + <label><wicket:message key="admin.email.recipients" /></label><span class="input" wicket:id="recipients"></span> + <label><wicket:message key="215" /></label><span class="input" wicket:id="subject"></span> + <label><wicket:message key="admin.email.body" /></label><span class="input" wicket:id="body"></span> + <label><wicket:message key="1110" /></label><span class="input" wicket:id="inserted"></span> + <label><wicket:message key="1112" /></label><span class="input" wicket:id="updated"></span> + <label><wicket:message key="admin.email.errorCount" /></label><span class="input" wicket:id="errorCount"></span> + <label><wicket:message key="admin.email.lastError" /></label><span style="white-space: pre;" class="input" wicket:id="lastError"></span> + </div> + </fieldset> + </div> + <button wicket:id="reset" style="float: right; margin-right: 20px;"><wicket:message key="admin.email.reset.status"/></button> + </form> + </div> +</wicket:extend> </html> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html Fri Mar 10 14:33:11 2017 @@ -7,91 +7,80 @@ 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:head> - <script type="text/javascript"> - function groupsInit() { - var documentHeight = $(document).height(); - $('#adminForm').height(documentHeight-114); - $('#adminTable').height(documentHeight-144); - }; - </script> - </wicket:head> - <wicket:panel> - <div class="adminPanel"> - <div class="adminPanelColumnTable"> - <span wicket:id="navigator">[dataview navigator]</span> - <table class="adminListTable"> - <tr> - <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="164" /></th> - <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="165" /></th> - </tr> - </table> - <div class="tableWrapper" id="adminTable"> - <table class="adminListTable"> - <tbody wicket:id="listContainer"> - <tr wicket:id="groupList"> - <td class="two_column_layout_column1"><div class="two_column_layout_divcolumn1"><span wicket:id="id"></span></div></td> - <td class="two_column_layout_column2"><div class="two_column_layout_divcolumn2"><span wicket:id="name"></span></div></td> - </tr> - </tbody> - </table> - </div> - </div> - <div class="adminPanelColumnForm"> - <form wicket:id="form" class="adminForm"> - <div wicket:id="buttons"></div> - <div class="scrollcontent" id="adminForm"> - <fieldset class="ui-widget-content"> - <legend class="ui-widget-header"><wicket:message key="170" /></legend> - <div class="formelement"> - <label><wicket:message key="171" /></label><input type="text" wicket:id="name" /> - </div> - <div class="formelement"> - <label><wicket:message key="admin.group.form.logo" /></label><div wicket:id="logo" class="input group logo"></div> - </div> - <div class="formelement"> - <label><wicket:message key="admin.group.form.tag" /></label><input type="text" wicket:id="tag" /> - </div> - <div class="formelement"> - <label style="font-weight: bold;"><wicket:message key="178" /></label><div class="om-select2"><select wicket:id="user2add" class="input"></select></div> - </div> - <div class="formelement"> - <div wicket:id="users"></div> - </div> - <div class="formelement"> - <label><wicket:message key="admin.group.form.limited" /></label><input type="checkbox" wicket:id="limited" /> - </div> - <div class="formelement" style="display:none"> - <label><wicket:message key="admin.group.form.maxFilesSize" /></label><input type="number" wicket:id="maxFilesSize" /><wicket:message key="network.test.mb"/> - </div> - <div class="formelement" style="display:none"> - <label><wicket:message key="admin.group.form.maxRecordingsSize" /></label><input type="number" wicket:id="maxRecordingsSize" /><wicket:message key="network.test.mb"/> - </div> - <div class="formelement" style="display:none"> - <label><wicket:message key="admin.group.form.maxRooms" /></label><input type="number" wicket:id="maxRooms" /> - </div> - <div class="formelement"> - <label><wicket:message key="admin.group.form.recordingTtl" /></label><input type="number" wicket:id="recordingTtl" /><wicket:message key="admin.group.form.days"/> - </div> - <div class="formelement"> - <label><wicket:message key="admin.group.form.reminderDays" /></label><input type="number" wicket:id="reminderDays" /><wicket:message key="admin.group.form.days"/> - </div> - </fieldset> +<wicket:extend> + <div class="adminPanelColumnTable"> + <span wicket:id="navigator">[dataview navigator]</span> + <table class="adminListTable"> + <tr> + <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="164" /></th> + <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="165" /></th> + </tr> + </table> + <div class="tableWrapper" id="adminTable"> + <table class="adminListTable"> + <tbody wicket:id="listContainer"> + <tr wicket:id="groupList"> + <td class="two_column_layout_column1"><div class="two_column_layout_divcolumn1"><span wicket:id="id"></span></div></td> + <td class="two_column_layout_column2"><div class="two_column_layout_divcolumn2"><span wicket:id="name"></span></div></td> + </tr> + </tbody> + </table> + </div> + </div> + <div class="adminPanelColumnForm"> + <form wicket:id="form" class="adminForm"> + <div wicket:id="buttons"></div> + <div class="scrollcontent" id="adminForm"> + <fieldset class="ui-widget-content"> + <legend class="ui-widget-header"><wicket:message key="170" /></legend> + <div class="formelement"> + <label><wicket:message key="171" /></label><input type="text" wicket:id="name" /> + </div> + <div class="formelement"> + <label><wicket:message key="admin.group.form.logo" /></label><div wicket:id="logo" class="input group logo"></div> + </div> + <div class="formelement"> + <label><wicket:message key="admin.group.form.tag" /></label><input type="text" wicket:id="tag" /> + </div> + <div class="formelement"> + <label style="font-weight: bold;"><wicket:message key="178" /></label><div class="om-select2"><select wicket:id="user2add" class="input"></select></div> + </div> + <div class="formelement"> + <div wicket:id="users"></div> + </div> + <div class="formelement"> + <label><wicket:message key="admin.group.form.limited" /></label><input type="checkbox" wicket:id="limited" /> </div> - </form> + <div class="formelement" style="display:none"> + <label><wicket:message key="admin.group.form.maxFilesSize" /></label><input type="number" wicket:id="maxFilesSize" /><wicket:message key="network.test.mb"/> + </div> + <div class="formelement" style="display:none"> + <label><wicket:message key="admin.group.form.maxRecordingsSize" /></label><input type="number" wicket:id="maxRecordingsSize" /><wicket:message key="network.test.mb"/> + </div> + <div class="formelement" style="display:none"> + <label><wicket:message key="admin.group.form.maxRooms" /></label><input type="number" wicket:id="maxRooms" /> + </div> + <div class="formelement"> + <label><wicket:message key="admin.group.form.recordingTtl" /></label><input type="number" wicket:id="recordingTtl" /><wicket:message key="admin.group.form.days"/> + </div> + <div class="formelement"> + <label><wicket:message key="admin.group.form.reminderDays" /></label><input type="number" wicket:id="reminderDays" /><wicket:message key="admin.group.form.days"/> + </div> + </fieldset> </div> - </div> - </wicket:panel> + </form> + </div> +</wicket:extend> </html> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Fri Mar 10 14:33:11 2017 @@ -23,7 +23,6 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.web.admin.AdminPanel; import org.apache.openmeetings.web.admin.SearchableDataView; -import org.apache.openmeetings.web.common.BasePanel; import org.apache.openmeetings.web.common.PagedEntityListPanel; import org.apache.openmeetings.web.data.DataViewContainer; import org.apache.openmeetings.web.data.OmOrderByBorder; @@ -32,7 +31,6 @@ import org.apache.wicket.AttributeModifi import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; -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.repeater.Item; @@ -49,13 +47,6 @@ public class GroupsPanel extends AdminPa private static final long serialVersionUID = 1L; private GroupForm form; - @Override - public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) { - super.onMenuPanelLoad(handler); - handler.appendJavaScript("groupsInit();"); - return this; - } - public GroupsPanel(String id) { super(id); final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer"); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html Fri Mar 10 14:33:11 2017 @@ -7,16 +7,16 @@ 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> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html Fri Mar 10 14:33:11 2017 @@ -7,93 +7,91 @@ 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="feedback"></div> - <script type="text/javascript"> - function labelsInit() { - $('#addLanguage').dialog({ - closeOnEscape: true - , autoOpen: false - , resizable: false - }); - var documentHeight = $(document).height(); - $('#adminForm').height(documentHeight - 114); - $('#adminTable').height(documentHeight - 172); - }; - </script> - <div class="adminPanel"> - <div class="adminPanelColumnTable"> - <div> - <div wicket:id="addLangBtn" class="addButton" wicket:message="title:362" ></div> - <div wicket:id="deleteLangBtn" class="delButton" wicket:message="title:363"></div> - <form wicket:id="langForm" class="addLanguagePanel"> - <table> - <tr> - <td> - <select wicket:id="language"></select> - </td> - <td> - <span wicket:id="export" class="btn"><wicket:message key="360"/></span> - </td> - <td> - <div class="fileupload fileupload-new" data-provides="fileupload" style="margin: 0;"> - <span class="btn btn-file ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span class="ui-button-text"><wicket:message key="387"/></span><input type="file" accept="text/xml" wicket:id="fileInput"/></span> - </div> - <span wicket:id="progress">[progressbar]</span> - </td> - </tr> - </table> - </form> - </div> - <span wicket:id="navigator">[dataview navigator]</span> - <table class="adminListTable"> - <thead> - <tr> - <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="351" /></th> - <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByValue"></span><wicket:message key="352" /></th> - </tr> - </thead> - </table> - <div class="tableWrapper" id="adminTable"> - <table class="adminListTable"> - <tbody wicket:id="listContainer" > - <tr wicket:id="langList"> - <td class="two_column_layout_column1"><div class="three_column_layout_divcolumn2"><span wicket:id="key"></span></div></td> - <td class="two_column_layout_column2"><div class="three_column_layout_divcolumn3"><span wicket:id="value"></span></div></td> - </tr> - </tbody> - </table> - </div> - </div> - <div class="adminPanelColumnForm"> - <form wicket:id="form" class="adminForm"> - <div wicket:id="buttons"></div> - <div class="scrollcontent" id="adminForm"> - <fieldset class="ui-widget-content"> - <legend class="ui-widget-header"><wicket:message key="353" /></legend> - <div class="formelement"> - <label><wicket:message key="354" /></label><input type="text" wicket:id="key"/> - </div> - <div class="formelement"> - <label><wicket:message key="355" /></label><textarea wicket:id="value"></textarea> - </div> - </fieldset> +<wicket:head> + <script type="text/javascript"> + function extAdminPanelInit() { + $('#addLanguage').dialog({ + closeOnEscape: true + , autoOpen: false + , resizable: false + }); + ADMIN_TABLE_SHIIFT = 172; + }; + </script> +</wicket:head> +<wicket:extend> + <div wicket:id="feedback"></div> + <div class="adminPanelColumnTable"> + <div> + <div wicket:id="addLangBtn" class="addButton" wicket:message="title:362" ></div> + <div wicket:id="deleteLangBtn" class="delButton" wicket:message="title:363"></div> + <form wicket:id="langForm" class="addLanguagePanel"> + <table> + <tr> + <td> + <select wicket:id="language"></select> + </td> + <td> + <span wicket:id="export" class="btn"><wicket:message key="360"/></span> + </td> + <td> + <div class="fileupload fileupload-new" data-provides="fileupload" style="margin: 0;"> + <span class="btn btn-file ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span class="ui-button-text"><wicket:message key="387"/></span><input type="file" accept="text/xml" wicket:id="fileInput"/></span> + </div> + <span wicket:id="progress">[progressbar]</span> + </td> + </tr> + </table> + </form> + </div> + <span wicket:id="navigator">[dataview navigator]</span> + <table class="adminListTable"> + <thead> + <tr> + <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="351" /></th> + <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByValue"></span><wicket:message key="352" /></th> + </tr> + </thead> + </table> + <div class="tableWrapper" id="adminTable"> + <table class="adminListTable"> + <tbody wicket:id="listContainer" > + <tr wicket:id="langList"> + <td class="two_column_layout_column1"><div class="three_column_layout_divcolumn2"><span wicket:id="key"></span></div></td> + <td class="two_column_layout_column2"><div class="three_column_layout_divcolumn3"><span wicket:id="value"></span></div></td> + </tr> + </tbody> + </table> + </div> + </div> + <div class="adminPanelColumnForm"> + <form wicket:id="form" class="adminForm"> + <div wicket:id="buttons"></div> + <div class="scrollcontent" id="adminForm"> + <fieldset class="ui-widget-content"> + <legend class="ui-widget-header"><wicket:message key="353" /></legend> + <div class="formelement"> + <label><wicket:message key="354" /></label><input type="text" wicket:id="key"/> </div> - </form> + <div class="formelement"> + <label><wicket:message key="355" /></label><textarea wicket:id="value"></textarea> + </div> + </fieldset> </div> - </div> - <div wicket:id="addLang"></div> - </wicket:panel> + </form> + </div> + <div wicket:id="addLang"></div> +</wicket:extend> </html> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Fri Mar 10 14:33:11 2017 @@ -33,7 +33,6 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.web.admin.AdminPanel; import org.apache.openmeetings.web.admin.SearchableDataView; import org.apache.openmeetings.web.app.Application; -import org.apache.openmeetings.web.common.BasePanel; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder; import org.apache.openmeetings.web.common.PagedEntityListPanel; import org.apache.openmeetings.web.data.DataViewContainer; @@ -46,7 +45,6 @@ import org.apache.wicket.ajax.AjaxEventB import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior; import org.apache.wicket.ajax.markup.html.AjaxLink; -import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; @@ -78,13 +76,6 @@ public class LangPanel extends AdminPane final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer"); Map.Entry<Long, Locale> language; - @Override - public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) { - super.onMenuPanelLoad(handler); - handler.appendJavaScript("labelsInit();"); - return this; - } - public LangPanel(String id) { super(id); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html Fri Mar 10 14:33:11 2017 @@ -7,96 +7,85 @@ 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:head> - <script type="text/javascript"> - function omLdapPanelInit() { - var documentHeight = $(document).height(); - $('#adminForm').height(documentHeight-114); - $('#adminTable').height(documentHeight-144); - } - </script> - </wicket:head> - <wicket:panel> - <div class="adminPanel"> - <div class="adminPanelColumnTable"> - <span wicket:id="navigator">[dataview navigator]</span> - <table class="adminListTable"> - <thead> - <tr> - <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="1104" /></th> - <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="1105" /></th> - <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByFile"></span><wicket:message key="1106" /></th> - </tr> - </thead> - </table> - <div class="tableWrapper" id="adminTable"> - <table class="adminListTable"> - <tbody wicket:id="listContainer"> - <tr wicket:id="ldapList"> - <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td> - <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="name"></span></div></td> - <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="configFileName"></span></div></td> - </tr> - </tbody> - </table> - </div> - </div> - <div class="adminPanelColumnForm"> - <form wicket:id="form" class="adminForm"> - <div wicket:id="buttons"></div> - <div class="scrollcontent" id="adminForm"> - <fieldset class="ui-widget-content"> - <legend class="ui-widget-header"><wicket:message key="1107" /></legend> - <div class="formelement"> - <label><wicket:message key="1108" /></label><input type="text" wicket:id="name"/> - </div> - <div class="formelement"> - <label><wicket:message key="1109" /></label><input type="checkbox" class="formcheckbox" wicket:id="active"/> - </div> - <div class="formelement"> - <label><wicket:message key="1110" /></label><span wicket:id="inserted"/> - </div> - <div class="formelement"> - <label><wicket:message key="1111" /></label><span wicket:id="insertedby.login"/> - </div> - <div class="formelement"> - <label><wicket:message key="1112" /></label><span wicket:id="updated"/> - </div> - <div class="formelement"> - <label><wicket:message key="1113" /></label><span wicket:id="updatedby.login"/> - </div> - <div class="formelement"> - <div class="info-text"><wicket:message key="1114" /></div> - <br/> - <label><wicket:message key="1115" /></label><input type="text" wicket:id="configFileName"/> - </div> - <div class="formelement"> - <div class="info-text"><wicket:message key="1116" /></div> - <br/> - <label><wicket:message key="1117" /></label><input type="checkbox" class="formcheckbox" wicket:id="addDomainToUserName"/> - </div> - <div class="formelement"> - <label><wicket:message key="1118" /></label><input type="text" wicket:id="domain"/> - </div> - <div class="formelement"> - <label><wicket:message key="270" /></label><textarea wicket:id="comment"/> - </div> - </fieldset> +<wicket:extend> + <div class="adminPanelColumnTable"> + <span wicket:id="navigator">[dataview navigator]</span> + <table class="adminListTable"> + <thead> + <tr> + <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="1104" /></th> + <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="1105" /></th> + <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByFile"></span><wicket:message key="1106" /></th> + </tr> + </thead> + </table> + <div class="tableWrapper" id="adminTable"> + <table class="adminListTable"> + <tbody wicket:id="listContainer"> + <tr wicket:id="ldapList"> + <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td> + <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="name"></span></div></td> + <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="configFileName"></span></div></td> + </tr> + </tbody> + </table> + </div> + </div> + <div class="adminPanelColumnForm"> + <form wicket:id="form" class="adminForm"> + <div wicket:id="buttons"></div> + <div class="scrollcontent" id="adminForm"> + <fieldset class="ui-widget-content"> + <legend class="ui-widget-header"><wicket:message key="1107" /></legend> + <div class="formelement"> + <label><wicket:message key="1108" /></label><input type="text" wicket:id="name"/> + </div> + <div class="formelement"> + <label><wicket:message key="1109" /></label><input type="checkbox" class="formcheckbox" wicket:id="active"/> + </div> + <div class="formelement"> + <label><wicket:message key="1110" /></label><span wicket:id="inserted"/> + </div> + <div class="formelement"> + <label><wicket:message key="1111" /></label><span wicket:id="insertedby.login"/> + </div> + <div class="formelement"> + <label><wicket:message key="1112" /></label><span wicket:id="updated"/> </div> - </form> + <div class="formelement"> + <label><wicket:message key="1113" /></label><span wicket:id="updatedby.login"/> + </div> + <div class="formelement"> + <div class="info-text"><wicket:message key="1114" /></div> + <br/> + <label><wicket:message key="1115" /></label><input type="text" wicket:id="configFileName"/> + </div> + <div class="formelement"> + <div class="info-text"><wicket:message key="1116" /></div> + <br/> + <label><wicket:message key="1117" /></label><input type="checkbox" class="formcheckbox" wicket:id="addDomainToUserName"/> + </div> + <div class="formelement"> + <label><wicket:message key="1118" /></label><input type="text" wicket:id="domain"/> + </div> + <div class="formelement"> + <label><wicket:message key="270" /></label><textarea wicket:id="comment"/> + </div> + </fieldset> </div> - </div> - </wicket:panel> + </form> + </div> +</wicket:extend> </html> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Fri Mar 10 14:33:11 2017 @@ -22,7 +22,6 @@ import org.apache.openmeetings.db.dao.se import org.apache.openmeetings.db.entity.server.LdapConfig; import org.apache.openmeetings.web.admin.AdminPanel; import org.apache.openmeetings.web.admin.SearchableDataView; -import org.apache.openmeetings.web.common.BasePanel; import org.apache.openmeetings.web.common.PagedEntityListPanel; import org.apache.openmeetings.web.data.DataViewContainer; import org.apache.openmeetings.web.data.OmOrderByBorder; @@ -30,7 +29,6 @@ import org.apache.openmeetings.web.data. import org.apache.wicket.AttributeModifier; import org.apache.wicket.ajax.AjaxEventBehavior; 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.repeater.Item; @@ -46,13 +44,6 @@ public class LdapsPanel extends AdminPan final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer"); private LdapForm form; - @Override - public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) { - super.onMenuPanelLoad(handler); - handler.appendJavaScript("omLdapPanelInit();"); - return this; - } - public LdapsPanel(String id) { super(id); SearchableDataView<LdapConfig> dataView = new SearchableDataView<LdapConfig>("ldapList" Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html Fri Mar 10 14:33:11 2017 @@ -7,105 +7,94 @@ 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:head> - <script type="text/javascript"> - function oauthPanelInit() { - var documentHeight = $(document).height(); - $('#adminForm').height(documentHeight-114); - $('#adminTable').height(documentHeight-144); - } - </script> - </wicket:head> - <wicket:panel> - <div class="adminPanel"> - <div class="adminPanelColumnTable"> - <span wicket:id="navigator">[dataview navigator]</span> - <table class="adminListTable"> - <thead> - <tr> - <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="1104" /></th> - <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="1105" /></th> - </tr> - </thead> - </table> - <div class="tableWrapper" id="adminTable"> - <table class="adminListTable"> - <tbody wicket:id="listContainer"> - <tr wicket:id="oauthServersList"> - <td class="two_column_layout_column1"><div class="two_column_layout_divcolumn1"><span wicket:id="id"></span></div></td> - <td class="two_column_layout_column2"><div class="two_column_layout_divcolumn2"><span wicket:id="name"></span></div></td> - </tr> - </tbody> - </table> - </div> - </div> - <div class="adminPanelColumnForm"> - <form wicket:id="form" class="adminForm"> - <div wicket:id="buttons"></div> - <div class="scrollcontent" id="adminForm"> - <fieldset class="ui-widget-content"> - <legend class="ui-widget-header"><wicket:message key="1581" /></legend> - <div class="formelement"> - <label><wicket:message key="1574" /></label><input type="checkbox" class="formcheckbox" wicket:id="isEnabled"/> - </div> - <div class="formelement"> - <label><wicket:message key="1573" /></label><input type="text" wicket:id="name"/> - </div> - <div class="formelement"> - <label><wicket:message key="1575" /></label><input type="text" wicket:id="iconUrl"/> - </div> - <div class="formelement"> - <label><wicket:message key="1576" /></label><input type="text" wicket:id="clientId"/> - </div> - <div class="formelement"> - <label><wicket:message key="1577" /></label><input type="text" wicket:id="clientSecret"/> - </div> - <div class="formelement"> - <label><wicket:message key="1587" /></label><input type="text" readonly="readonly" wicket:id="redirectUri"/> - </div> - <div class="formelement"> - <label><wicket:message key="1578" /></label><input type="text" wicket:id="requestKeyUrl"/> - </div> - <div class="formelement"> - <label><wicket:message key="1579" /></label><input type="text" wicket:id="requestTokenUrl"/> - </div> - <div class="formelement"> - <label><wicket:message key="1586" /></label><input type="text" wicket:id="requestTokenAttributes"/> - </div> - <div class="formelement"> - <label><wicket:message key="1580" /></label><input type="text" wicket:id="requestInfoUrl"/> - </div> - <div class="formelement"> - <label>Request method</label><select wicket:id="requestTokenMethod"></select> - </div> - <div class="formelement"> - <label><wicket:message key="1582" /></label><input type="text" wicket:id="loginParamName"/> - </div> - <div class="formelement"> - <label><wicket:message key="1583" /></label><input type="text" wicket:id="emailParamName"/> - </div> - <div class="formelement"> - <label><wicket:message key="1584" /></label><input type="text" wicket:id="firstnameParamName"/> - </div> - <div class="formelement"> - <label><wicket:message key="1585" /></label><input type="text" wicket:id="lastnameParamName"/> - </div> - </fieldset> +<wicket:extend> + <div class="adminPanelColumnTable"> + <span wicket:id="navigator">[dataview navigator]</span> + <table class="adminListTable"> + <thead> + <tr> + <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="1104" /></th> + <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="1105" /></th> + </tr> + </thead> + </table> + <div class="tableWrapper" id="adminTable"> + <table class="adminListTable"> + <tbody wicket:id="listContainer"> + <tr wicket:id="oauthServersList"> + <td class="two_column_layout_column1"><div class="two_column_layout_divcolumn1"><span wicket:id="id"></span></div></td> + <td class="two_column_layout_column2"><div class="two_column_layout_divcolumn2"><span wicket:id="name"></span></div></td> + </tr> + </tbody> + </table> + </div> + </div> + <div class="adminPanelColumnForm"> + <form wicket:id="form" class="adminForm"> + <div wicket:id="buttons"></div> + <div class="scrollcontent" id="adminForm"> + <fieldset class="ui-widget-content"> + <legend class="ui-widget-header"><wicket:message key="1581" /></legend> + <div class="formelement"> + <label><wicket:message key="1574" /></label><input type="checkbox" class="formcheckbox" wicket:id="isEnabled"/> + </div> + <div class="formelement"> + <label><wicket:message key="1573" /></label><input type="text" wicket:id="name"/> + </div> + <div class="formelement"> + <label><wicket:message key="1575" /></label><input type="text" wicket:id="iconUrl"/> + </div> + <div class="formelement"> + <label><wicket:message key="1576" /></label><input type="text" wicket:id="clientId"/> + </div> + <div class="formelement"> + <label><wicket:message key="1577" /></label><input type="text" wicket:id="clientSecret"/> + </div> + <div class="formelement"> + <label><wicket:message key="1587" /></label><input type="text" readonly="readonly" wicket:id="redirectUri"/> + </div> + <div class="formelement"> + <label><wicket:message key="1578" /></label><input type="text" wicket:id="requestKeyUrl"/> + </div> + <div class="formelement"> + <label><wicket:message key="1579" /></label><input type="text" wicket:id="requestTokenUrl"/> </div> - </form> + <div class="formelement"> + <label><wicket:message key="1586" /></label><input type="text" wicket:id="requestTokenAttributes"/> + </div> + <div class="formelement"> + <label><wicket:message key="1580" /></label><input type="text" wicket:id="requestInfoUrl"/> + </div> + <div class="formelement"> + <label>Request method</label><select wicket:id="requestTokenMethod"></select> + </div> + <div class="formelement"> + <label><wicket:message key="1582" /></label><input type="text" wicket:id="loginParamName"/> + </div> + <div class="formelement"> + <label><wicket:message key="1583" /></label><input type="text" wicket:id="emailParamName"/> + </div> + <div class="formelement"> + <label><wicket:message key="1584" /></label><input type="text" wicket:id="firstnameParamName"/> + </div> + <div class="formelement"> + <label><wicket:message key="1585" /></label><input type="text" wicket:id="lastnameParamName"/> + </div> + </fieldset> </div> - </div> - </wicket:panel> -</html> \ No newline at end of file + </form> + </div> +</wicket:extend> +</html> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java Fri Mar 10 14:33:11 2017 @@ -85,5 +85,4 @@ public class OAuthPanel extends AdminPan form.showNewRecord(); add(form); } - } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html Fri Mar 10 14:33:11 2017 @@ -7,224 +7,222 @@ 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="adminPanel"> - <div class="adminPanelColumnTable rooms"> - <span wicket:id="navigator">[dataview navigator]</span> - <table class="adminListTable"> - <thead> - <tr> - <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="188" /></th> - <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="189" /></th> - <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByPublic"></span><wicket:message key="190" /></th> - </tr> - </thead> - </table> - <div class="tableWrapper" id="adminTable"> +<wicket:extend> + <div class="adminPanelColumnTable rooms"> + <span wicket:id="navigator">[dataview navigator]</span> + <table class="adminListTable"> + <thead> + <tr> + <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="188" /></th> + <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="189" /></th> + <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByPublic"></span><wicket:message key="190" /></th> + </tr> + </thead> + </table> + <div class="tableWrapper" id="adminTable"> + <table class="adminListTable"> + <tbody wicket:id="listContainer"> + <tr wicket:id="roomList"> + <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td> + <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="name"></span></div></td> + <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="ispublic"></span></div></td> + </tr> + </tbody> + </table> + </div> + </div> + <div class="adminPanelColumnForm"> + <form wicket:id="form" class="adminForm"> + <div wicket:id="buttons"></div> + <div class="scrollcontent" id="adminForm"> + + <!-- General --> + <fieldset class="ui-widget-content"> + <legend class="ui-widget-header"><wicket:message key="187" /></legend> + <div class="formelement"> + <label><wicket:message key="193" /></label><input type="text" wicket:id="name" /> + </div> + <div class="formelement"> + <label><wicket:message key="482" /></label><select wicket:id="numberOfPartizipants"/> + </div> + <div class="formelement"> + <label><wicket:message key="194" /></label><select wicket:id="type"/> + </div> + <div class="formelement"> + <label><wicket:message key="196" /></label><textarea style="width: 200px; height: 100px;" wicket:id="comment"/> + </div> + <div class="formelement"> + <label><wicket:message key="620" /></label><input type="checkbox" class="formcheckbox" wicket:id="appointment" /> + </div> + </fieldset> + + <!-- Groups --> + <fieldset class="ui-widget-content"> + <legend class="ui-widget-header"><wicket:message key="191" /></legend> + <div class="formelement"> + <label><wicket:message key="195" /></label><input type="checkbox" class="formcheckbox" wicket:id="ispublic" /> + </div> + <div class="formelement"> + <div class="info-text"><wicket:message key="828" /></div> + <label><wicket:message key="191" /></label><div class="om-select2"><select class="input" wicket:id="roomGroups"></select></div> + </div> + </fieldset> + + <!-- Limitations --> + <fieldset class="ui-widget-content"> + <legend class="ui-widget-header"><wicket:message key="830" /></legend> + <div class="formelement"> + <label><wicket:message key="636" /></label><input type="checkbox" class="formcheckbox" wicket:id="isDemoRoom" /> + </div> + <div class="formelement"> + <label><wicket:message key="637" /></label><input type="text" wicket:id="demoTime" /> + </div> + </fieldset> + + <!-- Rights --> + <fieldset class="ui-widget-content"> + <legend class="ui-widget-header"><wicket:message key="881" /></legend> + <div class="formelement"> + <div class="info-text"><wicket:message key="880" /></div> + <label><wicket:message key="879" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowUserQuestions" /> + </div> + <div class="formelement"> + <div class="info-text"><wicket:message key="1077" /></div> + <label><wicket:message key="1076" /></label><input type="checkbox" class="formcheckbox" wicket:id="audioOnly" /> + </div> + <div class="formelement"> + <div class="info-text"><wicket:message key="1101" /></div> + <label><wicket:message key="1099" /></label><input type="checkbox" class="formcheckbox" wicket:id="closed" /> + </div> + <div class="formelement"> + <label><wicket:message key="1100" /></label><input type="text" wicket:id="redirectURL" /> + </div> + <div class="formelement"> + <div class="info-text"><wicket:message key="1102" /></div> + <br/> + <label><wicket:message key="1356" /></label><input type="checkbox" class="formcheckbox" wicket:id="waitForRecording" /> + </div> + <div class="formelement"> + <label><wicket:message key="1355" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowRecording" /> + </div> + <div class="formelement"> + <label><wicket:message key="1513" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatModerated" /> + </div> + </fieldset> + + <!-- Room Layout options --> + <fieldset class="ui-widget-content"> + <legend class="ui-widget-header"><wicket:message key="1443" /></legend> + <div class="formelement"> + <label><wicket:message key="admin.room.hidden.elements" /></label> + <div class="om-select2"><select class="input" wicket:id="hiddenElements"></select></div> + </div> + <div class="formelement"> + <label><wicket:message key="1515" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatOpened" /> + </div> + <div class="formelement"> + <label><wicket:message key="1516" /></label><input type="checkbox" class="formcheckbox" wicket:id="filesOpened" /> + </div> + <div class="formelement"> + <label><wicket:message key="1528" /></label><input type="checkbox" class="formcheckbox" wicket:id="autoVideoSelect" /> + </div> + </fieldset> + + <!-- Users in this Room --> + <fieldset class="ui-widget-content"> + <legend class="ui-widget-header"><wicket:message key="587" /></legend> <table class="adminListTable"> - <tbody wicket:id="listContainer"> - <tr wicket:id="roomList"> - <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td> - <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="name"></span></div></td> - <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="ispublic"></span></div></td> + <thead> + <tr> + <th class="three_column_layout_column1 ui-widget-header"><wicket:message key="588" /></th> + <th class="three_column_layout_column2 ui-widget-header"><wicket:message key="589" /></th> + <th class="three_column_layout_column3 ui-widget-header"><wicket:message key="590" /></th> </tr> - </tbody> + </thead> </table> - </div> - </div> - <div class="adminPanelColumnForm"> - <form wicket:id="form" class="adminForm"> - <div wicket:id="buttons"></div> - <div class="scrollcontent" id="adminForm"> - - <!-- General --> - <fieldset class="ui-widget-content"> - <legend class="ui-widget-header"><wicket:message key="187" /></legend> - <div class="formelement"> - <label><wicket:message key="193" /></label><input type="text" wicket:id="name" /> - </div> - <div class="formelement"> - <label><wicket:message key="482" /></label><select wicket:id="numberOfPartizipants"/> - </div> - <div class="formelement"> - <label><wicket:message key="194" /></label><select wicket:id="type"/> - </div> - <div class="formelement"> - <label><wicket:message key="196" /></label><textarea style="width: 200px; height: 100px;" wicket:id="comment"/> - </div> - <div class="formelement"> - <label><wicket:message key="620" /></label><input type="checkbox" class="formcheckbox" wicket:id="appointment" /> - </div> - </fieldset> - - <!-- Groups --> - <fieldset class="ui-widget-content"> - <legend class="ui-widget-header"><wicket:message key="191" /></legend> - <div class="formelement"> - <label><wicket:message key="195" /></label><input type="checkbox" class="formcheckbox" wicket:id="ispublic" /> - </div> - <div class="formelement"> - <div class="info-text"><wicket:message key="828" /></div> - <label><wicket:message key="191" /></label><div class="om-select2"><select class="input" wicket:id="roomGroups"></select></div> - </div> - </fieldset> - - <!-- Limitations --> - <fieldset class="ui-widget-content"> - <legend class="ui-widget-header"><wicket:message key="830" /></legend> - <div class="formelement"> - <label><wicket:message key="636" /></label><input type="checkbox" class="formcheckbox" wicket:id="isDemoRoom" /> - </div> - <div class="formelement"> - <label><wicket:message key="637" /></label><input type="text" wicket:id="demoTime" /> - </div> - </fieldset> - - <!-- Rights --> - <fieldset class="ui-widget-content"> - <legend class="ui-widget-header"><wicket:message key="881" /></legend> - <div class="formelement"> - <div class="info-text"><wicket:message key="880" /></div> - <label><wicket:message key="879" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowUserQuestions" /> - </div> - <div class="formelement"> - <div class="info-text"><wicket:message key="1077" /></div> - <label><wicket:message key="1076" /></label><input type="checkbox" class="formcheckbox" wicket:id="audioOnly" /> - </div> - <div class="formelement"> - <div class="info-text"><wicket:message key="1101" /></div> - <label><wicket:message key="1099" /></label><input type="checkbox" class="formcheckbox" wicket:id="closed" /> - </div> - <div class="formelement"> - <label><wicket:message key="1100" /></label><input type="text" wicket:id="redirectURL" /> - </div> - <div class="formelement"> - <div class="info-text"><wicket:message key="1102" /></div> - <br/> - <label><wicket:message key="1356" /></label><input type="checkbox" class="formcheckbox" wicket:id="waitForRecording" /> - </div> - <div class="formelement"> - <label><wicket:message key="1355" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowRecording" /> - </div> - <div class="formelement"> - <label><wicket:message key="1513" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatModerated" /> - </div> - </fieldset> - - <!-- Room Layout options --> - <fieldset class="ui-widget-content"> - <legend class="ui-widget-header"><wicket:message key="1443" /></legend> - <div class="formelement"> - <label><wicket:message key="admin.room.hidden.elements" /></label> - <div class="om-select2"><select class="input" wicket:id="hiddenElements"></select></div> - </div> - <div class="formelement"> - <label><wicket:message key="1515" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatOpened" /> - </div> - <div class="formelement"> - <label><wicket:message key="1516" /></label><input type="checkbox" class="formcheckbox" wicket:id="filesOpened" /> - </div> - <div class="formelement"> - <label><wicket:message key="1528" /></label><input type="checkbox" class="formcheckbox" wicket:id="autoVideoSelect" /> - </div> - </fieldset> - - <!-- Users in this Room --> - <fieldset class="ui-widget-content"> - <legend class="ui-widget-header"><wicket:message key="587" /></legend> - <table class="adminListTable"> - <thead> - <tr> - <th class="three_column_layout_column1 ui-widget-header"><wicket:message key="588" /></th> - <th class="three_column_layout_column2 ui-widget-header"><wicket:message key="589" /></th> - <th class="three_column_layout_column3 ui-widget-header"><wicket:message key="590" /></th> - </tr> - </thead> + <div class="tableWrapperSmall" id="adminTableSmall"> + <table class="adminListTable"> + <tbody wicket:id="clientsContainer"> + <tr wicket:id="clients"> + <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="clientId"></span></div></td> + <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="clientLogin"></span></div></td> + <td class="three_column_layout_column3"><div class="formCancelButton" wicket:id="clientDelete" wicket:message="title:604"></div></td> + </tr> + </tbody> + </table> + </div> + </fieldset> + + <!-- Default moderators --> + <fieldset class="ui-widget-content"> + <div class="formelement"> + <div class="info-text"><wicket:message key="823" /></div> + <label><wicket:message key="640" /></label><input type="checkbox" class="formcheckbox" wicket:id="moderated" /> + </div> + <div class="formelement"> + <label><wicket:message key="816" /></label><div class="om-select2"><select wicket:id="moderator2add" class="input"></select></div> + </div> + <div class="formelement" wicket:id="moderatorContainer"> + <table class="adminListTableSmall"> + <thead> + <tr> + <th class="three_column_layout_column1 ui-widget-header" style="overflow: hidden;" wicket:message="title:817"><wicket:message key="817" /></th> + <th class="three_column_layout_column2 ui-widget-header"><wicket:message key="818" /></th> + <th class="three_column_layout_column3 ui-widget-header"><wicket:message key="819" /></th> + <th class="three_column_layout_column4 ui-widget-header"><wicket:message key="820" /></th> + <th class="three_column_layout_column5 ui-widget-header"><wicket:message key="827" /></th> + </tr> + </thead> + </table> + <div class="tableWrapperSmall" id="adminTableSmall"> + <table class="adminListTableSmall"> + <tbody> + <tr wicket:id="moderators"> + <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><input type="checkbox" wicket:id="superModerator"/></div></td> + <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="userId"></span></div></td> + <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="uName"></span></div></td> + <td class="three_column_layout_column4"><div class="three_column_layout_divcolumn4" style="overflow: hidden;"><span wicket:id="email"></span></div></td> + <td style="width: 50px"><div style="width: 50px"><div class="formCancelButton" wicket:id="delete" wicket:message="title:274"></div></div></td> + </tr> + </tbody> </table> - <div class="tableWrapperSmall" id="adminTableSmall"> - <table class="adminListTable"> - <tbody wicket:id="clientsContainer"> - <tr wicket:id="clients"> - <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="clientId"></span></div></td> - <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="clientLogin"></span></div></td> - <td class="three_column_layout_column3"><div class="formCancelButton" wicket:id="clientDelete" wicket:message="title:604"></div></td> - </tr> - </tbody> - </table> - </div> - </fieldset> - - <!-- Default moderators --> - <fieldset class="ui-widget-content"> - <div class="formelement"> - <div class="info-text"><wicket:message key="823" /></div> - <label><wicket:message key="640" /></label><input type="checkbox" class="formcheckbox" wicket:id="moderated" /> - </div> - <div class="formelement"> - <label><wicket:message key="816" /></label><div class="om-select2"><select wicket:id="moderator2add" class="input"></select></div> - </div> - <div class="formelement" wicket:id="moderatorContainer"> - <table class="adminListTableSmall"> - <thead> - <tr> - <th class="three_column_layout_column1 ui-widget-header" style="overflow: hidden;" wicket:message="title:817"><wicket:message key="817" /></th> - <th class="three_column_layout_column2 ui-widget-header"><wicket:message key="818" /></th> - <th class="three_column_layout_column3 ui-widget-header"><wicket:message key="819" /></th> - <th class="three_column_layout_column4 ui-widget-header"><wicket:message key="820" /></th> - <th class="three_column_layout_column5 ui-widget-header"><wicket:message key="827" /></th> - </tr> - </thead> - </table> - <div class="tableWrapperSmall" id="adminTableSmall"> - <table class="adminListTableSmall"> - <tbody> - <tr wicket:id="moderators"> - <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><input type="checkbox" wicket:id="superModerator"/></div></td> - <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="userId"></span></div></td> - <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="uName"></span></div></td> - <td class="three_column_layout_column4"><div class="three_column_layout_divcolumn4" style="overflow: hidden;"><span wicket:id="email"></span></div></td> - <td style="width: 50px"><div style="width: 50px"><div class="formCancelButton" wicket:id="delete" wicket:message="title:274"></div></div></td> - </tr> - </tbody> - </table> - </div> - </div> - </fieldset> - <!--SIP Settings --> - <fieldset class="ui-widget-content"> - <legend class="ui-widget-header"><wicket:message key="1001" /></legend> - <div class="formelement"> - <div class="info-text"><wicket:message key="1002" /></div> - <br/> - </div> - <div class="formelement"> - <label><wicket:message key="1003" /></label><input type="text" wicket:id="confno" /> - </div> - <div class="formelement"> - <label><wicket:message key="1004" /></label><input type="text" wicket:id="pin" /> - </div> - <div class="formelement"> - <label><wicket:message key="1308" /></label><input type="text" wicket:id="ownerId" /> - </div> - <div class="formelement"> - <label><wicket:message key="1538" /></label><input type="checkbox" class="formcheckbox" wicket:id="sipEnabled" /> - </div> - </fieldset> + </div> + </div> + </fieldset> + <!--SIP Settings --> + <fieldset class="ui-widget-content"> + <legend class="ui-widget-header"><wicket:message key="1001" /></legend> + <div class="formelement"> + <div class="info-text"><wicket:message key="1002" /></div> + <br/> + </div> + <div class="formelement"> + <label><wicket:message key="1003" /></label><input type="text" wicket:id="confno" /> + </div> + <div class="formelement"> + <label><wicket:message key="1004" /></label><input type="text" wicket:id="pin" /> </div> - </form> + <div class="formelement"> + <label><wicket:message key="1308" /></label><input type="text" wicket:id="ownerId" /> + </div> + <div class="formelement"> + <label><wicket:message key="1538" /></label><input type="checkbox" class="formcheckbox" wicket:id="sipEnabled" /> + </div> + </fieldset> </div> - </div> - </wicket:panel> + </form> + </div> +</wicket:extend> </html> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Fri Mar 10 14:33:11 2017 @@ -24,7 +24,6 @@ import org.apache.openmeetings.db.dao.ro import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.web.admin.AdminPanel; import org.apache.openmeetings.web.admin.SearchableDataView; -import org.apache.openmeetings.web.common.BasePanel; import org.apache.openmeetings.web.common.PagedEntityListPanel; import org.apache.openmeetings.web.data.DataViewContainer; import org.apache.openmeetings.web.data.OmOrderByBorder; @@ -33,7 +32,6 @@ import org.apache.wicket.AttributeModifi import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; -import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -48,13 +46,6 @@ public class RoomsPanel extends AdminPan final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer"); private RoomForm form; - @Override - public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) { - super.onMenuPanelLoad(handler); - handler.appendJavaScript("omRoomPanelInit();"); - return this; - } - public RoomsPanel(String id) { super(id); SearchableDataView<Room> dataView = new SearchableDataView<Room>("roomList", new SearchableGroupAdminDataProvider<>(RoomDao.class)) {
