Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html Fri Mar 10 14:33:11 2017 @@ -7,108 +7,97 @@ 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 omServerPanelInit() { - 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="188" /></th> - <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="1500" /></th> - <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByAddress"></span><wicket:message key="1501" /></th> - </tr> - </thead> - </table> - <div class="tableWrapper" id="adminTable"> - <table class="adminListTable"> - <tbody wicket:id="listContainer"> - <tr wicket:id="serverList"> - <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="address"></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="1502" /></legend> - <div class="formelement"> - <label><wicket:message key="1500" /></label><input type="text" wicket:id="name"/> - </div> - <div class="formelement"> - <label><wicket:message key="1525" /></label><input type="checkbox" class="formcheckbox" wicket:id="active" /> - </div> - <div class="formelement"> - <label><wicket:message key="1501" /></label><input type="text" wicket:id="address"/> - </div> - <div class="formelement"> - <label><wicket:message key="1519" /></label><input type="text" wicket:id="port"/> - </div> - <div class="formelement"> - <label><wicket:message key="1520" /></label><input type="text" wicket:id="user"/> - </div> - <div class="formelement"> - <label><wicket:message key="1521" /></label><input type="text" wicket:id="pass"/> - </div> - <div class="formelement"> - <label><wicket:message key="1522" /></label><input type="text" wicket:id="webapp"/> - </div> - <div class="formelement"> - <label><wicket:message key="1523" /></label><input type="text" wicket:id="protocol"/> - </div> - <div class="formelement"> - <div class="info-text"><wicket:message key="1518" /></div> - <br/> - <label><wicket:message key="1517" /></label><span wicket:id="lastPing"/> - <!-- br/> - <label><wicket:message key="1524" /></label><span wicket:id="pingRunning"/--> - </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"> - <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="188" /></th> + <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="1500" /></th> + <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByAddress"></span><wicket:message key="1501" /></th> + </tr> + </thead> + </table> + <div class="tableWrapper" id="adminTable"> + <table class="adminListTable"> + <tbody wicket:id="listContainer"> + <tr wicket:id="serverList"> + <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="address"></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="1502" /></legend> + <div class="formelement"> + <label><wicket:message key="1500" /></label><input type="text" wicket:id="name"/> + </div> + <div class="formelement"> + <label><wicket:message key="1525" /></label><input type="checkbox" class="formcheckbox" wicket:id="active" /> + </div> + <div class="formelement"> + <label><wicket:message key="1501" /></label><input type="text" wicket:id="address"/> + </div> + <div class="formelement"> + <label><wicket:message key="1519" /></label><input type="text" wicket:id="port"/> + </div> + <div class="formelement"> + <label><wicket:message key="1520" /></label><input type="text" wicket:id="user"/> + </div> + <div class="formelement"> + <label><wicket:message key="1521" /></label><input type="text" wicket:id="pass"/> + </div> + <div class="formelement"> + <label><wicket:message key="1522" /></label><input type="text" wicket:id="webapp"/> </div> - </form> + <div class="formelement"> + <label><wicket:message key="1523" /></label><input type="text" wicket:id="protocol"/> + </div> + <div class="formelement"> + <div class="info-text"><wicket:message key="1518" /></div> + <br/> + <label><wicket:message key="1517" /></label><span wicket:id="lastPing"/> + <!-- br/> + <label><wicket:message key="1524" /></label><span wicket:id="pingRunning"/--> + </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"> + <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/servers/ServersPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.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.Server; 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 ServersPanel extends AdminP final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer"); private ServerForm form; - @Override - public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) { - super.onMenuPanelLoad(handler); - handler.appendJavaScript("omServerPanelInit();"); - return this; - } - public ServersPanel(String id) { super(id); SearchableDataView<Server> dataView = new SearchableDataView<Server>("serverList", Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html Fri Mar 10 14:33:11 2017 @@ -7,70 +7,59 @@ 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 omUserPanelInit() { - 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> +<wicket:extend> + <div class="adminPanelColumnTable"> + <span wicket:id="navigator">[dataview navigator]</span> + <table class="adminListTable"> + <thead> + <tr> + <th class="four_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span> <wicket:message key="146" /></th> + <th class="four_column_layout_column2 ui-widget-header"><span wicket:id="orderByLogin"></span> <wicket:message key="147" /></th> + <th class="four_column_layout_column3 ui-widget-header"><span wicket:id="orderByFirstName"></span> <wicket:message key="148" /></th> + <th class="four_column_layout_column4 ui-widget-header"><span wicket:id="orderByLastName"></span> <wicket:message key="149" /></th> + </tr> + </thead> + </table> + <div class="tableWrapper" id="adminTable"> <table class="adminListTable"> - <thead> - <tr> - <th class="four_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span> <wicket:message key="146" /></th> - <th class="four_column_layout_column2 ui-widget-header"><span wicket:id="orderByLogin"></span> <wicket:message key="147" /></th> - <th class="four_column_layout_column3 ui-widget-header"><span wicket:id="orderByFirstName"></span> <wicket:message key="148" /></th> - <th class="four_column_layout_column4 ui-widget-header"><span wicket:id="orderByLastName"></span> <wicket:message key="149" /></th> + <tbody wicket:id="listContainer"> + <tr wicket:id="userList"> + <td class="four_column_layout_column1"><div + class="four_column_layout_divcolumn1"> + <span wicket:id="id"></span> + </div></td> + <td class="four_column_layout_column2"><div + class="four_column_layout_divcolumn2"> + <span wicket:id="login"></span> + </div></td> + <td class="four_column_layout_column3"><div + class="four_column_layout_divcolumn3"> + <span wicket:id="firstname"></span> + </div></td> + <td class="four_column_layout_column4"><div + class="four_column_layout_divcolumn4"> + <span wicket:id="lastname"></span> + </div></td> </tr> - </thead> + </tbody> </table> - <div class="tableWrapper" id="adminTable"> - <table class="adminListTable"> - <tbody wicket:id="listContainer"> - <tr wicket:id="userList"> - <td class="four_column_layout_column1"><div - class="four_column_layout_divcolumn1"> - <span wicket:id="id"></span> - </div></td> - <td class="four_column_layout_column2"><div - class="four_column_layout_divcolumn2"> - <span wicket:id="login"></span> - </div></td> - <td class="four_column_layout_column3"><div - class="four_column_layout_divcolumn3"> - <span wicket:id="firstname"></span> - </div></td> - <td class="four_column_layout_column4"><div - class="four_column_layout_divcolumn4"> - <span wicket:id="lastname"></span> - </div></td> - </tr> - </tbody> - </table> - </div> - </div> - <div class="adminPanelColumnForm"> - <form wicket:id="form" class="adminForm"/> </div> </div> + <div class="adminPanelColumnForm"> + <form wicket:id="form" class="adminForm"/> + </div> <div wicket:id="warning"></div> -</wicket:panel> +</wicket:extend> </html> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java Fri Mar 10 14:33:11 2017 @@ -26,7 +26,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.PagedEntityListPanel; import org.apache.openmeetings.web.data.DataViewContainer; import org.apache.openmeetings.web.data.OmOrderByBorder; @@ -56,14 +55,6 @@ public class UsersPanel extends AdminPan public void onClose(IPartialPageRequestHandler handler, DialogButton button) { } }; - - @Override - public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) { - super.onMenuPanelLoad(handler); - handler.appendJavaScript("omUserPanelInit();"); - return this; - } - private UserForm form; public UsersPanel(String id) { Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css?rev=1786351&r1=1786350&r2=1786351&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css Fri Mar 10 14:33:11 2017 @@ -245,7 +245,9 @@ table.adminListTable td div.four_column_ word-wrap: break-word; width: 132px; } - +table.adminListTable .one_sixth { + width: 16.67%; +} .adminPanelColumnForm { display: inline-block; vertical-align: top;
