svn commit: r1553364 - in /openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile: UserProfilePanel.html UserProfilePanel.java

[vdegtyarev]

Author: vdegtyarev
Date: Wed Dec 25 09:07:21 2013
New Revision: 1553364

URL: http://svn.apache.org/r1553364
Log:
Duplicate timezone name is removed from user profile.

Modified:
    
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
    
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java

Modified: 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html?rev=1553364&r1=1553363&r2=1553364&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
 Wed Dec 25 09:07:21 2013
@@ -25,7 +25,7 @@
                        <td><div wicket:id="img"></div></td>
                        <td>
                                <wicket:ommessage key="1164"/>&nbsp;<span 
wicket:id="firstname"></span>&nbsp;<span wicket:id="lastname"></span><br/>
-                               <wicket:ommessage key="1165"/>&nbsp;<span 
wicket:id="tz"></span>&nbsp;<span wicket:id="tzname"></span><br/>
+                               <wicket:ommessage key="1165"/>&nbsp;<span 
wicket:id="tz"></span><br/>
                                <wicket:ommessage key="1296"/>&nbsp;<span 
wicket:id="created"></span>
                        </td>
                </tr>

Modified: 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1553364&r1=1553363&r2=1553364&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
 Wed Dec 25 09:07:21 2013
@@ -58,7 +58,6 @@ public class UserProfilePanel extends Us
                add(new Label("firstname", u.getFirstname()));
                add(new Label("lastname", u.getLastname()));
                add(new Label("tz", u.getTimeZoneId()));
-               add(new Label("tzname", u.getTimeZoneId()));
                add(new Label("created", u.getRegdate()));
                add(new TextArea<String>("offer", 
Model.of(u.getUserOffers())).setEnabled(userId == getUserId()));
                add(new TextArea<String>("interest", 
Model.of(u.getUserSearchs())).setEnabled(userId == getUserId()));