From 1aa136f0755f4b6740af55138ddcc66365c8fc78 Mon Sep 17 00:00:00 2001
From: manolobevia <manolobevia@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 23 Jun 2011 19:21:05 +0000
Subject: [PATCH] NIHVIVO-2280:  Created macro for generating number of
 accounts, pagination, accounts per page, and delete function.

---
 .../body/accounts/userAccounts-list.ftl       | 72 ++-----------------
 .../account/userAccounts-accountsNav.ftl      | 45 ++++++++++++
 2 files changed, 49 insertions(+), 68 deletions(-)
 create mode 100644 webapp/web/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl

diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
index 8211dfc16..10ec1d19c 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
@@ -2,6 +2,8 @@
 
 <#-- Template for displaying list of user accounts -->
 
+<#import "userAccounts-accountsNav.ftl" as p>
+
 <form method="POST" action="${formUrls.list}" class="customForm" role="">
 
     <#--current page: <input type="text" name="pageIndex" value="${page.current}" />
@@ -108,41 +110,8 @@
 </form>
 
 <form method="POST" action="${formUrls.list}" id="account-display" class="customForm" role="">
-    <section class="accounts">
-        <input type="submit" name="delete-account" class="delete-account submit" value="Delete" onClick="changeAction(this.form, '${formUrls.delete}')" />
-        <!-- 
-            When this is clicked, the checkboxes are noticed and all other fields are ignored. 
-            submit the form (submit action is formUrls.delete)
-        -->
+    <@p.accountsNav />
     
-        <nav class="display-tools">
-            <span>| <a href="#">n</a> accounts | </span>  
-    
-            <#assign counts = [25, 50, 100]>
-            
-            <select name="accountsPerPage" class="accounts-per-page">
-                <#list counts as count>
-                <option value="${count}" <#if accountsPerPage= count>selected</#if> >${count}</option>
-                </#list>
-                <!--     
-                    When accountsPerPage changes, 
-                    set pageIndex to 1 
-                    submit the form (submit action is formUrls.list) 
-                -->     
-            </select>
-    
-            accounts per page <input type="submit" name="accounts-per-page" value="Update" /> | 
-    
-            <#if page.previous?has_content>
-                <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.previous}">Previous</a> <!-- only present if current page is not 1.-->
-            </#if>
-                ${page.current} of ${page.last} 
-            <#if page.next?has_content>
-                <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.next}">Next</a><!-- only present if current page is not last page.-->
-            </#if>
-        </nav>
-    </section>
-
     <table id="account">
         <caption>Account Management</caption>
 
@@ -216,40 +185,7 @@
         </tbody>
     </table>
     
-    <section class="accounts">
-        <input type="submit" name="delete-account" class="delete-account submit" value="Delete" onClick="changeAction(this.form, '${formUrls.delete}')" />
-        <!-- 
-            When this is clicked, the checkboxes are noticed and all other fields are ignored. 
-            submit the form (submit action is formUrls.delete)
-        -->
-    
-        <nav class="display-tools">
-            <span>| <a href="#">n</a> accounts | </span>  
-    
-            <#assign counts = [25, 50, 100]>
-            
-            <select name="accountsPerPage" class="accounts-per-page">
-                <#list counts as count>
-                <option value="${count}" <#if accountsPerPage= count>selected</#if> >${count}</option>
-                </#list>
-                <!--     
-                    When accountsPerPage changes, 
-                    set pageIndex to 1 
-                    submit the form (submit action is formUrls.list) 
-                -->     
-            </select>
-    
-            accounts per page <input type="submit" name="accounts-per-page" value="Update" /> | 
-    
-            <#if page.previous?has_content>
-                <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.previous}">Previous</a> <!-- only present if current page is not 1.-->
-            </#if>
-                ${page.current} of ${page.last} 
-            <#if page.next?has_content>
-                <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.next}">Next</a><!-- only present if current page is not last page.-->
-            </#if>
-        </nav>
-    </section>
+    <@p.accountsNav />
 </form>
 
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/account/accountUtils.js"></script>')}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl b/webapp/web/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl
new file mode 100644
index 000000000..9c69e7323
--- /dev/null
+++ b/webapp/web/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl
@@ -0,0 +1,45 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-----------------------------------------------------------------------------
+    Macro for generating number of accounts, pagination, accounts per page, 
+    and delete function.
+------------------------------------------------------------------------------>
+
+<#assign counts=[25, 50, 100] /> <#-- accounts per page-->
+
+<#macro accountsNav accountsCount=counts>
+
+  <section class="accounts">
+      <input type="submit" name="delete-account" class="delete-account submit" value="Delete" onClick="changeAction(this.form, '${formUrls.delete}')" />
+      <!-- 
+          When this is clicked, the checkboxes are noticed and all other fields are ignored. 
+          submit the form (submit action is formUrls.delete)
+      -->
+
+      <nav class="display-tools">
+          <span>| <a href="#">n</a> accounts | </span>  
+
+          <select name="accountsPerPage" class="accounts-per-page">
+              <#list accountsCount as count>
+              <option value="${count}" <#if accountsPerPage= count>selected</#if> >${count}</option>
+              </#list>
+              <!--     
+                  When accountsPerPage changes, 
+                  set pageIndex to 1 
+                  submit the form (submit action is formUrls.list) 
+              -->     
+          </select>
+
+          accounts per page <input type="submit" name="accounts-per-page" value="Update" /> | 
+
+          <#if page.previous?has_content>
+              <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.previous}">Previous</a> <!-- only present if current page is not 1.-->
+          </#if>
+              ${page.current} of ${page.last} 
+          <#if page.next?has_content>
+              <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.next}">Next</a><!-- only present if current page is not last page.-->
+          </#if>
+      </nav>
+  </section>
+
+</#macro>
\ No newline at end of file