svn commit: r1039271 - in /incubator/esme/trunk/server/src/main: scala/org/apache/esme/model/User.scala scala/org/apache/esme/snippet/UserDisplay.scala scala/org/apache/esme/snippet/UserSnip.scala webapp/info_view/user.html

[rh...@apache.org]

Author: rhirsch
Date: Fri Nov 26 08:43:16 2010
New Revision: 1039271

URL: http://svn.apache.org/viewvc?rev=1039271&view=rev
Log:
[ESME-311] Profile picture doesn't display on the user page
Fixed problem - maybe not perfect - there is HTML code in scala but image is now displayed

Modified:
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserDisplay.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
    incubator/esme/trunk/server/src/main/webapp/info_view/user.html

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala?rev=1039271&r1=1039270&r2=1039271&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala Fri Nov 26 08:43:16 2010
@@ -341,7 +341,7 @@ class User extends KeyedMapper[Long, Use
     case _ => nickname // email.is
   }
 
-  // def niceNameWEmailLink = <a href={"mailto:"+email.is}>{niceName}</a>
+   def image_link = <img src={""+image_url} width="30px" /> 
 
   object uniqueId extends MappedUniqueId(this, 32) {
     override def dbIndexed_? = true

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserDisplay.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserDisplay.scala?rev=1039271&r1=1039270&r2=1039271&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserDisplay.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserDisplay.scala Fri Nov 26 08:43:16 2010
@@ -64,10 +64,9 @@ object UserDisplay {
          "nicename" -> user.niceName,
          "lastName" -> user.lastName,
          "firstName" -> user.firstName,
-          "image" -> user.image_url,
+          "image" -> user.image_link,
          "followButton" -> followOrNot,
-         "timeline" -> MessageUtils.bindMessages(Mailbox.mostRecentMessagesFor(user.id, 50).map(_._1)) _,
-         "messages" -> MessageUtils.bindMessages(Message.findAll(
+          "messages" -> MessageUtils.bindMessages(Message.findAll(
             By(Message.author, user), 
             OrderBy(Message.id, Descending), 
             MaxRows(50))) _,

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala?rev=1039271&r1=1039270&r2=1039271&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala Fri Nov 26 08:43:16 2010
@@ -118,7 +118,7 @@ class UserSnip extends DispatchSnippet {
   }
 
   def userFmt(u: User): Node = 
-   <li> <img width="30px" src={(u.image_url)} id="avatar" /> <a href={"/user/"+urlEncode(u.nickname.is)}>{u.niceName}</a> {u.firstName} {u.lastName}</li>
+   <li> <img width="30px" src={(u.image_url)} id="avatar"/> <a href={"/user/"+urlEncode(u.nickname.is)}>{u.niceName}</a> {u.firstName} {u.lastName}</li>
 
 
 

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/user.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/user.html?rev=1039271&r1=1039270&r2=1039271&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/user.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/user.html Fri Nov 26 08:43:16 2010
@@ -14,7 +14,8 @@
  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
  KIND, either express or implied.  See the License for the    *
  specific language governing permissions and limitations      *
- under the License.                                           *
+ under the License. 
+ <img <user:image/> alt="" width="50px"/>                                          *
 -->
 
 <lift:surround with="base" at="left">
@@ -26,7 +27,8 @@
 <div id="back-header">
        <lift:user_info>
 	<h1><lift:loc>ui_user_single_title</lift:loc> <i>'<user:nicename/>'</i></h1>
-	<img lift:snippet="user:imageUrl" alt="" width="50px"/>
+	
+	<user:image/>
 	<h4><lift:loc>ui_sign_up_firstname</lift:loc>: <user:firstName/></h4>
 	<h4><lift:loc>ui_sign_up_lastname</lift:loc>: <user:lastName/></h4>
 	<div class="container-aux">