From 6bcdae6f5c4ada2d408de9ca6c60a36defba19f6 Mon Sep 17 00:00:00 2001
From: hjkhjk54 <hjkhjk54@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 21 Nov 2011 21:58:01 +0000
Subject: [PATCH] updates for manage webpage to include correct reorder/delete
 url

---
 .../edit/forms/addAssociatedConcept.ftl       | 69 +++++++++++++++++--
 .../forms/addAuthorsToInformationResource.ftl |  2 +-
 .../forms/manageWebpagesForIndividual.ftl     |  4 +-
 3 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
index e9dca238..3ecfde3e 100644
--- a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
+++ b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
@@ -7,12 +7,12 @@
 	<#assign submissionErrors = editSubmission.validationErrors/>
 </#if>
 
+<#--This is set for testing purposes - will be retrieved dynamically from the generator later-->
+<#assign sources = [{"uri":"UMLS", "label":"UMLS"}, {"uri":"Agrovoc", "label":"Agrovoc"}]/>
 
 
 <h2>Manage Associated Concepts</h2>
-
-<#--Display error messages if any-->
-
+    
 
 <#if submissionErrors?has_content>
     <section id="error-alert" role="alert">
@@ -28,8 +28,10 @@
     </section>
 </#if>
 
+<#--@lvf.unsupportedBrowser-->
+
+<div class="noIE67">
 
-<section id="addAssociatedConcept" role="region">        
     
     
 <ul id="existingTerms" >
@@ -38,8 +40,7 @@
         var existingTermsData = [];
     </script>
     
-    <#list existingConcepts?keys as key>
-    	<#assign existingConcept = existingConcepts[key] />
+    <#list existingConcepts as existingConcept>
         <li class="existingTerm">
               
             <span class="term">
@@ -63,4 +64,58 @@
       </#list>    
 
 </ul>
-</section>
\ No newline at end of file
+       
+
+<#if (existingConcepts?size = 0) >   
+        <p>There are currently no concepts specified.</p>
+</#if>
+
+<div id="showAddForm">
+    <input type="submit" value="Add Term" id="showAddFormButton" name="showAddFormButton">  or 
+    <a class="cancel" href="${cancelUrl}">Return</a>
+</div> 
+    <form id="addTerminologyForm" class="customForm" action="${urls.base}/edit/processTerminologyAnnotation">
+
+    <#list sources as source>
+        <input type="radio" name="source" value="${source.uri}" role="radio" <#if selectedSource = source.uri>checked</#if> />
+        <label class="inline" for="${source.label}"> ${source.label}</label>
+        <br />
+    </#list>
+
+    <p class="inline">
+        <input type="text" id="searchTerm" label="Search UMLS Terms" class="acSelector" size="35" />
+        <input type="button" id="searchButton" name="searchButton" value="Search"/>
+    </p>
+    <input type="hidden" id="externalConceptURI" name="externalConceptURI" value=""/> <!-- Field value populated by JavaScript -->
+    <input type="hidden" id="externalConceptLabel" name="externalConceptLabel" value="" />  <!-- Field value populated by JavaScript -->
+
+    <div id="selectedTerm" name="selectedTerm" class="acSelection">
+        <%-- RY maybe make this a label and input field. See what looks best. --%>
+        <p class="inline">
+        </p>
+        <!-- Field value populated by JavaScript -->
+    </div>
+    	
+    <p class="submit">
+        <input type="submit" id="submit" name="submit" value="Add Term" />
+        <span class="or"> or <a class="cancel" href="${cancelUrl}">Cancel</a>
+    </p>
+
+    </form>
+</div>
+
+
+
+    <script type="text/javascript">
+    var customFormData = {
+        dataServiceUrl: '${urls.base}/UMLSTermsRetrieval',
+        UMLSCUIURL: 'http://link.informatics.stonybrook.edu/umls/CUI/'
+    };
+    </script>
+
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/edit/forms/js/addTerminology.js"></script>')}
+
+
+
+
diff --git a/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl b/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
index 19b187f5..1bd56bee 100644
--- a/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
+++ b/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
@@ -23,7 +23,7 @@
 <#assign requiredHint="<span class='requiredHint'> *</span>" />
 <#assign initialHint="<span class='hint'>(initial okay)</span>" />
 
-<#--include unsupported browser message-->
+<#--unsupported browser message-->
 <h2>${title}</h2>
 
 <ul id="authorships" ${ulClass}>
diff --git a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
index aaec2f41..3ea6d4b8 100644
--- a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
+++ b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
@@ -40,7 +40,7 @@
             </span>
             <span class="editingLinks">
                 <a href="${baseEditWebpageUrl}&objectUri=${webpage.link?url}" class="edit">Edit</a> | 
-                <a href="${deleteWebpageUrl}" class="remove">Delete</a> 
+                <a href="${urls.base}${deleteWebpageUrl}" class="remove">Delete</a> 
             </span>
         </li>    
         
@@ -65,7 +65,7 @@
 <script type="text/javascript">
 var customFormData = {
     rankPredicate: '${editConfiguration.pageData.rankPredicate}',
-    reorderUrl: '${editConfiguration.pageData.reorderUrl}'
+    reorderUrl: '${urls.base}/edit/reorder'
 };
 </script>