From 957b7cada7404d734e338a8f3af411afafcf9799 Mon Sep 17 00:00:00 2001
From: Josh Lagrimas <josh.lagrimas@gmail.com>
Date: Wed, 27 Jul 2022 12:28:16 +0100
Subject: [PATCH 1/4] Fix footer to display branding as needed (#620)

* exception handling for TOLOAD ontologies

* Fix for missing OBO_SYNONYM_TYPE

* Fix footer to display branding as needed

* Ignore application properties for ols-web

Co-authored-by: James McLaughlin <james@mclgh.net>
Co-authored-by: henrietteharmse <henrietteharmse@gmail.com>
Co-authored-by: Josh Lagrimas <joshlagrimas@ebi.ac.uk>
---
 .gitignore                                                 | 1 +
 ols-web/src/main/resources/application.properties          | 2 +-
 ols-web/src/main/resources/templates/fragments/footer.html | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0384ebc4..c6e5fd62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ ols-loader/src/test/resources/tmp
 ols-solr/src/main/resources/solr-conf/ontology/data
 ols-mongo/src/main/resources/mongodb
 ols-web/src/main/resources/static/documents/*
+ols-web/src/main/resources/application.properties
 properties
 .classpath
 .settings
diff --git a/ols-web/src/main/resources/application.properties b/ols-web/src/main/resources/application.properties
index c9cf65dc..6fca0bed 100644
--- a/ols-web/src/main/resources/application.properties
+++ b/ols-web/src/main/resources/application.properties
@@ -42,4 +42,4 @@ logging.config=classpath:logback-spring.xml
 #ols.customisation.errorMessage=Something went wrong!
 #ols.customisation.ontologyAlias=Data Dictionary
 #ols.customisation.ontologyAliasPlural=Data Dictionaries
-
+ols.customisation.ebiInfo=false
diff --git a/ols-web/src/main/resources/templates/fragments/footer.html b/ols-web/src/main/resources/templates/fragments/footer.html
index 2796761b..78b7539a 100644
--- a/ols-web/src/main/resources/templates/fragments/footer.html
+++ b/ols-web/src/main/resources/templates/fragments/footer.html
@@ -47,7 +47,7 @@
         </div>
 
         <div class="row">
-            <div class="ols-logo">
+            <div th:if="${ebiInfo} == false" class="ols-logo">
                 <a th:href="@{${web}}"
                    th:title="'Go to ' + ${org} + ' homepage'">
                     <img th:src="@{${logo}}" style=""/>

From 1b0610f02d0028c04a89e2e3389a80c98bc5177b Mon Sep 17 00:00:00 2001
From: Josh Lagrimas <joshlagrimas@ebi.ac.uk>
Date: Fri, 29 Jul 2022 12:14:45 +0100
Subject: [PATCH 2/4] issue-572: update Related Tools verbiage

Fix for #572
---
 ols-web/src/main/resources/templates/index.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ols-web/src/main/resources/templates/index.html b/ols-web/src/main/resources/templates/index.html
index 201ea3e4..2ca93450 100644
--- a/ols-web/src/main/resources/templates/index.html
+++ b/ols-web/src/main/resources/templates/index.html
@@ -84,11 +84,10 @@ <h4>
                         <a href="https://www.ebi.ac.uk/spot/ontology/">Related Tools</a>
                     </h4>
                     <p class="about">
-                        In addition to OLS the SPOT team also provides the OxO, Zooma and Webulous services.
-                        <a href="//www.ebi.ac.uk/spot/oxo">OxO</a> provides cross-ontology mappings between terms from
-                        different ontologies. <a href="//www.ebi.ac.uk/spot/zooma">Zooma</a> is a service to assist in
-                        mapping data to ontologies in OLS and <a href="//www.ebi.ac.uk/spot/webulous">Webulous</a> is a
-                        tool for building ontologies from spreadsheets.
+                        In addition to OLS, we also provide ontology tools and services such as
+                        <a href="https://www.ebi.ac.uk/spot/oxo/">OxO</a>,
+                        <a href="https://www.ebi.ac.uk/spot/zooma/">Zooma</a>, and
+                        <a href="https://www.ebi.ac.uk/spot/ontostring/">OntoString</a>.
                     </p>
                 </div>
                 <div class="small-4 columns">

From dac2048308bbdfc6a6bc4488e0f4ba9500e5eb9b Mon Sep 17 00:00:00 2001
From: Josh Lagrimas <josh.lagrimas@gmail.com>
Date: Wed, 27 Jul 2022 12:28:16 +0100
Subject: [PATCH 3/4] Fix footer to display branding as needed (#620)

issue-572: update Related Tools verbiage

Fix for #572
---
 .gitignore                                               | 1 +
 ols-web/src/main/resources/application.properties        | 2 +-
 .../src/main/resources/templates/fragments/footer.html   | 2 +-
 ols-web/src/main/resources/templates/index.html          | 9 ++++-----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0384ebc4..c6e5fd62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ ols-loader/src/test/resources/tmp
 ols-solr/src/main/resources/solr-conf/ontology/data
 ols-mongo/src/main/resources/mongodb
 ols-web/src/main/resources/static/documents/*
+ols-web/src/main/resources/application.properties
 properties
 .classpath
 .settings
diff --git a/ols-web/src/main/resources/application.properties b/ols-web/src/main/resources/application.properties
index c9cf65dc..6fca0bed 100644
--- a/ols-web/src/main/resources/application.properties
+++ b/ols-web/src/main/resources/application.properties
@@ -42,4 +42,4 @@ logging.config=classpath:logback-spring.xml
 #ols.customisation.errorMessage=Something went wrong!
 #ols.customisation.ontologyAlias=Data Dictionary
 #ols.customisation.ontologyAliasPlural=Data Dictionaries
-
+ols.customisation.ebiInfo=false
diff --git a/ols-web/src/main/resources/templates/fragments/footer.html b/ols-web/src/main/resources/templates/fragments/footer.html
index 2796761b..78b7539a 100644
--- a/ols-web/src/main/resources/templates/fragments/footer.html
+++ b/ols-web/src/main/resources/templates/fragments/footer.html
@@ -47,7 +47,7 @@
         </div>
 
         <div class="row">
-            <div class="ols-logo">
+            <div th:if="${ebiInfo} == false" class="ols-logo">
                 <a th:href="@{${web}}"
                    th:title="'Go to ' + ${org} + ' homepage'">
                     <img th:src="@{${logo}}" style=""/>
diff --git a/ols-web/src/main/resources/templates/index.html b/ols-web/src/main/resources/templates/index.html
index 201ea3e4..2ca93450 100644
--- a/ols-web/src/main/resources/templates/index.html
+++ b/ols-web/src/main/resources/templates/index.html
@@ -84,11 +84,10 @@ <h4>
                         <a href="https://www.ebi.ac.uk/spot/ontology/">Related Tools</a>
                     </h4>
                     <p class="about">
-                        In addition to OLS the SPOT team also provides the OxO, Zooma and Webulous services.
-                        <a href="//www.ebi.ac.uk/spot/oxo">OxO</a> provides cross-ontology mappings between terms from
-                        different ontologies. <a href="//www.ebi.ac.uk/spot/zooma">Zooma</a> is a service to assist in
-                        mapping data to ontologies in OLS and <a href="//www.ebi.ac.uk/spot/webulous">Webulous</a> is a
-                        tool for building ontologies from spreadsheets.
+                        In addition to OLS, we also provide ontology tools and services such as
+                        <a href="https://www.ebi.ac.uk/spot/oxo/">OxO</a>,
+                        <a href="https://www.ebi.ac.uk/spot/zooma/">Zooma</a>, and
+                        <a href="https://www.ebi.ac.uk/spot/ontostring/">OntoString</a>.
                     </p>
                 </div>
                 <div class="small-4 columns">

From 22e4e126a9b676cc21065adc96a8e8b702a26924 Mon Sep 17 00:00:00 2001
From: Josh Lagrimas <josh.lagrimas@gmail.com>
Date: Wed, 27 Jul 2022 12:28:16 +0100
Subject: [PATCH 4/4] Fix footer and update Related Tools verbiage

issue-572: update Related Tools verbiage (#572), Fix footer to display branding as needed (#620)
---
 ols-web/src/main/resources/templates/index.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ols-web/src/main/resources/templates/index.html b/ols-web/src/main/resources/templates/index.html
index 201ea3e4..2ca93450 100644
--- a/ols-web/src/main/resources/templates/index.html
+++ b/ols-web/src/main/resources/templates/index.html
@@ -84,11 +84,10 @@ <h4>
                         <a href="https://www.ebi.ac.uk/spot/ontology/">Related Tools</a>
                     </h4>
                     <p class="about">
-                        In addition to OLS the SPOT team also provides the OxO, Zooma and Webulous services.
-                        <a href="//www.ebi.ac.uk/spot/oxo">OxO</a> provides cross-ontology mappings between terms from
-                        different ontologies. <a href="//www.ebi.ac.uk/spot/zooma">Zooma</a> is a service to assist in
-                        mapping data to ontologies in OLS and <a href="//www.ebi.ac.uk/spot/webulous">Webulous</a> is a
-                        tool for building ontologies from spreadsheets.
+                        In addition to OLS, we also provide ontology tools and services such as
+                        <a href="https://www.ebi.ac.uk/spot/oxo/">OxO</a>,
+                        <a href="https://www.ebi.ac.uk/spot/zooma/">Zooma</a>, and
+                        <a href="https://www.ebi.ac.uk/spot/ontostring/">OntoString</a>.
                     </p>
                 </div>
                 <div class="small-4 columns">