You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/07/03 11:49:25 UTC
svn commit: r1499296 - in /openmeetings/trunk/singlewebapp:
WebContent/openmeetings/css/
src/org/apache/openmeetings/web/admin/configurations/
src/org/apache/openmeetings/web/admin/groups/
src/org/apache/openmeetings/web/admin/labels/ src/org/apache/op...
Author: solomax
Date: Wed Jul 3 09:49:24 2013
New Revision: 1499296
URL: http://svn.apache.org/r1499296
Log:
[OPENMEETINGS-615] New message dialog fields has valid height on first open;
Navigation is updated on sort changes;
Messages sort works as expected
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmOrderByBorder.java
- copied, changed from r1499238, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OrderByBorder.java
Removed:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OrderByBorder.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/DataViewContainer.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css?rev=1499296&r1=1499295&r2=1499296&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css (original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css Wed Jul 3 09:49:24 2013
@@ -843,7 +843,8 @@ table.messages td.main {
height: 18px;
}
.messages.column.label {
- width: 10px;
+ width: 20px;
+ min-height: inherit;
}
input[type="text"].messages.text {
width: 100%;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1499296&r1=1499295&r2=1499296&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Wed Jul 3 09:49:24 2013
@@ -24,7 +24,7 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.OrderByBorder;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -78,19 +78,20 @@ public class ConfigsPanel extends AdminP
};
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
- DataViewContainer<Configuration> container = new DataViewContainer<Configuration>(listContainer, dataView);
- container.setLinks(new OrderByBorder<Configuration>("orderById", "configuration_id", container)
- , new OrderByBorder<Configuration>("orderByKey", "conf_key", container)
- , new OrderByBorder<Configuration>("orderByValue", "conf_value", container));
- add(container.orderLinks);
- add(new PagedEntityListPanel("navigator", dataView) {
+ PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
@Override
protected void onEvent(AjaxRequestTarget target) {
target.add(listContainer);
}
- });
+ };
+ DataViewContainer<Configuration> container = new DataViewContainer<Configuration>(listContainer, dataView, navigator);
+ container.setLinks(new OmOrderByBorder<Configuration>("orderById", "configuration_id", container)
+ , new OmOrderByBorder<Configuration>("orderByKey", "conf_key", container)
+ , new OmOrderByBorder<Configuration>("orderByValue", "conf_value", container));
+ add(container.orderLinks);
+ add(navigator);
form = new ConfigForm("form", listContainer, new Configuration());
form.showNewRecord();
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1499296&r1=1499295&r2=1499296&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Wed Jul 3 09:49:24 2013
@@ -26,7 +26,7 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.OrderByBorder;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -118,17 +118,18 @@ public class GroupsPanel extends AdminPa
//Paging
add(listContainer.add(dataView).setOutputMarkupId(true));
- DataViewContainer<Organisation> container = new DataViewContainer<Organisation>(listContainer, dataView);
- container.setLinks(new OrderByBorder<Organisation>("orderById", "organisation_id", container)
- , new OrderByBorder<Organisation>("orderByName", "name", container));
- add(container.orderLinks);
- add(new PagedEntityListPanel("navigator", dataView) {
+ PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
@Override
protected void onEvent(AjaxRequestTarget target) {
target.add(listContainer);
}
- });
+ };
+ DataViewContainer<Organisation> container = new DataViewContainer<Organisation>(listContainer, dataView, navigator);
+ container.setLinks(new OmOrderByBorder<Organisation>("orderById", "organisation_id", container)
+ , new OmOrderByBorder<Organisation>("orderByName", "name", container));
+ add(container.orderLinks);
+ add(navigator);
}
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1499296&r1=1499295&r2=1499296&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java Wed Jul 3 09:49:24 2013
@@ -40,7 +40,7 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.OrderByBorder;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.openmeetings.web.util.AjaxDownload;
import org.apache.wicket.AttributeModifier;
@@ -147,12 +147,7 @@ public class LangPanel extends AdminPane
listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
- DataViewContainer<Fieldvalues> container = new DataViewContainer<Fieldvalues>(listContainer, dataView);
- container.setLinks(new OrderByBorder<Fieldvalues>("orderById", "fieldvalues.fieldvalues_id", container)
- , new OrderByBorder<Fieldvalues>("orderByName", "fieldvalues.name", container)
- , new OrderByBorder<Fieldvalues>("orderByValue", "value", container));
- add(container.orderLinks);
- add(new PagedEntityListPanel("navigator", dataView) {
+ PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
@Override
@@ -160,7 +155,13 @@ public class LangPanel extends AdminPane
dataView.modelChanging();
target.add(listContainer);
}
- });
+ };
+ DataViewContainer<Fieldvalues> container = new DataViewContainer<Fieldvalues>(listContainer, dataView, navigator);
+ container.setLinks(new OmOrderByBorder<Fieldvalues>("orderById", "fieldvalues.fieldvalues_id", container)
+ , new OmOrderByBorder<Fieldvalues>("orderByName", "fieldvalues.name", container)
+ , new OmOrderByBorder<Fieldvalues>("orderByValue", "value", container));
+ add(container.orderLinks);
+ add(navigator);
langForm = new LangForm("langForm", listContainer, this);
fileUploadField = new FileUploadField("fileInput");
langForm.add(fileUploadField);
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1499296&r1=1499295&r2=1499296&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Wed Jul 3 09:49:24 2013
@@ -24,8 +24,8 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
import org.apache.openmeetings.web.data.SearchableDataProvider;
-import org.apache.openmeetings.web.data.OrderByBorder;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -76,19 +76,20 @@ public class LdapsPanel extends AdminPan
};
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
- DataViewContainer<LdapConfig> container = new DataViewContainer<LdapConfig>(listContainer, dataView);
- container.setLinks(new OrderByBorder<LdapConfig>("orderById", "ldapConfigId", container)
- , new OrderByBorder<LdapConfig>("orderByName", "name", container)
- , new OrderByBorder<LdapConfig>("orderByFile", "configFileName", container));
- add(container.orderLinks);
- add(new PagedEntityListPanel("navigator", dataView) {
+ PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = -1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
target.add(listContainer);
}
- });
+ };
+ DataViewContainer<LdapConfig> container = new DataViewContainer<LdapConfig>(listContainer, dataView, navigator);
+ container.setLinks(new OmOrderByBorder<LdapConfig>("orderById", "ldapConfigId", container)
+ , new OmOrderByBorder<LdapConfig>("orderByName", "name", container)
+ , new OmOrderByBorder<LdapConfig>("orderByFile", "configFileName", container));
+ add(container.orderLinks);
+ add(navigator);
form = new LdapForm("form", listContainer, new LdapConfig());
form.showNewRecord();
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1499296&r1=1499295&r2=1499296&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Wed Jul 3 09:49:24 2013
@@ -25,7 +25,7 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.OrderByBorder;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -74,19 +74,20 @@ public class RoomsPanel extends AdminPan
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
- DataViewContainer<Room> container = new DataViewContainer<Room>(listContainer, dataView);
- container.setLinks(new OrderByBorder<Room>("orderById", "rooms_id", container)
- , new OrderByBorder<Room>("orderByName", "name", container)
- , new OrderByBorder<Room>("orderByPublic", "ispublic", container));
- add(container.orderLinks);
- add(new PagedEntityListPanel("navigator", dataView) {
+ PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = -1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
target.add(listContainer);
}
- });
+ };
+ DataViewContainer<Room> container = new DataViewContainer<Room>(listContainer, dataView, navigator);
+ container.setLinks(new OmOrderByBorder<Room>("orderById", "rooms_id", container)
+ , new OmOrderByBorder<Room>("orderByName", "name", container)
+ , new OmOrderByBorder<Room>("orderByPublic", "ispublic", container));
+ add(container.orderLinks);
+ add(navigator);
final WebMarkupContainer addModerator = new WebMarkupContainer("addModerator");
addModerator.add(new AjaxEventBehavior("onclick") {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1499296&r1=1499295&r2=1499296&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.java Wed Jul 3 09:49:24 2013
@@ -24,8 +24,8 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
import org.apache.openmeetings.web.data.SearchableDataProvider;
-import org.apache.openmeetings.web.data.OrderByBorder;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -77,19 +77,20 @@ public class ServersPanel extends AdminP
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
- DataViewContainer<Server> container = new DataViewContainer<Server>(listContainer, dataView);
- container.setLinks(new OrderByBorder<Server>("orderById", "id", container)
- , new OrderByBorder<Server>("orderByName", "name", container)
- , new OrderByBorder<Server>("orderByAddress", "address", container));
- add(container.orderLinks);
- add(new PagedEntityListPanel("navigator", dataView) {
+ PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
@Override
protected void onEvent(AjaxRequestTarget target) {
target.add(listContainer);
}
- });
+ };
+ DataViewContainer<Server> container = new DataViewContainer<Server>(listContainer, dataView, navigator);
+ container.setLinks(new OmOrderByBorder<Server>("orderById", "id", container)
+ , new OmOrderByBorder<Server>("orderByName", "name", container)
+ , new OmOrderByBorder<Server>("orderByAddress", "address", container));
+ add(container.orderLinks);
+ add(navigator);
form = new ServerForm("form", listContainer, new Server());
form.showNewRecord();
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1499296&r1=1499295&r2=1499296&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.java Wed Jul 3 09:49:24 2013
@@ -27,7 +27,7 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.OrderByBorder;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -79,20 +79,21 @@ public class UsersPanel extends AdminPan
};
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
- DataViewContainer<User> container = new DataViewContainer<User>(listContainer, dataView);
- container.setLinks(new OrderByBorder<User>("orderById", "user_id", container)
- , new OrderByBorder<User>("orderByLogin", "login", container)
- , new OrderByBorder<User>("orderByFirstName", "firstname", container)
- , new OrderByBorder<User>("orderByLastName", "lastname", container));
- add(container.orderLinks);
- add(new PagedEntityListPanel("navigator", dataView) {
+ PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
@Override
protected void onEvent(AjaxRequestTarget target) {
target.add(listContainer);
}
- });
+ };
+ DataViewContainer<User> container = new DataViewContainer<User>(listContainer, dataView, navigator);
+ container.setLinks(new OmOrderByBorder<User>("orderById", "user_id", container)
+ , new OmOrderByBorder<User>("orderByLogin", "login", container)
+ , new OmOrderByBorder<User>("orderByFirstName", "firstname", container)
+ , new OmOrderByBorder<User>("orderByLastName", "lastname", container));
+ add(container.orderLinks);
+ add(navigator);
UsersDao usersDaoImpl = getBean(UsersDao.class);
form = new UserForm("form", listContainer, usersDaoImpl.getNewUserInstance(usersDaoImpl.get(getUserId())));
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/DataViewContainer.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/DataViewContainer.java?rev=1499296&r1=1499295&r2=1499296&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/DataViewContainer.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/DataViewContainer.java Wed Jul 3 09:49:24 2013
@@ -22,21 +22,24 @@ import java.io.Serializable;
import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.web.admin.SearchableDataView;
+import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
public class DataViewContainer<T extends IDataProviderEntity> implements Serializable {
private static final long serialVersionUID = -1027478954223527890L;
public WebMarkupContainer container;
public SearchableDataView<T> view;
- public OrderByBorder<T>[] orderLinks;
+ public PagedEntityListPanel navigator;
+ public OmOrderByBorder<T>[] orderLinks;
- public DataViewContainer(WebMarkupContainer container, SearchableDataView<T> view) {
+ public DataViewContainer(WebMarkupContainer container, SearchableDataView<T> view, PagedEntityListPanel navigator) {
this.container = container;
this.view = view;
+ this.navigator = navigator;
}
//TODO refactor to remove warnings
- public void setLinks(OrderByBorder<T>... orderLinks) {
+ public void setLinks(OmOrderByBorder<T>... orderLinks) {
this.orderLinks = orderLinks;
}
}
Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmOrderByBorder.java (from r1499238, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OrderByBorder.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmOrderByBorder.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmOrderByBorder.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OrderByBorder.java&r1=1499238&r2=1499296&rev=1499296&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OrderByBorder.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmOrderByBorder.java Wed Jul 3 09:49:24 2013
@@ -23,11 +23,11 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.sort.AjaxFallbackOrderByBorder;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.CssProvider;
-public class OrderByBorder<T extends IDataProviderEntity> extends AjaxFallbackOrderByBorder<String> {
+public class OmOrderByBorder<T extends IDataProviderEntity> extends AjaxFallbackOrderByBorder<String> {
private static final long serialVersionUID = -867341109912297431L;
private DataViewContainer<T> container;
- public OrderByBorder(final String id, final String property, DataViewContainer<T> container) {
+ public OmOrderByBorder(final String id, final String property, DataViewContainer<T> container) {
super(id, property, container.view.getDataProvider(), new SortIconCssProvider());
this.container = container;
setOutputMarkupId(true);
@@ -39,7 +39,7 @@ public class OrderByBorder<T extends IDa
@Override
protected void onAjaxClick(AjaxRequestTarget target) {
- target.add(container.container);
+ target.add(container.container, container.navigator);
target.add(container.orderLinks);
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html?rev=1499296&r1=1499295&r2=1499296&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html Wed Jul 3 09:49:24 2013
@@ -37,27 +37,27 @@
</div>
</td>
<td class="main">
- <div wicket:id="container">
- <div><b><wicket:ommessage key="1206"/> (<span wicket:id="unread"></span>)</b></div>
- <div wicket:id="navigator"></div>
- <table id="messagesTable" style="width: 100%;">
- <thead>
- <tr>
- <th><span wicket:id="orderById"></span><wicket:ommessage key="1205"/></th>
- <th><span wicket:id="orderByFrom"></span><wicket:ommessage key="1202"/></th>
- <th><span wicket:id="orderBySubject"></span><wicket:ommessage key="1203"/></th>
- <th><span wicket:id="orderBySend"></span><wicket:ommessage key="1204"/></th>
- </tr>
- </thead>
- <tbody style="background-color: white;">
- <tr wicket:id="messages">
- <td wicket:id="id"></td>
- <td wicket:id="from"></td>
- <td wicket:id="subject"></td>
- <td wicket:id="send"></td>
- </tr>
- </tbody>
- </table>
+ <div>
+ <div><b><wicket:ommessage key="1206"/> (<span wicket:id="unread"></span>)</b></div>
+ <div wicket:id="navigator"></div>
+ <table id="messagesTable" style="width: 100%;">
+ <thead>
+ <tr>
+ <th><span wicket:id="orderById"></span><wicket:ommessage key="1205"/></th>
+ <th><span wicket:id="orderByFrom"></span><wicket:ommessage key="1202"/></th>
+ <th><span wicket:id="orderBySubject"></span><wicket:ommessage key="1203"/></th>
+ <th><span wicket:id="orderBySend"></span><wicket:ommessage key="1204"/></th>
+ </tr>
+ </thead>
+ <tbody wicket:id="container" style="background-color: white;">
+ <tr wicket:id="messages">
+ <td wicket:id="id"></td>
+ <td wicket:id="from"></td>
+ <td wicket:id="subject"></td>
+ <td wicket:id="send"></td>
+ </tr>
+ </tbody>
+ </table>
</div>
</td>
<td class="side right">
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1499296&r1=1499295&r2=1499296&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Wed Jul 3 09:49:24 2013
@@ -21,7 +21,6 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getDateFormat;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import static org.apache.wicket.util.time.Duration.seconds;
import java.util.Iterator;
import java.util.List;
@@ -37,11 +36,10 @@ import org.apache.openmeetings.web.commo
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.OrderByBorder;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.AjaxSelfUpdatingTimerBehavior;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -64,7 +62,7 @@ public class MessagesContactsPanel exten
private static final long serialVersionUID = 8098087441571734957L;
private final WebMarkupContainer container = new WebMarkupContainer("container");
private final WebMarkupContainer folders = new WebMarkupContainer("folders");
- private final IModel<Long> unreadModel = Model.of(0L);
+ private final Label unread = new Label("unread", Model.of(0L));
private final static long INBOX_FOLDER_ID = -1;
private final static long SENT_FOLDER_ID = -2;
private final static long TRASH_FOLDER_ID = -3;
@@ -74,6 +72,7 @@ public class MessagesContactsPanel exten
private final WebMarkupContainer sent = new WebMarkupContainer("sent");
private final WebMarkupContainer trash = new WebMarkupContainer("trash");
private final MessageDialog newMessage;
+ private final DataViewContainer<PrivateMessage> dataContainer;
private void setDefaultFolderClass() {
inbox.add(AttributeAppender.replace("class", "email inbox clickable"));
@@ -97,8 +96,11 @@ public class MessagesContactsPanel exten
setDefaultFolderClass();
selectFolder(folder);
container.add(new FixedHeaderTableBehavior("#messagesTable", new Options("height", 100)));
+ unread.setDefaultModelObject(getBean(PrivateMessagesDao.class).count(getUserId(), null, false, false));
if (target != null) {
- target.add(folders, container);
+ target.add(folders, container, unread);
+ target.add(dataContainer.container, dataContainer.navigator);
+ target.add(dataContainer.orderLinks);
}
}
@@ -211,7 +213,6 @@ public class MessagesContactsPanel exten
setFolderClass(item);
}
}).setOutputMarkupId(true));
- unreadModel.setObject(getBean(PrivateMessagesDao.class).count(getUserId(), null, false, false));
SearchableDataProvider<PrivateMessage> sdp = new SearchableDataProvider<PrivateMessage>(PrivateMessagesDao.class) {
private static final long serialVersionUID = 1L;
@@ -225,7 +226,7 @@ public class MessagesContactsPanel exten
public Iterator<? extends PrivateMessage> iterator(long first, long count) {
//FIXME need to be refactored + sort + search
long folder = selectedModel.getObject();
- String sort = getSort() == null ? "" : getSort().getProperty();
+ String sort = getSort() == null ? "" : "c." + getSort().getProperty();
boolean isAsc = getSort() == null ? true : getSort().isAscending();
String _search = search == null ? "" : "c." + search; //FIXME need to be refactored
if (INBOX_FOLDER_ID == folder) {
@@ -266,28 +267,29 @@ public class MessagesContactsPanel exten
item.add(new Label("send", getDateFormat().format(m.getInserted())));
}
};
- DataViewContainer<PrivateMessage> dataContainer = new DataViewContainer<PrivateMessage>(container, dv);
- dataContainer.setLinks(new OrderByBorder<PrivateMessage>("orderById", "privateMessageId", dataContainer)
- , new OrderByBorder<PrivateMessage>("orderByFrom", "from.lastname", dataContainer)
- , new OrderByBorder<PrivateMessage>("orderBySubject", "subject", dataContainer)
- , new OrderByBorder<PrivateMessage>("orderBySend", "inserted", dataContainer));
- container.add(dataContainer.orderLinks);
- container.add(new PagedEntityListPanel("navigator", dv) {
+ PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dv) {
private static final long serialVersionUID = 5097048616003411362L;
@Override
protected void onEvent(AjaxRequestTarget target) {
target.add(container);
}
- });
+ };
+ dataContainer = new DataViewContainer<PrivateMessage>(container, dv, navigator);
+ dataContainer.setLinks(new OmOrderByBorder<PrivateMessage>("orderById", "privateMessageId", dataContainer)
+ , new OmOrderByBorder<PrivateMessage>("orderByFrom", "from.lastname", dataContainer)
+ , new OmOrderByBorder<PrivateMessage>("orderBySubject", "subject", dataContainer)
+ , new OmOrderByBorder<PrivateMessage>("orderBySend", "inserted", dataContainer));
+ add(dataContainer.orderLinks);
+ add(navigator);
selectFolder(inbox, INBOX_FOLDER_ID, null);
- container.add(new Label("unread", unreadModel));
+ add(unread.setOutputMarkupId(true));
add(new WebMarkupContainer("pendingContacts"));//FIXME
add(new WebMarkupContainer("na1"));//FIXME
add(container.add(dv).setOutputMarkupId(true));
- container.add(new AjaxSelfUpdatingTimerBehavior(seconds(15)));
+ //TODO add valid autoupdate add(new AjaxSelfUpdatingTimerBehavior(seconds(15)));
add(newMessage);
}
}