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/07/17 16:58:12 UTC
svn commit: r965092 - in /incubator/esme/trunk/server/src/main/webapp:
info_view/streams.html style/style.css
Author: esjewett
Date: Sat Jul 17 14:58:11 2010
New Revision: 965092
URL: http://svn.apache.org/viewvc?rev=965092&view=rev
Log:
[ESME-231] Fixes issue with footer on stream page not adjusting to longer streams
Modified:
incubator/esme/trunk/server/src/main/webapp/info_view/streams.html
incubator/esme/trunk/server/src/main/webapp/style/style.css
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=965092&r1=965091&r2=965092&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 Sat Jul 17 14:58:11 2010
@@ -16,83 +16,64 @@
specific language governing permissions and limitations *
under the License. *
-->
-<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 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>
\ No newline at end of file
Modified: incubator/esme/trunk/server/src/main/webapp/style/style.css
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/style/style.css?rev=965092&r1=965091&r2=965092&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/style/style.css (original)
+++ incubator/esme/trunk/server/src/main/webapp/style/style.css Sat Jul 17 14:58:11 2010
@@ -554,8 +554,7 @@ ul#toc li.current a {
.container-streams {
float:left;
- width: 563px;
- height:500px;
+ width: 563px;
padding:20px 30px;
background: url(../images/bg-tabs.png) no-repeat;
margin-bottom:20px;
@@ -658,13 +657,11 @@ position:absolute;
top: 70px
}
-.StreamUI {
-position:absolute;
+.StreamUI {
top: 60px
}
-.stream_body {
-position:absolute;
+.stream_body {
top: 100px
}