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 2014/10/09 17:32:30 UTC
svn commit: r1630511 - in /openmeetings: branches/3.0.x/src/main/webapp/css/
branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/
branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/
trunk/singlewebapp/openmeetings-db/src/ma...
Author: solomax
Date: Thu Oct 9 15:32:29 2014
New Revision: 1630511
URL: http://svn.apache.org/r1630511
Log:
[OPENMEETINGS-1062] more fields are displayed as contact data
Modified:
openmeetings/branches/3.0.x/src/main/webapp/css/theme.css
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
Modified: openmeetings/branches/3.0.x/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/css/theme.css?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/css/theme.css (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/css/theme.css Thu Oct 9 15:32:29 2014
@@ -587,3 +587,10 @@ select.messages.selector {
margin: 10px;
max-width: 900px;
}
+.user.info.panel legend {
+ font-style: italic;
+ text-align: right;
+}
+.user.info.panel fieldset table, .user.info.panel fieldset table textarea {
+ width: 100%;
+}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java Thu Oct 9 15:32:29 2014
@@ -31,7 +31,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.model.PropertyModel;
public abstract class PagedEntityListPanel extends BasePanel {
- private static final long serialVersionUID = -4280843184916302671L;
+ private static final long serialVersionUID = 1L;
private List<Integer> numbers = Arrays.asList(10, 25, 50, 75, 100, 200);
public PagedEntityListPanel(String id, final SearchableDataView<? extends IDataProviderEntity> dataView) {
@@ -45,14 +45,13 @@ public abstract class PagedEntityListPan
PagedEntityListPanel.this.onEvent(target);
}
};
- dataView.setItemsPerPage(navPanel.getEntitiesPerPage());
final SearchableDataProvider<? extends IDataProviderEntity> dp = dataView.getDataProvider();
Form<Void> searchForm = new Form<Void>("searchForm");
add(searchForm.setOutputMarkupId(true));
searchForm.add(new TextField<String>("searchText", new PropertyModel<String>(dp, "search")).setOutputMarkupId(true));
searchForm.add(new AjaxButton("search", searchForm) {
- private static final long serialVersionUID = -1659023337945692814L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java Thu Oct 9 15:32:29 2014
@@ -30,16 +30,22 @@ import org.apache.wicket.model.PropertyM
public abstract class PagingNavigatorPanel extends Panel {
private static final long serialVersionUID = 1L;
- private int entitiesPerPage = 50;
+ private int entitiesPerPage;
public PagingNavigatorPanel(String id, final DataView<?> dataView, List<Integer> numbers) {
+ this(id, dataView, numbers, 50);
+ }
+
+ public PagingNavigatorPanel(String id, final DataView<?> dataView, List<Integer> numbers, int _entitiesPerPage) {
super(id);
setOutputMarkupId(true);
+ this.entitiesPerPage = _entitiesPerPage;
+ dataView.setItemsPerPage(entitiesPerPage);
final Form<Void> f = new Form<Void>("pagingForm");
f.add(new OmPagingNavigator("navigator", dataView).setOutputMarkupId(true))
.add(new DropDownChoice<Integer>("entitiesPerPage", new PropertyModel<Integer>(this, "entitiesPerPage"), numbers)
.add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID = -7754441983330112248L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onUpdate(AjaxRequestTarget target) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html Thu Oct 9 15:32:29 2014
@@ -20,24 +20,68 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <table>
- <tr>
- <td><div wicket:id="img"></div></td>
- <td>
- <wicket:ommessage key="1164"/> <span wicket:id="firstname"></span> <span wicket:id="lastname"></span><br/>
- <wicket:ommessage key="1165"/> <span wicket:id="tz"></span><br/>
- <wicket:ommessage key="1296"/> <span wicket:id="created"></span>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <b><wicket:ommessage key="1166"/></b><br/>
- <wicket:ommessage key="1162"/><textarea wicket:id="offer"></textarea><br/>
- <wicket:ommessage key="1163"/><textarea wicket:id="interest"></textarea><br/>
- <b><wicket:ommessage key="1167"/></b><br/>
- <wicket:ommessage key="1270"/> <div wicket:id="address"></div>
- </td>
- </tr>
- </table>
+ <div class="user info panel">
+ <table>
+ <tr>
+ <td><div wicket:id="img"></div></td>
+ <td>
+ <table>
+ <tr>
+ <td><wicket:ommessage key="1164"/></td><td><span wicket:id="firstname"></span> <span wicket:id="lastname"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="1165"/></td><td><span wicket:id="tz"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="1296"/></td><td><span wicket:id="created"></span></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <div>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="1166"/></legend>
+ <table>
+ <tr>
+ <td><wicket:ommessage key="1162"/></td>
+ <td><textarea wicket:id="offer"></textarea></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="1163"/></td>
+ <td><textarea wicket:id="interest"></textarea></td>
+ </tr>
+ </table>
+ </fieldset>
+ </div>
+ <div>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="1167"/></legend>
+ <table wicket:id="address">
+ <tr>
+ <td><wicket:ommessage key="607" /></td>
+ <td><span wicket:id="phone"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="139" /></td>
+ <td><span wicket:id="street"></span> <span wicket:id="additionalname"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="140" /></td>
+ <td><span wicket:id="zip"></span> <span wicket:id="town"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="141" /></td>
+ <td><span wicket:id="state"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="142" /></td>
+ <td><span wicket:id="address"></span></td>
+ </tr>
+ </table>
+ <div wicket:id="addressDenied"></div>
+ </fieldset>
+ </div>
+ </div>
</wicket:panel>
</html>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java Thu Oct 9 15:32:29 2014
@@ -22,32 +22,38 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.Address;
+import org.apache.openmeetings.db.entity.user.State;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ProfileImagePanel;
import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.Model;
public class UserProfilePanel extends UserPanel {
- private static final long serialVersionUID = 137157820964246251L;
+ private static final long serialVersionUID = 1L;
+ private final WebMarkupContainer address = new WebMarkupContainer("address");
+ private final Label addressDenied = new Label("addressDenied", "");
- private String getAddress(User u) {
- String result = "";
+ private void setAddress(User u) {
if (getUserId() == u.getUser_id() || Boolean.TRUE.equals(u.getShowContactData())) {
- //FIXME, more details should be added
- if (u.getAdresses() != null) {
- result = u.getAdresses().getStreet();
- } else {
- result = "[address]"; //FIXME
- }
- } else if (Boolean.TRUE.equals(u.getShowContactDataToContacts())) {
- result = WebSession.getString(1269);
+ addressDenied.setVisible(false);
+ Address a = u.getAdresses() == null ? new Address() : u.getAdresses();
+ address.add(new Label("phone", a.getPhone()));
+ address.add(new Label("street", a.getStreet()));
+ address.add(new Label("additionalname", a.getAdditionalname()));
+ address.add(new Label("zip", a.getZip()));
+ address.add(new Label("town", a.getTown()));
+ State s = a.getStates();
+ address.add(new Label("state", s == null ? null : s.getName()));
+ address.add(new Label("address", a.getComment()));
} else {
- result = WebSession.getString(1268);
+ address.setVisible(false);
+ addressDenied.setDefaultModelObject(WebSession.getString(Boolean.TRUE.equals(u.getShowContactDataToContacts()) ? 1269 : 1268));
}
- return result;
}
public UserProfilePanel(String id, long userId) {
@@ -61,6 +67,8 @@ public class UserProfilePanel extends Us
add(new Label("created", u.getRegdate()));
add(new TextArea<String>("offer", Model.of(u.getUserOffers())).setEnabled(false));
add(new TextArea<String>("interest", Model.of(u.getUserSearchs())).setEnabled(false));
- add(new Label("address", getAddress(u)));
+ setAddress(u);
+ add(address);
+ add(addressDenied);
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java Thu Oct 9 15:32:29 2014
@@ -55,7 +55,7 @@ import com.googlecode.wicket.jquery.ui.p
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class UserSearchPanel extends UserPanel {
- private static final long serialVersionUID = -3604291982438458598L;
+ private static final long serialVersionUID = 1L;
private final static List<Integer> itemsPerPage = Arrays.asList(10, 25, 50, 75, 100, 200, 500, 1000, 2500, 5000);
private String text;
private String search;
@@ -75,13 +75,13 @@ public class UserSearchPanel extends Use
super(id);
add(new Form<Void>("form") {
- private static final long serialVersionUID = 3171252669473438834L;
+ private static final long serialVersionUID = 1L;
{
add(new TextField<String>("text", new PropertyModel<String>(UserSearchPanel.this, "text")));
add(new TextField<String>("offer", new PropertyModel<String>(UserSearchPanel.this, "offer")));
add(new TextField<String>("search", new PropertyModel<String>(UserSearchPanel.this, "search")));
add(new AjaxFormSubmitBehavior(this, "onsubmit") {
- private static final long serialVersionUID = -5767210068168188960L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target) {
@@ -102,7 +102,7 @@ public class UserSearchPanel extends Use
}
});
IDataProvider<User> dp = new IDataProvider<User>() {
- private static final long serialVersionUID = -1757645522251197822L;
+ private static final long serialVersionUID = 1L;
public void detach() {
}
@@ -123,7 +123,7 @@ public class UserSearchPanel extends Use
};
final UserInfoDialog d = new UserInfoDialog("infoDialog", newMessage);
final DataView<User> dv = new DataView<User>("users", dp) {
- private static final long serialVersionUID = -3314136686941736574L;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(Item<User> item) {
@@ -136,7 +136,7 @@ public class UserSearchPanel extends Use
item.add(new Label("offer", u.getUserOffers()));
item.add(new Label("search", u.getUserSearchs()));
item.add(new WebMarkupContainer("view").add(new AjaxEventBehavior("onclick") {
- private static final long serialVersionUID = 7223188816617664993L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
@@ -163,17 +163,15 @@ public class UserSearchPanel extends Use
//item.add(new TooltipBehavior(new Options("content", "TODO:: Picture will be displayed"))); //FIXME
}
};
- final PagingNavigatorPanel navPanel = new PagingNavigatorPanel("navigator", dv, itemsPerPage) {
+
+ add(d, container.add(dv, new PagingNavigatorPanel("navigator", dv, itemsPerPage, 100) {
private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
refresh(target);
}
- };
- navPanel.setEntitiesPerPage(1000);
-
- add(d, container.add(dv, navPanel).setOutputMarkupId(true));
+ }).setOutputMarkupId(true));
}
private String getName(User u) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java Thu Oct 9 15:32:29 2014
@@ -243,13 +243,13 @@ public class User implements IDataProvid
@Element(data = true, required = false)
private String userSearchs;
- @Column(name = "show_contact_data")
+ @Column(name = "show_contact_data", nullable = false)
@Element(data = true, required = false)
- private Boolean showContactData;
+ private boolean showContactData;
- @Column(name = "show_contact_data_to_contacts")
+ @Column(name = "show_contact_data_to_contacts", nullable = false)
@Element(data = true, required = false)
- private Boolean showContactDataToContacts;
+ private boolean showContactDataToContacts;
@Column(name = "type")
@Element(data = true, required = false)
@@ -528,19 +528,19 @@ public class User implements IDataProvid
this.userSearchs = userSearchs;
}
- public Boolean getShowContactData() {
+ public boolean isShowContactData() {
return showContactData;
}
- public void setShowContactData(Boolean showContactData) {
+ public void setShowContactData(boolean showContactData) {
this.showContactData = showContactData;
}
- public Boolean getShowContactDataToContacts() {
+ public boolean isShowContactDataToContacts() {
return showContactDataToContacts;
}
- public void setShowContactDataToContacts(Boolean showContactDataToContacts) {
+ public void setShowContactDataToContacts(boolean showContactDataToContacts) {
this.showContactDataToContacts = showContactDataToContacts;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java Thu Oct 9 15:32:29 2014
@@ -39,9 +39,9 @@ public class ComunityUserForm extends Fo
public Long getObject() {
User u = ComunityUserForm.this.getModelObject();
- if (Boolean.TRUE.equals(u.getShowContactData())) {
+ if (u.isShowContactData()) {
return 1L;
- } else if (Boolean.TRUE.equals(u.getShowContactDataToContacts())) {
+ } else if (u.isShowContactDataToContacts()) {
return 2L;
}
return 3L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java Thu Oct 9 15:32:29 2014
@@ -45,7 +45,6 @@ public abstract class PagedEntityListPan
PagedEntityListPanel.this.onEvent(target);
}
};
- dataView.setItemsPerPage(navPanel.getEntitiesPerPage());
final SearchableDataProvider<? extends IDataProviderEntity> dp = dataView.getDataProvider();
Form<Void> searchForm = new Form<Void>("searchForm");
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java Thu Oct 9 15:32:29 2014
@@ -30,11 +30,17 @@ import org.apache.wicket.model.PropertyM
public abstract class PagingNavigatorPanel extends Panel {
private static final long serialVersionUID = 1L;
- private int entitiesPerPage = 50;
+ private int entitiesPerPage;
public PagingNavigatorPanel(String id, final DataView<?> dataView, List<Integer> numbers) {
+ this(id, dataView, numbers, 50);
+ }
+
+ public PagingNavigatorPanel(String id, final DataView<?> dataView, List<Integer> numbers, int _entitiesPerPage) {
super(id);
setOutputMarkupId(true);
+ this.entitiesPerPage = _entitiesPerPage;
+ dataView.setItemsPerPage(entitiesPerPage);
final Form<Void> f = new Form<Void>("pagingForm");
f.add(new OmPagingNavigator("navigator", dataView).setOutputMarkupId(true))
.add(new DropDownChoice<Integer>("entitiesPerPage", new PropertyModel<Integer>(this, "entitiesPerPage"), numbers)
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html Thu Oct 9 15:32:29 2014
@@ -20,24 +20,68 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <table>
- <tr>
- <td><div wicket:id="img"></div></td>
- <td>
- <wicket:ommessage key="1164"/> <span wicket:id="firstname"></span> <span wicket:id="lastname"></span><br/>
- <wicket:ommessage key="1165"/> <span wicket:id="tz"></span><br/>
- <wicket:ommessage key="1296"/> <span wicket:id="created"></span>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <b><wicket:ommessage key="1166"/></b><br/>
- <wicket:ommessage key="1162"/><textarea wicket:id="offer"></textarea><br/>
- <wicket:ommessage key="1163"/><textarea wicket:id="interest"></textarea><br/>
- <b><wicket:ommessage key="1167"/></b><br/>
- <wicket:ommessage key="1270"/> <div wicket:id="address"></div>
- </td>
- </tr>
- </table>
+ <div class="user info panel">
+ <table>
+ <tr>
+ <td><div wicket:id="img"></div></td>
+ <td>
+ <table>
+ <tr>
+ <td><wicket:ommessage key="1164"/></td><td><span wicket:id="firstname"></span> <span wicket:id="lastname"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="1165"/></td><td><span wicket:id="tz"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="1296"/></td><td><span wicket:id="created"></span></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <div>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="1166"/></legend>
+ <table>
+ <tr>
+ <td><wicket:ommessage key="1162"/></td>
+ <td><textarea wicket:id="offer"></textarea></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="1163"/></td>
+ <td><textarea wicket:id="interest"></textarea></td>
+ </tr>
+ </table>
+ </fieldset>
+ </div>
+ <div>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="1167"/></legend>
+ <table wicket:id="address">
+ <tr>
+ <td><wicket:ommessage key="607" /></td>
+ <td><span wicket:id="phone"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="139" /></td>
+ <td><span wicket:id="street"></span> <span wicket:id="additionalname"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="140" /></td>
+ <td><span wicket:id="zip"></span> <span wicket:id="town"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="141" /></td>
+ <td><span wicket:id="state"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="142" /></td>
+ <td><span wicket:id="address"></span></td>
+ </tr>
+ </table>
+ <div wicket:id="addressDenied"></div>
+ </fieldset>
+ </div>
+ </div>
</wicket:panel>
</html>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java Thu Oct 9 15:32:29 2014
@@ -22,32 +22,38 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.Address;
+import org.apache.openmeetings.db.entity.user.State;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ProfileImagePanel;
import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.Model;
public class UserProfilePanel extends UserPanel {
private static final long serialVersionUID = 1L;
+ private final WebMarkupContainer address = new WebMarkupContainer("address");
+ private final Label addressDenied = new Label("addressDenied", "");
- private String getAddress(User u) {
- String result = "";
- if (getUserId() == u.getId() || Boolean.TRUE.equals(u.getShowContactData())) {
- //FIXME, more details should be added
- if (u.getAdresses() != null) {
- result = u.getAdresses().getStreet();
- } else {
- result = "[address]"; //FIXME
- }
- } else if (Boolean.TRUE.equals(u.getShowContactDataToContacts())) {
- result = WebSession.getString(1269);
+ private void setAddress(User u) {
+ if (getUserId() == u.getId() || u.isShowContactData()) {
+ addressDenied.setVisible(false);
+ Address a = u.getAdresses() == null ? new Address() : u.getAdresses();
+ address.add(new Label("phone", a.getPhone()));
+ address.add(new Label("street", a.getStreet()));
+ address.add(new Label("additionalname", a.getAdditionalname()));
+ address.add(new Label("zip", a.getZip()));
+ address.add(new Label("town", a.getTown()));
+ State s = a.getStates();
+ address.add(new Label("state", s == null ? null : s.getName()));
+ address.add(new Label("address", a.getComment()));
} else {
- result = WebSession.getString(1268);
+ address.setVisible(false);
+ addressDenied.setDefaultModelObject(WebSession.getString(u.isShowContactDataToContacts() ? 1269 : 1268));
}
- return result;
}
public UserProfilePanel(String id, long userId) {
@@ -61,6 +67,8 @@ public class UserProfilePanel extends Us
add(new Label("created", u.getRegdate()));
add(new TextArea<String>("offer", Model.of(u.getUserOffers())).setEnabled(false));
add(new TextArea<String>("interest", Model.of(u.getUserSearchs())).setEnabled(false));
- add(new Label("address", getAddress(u)));
+ setAddress(u);
+ add(address);
+ add(addressDenied);
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java Thu Oct 9 15:32:29 2014
@@ -163,17 +163,15 @@ public class UserSearchPanel extends Use
//item.add(new TooltipBehavior(new Options("content", "TODO:: Picture will be displayed"))); //FIXME
}
};
- final PagingNavigatorPanel navPanel = new PagingNavigatorPanel("navigator", dv, itemsPerPage) {
+
+ add(d, container.add(dv, new PagingNavigatorPanel("navigator", dv, itemsPerPage, 100) {
private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
refresh(target);
}
- };
- navPanel.setEntitiesPerPage(1000);
-
- add(d, container.add(dv, navPanel).setOutputMarkupId(true));
+ }).setOutputMarkupId(true));
}
private String getName(User u) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css?rev=1630511&r1=1630510&r2=1630511&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css Thu Oct 9 15:32:29 2014
@@ -564,6 +564,13 @@ select.messages.selector {
margin: 10px;
max-width: 900px;
}
+.user.info.panel legend {
+ font-style: italic;
+ text-align: right;
+}
+.user.info.panel fieldset table, .user.info.panel fieldset table textarea {
+ width: 100%;
+}
#topControls #wicketDebugBar {
right: initial;
top: initial;