Author: sebawagner
Date: Thu Sep 20 18:06:56 2012
New Revision: 1388145
URL: http://svn.apache.org/viewvc?rev=1388145&view=rev
Log:
OPENMEETINGS-428 config and groups table to have table scroll only body (or at
least look like that)
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
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=1388145&r1=1388144&r2=1388145&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:06:56 2012
@@ -61,14 +61,18 @@
right: 100px;
}
+/*
+ ################################
+ Column layout admin section
+ ################################
+ */
.adminPanelColumnTable {
-
+
}
table.adminListTable {
- overflow: hidden;
- max-width: 536px;
- min-width: 536px;
+ max-width: 518px;
+ min-width: 518px;
}
table.adminListTable th {
@@ -76,28 +80,70 @@ table.adminListTable th {
color: #ffffff;
}
-/**/
-table.adminListTable td.column1 {
+table.adminListTable th.two_column_layout_column1 {
+ width: 136px;
+}
+
+table.adminListTable th.two_column_layout_column2 {
+ width: 354px;
+}
+
+table.adminListTable td.two_column_layout_column1 {
+ width: 136px;
+}
+
+table.adminListTable td.two_column_layout_column2 {
+ width: 354px;
+}
+
+table.adminListTable td div.two_column_layout_divcolumn1 {
+ word-wrap: break-word;
+ width: 136px;
+}
+
+table.adminListTable td div.two_column_layout_divcolumn2 {
+ word-wrap: break-word;
+ width: 354px;
+}
+
+
+table.adminListTable th.three_column_layout_column1 {
+ width: 36px;
+}
+
+table.adminListTable th.three_column_layout_column2 {
+ width: 150px;
+}
+
+table.adminListTable th.three_column_layout_column3 {
+ width: 304px;
+}
+
+table.adminListTable td.three_column_layout_column1 {
width: 36px;
}
-table.adminListTable td.column2 {
+
+table.adminListTable td.three_column_layout_column2 {
width: 150px;
}
-table.adminListTable td.column3 {
- width: 350px;
+
+table.adminListTable td.three_column_layout_column3 {
+ width: 304px;
}
-table.adminListTable td div.divcolumn1 {
+table.adminListTable td div.three_column_layout_divcolumn1 {
word-wrap: break-word;
width: 36px;
}
-table.adminListTable td div.divcolumn2 {
+
+table.adminListTable td div.three_column_layout_divcolumn2 {
word-wrap: break-word;
width: 150px;
}
-table.adminListTable td div.divcolumn3 {
+
+table.adminListTable td div.three_column_layout_divcolumn3 {
word-wrap: break-word;
- width: 330px;
+ width: 304px;
}
table.adminListTable tr.even {
@@ -108,6 +154,12 @@ table.adminListTable tr.odd {
background-color: #ffffff;
}
+div.tableWrapper {
+ width: 536px;
+ height: 500px;
+ overflow-y: scroll;
+}
+
.adminPanelColumnForm {
vertical-align: top;
}
@@ -122,4 +174,4 @@ table.adminListTable tr.odd {
.adminForm select {
width: 200px;
-}
+}
\ No newline at end of file
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java?rev=1388145&r1=1388144&r2=1388145&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java
Thu Sep 20 18:06:56 2012
@@ -30,6 +30,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 = "organisation")
@Root(name="organisation")
-public class Organisation implements Serializable {
+public class Organisation implements Serializable, OmEntity {
private static final long serialVersionUID = 99123580264065654L;
@Id
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html?rev=1388145&r1=1388144&r2=1388145&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
Thu Sep 20 18:06:56 2012
@@ -30,19 +30,23 @@
<table class="adminListTable">
<thead>
<tr>
-
<th><wicket:ommessage key="264" /></th>
-
<th><wicket:ommessage key="265" /></th>
-
<th><wicket:ommessage key="598" /></th>
+ <th
class="three_column_layout_column1"><wicket:ommessage key="264" /></th>
+ <th
class="three_column_layout_column2"><wicket:ommessage key="265" /></th>
+ <th
class="three_column_layout_column3"><wicket:ommessage key="598" /></th>
</tr>
</thead>
- <tbody
wicket:id="listContainer" >
- <tr wicket:id="configList">
- <td
class="column1"><div class="divcolumn1"><span
wicket:id="configuration_id"></span></div></td>
- <td
class="column2"><div class="divcolumn2"><span
wicket:id="conf_key"></span></div></td>
- <td
class="column3"><div class="divcolumn3"><span
wicket:id="conf_value"></span></div></td>
- </tr>
- </tbody>
</table>
+ <div class="tableWrapper">
+ <table class="adminListTable">
+ <tbody
wicket:id="listContainer" >
+ <tr
wicket:id="configList">
+ <td
class="three_column_layout_column1"><div
class="three_column_layout_divcolumn1"><span
wicket:id="configuration_id"></span></div></td>
+ <td
class="three_column_layout_column2"><div
class="three_column_layout_divcolumn2"><span
wicket:id="conf_key"></span></div></td>
+ <td
class="three_column_layout_column3"><div
class="three_column_layout_divcolumn3"><span
wicket:id="conf_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/groups/GroupsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html?rev=1388145&r1=1388144&r2=1388145&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
Thu Sep 20 18:06:56 2012
@@ -27,14 +27,20 @@
<span wicket:id="navigator">[dataview
navigator]</span>
<table class="adminListTable">
<tr>
- <th><wicket:ommessage
key="164" /></th>
- <th><wicket:ommessage
key="165" /></th>
- </tr>
- <tr wicket:id="groupList">
- <td><span
wicket:id="organisation_id"></span></td>
- <td><span
wicket:id="name"></span></td>
- </tr>
+ <th
class="two_column_layout_column1"><wicket:ommessage key="164" /></th>
+ <th
class="two_column_layout_column2"><wicket:ommessage key="165" /></th>
+ </tr>
</table>
+ <div class="tableWrapper">
+ <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="organisation_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>
</td>
<td class="adminPanelColumnForm">
<form wicket:id="form"
class="adminForm">
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java?rev=1388145&r1=1388144&r2=1388145&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
Thu Sep 20 18:06:56 2012
@@ -24,10 +24,11 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.components.admin.AdminPanel;
+import org.apache.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;
@@ -82,9 +83,18 @@ public class GroupsPanel extends AdminPa
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 =
-7378765368303904897L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ target.add(listContainer);
+ }
+ });
+
Organisation organisation = new Organisation();
form = new GroupForm("form", organisation);
