From 546b214a865d193739f1578c0c3c7369a5c1d418 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 22 Dec 2010 19:14:08 +0000
Subject: [PATCH] Comments

---
 .../web/templates/freemarker/lib/lib-list.ftl | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/webapp/web/templates/freemarker/lib/lib-list.ftl b/webapp/web/templates/freemarker/lib/lib-list.ftl
index dc61b170d..6570164a1 100644
--- a/webapp/web/templates/freemarker/lib/lib-list.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-list.ftl
@@ -13,11 +13,19 @@
     <li> elements. An <li> element may span multiple lines.
     
     Usage:
-        <@firstLastList />
+        <@firstLastList>
             <li>apples</li>
             <li>bananas</li>
             <li>oranges</li>
-        </@firstLastList />
+        </@firstLastList>
+        
+        <@firstLastList>
+            <#list animals as animal>
+                <#if animal != "cow"> 
+                    <li>${animal}</li>
+                </#if>
+            </#list>
+        </@firstLastList>
 
     RY Consider rewriting in Java. Probably designers won't want to modify this. That would allow us to support
     nested <li> elements.
@@ -27,9 +35,8 @@
     <#assign text>
         <#nested>
     </#assign>
-    
-    <@processListItems text?matches("<li>.*?</li>", "s") />
 
+    <@processListItems text?matches("<li>.*?</li>", "s") />
 </#macro>
 
 <#---------------------------------------------------------------------------->
@@ -49,19 +56,27 @@
     indicate how to split the text.
     
     Usage:
-        <@firstLastListNested />
+        <@firstLastListNested>
             <li>apples</li>,
             <li>bananas</li>,
             <li>oranges</li>
-        </@firstLastListNested />
+        </@firstLastListNested>
         
-        <@firstLastListNested delim="??" />
+        <@firstLastListNested>
+            <#list animals as animal>
+                <#if animal != "cow"> 
+                    <li>${animal}</li>,
+                </#if>
+            </#list>
+        </@firstLastListNested>
+        
+        <@firstLastListNested delim="??">
             <li>apples, oranges</li>??
             <li>bananas, lemons</li>??
             <li>grapefruit, limes</li>
-        </@firstLastListNested />
+        </@firstLastListNested>
         
-        <@firstLastListNested delim="??" />
+        <@firstLastListNested delim="??">
             <li>Books
                 <ul>
                     <li>Persuasion</li>
@@ -74,7 +89,7 @@
                     <li>Time</li>
                 </ul>
             </li>
-        </@firstLastListNested />
+        </@firstLastListNested>
 
     RY Consider rewriting in Java. Probably designers won't want to modify this.
 -->
@@ -104,6 +119,7 @@
 -->
 <#macro processListItems items>
     <#list items as item>
+
         <#-- A FreeMarker loop variable cannot have its value modified, so we use a new variable. -->
         <#assign newItem = item?trim>
 
@@ -112,6 +128,7 @@
         <#-- Keep any class value already assigned -->
         <#assign currentClass = newItem?matches("^<li [^>]*(class=[\'\"](.*?)[\'\"])")>
         <#list currentClass as m>
+        ${m?groups[2]}<br />
             <#assign classVal = m?groups[2]>
             <#assign newItem = newItem?replace(m?groups[1], "")>
         </#list>