roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r439397 - in /incubator/roller/branches/roller_3.0/web: WEB-INF/velocity/ WEB-INF/velocity/deprecated/ themes/andreas08/ themes/basic/ themes/brushedmetal/ themes/cheb/ themes/clean/ themes/currency-i18n/ themes/currency/ themes/grey2/ them...
Date Fri, 01 Sep 2006 17:41:46 GMT
Author: snoopdave
Date: Fri Sep  1 10:41:44 2006
New Revision: 439397

URL: http://svn.apache.org/viewvc?rev=439397&view=rev
Log:
Restoring trackback link in legacy show-entries macro and adding trackback autodisco to all
day templates

Modified:
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/andreas08/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/basic/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/cheb/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/clean/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/currency/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/grey2/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/moonshine/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/movablemanila/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/pacifica/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/robot/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/rolling/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/sotto/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/sunsets/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/werner/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/x2/_day.vm

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=439397&r1=439396&r2=439397&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 Sep
 1 10:41:44 2006
@@ -75,6 +75,11 @@
     #end
 
     #if ($model.permalink)
+        #if($config.trackbacksEnabled && $model.weblog.allowComments && $entry.commentsStillAllowed)
+            <div class="trackbackUrl">
+                $text.get("macro.weblog.trackback") $url.trackback($entry.anchor)
+            </div>
+        #end
         #showEntryLinkbacks($entry)
         #showWeblogEntryComments($entry)
         #showCommentForm($entry)

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm Fri Sep  1 10:41:44
2006
@@ -75,9 +75,11 @@
 
 
 #**
- * Display a trackback auto-discovery RDF comment for a WeblogEntry.
+ * Display a trackback auto-discovery RDF comment for a WeblogEntry, but only
+ * if trackbacks are enabled and comments are allowed for the entry.
  **#
 #macro( showTrackbackAutodiscovery $entry )
+#if($config.trackbacksEnabled && $model.weblog.allowComments && $entry.commentsStillAllowed)
 <!--
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
@@ -93,6 +95,7 @@
     dc:date="$entry.pubTime" />
 </rdf:RDF>
 -->
+#end
 #end
 
 

Modified: incubator/roller/branches/roller_3.0/web/themes/andreas08/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/andreas08/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/andreas08/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/andreas08/_day.vm Fri Sep  1 10:41:44
2006
@@ -38,6 +38,7 @@
             <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
         #end
     </span>
+        #showTrackbackAutodiscovery($entry)
 
 </p>
 #end

Modified: incubator/roller/branches/roller_3.0/web/themes/basic/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/basic/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/basic/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/basic/_day.vm Fri Sep  1 10:41:44 2006
@@ -27,6 +27,7 @@
                 <a href="$link" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
             #end
         </p>
+        #showTrackbackAutodiscovery($entry)
     </div>
     #end
 

Modified: incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_day.vm Fri Sep  1 10:41:44
2006
@@ -27,6 +27,7 @@
                 <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
             #end
         </p>
+        #showTrackbackAutodiscovery($entry)
     </div>
     #end
 

Modified: incubator/roller/branches/roller_3.0/web/themes/cheb/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/cheb/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/cheb/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/cheb/_day.vm Fri Sep  1 10:41:44 2006
@@ -29,6 +29,7 @@
                 <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
             #end
         </p>
+        #showTrackbackAutodiscovery($entry)
     </div>
     #end
 

Modified: incubator/roller/branches/roller_3.0/web/themes/clean/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/clean/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/clean/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/clean/_day.vm Fri Sep  1 10:41:44 2006
@@ -1 +1 @@
-<div class="dayBox">

<div class="bluebar">
   <div class="entryHeader">
      <img class="daypermalink" src="$url.site/images/permalink.gif" alt="pageicon"></a>
      $utils.formatDate($day, "EEEE MMM dd, yyyy")
   </div>
</div>

    #foreach(
$entry in $entries )
    <div class="entryBox">
        <a name="$utils.encode($entry.anchor)"
id="$utils.encode($entry.anchor)"></a>
        <p class="entryTitle">$entry.title</p>
        
            #if($model.permalink)
                $entry.displayContent
        
   #else
                $entry.displayContent($url.entry($entry.anchor))
            #end
       
        <p class="entryInfo">
            Posted at <a href="$url.entry($entry.anchor)">
              $utils.formatDate($entry.pubTime, "hh:mma MMM dd, yyyy")</a>
        
   by $entry.creator.fullName in <span class="category">$entry.category.name</span>
&nbsp;|&nbsp;
            #if ($utils.isUserAuthorizedToAuthor($entry.website))
 
              <a href="$url.ed
 itEntry($entry.anchor)">
                $text.get("macro.weblog.entrypermalink.edit")</a>
&nbsp;|&nbsp;
            #end
            #set($commentCount = $entry.commentCount)
           #if($entry.commentsStillAllowed || $commentCount > 0)  
                <a
href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
           #end
        </p>
    </div>
    #end

</div>
\ No newline at end of file
+<div class="dayBox">

<div class="bluebar">
   <div class="entryHeader">
      <img class="daypermalink" src="$url.site/images/permalink.gif" alt="pageicon"></a>
      $utils.formatDate($day, "EEEE MMM dd, yyyy")
   </div>
</div>

    #foreach(
$entry in $entries )
    <div class="entryBox">
        <a name="$utils.encode($entry.anchor)"
id="$utils.encode($entry.anchor)"></a>
        <p class="entryTitle">$entry.title</p>
        
            #if($model.permalink)
                $entry.displayContent
        
   #else
                $entry.displayContent($url.entry($entry.anchor))
            #end
       
        <p class="entryInfo">
            Posted at <a href="$url.entry($entry.anchor)">
              $utils.formatDate($entry.pubTime, "hh:mma MMM dd, yyyy")</a>
        
   by $entry.creator.fullName in <span class="category">$entry.category.name</span>
&nbsp;|&nbsp;
            #if ($utils.isUserAuthorizedToAuthor($entry.website))
 
              <a href="$url.ed
 itEntry($entry.anchor)">
                $text.get("macro.weblog.entrypermalink.edit")</a>
&nbsp;|&nbsp;
            #end
            #set($commentCount = $entry.commentCount)
           #if($entry.commentsStillAllowed || $commentCount > 0)  
                <a
href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
           #end
        </p>
        #showTrackbackAutodiscovery($entry)
    </div>
   #end

</div>
\ No newline at end of file

Modified: incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_day.vm Fri Sep  1 10:41:44
2006
@@ -29,6 +29,7 @@
                 <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
             #end
         </p>
+        #showTrackbackAutodiscovery($entry)
     </div>
     #end
 

Modified: incubator/roller/branches/roller_3.0/web/themes/currency/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/currency/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/currency/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/currency/_day.vm Fri Sep  1 10:41:44 2006
@@ -28,6 +28,7 @@
                 <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
             #end
         </p>
+        #showTrackbackAutodiscovery($entry)
     </div>
     #end
 

Modified: incubator/roller/branches/roller_3.0/web/themes/grey2/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/grey2/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/grey2/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/grey2/_day.vm Fri Sep  1 10:41:44 2006
@@ -28,6 +28,7 @@
                 <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
             #end
         </p>
+        #showTrackbackAutodiscovery($entry)
     </div>
     #end
 

Modified: incubator/roller/branches/roller_3.0/web/themes/moonshine/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/moonshine/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/moonshine/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/moonshine/_day.vm Fri Sep  1 10:41:44
2006
@@ -1 +1 @@
-<div class="dayBox">

    <div class="dayTitle">
       $utils.formatDate($day,
"EEEE MMM dd, yyyy")
    </div>

    #foreach( $entry in $entries )
    <div class="entryBox">
       <a name="$utils.encode($entry.anchor)" id="$utils.encode($entry.anchor)"></a>
       <p class="entryTitle">$entry.title</p>
        <p class="entryContent">

            #if($model.permalink)
                $entry.displayContent
            #else
               $entry.displayContent($url.entry($entry.anchor))
            #end
        </p>
       <p class="entryInfo">
            Posted at <a href="$url.entry($entry.anchor)">
                $utils.formatDate($entry.pubTime, "hh:mma MMM dd, yyyy")</a>
      
     by $entry.creator.fullName in <span class="category">$entry.category.name</span>
&nbsp;|&nbsp;
            #if ($utils.isUserAuthorizedToAuthor($entry.website))
 
              <a href="$url.editEntry($entry.anchor)">
                 $text.get("macro.weblog.entrypermalink.edit")</a
 > &nbsp;|&nbsp;
            #end
            #set($commentCount = $entry.commentCount)
           #if($entry.commentsStillAllowed || $commentCount > 0)  
                <a
href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
           #end
        </p>
    </div>
    #end

</div>

\ No newline at end of file
+<div class="dayBox">

    <div class="dayTitle">
       $utils.formatDate($day,
"EEEE MMM dd, yyyy")
    </div>

    #foreach( $entry in $entries )
    <div class="entryBox">
       <a name="$utils.encode($entry.anchor)" id="$utils.encode($entry.anchor)"></a>
       <p class="entryTitle">$entry.title</p>
        <p class="entryContent">

            #if($model.permalink)
                $entry.displayContent
            #else
               $entry.displayContent($url.entry($entry.anchor))
            #end
        </p>
       <p class="entryInfo">
            Posted at <a href="$url.entry($entry.anchor)">
                $utils.formatDate($entry.pubTime, "hh:mma MMM dd, yyyy")</a>
      
     by $entry.creator.fullName in <span class="category">$entry.category.name</span>
&nbsp;|&nbsp;
            #if ($utils.isUserAuthorizedToAuthor($entry.website))
 
              <a href="$url.editEntry($entry.anchor)">
                 $text.get("macro.weblog.entrypermalink.edit")</a
 > &nbsp;|&nbsp;
            #end
            #set($commentCount = $entry.commentCount)
           #if($entry.commentsStillAllowed || $commentCount > 0)  
                <a
href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
           #end
        </p>
        #showTrackbackAutodiscovery($entry)
    </div>
   #end

</div>

\ No newline at end of file

Modified: incubator/roller/branches/roller_3.0/web/themes/movablemanila/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/movablemanila/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/movablemanila/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/movablemanila/_day.vm Fri Sep  1 10:41:44
2006
@@ -28,5 +28,6 @@
           | <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$entry.commentCount]</a>
       #end
    </span>
+        #showTrackbackAutodiscovery($entry)
 </div>
 #end

Modified: incubator/roller/branches/roller_3.0/web/themes/pacifica/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/pacifica/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/pacifica/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/pacifica/_day.vm Fri Sep  1 10:41:44 2006
@@ -29,6 +29,7 @@
                 <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
             #end
         </p>
+        #showTrackbackAutodiscovery($entry)
     </div>
     #end
 

Modified: incubator/roller/branches/roller_3.0/web/themes/robot/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/robot/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/robot/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/robot/_day.vm Fri Sep  1 10:41:44 2006
@@ -29,6 +29,7 @@
                 <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
             #end
         </p>
+        #showTrackbackAutodiscovery($entry)
     </div>
     #end
 

Modified: incubator/roller/branches/roller_3.0/web/themes/rolling/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/rolling/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/rolling/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/rolling/_day.vm Fri Sep  1 10:41:44 2006
@@ -35,6 +35,7 @@
                 <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
             #end
         </p>
+        #showTrackbackAutodiscovery($entry)
     </div>
     #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=439397&r1=439396&r2=439397&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 Sep  1 10:41:44 2006
@@ -41,7 +41,7 @@
             #end
         #end
         </div>
-
+        #showTrackbackAutodiscovery($entry)
 	</div>
 #end
   <div class="floatSpacer">&nbsp;</div>

Modified: incubator/roller/branches/roller_3.0/web/themes/sunsets/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/sunsets/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/sunsets/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/sunsets/_day.vm Fri Sep  1 10:41:44 2006
@@ -39,6 +39,7 @@
                 <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
             #end
         </p>
+        #showTrackbackAutodiscovery($entry)
     </div>
     #end
 

Modified: incubator/roller/branches/roller_3.0/web/themes/werner/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/werner/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/werner/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/werner/_day.vm Fri Sep  1 10:41:44 2006
@@ -29,6 +29,7 @@
             #end
         </p>
     </div>
+    #showTrackbackAutodiscovery($entry)
     #end
 
 </div>

Modified: incubator/roller/branches/roller_3.0/web/themes/x2/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/x2/_day.vm?rev=439397&r1=439396&r2=439397&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/x2/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/x2/_day.vm Fri Sep  1 10:41:44 2006
@@ -39,6 +39,7 @@
                 <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
             #end
         </p>
+        #showTrackbackAutodiscovery($entry)
     </div>
     #end
 



Mime
View raw message