Return-Path: 
 <esme-commits-return-556-apmail-incubator-esme-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org
Received: (qmail 76548 invoked from network); 23 Aug 2010 18:53:03 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 23 Aug 2010 18:53:03 -0000
Received: (qmail 47274 invoked by uid 500); 23 Aug 2010 18:53:03 -0000
Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org
Received: (qmail 47238 invoked by uid 500); 23 Aug 2010 18:53:03 -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 47230 invoked by uid 99); 23 Aug 2010 18:53:03 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Aug 2010 18:53:03 +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, 23 Aug 2010 18:53:02 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8999F238890A; Mon, 23 Aug 2010 18:51:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r988247 -
 /incubator/esme/trunk/server/src/main/webapp/info_view/streams.html
Date: Mon, 23 Aug 2010 18:51:45 -0000
To: esme-commits@incubator.apache.org
From: esjewett@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100823185145.8999F238890A@eris.apache.org>

Author: esjewett
Date: Mon Aug 23 18:51:45 2010
New Revision: 988247

URL: http://svn.apache.org/viewvc?rev=988247&view=rev
Log:
[ESME-259] Pool selector in streams doesn't work anymore
Patch by Imtiaz Ahmed Hajee Esmail

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

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/streams.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/streams.html?rev=988247&r1=988246&r2=988247&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/streams.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/streams.html Mon Aug 23 18:51:45 2010
@@ -16,64 +16,83 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="base" at="left">     
-  <lift:TableSorterSnip/>
-  <div id="back-header">
-    <h1><b><lift:loc>ui_streams_manage</lift:loc></b></h1>  
-  </div>
-   
-  <!---CONTENT BOX-->
-  <div class="container-streams"> 
-    <div class="StreamUI">
-	    <lift:streamFilters>
-			  <table class="tablesorter" >
-			    <thead>
-				    <tr>
-					    <th class="tipelement" title="These are users that you follow">
-						    <lift:loc>ui_streams_filter_resender</lift:loc> <main:resent/>
-					    </th>
-					    <th align="center" class="tipelement" title="Filter by messages that have been resent by those you follow. ">
-						    <lift:loc>ui_streams_resent_active</lift:loc> <main:filterResent/>
-					    </th>
-					    <th class="tipelement" title="These are pools in which you are a member">
-						    <lift:loc>ui_streams_filter_pool</lift:loc> <main:pools/> 
-					    </th>
-					    <th align="center">
-						    <lift:loc>ui_streams_pool_active</lift:loc> <main:filterPools/>
-					    </th>
-				    </tr>
-				  </thead>
-			  </table>
-		  </lift:streamFilters>
-    </div>
-    
-    <div class ="stream_body">
-      <table id="esme-table" class="tablesorter">            
-        <thead>
-            <tr>
-                <th></th>
-                <th><lift:loc>ui_user_list_nickname</lift:loc></th>
-                <th><lift:loc>ui_user_list_last_message</lift:loc></th>
-                <th><lift:loc>ui_user_list_last_message_date</lift:loc></th>
-            </tr>
-        </thead>
-        <tbody id="StreamSpan">         
-          <lift:displayStream>                  
-            <disp:item>
-              <tr class="user_row">
-                <td><item:imageUrl/></td>
-                <td>
-                  <div class="user_name">
-                    <item:author/>
-	                </div>
-                </td>
-                <td class="user_message"><item:text/></td>
-                <td><item:date/></td>
-              </tr>
-            </disp:item>
-          </lift:displayStream>
-        </tbody>
-      </table>
-    </div> 
-  </div>    
+<lift:surround with="base" at="left">
+    <link rel="stylesheet" type="text/css" href="../style/style.css"/>
+    <lift:TableSorterSnip/>
+    <div id="back-header">
+      <h1><b><lift:loc>ui_streams_manage</lift:loc></b></h1>
+     
+	<!---CONTENT BOX-->
+	<div class="container-streams">
+	
+	<div class ="stream_body">
+        <table id="esme-table" class="tablesorter">        
+            <thead>
+                <tr>
+                    <th>
+                    </th>
+                    <th>
+                        <lift:loc>ui_user_list_nickname</lift:loc>
+                    </th>
+                    <th>
+                        <lift:loc>ui_user_list_last_message</lift:loc>
+                    </th>
+                    <th>
+                        <lift:loc>ui_user_list_last_message_date</lift:loc>
+                    </th>
+                </tr>
+            </thead>
+            <tbody id="StreamSpan">         
+                <lift:displayStream>                  
+                    <disp:item>
+                        <tr class="user_row">
+                            <td>
+                                <item:imageUrl/>
+                            </td>
+                            <td>
+	                    <div class="user_name">
+                                	<item:author/>
+			    </div>
+                            </td>
+                            <td class="user_message">
+                                <item:text/>
+                            </td>
+                            <td>
+                                <item:date/>
+                            </td>
+                        </tr>
+                    </disp:item>
+                   
+                </lift:displayStream>
+                 
+            </tbody>
+        </table>
+       </div>
+		
+		<div class="StreamUI">
+			<lift:streamFilters>
+					<table class="tablesorter" >
+					<thead>
+						<tr>
+							<th class="tipelement" title="These are users that you follow">
+								 <lift:loc>ui_streams_filter_resender</lift:loc> <main:resent/>
+							</th>
+							<th align="center" class="tipelement" title="Filter by messages that have been resent by those you follow. ">
+								 <lift:loc>ui_streams_resent_active</lift:loc> <main:filterResent/>
+							</th>
+							<th class="tipelement" title="These are pools in which you are a member">
+								<lift:loc>ui_streams_filter_pool</lift:loc> <main:pools/> 
+							</th>
+							<th align="center">
+								<lift:loc>ui_streams_pool_active</lift:loc> <main:filterPools/>
+							</th>
+						</tr>
+						 </thead>
+					</table>
+				</lift:streamFilters>
+		</div>		
+
+	</div>
+	</div>
+	<!-- End demo -->
 </lift:surround>
\ No newline at end of file