roller/web main.jsp,1.10,1.11

Update of /cvsroot/roller/roller/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30603/web

Modified Files:
        main.jsp 
Log Message:
Main page now shows weblog entry text, java.blogs style

Still not done...

Index: main.jsp
===================================================================
RCS file: /cvsroot/roller/roller/web/main.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** main.jsp    27 Feb 2004 05:01:37 -0000      1.10
--- main.jsp    28 Feb 2004 05:03:37 -0000      1.11
***************
*** 13,47 ****
  
  <%-- Load data, note this is inside cache tags --%>
! <bean:define id="popularWebsites" name="data" property="popularWebsites" 
scope="request" />
! <bean:define id="recentPosts" name="data" property="recentWeblogEntries" 
scope="request" />
  
  <h3>Most recent weblog posts</h3>
  
! <table class="rTable">
      <tr class="rHeaderTr">
!         <td width="10%">User</td>
!         <td width="40%">Title</td>
!         <td width="10%">Category</td>
!         <td width="25%">Time</td>
      </tr>
!     <logic:iterate id="post" name="recentPosts" >
          <roller:row oddStyleClass="rOddTr" evenStyleClass="rEvenTr">
!             <td class="rTd"><bean:write name="post" 
property="website.user.userName" /></td>
!             <td class="rTd">
!                 <a href='<bean:write name="baseURL" 
scope="request"/><bean:write name="post" property="permaLink" />'>
!                     <str:truncateNicely lower="35" 
!                         upper="45"><bean:write name="post"  
!                     property="displayTitle" /></str:truncateNicely>
!                 </a>
!             </td>
!             <td class="rTd">
!                 <str:truncateNicely lower="25"
!                      upper="30"><bean:write name="post"
!                 property="category.name" /></str:truncateNicely>
              </td>
-             <td class="rTd" align="center"><bean:write name="post" 
property="pubTime" /></td>
          </roller:row>
!     </logic:iterate>
  </table>
  <span class="version">
  <a href="rss" title="Syndicate this site">
--- 13,42 ----
  
  <%-- Load data, note this is inside cache tags --%>
! <c:set var="popularWebsites" value="${data.popularWebsites}" />
! <c:set var="recentPosts" value="${data.recentWeblogEntries}" />
  
  <h3>Most recent weblog posts</h3>
  
! <table class="rTable" cellpadding="5px">
      <tr class="rHeaderTr">
!         <td width="100%">Summary</td>
      </tr>
!     <c:forEach var="post" items="${recentPosts}">
!     
          <roller:row oddStyleClass="rOddTr" evenStyleClass="rEvenTr">
!             <td class="rTd">            
!                <a href='<c:out value="${baseURL}" /><c:out 
value="${post.permaLink}" />'>
!                    <c:out value="${post.displayTitle}" />
!                </a><br />
!                <a href='<c:out value="${baseURL}" />/<c:out 
value="${post.website.user.userName}" />' >
!                   <c:out value="${post.website.name}" /></a><br />            
  
!                <roller:ApplyPlugins entryKey="post" stripHtml="true" 
maxLength="350" />               
              </td>
          </roller:row>
!         
!     </c:forEach>
  </table>
+ 
+ <br />
  <span class="version">
  <a href="rss" title="Syndicate this site">
***************
*** 55,80 ****
      <tr class="rHeaderTr">
          <td width="10%">User</td>
-         <td width="50%">Weblog</td>
          <td width="5%">Hits</td>
-         <td width="5%">RSS</td>
      </tr>
!     <logic:iterate id="site" name="popularWebsites" >
          <roller:row oddStyleClass="rOddTr" evenStyleClass="rEvenTr">
-             <td class="rTd"><bean:write name="site" property="userName" 
/></td>
              <td class="rTd">
!                 <a href='page/<bean:write name="site" property="userName" />'>
!                     <str:truncateNicely lower="55" 
!                         upper="60"><bean:write name="site" 
!                     property="id" /></str:truncateNicely>
                  </a>
              </td>
-             <td class="rTd" align="center"><bean:write name="site" 
property="hits" /></td>
              <td class="rTd" align="center">
!                 <a href='rss/<bean:write name="site" property="userName"/>'>
!                     <img src="images/rssbadge.gif" alt="RSS"/>
!                 </a>
              </td>
          </roller:row>
!     </logic:iterate>
  </table>
  
--- 50,71 ----
      <tr class="rHeaderTr">
          <td width="10%">User</td>
          <td width="5%">Hits</td>
      </tr>
!     <c:forEach var="site" items="${popularWebsites}" >
!     
          <roller:row oddStyleClass="rOddTr" evenStyleClass="rEvenTr">
              <td class="rTd">
!                 <a href='page/<c:out value="${site.userName}" />'>
!                     <str:truncateNicely lower="55" upper="60">
!                        <c:out value="${site.userName}" />
!                     </str:truncateNicely>
                  </a>
              </td>
              <td class="rTd" align="center">
!                <c:out value="${site.hits}" />
              </td>
          </roller:row>
!         
!     </c:forEach>
  </table>
  



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click