From b0b65d14e3353e0af267ccfe7d11e119eaf3e307 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 4 Jan 2011 00:16:36 +0000
Subject: [PATCH] NIHVIVO-641 Renaming and refactoring of menupage partials

---
 .../menupage/menupage--classgroup-people.ftl     | 16 ++++++++--------
 .../freemarker/body/menupage/menupage.ftl        |  4 ++--
 .../body/partials/menupage/menupage-browse.ftl   |  2 +-
 ...e-browseByVClass.ftl => menupage-scripts.ftl} |  2 +-
 ...enu.ftl => menupage-vClassesInClassgroup.ftl} |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename webapp/web/templates/freemarker/body/partials/menupage/{menupage-browseByVClass.ftl => menupage-scripts.ftl} (94%)
 rename webapp/web/templates/freemarker/body/partials/menupage/{menupage-classGroupsMenu.ftl => menupage-vClassesInClassgroup.ftl} (83%)

diff --git a/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl b/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
index c2a20159d..bd369db43 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
@@ -5,7 +5,7 @@
     <section id="content-foaf-person" role="region">
         <h4>Visual Graph</h4>
         
-        <#include "menupage-classGroupsMenu.ftl">
+        <#include "menupage-vClassesInClassgroup.ftl">
           
         <section id="foaf-person-graph" role="region">
             <img src="${urls.images}/menupage/visual-graph.jpg" alt="" />
@@ -43,12 +43,12 @@
     
         <nav id="profile-photo-display" role = "navigation">
             <ul>
-                <li><img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
-                <li><img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
-                <li><img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
-                <li><img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
-                <li><img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
-                <li><img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
+                <li><img src="${urls.images}/placeholders/person.thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
+                <li><img src="${urls.images}/placeholders/person.thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
+                <li><img src="${urls.images}/placeholders/person.thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
+                <li><img src="${urls.images}/placeholders/person.thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
+                <li><img src="${urls.images}/placeholders/person.thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
+                <li><img src="${urls.images}/placeholders/person.thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
             </ul>
         </nav>
         
@@ -64,4 +64,4 @@
 
 ${stylesheets.add("/css/menupage/menupage.css")}
 
-<#include "menupage-browseByVClass.ftl">
\ No newline at end of file
+<#include "menupage-scripts.ftl">
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/menupage/menupage.ftl b/webapp/web/templates/freemarker/body/menupage/menupage.ftl
index d25731c55..4b95de7b2 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage.ftl
@@ -6,7 +6,7 @@
     <section id="content-generic-class" role="region">
         <h4>Visual Graph</h4>
     
-        <#include "menupage-classGroupsMenu.ftl">
+        <#include "menupage-vClassesInClassgroup.ftl">
     
         <section id="generic-class-graph" role="region">
             <img src="${urls.images}/menupage/visual-graph-generic-class.jpg" width="500" height="283" alt ="" />
@@ -18,4 +18,4 @@
 
 ${stylesheets.add("/css/menupage/menupage.css")}
 
-<#include "menupage-browseByVClass.ftl">
\ No newline at end of file
+<#include "menupage-scripts.ftl">
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl
index 9c6f4fcf2..036f6d6b1 100644
--- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl
+++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl
@@ -1,6 +1,6 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#-- Template for browsing class groups in menupages -->
+<#-- Template for browsing individuals in class groups for menupages -->
 
 <section id="browse-by" role="region">
     <h2>Browse by</h2>
diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browseByVClass.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-scripts.ftl
similarity index 94%
rename from webapp/web/templates/freemarker/body/partials/menupage/menupage-browseByVClass.ftl
rename to webapp/web/templates/freemarker/body/partials/menupage/menupage-scripts.ftl
index d12cc62fa..0b6a7e53d 100644
--- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browseByVClass.ftl
+++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-scripts.ftl
@@ -1,6 +1,6 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#-- Template for browsing VClasses in menupages-->
+<#-- Template to setup and call scripts for menupages -->
 
 <#----------------------------------------------------------------------------------
 requestedPage is currently provided by FreemarkerHttpServlet. Should this be moved
diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-classGroupsMenu.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl
similarity index 83%
rename from webapp/web/templates/freemarker/body/partials/menupage/menupage-classGroupsMenu.ftl
rename to webapp/web/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl
index 0af660f04..212587dcb 100644
--- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-classGroupsMenu.ftl
+++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl
@@ -1,6 +1,6 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#-- Template for class groups menu in menupages -->
+<#-- Template for rendering the classes in a class group for menupages -->
 
 <nav role="navigation">
     <ul id="vgraph-childClasses">