You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/09/20 20:38:28 UTC
svn commit: r1388153 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/openmeetings/css/
src/org/apache/openmeetings/persistence/beans/basic/
src/org/apache/openmeetings/persistence/beans/rooms/
src/org/apache/openmeetings/web/components/admi...
Author: sebawagner
Date: Thu Sep 20 18:38:27 2012
New Revision: 1388153
URL: http://svn.apache.org/viewvc?rev=1388153&view=rev
Log:
OPENMEETINGS-428 style other tables too and add paging drop down where it is not added yet
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css?rev=1388153&r1=1388152&r2=1388153&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css Thu Sep 20 18:38:27 2012
@@ -146,6 +146,59 @@ table.adminListTable td div.three_column
width: 304px;
}
+
+table.adminListTable th.four_column_layout_column1 {
+ width: 36px;
+}
+
+table.adminListTable th.four_column_layout_column2 {
+ width: 150px;
+}
+
+table.adminListTable th.four_column_layout_column3 {
+ width: 152px;
+}
+
+table.adminListTable th.four_column_layout_column4 {
+ width: 152px;
+}
+
+table.adminListTable td.four_column_layout_column1 {
+ width: 36px;
+}
+
+table.adminListTable td.four_column_layout_column2 {
+ width: 150px;
+}
+
+table.adminListTable td.four_column_layout_column3 {
+ width: 152px;
+}
+
+table.adminListTable td.four_column_layout_column4 {
+ width: 152px;
+}
+
+table.adminListTable td div.four_column_layout_divcolumn1 {
+ word-wrap: break-word;
+ width: 36px;
+}
+
+table.adminListTable td div.four_column_layout_divcolumn2 {
+ word-wrap: break-word;
+ width: 150px;
+}
+
+table.adminListTable td div.four_column_layout_divcolumn3 {
+ word-wrap: break-word;
+ width: 152px;
+}
+
+table.adminListTable td div.four_column_layout_divcolumn4 {
+ word-wrap: break-word;
+ width: 152px;
+}
+
table.adminListTable tr.even {
background-color: #ffebcd;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java?rev=1388153&r1=1388152&r2=1388153&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java Thu Sep 20 18:38:27 2012
@@ -29,6 +29,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openmeetings.persistence.beans.OmEntity;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -45,7 +46,7 @@ import org.simpleframework.xml.Root;
})
@Table(name = "server")
@Root
-public class Server implements Serializable {
+public class Server implements Serializable, OmEntity {
private static final long serialVersionUID = -6822732074549167727L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java?rev=1388153&r1=1388152&r2=1388153&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java Thu Sep 20 18:38:27 2012
@@ -38,6 +38,7 @@ import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
+import org.apache.openmeetings.persistence.beans.OmEntity;
import org.apache.openmeetings.persistence.beans.basic.Server;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
@@ -49,7 +50,7 @@ import org.simpleframework.xml.Root;
})
@Table(name = "rooms")
@Root(name="room")
-public class Rooms implements Serializable {
+public class Rooms implements Serializable, OmEntity {
private static final long serialVersionUID = -2860312283159251568L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html?rev=1388153&r1=1388152&r2=1388153&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html Thu Sep 20 18:38:27 2012
@@ -37,18 +37,26 @@
<div class="formCancelButton" wicket:id="deleteLngBtn"><input/></div>
<form wicket:id="langForm" style="display: inline-block;"><select wicket:id="language"></select></form>
<span wicket:id="navigator">[dataview navigator]</span>
- <table wicket:id="listContainer" class="adminListTable">
- <tr>
- <th><wicket:ommessage key="350" /></th>
- <th><wicket:ommessage key="351" /></th>
- <th><wicket:ommessage key="352" /></th>
- </tr>
- <tr wicket:id="langList">
- <td><span wicket:id="lblId"></span></td>
- <td><span wicket:id="name"></span></td>
- <td><span wicket:id="value"></span></td>
- </tr>
+ <table class="adminListTable">
+ <thead>
+ <tr>
+ <th class="three_column_layout_column1"><wicket:ommessage key="350" /></th>
+ <th class="three_column_layout_column2"><wicket:ommessage key="351" /></th>
+ <th class="three_column_layout_column3"><wicket:ommessage key="352" /></th>
+ </tr>
+ </thead>
</table>
+ <div class="tableWrapper">
+ <table class="adminListTable">
+ <tbody wicket:id="listContainer" >
+ <tr wicket:id="langList">
+ <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="lblId"></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="value"></span></div></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</td>
<td class="adminPanelColumnForm">
<form wicket:id="form" class="adminForm">
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html?rev=1388153&r1=1388152&r2=1388153&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html Thu Sep 20 18:38:27 2012
@@ -25,18 +25,26 @@
<tr>
<td class="adminPanelColumnTable">
<span wicket:id="navigator">[dataview navigator]</span>
- <table wicket:id="listContainer" class="adminListTable">
- <tr>
- <th><wicket:ommessage key="1104" /></th>
- <th><wicket:ommessage key="1105" /></th>
- <th><wicket:ommessage key="1106" /></th>
- </tr>
- <tr wicket:id="ldapList">
- <td><span wicket:id="ldapConfigId"></span></td>
- <td><span wicket:id="name"></span></td>
- <td><span wicket:id="configFileName"></span></td>
- </tr>
+ <table class="adminListTable">
+ <thead>
+ <tr>
+ <th class="three_column_layout_column1"><wicket:ommessage key="1104" /></th>
+ <th class="three_column_layout_column2"><wicket:ommessage key="1105" /></th>
+ <th class="three_column_layout_column3"><wicket:ommessage key="1106" /></th>
+ </tr>
+ </thead>
</table>
+ <div class="tableWrapper">
+ <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="ldapConfigId"></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>
</td>
<td class="adminPanelColumnForm">
<form wicket:id="form" class="adminForm">
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java?rev=1388153&r1=1388152&r2=1388153&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java Thu Sep 20 18:38:27 2012
@@ -62,7 +62,7 @@ public class LdapsPanel extends AdminPan
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
add(new PagedEntityListPanel("navigator", dataView) {
- private static final long serialVersionUID = 5097048616003411362L;
+ private static final long serialVersionUID = -1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html?rev=1388153&r1=1388152&r2=1388153&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html Thu Sep 20 18:38:27 2012
@@ -26,17 +26,25 @@
<td class="adminPanelColumnTable">
<span wicket:id="navigator">[dataview navigator]</span>
<table class="adminListTable">
- <tr>
- <th><wicket:ommessage key="188" /></th>
- <th><wicket:ommessage key="189" /></th>
- <th><wicket:ommessage key="190" /></th>
- </tr>
- <tr wicket:id="roomList">
- <td><span wicket:id="rooms_id"></span></td>
- <td><span wicket:id="name"></span></td>
- <td><span wicket:id="ispublic"></span></td>
- </tr>
+ <thead>
+ <tr>
+ <th class="three_column_layout_column1"><wicket:ommessage key="188" /></th>
+ <th class="three_column_layout_column2"><wicket:ommessage key="189" /></th>
+ <th class="three_column_layout_column3"><wicket:ommessage key="190" /></th>
+ </tr>
+ </thead>
</table>
+ <div class="tableWrapper">
+ <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="rooms_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>
</td>
<td class="adminPanelColumnForm">
<form wicket:id="form" class="adminForm">
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java?rev=1388153&r1=1388152&r2=1388153&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java Thu Sep 20 18:38:27 2012
@@ -24,10 +24,11 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.components.admin.AdminPanel;
+import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
@@ -81,9 +82,17 @@ public class RoomsPanel extends AdminPan
item.add(AttributeModifier.replace("class", (item.getIndex() % 2 == 1) ? "even" : "odd"));
}
};
- dataView.setItemsPerPage(8); //FIXME need to be parametrized
- add(dataView);
- add(new AjaxPagingNavigator("navigator", dataView));
+
+ final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
+ add(listContainer.add(dataView).setOutputMarkupId(true));
+ add(new PagedEntityListPanel("navigator", dataView) {
+ private static final long serialVersionUID = -1L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ target.add(listContainer);
+ }
+ });
Rooms room = new Rooms();
form = new RoomForm("form", room);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html?rev=1388153&r1=1388152&r2=1388153&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html Thu Sep 20 18:38:27 2012
@@ -26,17 +26,25 @@
<td class="adminPanelColumnTable">
<span wicket:id="navigator">[dataview navigator]</span>
<table class="adminListTable">
- <tr>
- <th><wicket:ommessage key="188" /></th>
- <th><wicket:ommessage key="1500" /></th>
- <th><wicket:ommessage key="1501" /></th>
- </tr>
- <tr wicket:id="serverList">
- <td><span wicket:id="id"></span></td>
- <td><span wicket:id="name"></span></td>
- <td><span wicket:id="address"></span></td>
- </tr>
+ <thead>
+ <tr>
+ <th class="three_column_layout_column1"><wicket:ommessage key="188" /></th>
+ <th class="three_column_layout_column2"><wicket:ommessage key="1500" /></th>
+ <th class="three_column_layout_column3"><wicket:ommessage key="1501" /></th>
+ </tr>
+ </thead>
</table>
+ <div class="tableWrapper">
+ <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>
</td>
<td class="adminPanelColumnForm">
<form wicket:id="form" class="adminForm">
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java?rev=1388153&r1=1388152&r2=1388153&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java Thu Sep 20 18:38:27 2012
@@ -24,10 +24,11 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.components.admin.AdminPanel;
+import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
@@ -81,9 +82,17 @@ public class ServersPanel extends AdminP
item.add(AttributeModifier.replace("class", (item.getIndex() % 2 == 1) ? "even" : "odd"));
}
};
- dataView.setItemsPerPage(8); //FIXME need to be parametrized
- add(dataView);
- add(new AjaxPagingNavigator("navigator", dataView));
+
+ final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
+ add(listContainer.add(dataView).setOutputMarkupId(true));
+ add(new PagedEntityListPanel("navigator", dataView) {
+ private static final long serialVersionUID = 5097048616003411362L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ target.add(listContainer);
+ }
+ });
Server Server = new Server();
form = new ServerForm("form", Server);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html?rev=1388153&r1=1388152&r2=1388153&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html Thu Sep 20 18:38:27 2012
@@ -25,20 +25,28 @@
<tr>
<td valign="top" class="adminPanelColumnTable">
<span wicket:id="navigator">[dataview navigator]</span>
- <table wicket:id="listContainer" class="adminListTable">
- <tr>
- <th><wicket:ommessage key="146" /></th>
- <th><wicket:ommessage key="147" /></th>
- <th><wicket:ommessage key="148" /></th>
- <th><wicket:ommessage key="149" /></th>
- </tr>
- <tr wicket:id="userList">
- <td><span wicket:id="userId"></span></td>
- <td><span wicket:id="login"></span></td>
- <td><span wicket:id="firstName"></span></td>
- <td><span wicket:id="lastName"></span></td>
- </tr>
+ <table class="adminListTable">
+ <thead>
+ <tr>
+ <th class="four_column_layout_column1"><wicket:ommessage key="146" /></th>
+ <th class="four_column_layout_column2"><wicket:ommessage key="147" /></th>
+ <th class="four_column_layout_column3"><wicket:ommessage key="148" /></th>
+ <th class="four_column_layout_column4"><wicket:ommessage key="149" /></th>
+ </tr>
+ </thead>
</table>
+ <div class="tableWrapper">
+ <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="userId"></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>
</td>
<td class="adminPanelColumnForm">
<form wicket:id="form" class="adminForm">