From 5ba226bde722f7902f5a24767d07231e4885f66c Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Wed, 13 Sep 2017 20:27:27 +0100
Subject: [PATCH] [VIVO-1367] Update AGROVOC URL

---
 .../service/impl/AgrovocService.java          |  6 +-
 .../edit/forms/addAssociatedConcept.ftl       | 62 +++++++++++--------
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java
index baa43e56..0639b9c4 100644
--- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java
+++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java
@@ -58,9 +58,9 @@ public class AgrovocService implements ExternalConceptService {
 	protected final String dbpedia_endpoint = " http://dbpedia.org/sparql";
 	// URL to get all the information for a concept
 	
-	protected final String conceptSkosMosBase = "http://aims.fao.org/skosmos/rest/v1/";
+	protected final String conceptSkosMosBase = "http://artemide.art.uniroma2.it:8081/skosmos/rest/v1/";
 	protected final String conceptsSkosMosSearch = conceptSkosMosBase + "search?";
-	protected final String conceptSkosMosURL = conceptSkosMosBase + "/agrovoc/data?";
+	protected final String conceptSkosMosURL = conceptSkosMosBase + "data?";
 	@Override
 	public List<Concept> getConcepts(String term) throws Exception {
 		List<Concept> conceptList = new ArrayList<Concept>();
@@ -145,7 +145,7 @@ public class AgrovocService implements ExternalConceptService {
 
 
 
-	
+
 
 
 	public List<Concept> processResults(String term) throws Exception {
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl
index 495fa259..23f5ede3 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl
@@ -42,40 +42,48 @@
     </script>
     <#if (existingConcepts?size > 0)>
     	 <li class="conceptHeadings conceptsListContainer">
-    	 	<div class="row">
-    	 		 <div class="column conceptLabelInfo"> 
-    	 		 	<h4>Concept (Type)</h4>
-    	 		 </div>
-    	 		 <div class="column conceptVocabSource"> 
-    	 		 	<h4>Vocabulary Source</h4>
-    	 		 </div>
-    	 		 <div class="column conceptRemoval">&nbsp;
-    	 		 </div>
-    	 	</div>	
+             <div class="container">
+                 <div class="row">
+                     <div class="col-12">
+                         <div class="column conceptLabelInfo">
+                            <h4>Concept (Type)</h4>
+                         </div>
+                         <div class="column conceptVocabSource">
+                            <h4>Vocabulary Source</h4>
+                         </div>
+                         <div class="column conceptRemoval">&nbsp;
+                         </div>
+                     </div>
+                 </div>
+             </div>
     	 </li>
     </#if>
     
     <#list existingConcepts as existingConcept>
         <li class="existingConcept conceptsListContainer">
+            <div class="container">
                 <div class="row">
-                   <div class="column conceptLabelInfo"> ${existingConcept.conceptLabel} 
-                   	<#if existingConcept.conceptSemanticTypeLabel?has_content>
-                   	 (${existingConcept.conceptSemanticTypeLabel})
-                   	</#if>
-                   	</div>
-                   	<div class="column conceptVocabSource">
-                   	<#if existingConcept.vocabURI?has_content && existingConcept.vocabLabel?has_content>
-                   		${existingConcept.vocabLabel}
-                   	<#else>
-                   		&nbsp;
-                   		<#--We still want the column to be there even if no vocabulary source is present-->	
-                   	</#if>
-                  	</div> 
-                  	<div class="column conceptRemoval">
-                  	     <a href="${urls.base}/edit/primitiveRdfEdit" class="remove" title="${i18n().remove_capitalized}">${i18n().remove_capitalized}</a>
-                  	
-                  	</div>
+                    <div class="col-12">
+                        <div class="column conceptLabelInfo"> ${existingConcept.conceptLabel}
+                            <#if existingConcept.conceptSemanticTypeLabel?has_content>
+                                (${existingConcept.conceptSemanticTypeLabel})
+                            </#if>
+                        </div>
+                        <div class="column conceptVocabSource">
+                            <#if existingConcept.vocabURI?has_content && existingConcept.vocabLabel?has_content>
+                            ${existingConcept.vocabLabel}
+                            <#else>
+                                &nbsp;
+                            <#--We still want the column to be there even if no vocabulary source is present-->
+                            </#if>
+                        </div>
+                        <div class="column conceptRemoval">
+                            <a href="${urls.base}/edit/primitiveRdfEdit" class="remove" title="${i18n().remove_capitalized}">${i18n().remove_capitalized}</a>
+
+                        </div>
+                    </div>
                 </div>
+            </div>
         </li>    
         
         <script type="text/javascript">