roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r414908 - in /incubator/roller/branches/roller_3.0/web: WEB-INF/jsps/admin/ WEB-INF/jsps/authoring/ WEB-INF/jsps/tiles/ WEB-INF/velocity/deprecated/ WEB-INF/velocity/templates/feeds/ themes/sotto/
Date Fri, 16 Jun 2006 20:58:21 GMT
Author: agilliland
Date: Fri Jun 16 13:58:20 2006
New Revision: 414908

URL: http://svn.apache.org/viewvc?rev=414908&view=rev
Log:
fixing permalink urls.


Modified:
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/main.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/searchResults.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/comments.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/atom.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/rss.vm
    incubator/roller/branches/roller_3.0/web/themes/sotto/_day.vm

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/main.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/main.jsp?rev=414908&r1=414907&r2=414908&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/main.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/main.jsp Fri Jun 16 13:58:20
2006
@@ -45,7 +45,7 @@
     <c:forEach var="post" items="${pinnedPosts}">
         <div class="entryBoxPinned">
 
-            <a href='<c:out value="${post.permaLink}" />' class="entryTitle">
+            <a href='<c:out value="${baseURL}" /><c:out value="${post.permaLink}"
/>' class="entryTitle">
                 <str:truncateNicely upper="90" >
                    <c:out value="${post.displayTitle}" />
                 </str:truncateNicely></a>
@@ -79,7 +79,7 @@
     <c:if test="${!post.pinnedToMain}">
     <div class="entryBox">
 
-        <a href='<c:out value="${post.permaLink}" />' class="entryTitle">
+        <a href='<c:out value="${baseURL}" /><c:out value="${post.permaLink}"
/>' class="entryTitle">
             <str:truncateNicely upper="90" >
                <c:out value="${post.displayTitle}" />
             </str:truncateNicely></a>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp?rev=414908&r1=414907&r2=414908&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp
(original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp
Fri Jun 16 13:58:20 2006
@@ -291,7 +291,7 @@
                         <td style="border: none; padding:0px;">
                             <fmt:message key="commentManagement.entryTitled" /></td>
                         <td class="details" style="border: none; padding:0px;">  
-                            <a href='<c:out value="${comment.weblogEntry.permaLink}"
/>'>
+                            <a href='<c:out value="${model.baseURL}" /><c:out
value="${comment.weblogEntry.permaLink}" />'>
                                <c:out value="${comment.weblogEntry.title}" /></a>
                         </td>
                     </tr>  

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp?rev=414908&r1=414907&r2=414908&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp
(original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp
Fri Jun 16 13:58:20 2006
@@ -168,7 +168,7 @@
                 
         <td>
             <c:if test='${post.status == "PUBLISHED"}'>
-                <a href='<c:out value="${post.permaLink}" />'>
+                <a href='<c:out value="${model.baseURL}" /><c:out value="${post.permaLink}"
/>'>
                     <fmt:message key="weblogEntryQuery.view" />
                 </a>
             </c:if>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/searchResults.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/searchResults.jsp?rev=414908&r1=414907&r2=414908&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/searchResults.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/searchResults.jsp Fri Jun
16 13:58:20 2006
@@ -122,7 +122,7 @@
         <div class="daybox" style="margin: 0px 5px 0px 10px">
         <c:forEach var="post" items="${dayMap}">
 
-            <a href='<c:out value="${post.permaLink}" />' class="entryTitle">
+            <a href='<c:out value="${model.baseURL}" /><c:out value="${post.permaLink}"
/>' class="entryTitle">
                 <str:truncateNicely upper="90" >
                    <c:out value="${post.displayTitle}" />
                 </str:truncateNicely></a>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/comments.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/comments.vm?rev=414908&r1=414907&r2=414908&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/comments.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/comments.vm Fri Jun
16 13:58:20 2006
@@ -11,7 +11,7 @@
 #macro( showCommentsLink $entry )
     #set( $commentCount = $pageModel.getCommentCount($entry.Id) )
     #if (($commentsEnabled && $entry.commentsStillAllowed && $website.allowComments)
|| $commentCount > 0)
-        #set( $link = "$entry.permaLink&popup=true#comments" )
+        #set( $link = "$ctxPath$entry.permaLink&popup=true#comments" )
         <a href="$link " onclick="window.open('$link', 'comments',
             'width=480,height=480,scrollbars=yes,status=yes,resizable'); return false;"
             class="entrycommentslink">$text.get( "macro.weblog.comments" ) [$commentCount]</a>
@@ -25,7 +25,7 @@
 #macro( showCommentsPageLink $entry )
     #set( $commentCount = $pageModel.getCommentCount($entry.Id) )
     #if (($commentsEnabled && $entry.commentsStillAllowed && $website.allowComments)
|| $commentCount > 0)
-        #set( $link = "$entry.permaLink#comments" )
+        #set( $link = "$ctxPath$entry.permaLink#comments" )
         <a href="$link" class="entrycommentslink">$text.get( "macro.weblog.comments"
) [$commentCount]</a>
     #end
 #end
@@ -41,7 +41,7 @@
         <div class="comments" id="comments">
             <div id="commentTwisty$entry.Id" class="commentTwisty"
                 onclick="toggleComments('$entry.Id', '${ctxPath}/page/${website.handle}');
return false;">
-            <a href="$entry.permaLink" class="plain">
+            <a href="$ctxPath$entry.permaLink" class="plain">
             #if($commentCount == 0)
                 $text.get( "macro.weblog.addcomment" )
             #elseif($commentCount == 1)
@@ -72,7 +72,7 @@
         $text.get( "macro.weblog.postedbywebsite", [$comment.url, $comment.url] )
     #end
     #if( $showPermalink )
-    <a href="${entry.permaLink}#comment${velocityCount}"
+    <a href="${ctxPath}${entry.permaLink}#comment${velocityCount}"
        class="entrypermalink"
        title="$text.get( "macro.weblog.commentpermalink.title" )">#</a>
     #end
@@ -158,7 +158,7 @@
         #set($content = $utilities.encodeEmail($comment.content))
         #set($content = $utilities.addNofollow($content))
         <li class="commentsListItem"><a
-           href="${comment.weblogEntry.permaLink}#comments"
+           href="${ctxPath}${comment.weblogEntry.permaLink}#comments"
            class="entrypermalink"
            title="$text.get( "macro.weblog.commentpermalink.title" ) to
                '$utilities.removeHTML($comment.weblogEntry.title)'"

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm?rev=414908&r1=414907&r2=414908&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm Fri Jun
16 13:58:20 2006
@@ -175,7 +175,7 @@
     #if( $pageModel.previousEntry )
         #set( $prev = $pageModel.previousEntry )
         #if( $pageModel.weblogEntry )
-            #set( $prevURL = "${prev.permaLink}" )
+            #set( $prevURL = "${ctxPath}${prev.permaLink}" )
             <a href="$prevURL" title="Previous Entry"
                 > &laquo; $utilities.truncateNicely($prev.title, 25, 25, "...")</a>
         #else
@@ -196,7 +196,7 @@
     #if( $pageModel.nextEntry )
         #set( $next = $pageModel.nextEntry )        
         #if( $pageModel.weblogEntry )
-            #set( $nextURL = "${next.permaLink}" )
+            #set( $nextURL = "${ctxPath}${next.permaLink}" )
             <a href="$nextURL" title="Next Entry"
                 >$utilities.truncateNicely($next.title, 25, 25, "...") &raquo; </a>
         #else
@@ -236,7 +236,7 @@
           #if( $utilities.isNotEmpty($entry.summary) )
               #set( $sourceText = $entry.summary )
               #if( $utilities.isNotEmpty($entry.text) )
-                 #set( $readMore = "<a class='readmore' href='$entry.permaLink'> ...</a>"
)
+                 #set( $readMore = "<a class='readmore' href='$baseURL$entry.permaLink'>
...</a>" )
                  #set( $sourceText = "$sourceText$readMore")
               #end
           #else 
@@ -335,7 +335,7 @@
  * @param entry WeblogEntry object.
  *#
 #macro( showEntryPermalink $entry )
-    <a href="$entry.permaLink"
+    <a href="$baseURL$entry.permaLink"
         title="$text.get( "macro.weblog.entrypermalink.title" )"
         class="entrypermalink">Permalink</a>
     #if ($pageHelper.isUserAuthorizedToEdit())
@@ -370,10 +370,10 @@
          xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
          xmlns:dc="http://purl.org/dc/elements/1.1/">
 <rdf:Description
-    rdf:about="$entry.permaLink"
+    rdf:about="$absBaseURL$entry.permaLink"
     trackback:ping="#showTrackbackURL($entry)"
     dc:title="$entry.title"
-    dc:identifier="$entry.permaLink"
+    dc:identifier="$absBaseURL$entry.permaLink"
     dc:subject="$entry.category.name"
     dc:description="$entry.title"
     dc:creator="$entry.creator.userName"

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/atom.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/atom.vm?rev=414908&r1=414907&r2=414908&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/atom.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/atom.vm Fri
Jun 16 13:58:20 2006
@@ -23,10 +23,10 @@
     #set( $entries = $pageModel.getRecentWeblogEntriesArray($entryCount, 'nil') )
     #foreach( $entry in $entries )
     <entry>
-        <id>$entry.permaLink</id>
+        <id>$absBaseURL$entry.permaLink</id>
         <title type="html">$utilities.textToHTML($entry.title,true)</title>
         <author><name>$entry.creator.fullName</name></author>
-        <link rel="alternate" type="text/html" href="$entry.permaLink"/>
+        <link rel="alternate" type="text/html" href="$absBaseURL$entry.permaLink"/>
         <published>$utilities.formatIso8601Date($entry.pubTime)</published>
         <updated>$utilities.formatIso8601Date($entry.updateTime)</updated> 
         <category term="$utilities.textToHTML($entry.category.path, true)" label="$utilities.textToHTML($entry.category.name,
true)" />

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/rss.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/rss.vm?rev=414908&r1=414907&r2=414908&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/rss.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/rss.vm Fri Jun
16 13:58:20 2006
@@ -13,10 +13,10 @@
   #set( $entries = $pageModel.getRecentWeblogEntriesArray($entryCount, 'nil') )
   #foreach( $entry in $entries )
   <item>
-    <guid isPermaLink="true">$entry.permaLink</guid>
+    <guid isPermaLink="true">$absBaseURL$entry.permaLink</guid>
     <title>$utilities.textToHTML($utilities.removeHTML($entry.title))</title>
     <dc:creator>$utilities.textToHTML($entry.creator.fullName,true)</dc:creator>
-    <link>$entry.permaLink</link>
+    <link>$absBaseURL$entry.permaLink</link>
     #if( $entry.link && !$entry.link.trim().equals("") )
     <source url="$utilities.textToHTML($entry.link)">$utilities.textToHTML($entry.link)</source>
     #end

Modified: incubator/roller/branches/roller_3.0/web/themes/sotto/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/sotto/_day.vm?rev=414908&r1=414907&r2=414908&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/sotto/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/sotto/_day.vm Fri Jun 16 13:58:20 2006
@@ -32,7 +32,7 @@
             #if($website.allowComments)
                 <span class="noDisplay">[</span>
                     #set( $commentCount = $pageModel.getCommentCount($entry.Id) )
-                    #set( $link = "$entry.permaLink" )
+                    #set( $link = "$ctxPath$entry.permaLink" )
                     <a href="$link" class="storyLink">
                         Comments [$commentCount]</a>
                 <span class="noDisplay">]</span> 



Mime
View raw message