Minor Freemarker template improvements

yannisf · Jul 9, 2017 · 4bba439 · 4bba439
1 parent 775d858
commit 4bba439
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/src/main/webapp/WEB-INF/templates/child_cards.ftl b/src/main/webapp/WEB-INF/templates/child_cards.ftl
@@ -31,15 +31,15 @@
 
                 <tr>
                     <#list 0..1 as i>
-                    <td class="tablet-medium${mod!''}">
+                    <td class="tablet-medium${mod!}">
                         ${child.simpleName}<br/>
                         ${child.lastName}
                     </td>
                     </#list>
                 </tr>
 
                 <tr>
-                    <td colspan="2" class="tablet-large${mod!''}">
+                    <td colspan="2" class="tablet-large${mod!}">
                         ${child.simpleName}<br/>
                         ${child.lastName}
                     </td>

diff --git a/src/main/webapp/WEB-INF/templates/communication_report.ftl b/src/main/webapp/WEB-INF/templates/communication_report.ftl
@@ -53,22 +53,18 @@
                 <td class="name">${child.name}</td>
                 <td>
                     <ul>
-                        <#if (child.guardians)??>
-                            <#list child.guardians as guardian>
-                                <li>
-                                    ${guardian.name}
-                                    <strong style="font-size:5pt">${relationshipTypeMap[guardian.relationship]}</strong>
-                                    <#if (guardian.telephones)??>
-                                        <#list guardian.telephones as telephone>
-                                            |${telephone.number} <strong style="font-size:5pt">${phoneTypeMap[telephone.type]}</strong>
-                                        </#list>
-                                    </#if>
-                                </li>
-                            </#list>
-                        </#if>
+                        <#list child.guardians! as guardian>
+                            <li>
+                                ${guardian.name}
+                                <strong style="font-size:5pt">${relationshipTypeMap[guardian.relationship]}</strong>
+                                <#list guardian.telephones! as telephone>
+                                    |${telephone.number} <strong style="font-size:5pt">${phoneTypeMap[telephone.type]}</strong>
+                                </#list>
+                            </li>
+                        </#list>
                     </ul>
                 </td>
-                <td class="notes">${child.notes!''}</td>
+                <td class="notes">${child.notes!}</td>
             </tr>
             </#list>
         </tbody>