You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/05/26 21:49:38 UTC

svn commit: r409724 - in /incubator/roller/branches/roller_3.0/web: WEB-INF/jsps/admin/head-planet.jsp WEB-INF/jsps/admin/planet-sidebar.jsp WEB-INF/jsps/admin/planet.jsp planet/head-planet.jsp planet/planet-sidebar.jsp planet/planet.jsp

Author: snoopdave
Date: Fri May 26 12:49:37 2006
New Revision: 409724

URL: http://svn.apache.org/viewvc?rev=409724&view=rev
Log:
Moved planet JSPs under WEB-INF and fixes bugs caused by Atlas work

Added:
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/head-planet.jsp
      - copied unchanged from r409722, incubator/roller/branches/roller_3.0/web/planet/head-planet.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/planet-sidebar.jsp
      - copied unchanged from r409722, incubator/roller/branches/roller_3.0/web/planet/planet-sidebar.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/planet.jsp
      - copied, changed from r409722, incubator/roller/branches/roller_3.0/web/planet/planet.jsp
Removed:
    incubator/roller/branches/roller_3.0/web/planet/head-planet.jsp
    incubator/roller/branches/roller_3.0/web/planet/planet-sidebar.jsp
    incubator/roller/branches/roller_3.0/web/planet/planet.jsp

Copied: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/planet.jsp (from r409722, incubator/roller/branches/roller_3.0/web/planet/planet.jsp)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/planet.jsp?p2=incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/planet.jsp&p1=incubator/roller/branches/roller_3.0/web/planet/planet.jsp&r1=409722&r2=409724&rev=409724&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/planet/planet.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/planet.jsp Fri May 26 12:49:37 2006
@@ -46,7 +46,7 @@
 
     <div class="entryBox">
     
-        <a href='<c:out value="${post.permalink}" />' class="entryTitle">
+        <a href='<c:out value="${post.permaLink}" />' class="entryTitle">
            <str:truncateNicely upper="90" >
               <str:removeXml>
                  <c:out value="${post.title}" />
@@ -61,14 +61,14 @@
                   <c:out value="${post.subscription.title}" />
                </str:removeXml>
             </a>               
-            <fmt:formatDate value="${post.published}" type="both" 
+            <fmt:formatDate value="${post.pubTime}" type="both" 
                 dateStyle="medium" timeStyle="medium" />
             <br />
         </span>
 
         <str:truncateNicely upper="250" >
            <str:removeXml>
-              <c:out value="${post.content}" escapeXml="false" />
+              <c:out value="${post.text}" escapeXml="false" />
            </str:removeXml>
         </str:truncateNicely>