roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r429489 - in /incubator/roller/branches/roller_3.0/web: WEB-INF/velocity/weblog.vm themes/andreas08/_day.vm themes/basic/_day.vm
Date Mon, 07 Aug 2006 21:52:58 GMT
Author: agilliland
Date: Mon Aug  7 14:52:58 2006
New Revision: 429489

URL: http://svn.apache.org/viewvc?rev=429489&view=rev
Log:
dropping #showWeblogEntryContent() macro in favor of $entry.displayContent() method.


Modified:
    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

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=429489&r1=429488&r2=429489&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 Mon Aug  7 14:52:58
2006
@@ -148,32 +148,6 @@
 #end
 
 
-#**
-Show either weblog entry text or summary as appropriate for 
-normal page or a permalink page with plugins applied.
-*#
-#macro(showWeblogEntryContent $entry $isPermalink)
-    #if($isPermalink) 
-        #if($utils.isNotEmpty($entry.text))
-            #set($sourceText = $entry.transformedText)
-        #else 
-            #set($sourceText = $entry.transformedSummary)
-        #end
-    #else
-        #if($utils.isNotEmpty($entry.summary))
-            #set($sourceText = $entry.transformedSummary)
-            #if($utils.isNotEmpty($entry.text))
-               #set($readMore = "[<a class='readmore' href='$url.entry($entry.anchor)'>$text.get('macro.weblog.readMore')</a>]"
)
-               #set($sourceText = "$sourceText$readMore")
-            #end
-        #else 
-            #set($sourceText = $entry.transformedText)
-        #end
-    #end
-    $sourceText
-#end
-
-
 #** 
 Show comments for weblog entry according to Roller configuration.
 *#

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=429489&r1=429488&r2=429489&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 Mon Aug  7 14:52:58
2006
@@ -20,24 +20,11 @@
         #end
     </span>
 
-    #if($model.permalink) 
-        #if($utils.isNotEmpty($entry.text))
-            #set($sourceText = $entry.transformedText)
-        #else 
-            #set($sourceText = $entry.transformedSummary)
-        #end
+    #if($model.permalink)
+        $entry.displayContent
     #else
-        #if($utils.isNotEmpty($entry.summary))
-            #set($sourceText = $entry.transformedSummary)
-            #if($utils.isNotEmpty($entry.text))
-               #set($readMore = "[<a class='readmore' href='$url.entry($entry.anchor)'>$text.get('macro.weblog.readMore')</a>]"
)
-               #set($sourceText = "$sourceText$readMore")
-            #end
-        #else 
-            #set($sourceText = $entry.transformedText)
-        #end
+        $entry.displayContent($url.entry($entry.anchor))
     #end
-    $sourceText
 
     <span class="info">
         #if ($utils.isUserAuthorizedToAuthor($entry.website))

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=429489&r1=429488&r2=429489&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 Mon Aug  7 14:52:58 2006
@@ -8,7 +8,13 @@
     <div class="entryBox">
         <a name="$utils.encode($entry.anchor)" id="$utils.encode($entry.anchor)"></a>
         <p class="entryTitle">$entry.title</p>
-        <p class="entryContent">#showWeblogEntryContent($entry $model.permalink)</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;



Mime
View raw message