Return-Path: 
 <esme-commits-return-646-apmail-incubator-esme-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org
Received: (qmail 25137 invoked from network); 22 Nov 2010 08:46:58 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 22 Nov 2010 08:46:58 -0000
Received: (qmail 25674 invoked by uid 500); 22 Nov 2010 08:47:30 -0000
Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org
Received: (qmail 25640 invoked by uid 500); 22 Nov 2010 08:47:29 -0000
Mailing-List: contact esme-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:esme-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:esme-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:esme-commits@incubator.apache.org>
List-Id: <esme-commits.incubator.apache.org>
Reply-To: esme-dev@incubator.apache.org
Delivered-To: mailing list esme-commits@incubator.apache.org
Received: (qmail 25630 invoked by uid 99); 22 Nov 2010 08:47:28 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Nov 2010 08:47:28 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Nov 2010 08:47:26 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id BDEE823889B3; Mon, 22 Nov 2010 08:45:53 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1037632 -
 /incubator/esme/trunk/server/src/main/webapp/info_view/user.html
Date: Mon, 22 Nov 2010 08:45:53 -0000
To: esme-commits@incubator.apache.org
From: rhirsch@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101122084553.BDEE823889B3@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rhirsch
Date: Mon Nov 22 08:45:53 2010
New Revision: 1037632

URL: http://svn.apache.org/viewvc?rev=1037632&view=rev
Log:
[ESME-309] Remove Timeline tab from user page
[ESME-310] Replace "Contacts" tab on user page with "Following" and "Followers" tabs

Modified:
    incubator/esme/trunk/server/src/main/webapp/info_view/user.html

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=1037632&r1=1037631&r2=1037632&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 Mon Nov 22 08:45:53 2010
@@ -34,52 +34,16 @@
             <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_timeline</lift:loc></a>
+                        <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"><user:nicename/><lift:loc>ui_user_messages</lift:loc></a>
+                        <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_contacts</lift:loc></a>
+                        <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" id="tabs-1">
-                    <dl class="messages">
-                        <dd>
-                            <table id="esme-table" class="tablesorter">
-                                <thead>
-                                    <tr>
-                                        <th>
-                                            <lift:loc>ui_user_author</lift:loc>
-                                        </th>
-                                        <th>
-                                            <lift:loc>ui_user_message</lift:loc>
-                                        </th>
-                                        <th>
-                                            <lift:loc>ui_user_date</lift:loc>
-                                        </th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <user:timeline>
-                                        <tr class="user_row">
-                                            <td>
-                                                <item:author/>
-                                            </td>
-                                            <td class ="user_message">
-                                                <item:body/>
-                                            </td>
-                                            <td>
-                                                <item:date/>
-                                            </td>
-                                        </tr>
-                                    </user:timeline>
-                                </tbody>
-                            </table>
-                        </dd>
-                    </dl>
-                </div>
-                <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
+                <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">
@@ -109,14 +73,16 @@
                         </dd>
                     </dl>
                 </div>
-                <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-3">
+                <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">
-                            <b><lift:loc>ui_user_following</lift:loc></b>
                             <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">
-                            <b><lift:loc>ui_user_followers</lift:loc></b>
                             <lift:UserSnip.followers user:userId=""/>
                         </dd>
                     </dl>