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
