Merge pull request #309 from min2ha/master

1.3.4 BugFix - Release As issues now resolved and remaining image issues to be fixed in a later release, accepted as a pull request.
ukwa · Nov 27, 2020 · 31973b0 · 31973b0
2 parents afce3e7 + 70a2f81
commit 31973b0
Show file tree

Hide file tree

Showing 22 changed files with 11 additions and 235 deletions.
diff --git a/src/main/resources/static/ukwa/img/about-logos.png b/src/main/resources/static/ukwa/img/about-logos.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_1211.png b/src/main/resources/static/ukwa/img/collections/collection_1211.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_1230.png b/src/main/resources/static/ukwa/img/collections/collection_1230.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_1231.png b/src/main/resources/static/ukwa/img/collections/collection_1231.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_1232.png b/src/main/resources/static/ukwa/img/collections/collection_1232.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_238.png b/src/main/resources/static/ukwa/img/collections/collection_238.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_2396.png b/src/main/resources/static/ukwa/img/collections/collection_2396.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_2431.png b/src/main/resources/static/ukwa/img/collections/collection_2431.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_2436.png b/src/main/resources/static/ukwa/img/collections/collection_2436.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_2437.png b/src/main/resources/static/ukwa/img/collections/collection_2437.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_2452.png b/src/main/resources/static/ukwa/img/collections/collection_2452.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_2618.png b/src/main/resources/static/ukwa/img/collections/collection_2618.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_2678.png b/src/main/resources/static/ukwa/img/collections/collection_2678.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_2798.png b/src/main/resources/static/ukwa/img/collections/collection_2798.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_2912.png b/src/main/resources/static/ukwa/img/collections/collection_2912.png
diff --git a/src/main/resources/static/ukwa/img/collections/collection_689.png b/src/main/resources/static/ukwa/img/collections/collection_689.png
diff --git a/src/main/resources/static/ukwa/img/icons/about-logos.png b/src/main/resources/static/ukwa/img/icons/about-logos.png
diff --git a/src/main/resources/static/ukwa/img/trinity-logo-3.png b/src/main/resources/static/ukwa/img/trinity-logo-3.png
diff --git a/src/main/webapp/WEB-INF/jsp/accessibility_statement.jsp b/src/main/webapp/WEB-INF/jsp/accessibility_statement.jsp
@@ -30,31 +30,18 @@
 <spring:message code='accessibility.page.title' var="title"/>
 <%@include file="title.jsp" %>
 
-
 <section id="content">
   <div class="row default-padding page-content margin-0 px-md-3 px-sm-2 px-2">
     <div class="col-md-12 col-sm-12 page-content-col">
       <article>
         <c:choose>
           <c:when test="${locale == 'en'}">
-
-            <a href="/en<c:out value="${textUriWithoutLang}?${params}"/>#translation_gd" class="float-right pl-5"><spring:message code="main.menu.scottish" /></a>
-            <a href="/cy<c:out value="${textUriWithoutLang}?${params}"/>" class="float-right"><spring:message code="main.menu.welsh" /></a>
-
-
             <%@include file="accessibility_statement_body_en.jsp" %>
-
             <hr/>
-		    <h2 id="translation_gd">Aithris Ruigsinneachd Tasglann-l&igrave;n na RA</h2>
-            <%@include file="accessibility_statement_body_gd.jsp" %>
-
           </c:when>
           <c:when test="${locale == 'cy'}">
             <%@include file="accessibility_statement_body_cy.jsp" %>
           </c:when>
-          <c:when test="${locale == 'gd'}">
-            <%@include file="accessibility_statement_body_gd.jsp" %>
-          </c:when>
           <c:otherwise>
           </c:otherwise>
         </c:choose>

diff --git a/src/main/webapp/WEB-INF/jsp/accessibility_statement_body_cy.jsp b/src/main/webapp/WEB-INF/jsp/accessibility_statement_body_cy.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/accessibility_statement_body_en.jsp b/src/main/webapp/WEB-INF/jsp/accessibility_statement_body_en.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/footer.jsp b/src/main/webapp/WEB-INF/jsp/footer.jsp
@@ -130,7 +130,7 @@
         <div class="footer-logo-BW"><a href="https://www.nls.uk/" target="_blank"><img src="img/NLS_logo_2_BW.jpg" alt="Opens in a new window <spring:message code="footer.logo.nls" />" /></a></div>
         <div class="footer-logo-BW"><a href="https://www.bl.uk/" target="_blank"><img src="img/bl_logo_BW.png" alt="Opens in a new window <spring:message code="footer.logo.blib" />" /></a></div>
         <div class="footer-logo-BW"><a href="http://www.lib.cam.ac.uk/" target="_blank"><img src="img/cambrige_logo600_BW.png" alt="Opens in a new window <spring:message code="footer.logo.cul" />" /></a></div>
-        <div class="footer-logo-BW"><a href="https://www.tcd.ie/" target="_blank"><img src="img/trinity_logo_BW.jpg" alt="Opens in a new window <spring:message code="footer.logo.tcd" />" /></a></div>
+        <div class="footer-logo-BW"><a href="https://www.tcd.ie/" target="_blank"><img src="img/trinity-logo-3.png" alt="Opens in a new window <spring:message code="footer.logo.tcd" />" /></a></div>
     </div>
     </div>
 </div>