From 7d4d31d706199b84ffe6476d32580ba68d665493 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 2 Nov 2011 21:16:15 +0000
Subject: [PATCH] changes for button text

---
 .../freemarker/edit/forms/addAttendeeRoleToPerson.ftl |  2 +-
 .../edit/forms/addOrganizerRoleToPerson.ftl           |  2 +-
 .../edit/forms/addPresenterRoleToPerson.ftl           |  2 +-
 .../freemarker/edit/forms/addReviewerRoleToPerson.ftl |  2 +-
 .../freemarker/edit/forms/addRoleToPersonTwoStage.ftl | 11 +++++------
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl
index bcbd744b..7831d4ff 100644
--- a/productMods/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl
@@ -20,7 +20,7 @@ roleExamples-->
 <#--Variable assignments for Add Clinical Role To Person-->
 <#assign roleDescriptor = "attended" />
 <#assign typeSelectorLabel = "event type" />
-
+<#assign buttonText = "Attendee" />
 
 <#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">
\ No newline at end of file
diff --git a/productMods/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl
index ce50fce9..43785ac3 100644
--- a/productMods/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl
@@ -20,7 +20,7 @@ roleExamples-->
 <#--Variable assignments for Add Clinical Role To Person-->
 <#assign roleDescriptor = "organizer of" />
 <#assign typeSelectorLabel = "organizer of" />
-
+<#assign buttonText = "Organizer Role" />
 
 <#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">
\ No newline at end of file
diff --git a/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
index d7effa87..aeef293d 100644
--- a/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
@@ -20,7 +20,7 @@ roleExamples-->
 <#--Variable assignments for Add Clinical Role To Person-->
 <#assign roleDescriptor = "presentation" />
 <#assign typeSelectorLabel = "presentation type" />
-
+<#assign buttonText = "Presentation Role" />
 
 <#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">
\ No newline at end of file
diff --git a/productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl
index 093227b7..7dfde027 100644
--- a/productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl
@@ -20,7 +20,7 @@ roleExamples-->
 <#--Variable assignments for Add Clinical Role To Person-->
 <#assign roleDescriptor = "reviewer of" />
 <#assign typeSelectorLabel = "reviewer of" />
-
+<#assign buttonText = "Reviewer Role" />
 
 <#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">
\ No newline at end of file
diff --git a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
index 9cc044e2..aba7c839 100644
--- a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
+++ b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
@@ -27,7 +27,7 @@
 <#--Setting values for titleVerb, submitButonText, and disabled Value-->
 <#if editConfiguration.objectUri?has_content>
 	<#assign titleVerb = "Edit"/>
-	<#assign submitButtonText>Edit ${buttonText}</#assign>
+	<#assign submitButtonText>Edit ${buttonText?capitalize}</#assign>
 	<#if editMode = "repair">
 		<#assign disabledVal = ""/>
 	<#else>
@@ -35,7 +35,7 @@
 	</#if>
 <#else>
 	<#assign titleVerb = "Create"/>
-	<#assign submitButtonText>${buttonText}</#assign>
+	<#assign submitButtonText>${buttonText?capitalize}</#assign>
 	<#assign disabledVal = ""/>
 	<#assign editMode = "add" />
 </#if>
@@ -87,7 +87,7 @@
     
     <form id="add${roleDescriptor?capitalize}RoleToPersonTwoStage" class="customForm noIE67" action="${submitUrl}"  role="add/edit grant role">
 
-       <p class="inline"><label for="typeSelector">${roleDescriptor?capitalize} Type ${requiredHint}</label>
+       <p class="inline"><label for="typeSelector">${typeSelectorLabel?capitalize} ${requiredHint}</label>
            <select id="typeSelector" name="roleActivityType" 
            <#if disabledVal?has_content>
            	disabled = "${disabledVal}"
@@ -161,8 +161,8 @@
                </#if>
             </#if>
         </div>
-        <input type="hidden" id="editKey" name="editKey" value="${editKey}" />
         <p class="submit">
+            <input type="hidden" id="editKey" name="editKey" value="${editKey}" />
             <input type="submit" id="submit" value="${submitButtonText}"/><span class="or"> or <a class="cancel" href="${cancelUrl}">Cancel</a>
         </p>
 
@@ -188,5 +188,4 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/edit/forms/js/customFormWithAutocomplete.js"></script>')}
 
-
- </section>   
\ No newline at end of file
+</section>   
\ No newline at end of file