You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by es...@apache.org on 2010/12/12 12:30:06 UTC
svn commit: r1044796 - in /incubator/esme/branches/lift-2.2/trunk/server: ./
src/main/resources/props/ src/main/scala/org/apache/esme/comet/
src/main/scala/org/apache/esme/snippet/ src/main/webapp/info_view/
src/main/webapp/templates-hidden/
Author: esjewett
Date: Sun Dec 12 11:30:05 2010
New Revision: 1044796
URL: http://svn.apache.org/viewvc?rev=1044796&view=rev
Log:
Pulling latest changes from trunk into the Lift 2.2 branch
Added:
incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/comet/UserMessagesTimeline.scala
- copied unchanged from r1044792, incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/UserMessagesTimeline.scala
incubator/esme/branches/lift-2.2/trunk/server/src/main/webapp/templates-hidden/timeline_user_messages.html
- copied unchanged from r1044792, incubator/esme/trunk/server/src/main/webapp/templates-hidden/timeline_user_messages.html
Modified:
incubator/esme/branches/lift-2.2/trunk/server/ (props changed)
incubator/esme/branches/lift-2.2/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml (props changed)
incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/comet/PersonalTimeline.scala
incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/snippet/UserDisplay.scala
incubator/esme/branches/lift-2.2/trunk/server/src/main/webapp/info_view/user.html
Propchange: incubator/esme/branches/lift-2.2/trunk/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 12 11:30:05 2010
@@ -3,3 +3,4 @@
/incubator/esme/branches/metadata:966215-979767
/incubator/esme/branches/tagandconversationfollow:966215-1006324
/incubator/esme/branches/ui-2010-03-05:919339-923098
+/incubator/esme/trunk/server:1043380-1044792
Propchange: incubator/esme/branches/lift-2.2/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 12 11:30:05 2010
@@ -1,2 +1,3 @@
/incubator/esme/branches/metadata/src/main/resources/props/compass.filesystem.cfg.xml:966215-979767
/incubator/esme/branches/tagandconversationfollow/src/main/resources/props/compass.filesystem.cfg.xml:966215-1006324
+/incubator/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1043380-1044792
Modified: incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/comet/PersonalTimeline.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/comet/PersonalTimeline.scala?rev=1044796&r1=1044795&r2=1044796&view=diff
==============================================================================
--- incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/comet/PersonalTimeline.scala (original)
+++ incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/comet/PersonalTimeline.scala Sun Dec 12 11:30:05 2010
@@ -32,7 +32,7 @@ class PersonalTimeline extends Timeline
override def localSetup() {
super.localSetup()
for (user <- User.currentUser) {
- Distributor ! Distributor.Listen(user.id, this)
+ Distributor ! Distributor.ListenObject(user, this)
Distributor !? (2000, Distributor.LatestMessages(user.id, 40)) match {
case Full(msg: List[(Long,MailboxReason,Boolean)]) => messages = msg
case x =>
Modified: incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/snippet/UserDisplay.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/snippet/UserDisplay.scala?rev=1044796&r1=1044795&r2=1044796&view=diff
==============================================================================
--- incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/snippet/UserDisplay.scala (original)
+++ incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/snippet/UserDisplay.scala Sun Dec 12 11:30:05 2010
@@ -57,14 +57,19 @@ object UserDisplay {
case _ => <xml:group> <div class="thatsyou">{S.?("base_user_thats_you")}</div></xml:group>
}
+ }
+
+ def cometTimeline:NodeSeq = {
+ println(<lift:comet type="UserMessagesTimeline" name={"user"+user.id.is} />)
+ <lift:comet type="UserMessagesTimeline" name={"user"+user.id.is} />
}
-
-
+
bind("user", in,
"nicename" -> user.niceName,
"lastName" -> user.lastName,
"firstName" -> user.firstName,
- "image" -> user.image_link,
+ "image" -> user.image_link,
+ "cometTimeline" -> cometTimeline,
"followButton" -> followOrNot,
"messages" -> MessageUtils.bindMessages(Message.findAll(
By(Message.author, user),
Modified: incubator/esme/branches/lift-2.2/trunk/server/src/main/webapp/info_view/user.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.2/trunk/server/src/main/webapp/info_view/user.html?rev=1044796&r1=1044795&r2=1044796&view=diff
==============================================================================
--- incubator/esme/branches/lift-2.2/trunk/server/src/main/webapp/info_view/user.html (original)
+++ incubator/esme/branches/lift-2.2/trunk/server/src/main/webapp/info_view/user.html Sun Dec 12 11:30:05 2010
@@ -14,8 +14,7 @@
"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.
- <img <user:image/> alt="" width="50px"/> *
+ under the License. *
-->
<lift:surround with="base" at="left">
@@ -24,75 +23,48 @@
<script type="text/javascript" src="../scripts/jquery-ui-1.8.2.custom.min.js"> </script>
<script type="text/javascript" src="../scripts/esme_table_sorter.js"></script>
<script type="text/javascript" src="../scripts/esme.js"></script>
-<div id="back-header">
- <lift:user_info>
- <h1><lift:loc>ui_user_single_title</lift:loc> <i>'<user:nicename/>'</i></h1>
-
- <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">
- <span id="following"><user:followButton/></span>
- <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
- <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
- <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active">
- <a href="#tabs-1"><user:nicename/><lift:loc>ui_user_messages</lift:loc></a>
- </li>
- <li class="ui-state-default ui-corner-top">
- <a href="#tabs-2"><lift:loc>ui_user_following</lift:loc></a>
- </li>
- <li class="ui-state-default ui-corner-top">
- <a href="#tabs-3"><lift:loc>ui_user_followers</lift:loc></a>
- </li>
- </ul>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-1">
- <dl class="">
- <dd class="b-clouds">
- <table class="tablesorter">
- <thead>
- <tr>
- <th>
- <lift:loc>ui_user_message</lift:loc>
- </th>
- <th>
- <lift:loc>ui_user_date</lift:loc>
- </th>
- </tr>
- </thead>
- <tbody>
- <user:messages>
- <tr class="user_row">
- <td class ="user_message">
- <item:body/>
- </td>
- <td>
- <item:date/>
- </td>
- </tr>
- </user:messages>
- </tbody>
- </table>
- </dd>
- </dl>
- </div>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
- <dl class="">
- <dd class="b-contacts" style="height: 240px; overflow: auto">
- <lift:UserSnip.following user:userId=""/>
- </dd>
- </dl>
- </div>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-3">
- <dl class="">
- <dd class="b-contacts" style="height: 240px; overflow: auto">
- <lift:UserSnip.followers user:userId=""/>
- </dd>
- </dl>
- </div>
- </div>
-
- </div>
- </lift:user_info>
- </div>
- <!-- End demo -->
+ <lift:user_info>
+ <div id="back-header">
+ <h1>
+ <user:image/> <i>'<user:nicename/>'</i> - <user:firstName/> <user:lastName/>
+ <span id="following"><user:followButton/></span>
+ </h1>
+ </div>
+ <div class="container-aux">
+ <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
+ <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
+ <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active">
+ <a href="#tabs-1"><user:nicename/><lift:loc>ui_user_messages</lift:loc></a>
+ </li>
+ <li class="ui-state-default ui-corner-top">
+ <a href="#tabs-2"><lift:loc>ui_user_following</lift:loc></a>
+ </li>
+ <li class="ui-state-default ui-corner-top">
+ <a href="#tabs-3"><lift:loc>ui_user_followers</lift:loc></a>
+ </li>
+ </ul>
+ <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-1">
+ <dl class="">
+ <dd class="b-clouds">
+ <lift:embed what="templates-hidden/timeline_user_messages"/>
+ </dd>
+ </dl>
+ </div>
+ <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
+ <dl class="">
+ <dd class="b-contacts" style="height: 240px; overflow: auto">
+ <lift:UserSnip.following user:userId=""/>
+ </dd>
+ </dl>
+ </div>
+ <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-3">
+ <dl class="">
+ <dd class="b-contacts" style="height: 240px; overflow: auto">
+ <lift:UserSnip.followers user:userId=""/>
+ </dd>
+ </dl>
+ </div>
+ </div>
+ </div>
+ </lift:user_info>
</lift:surround>
\ No newline at end of file