Merge pull request #328 from min2ha/master

1.3.6 - Bugfix release

.github/workflows/build.yml

@@ -0,0 +1,45 @@
+on:
+  push:
+    branches:
+      - master
+      - dev
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  UKWA-UI_build_and_push_to_registry_job:
+    runs-on: ubuntu-latest
+    name: A job to build and push docker
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Build with Maven
+        run: mvn clean package -Dmaven.test.skip=true
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          pull: true
+          push: true
+          cache-from: type=registry,ref=min2ha/ukwa-ui:latest
+          cache-to: type=inline
+          tags: min2ha/ukwa-ui:latest
+#          build-args: PROFILE=dev,ARG2=test

src/main/resources/i18n/messages.properties

@@ -260,7 +260,7 @@ collection.titlecountwithin = titles are included in this collection.
 noresults.title = UKWA No results
 noresults.back.button = Back to the list
 noresults.main.heading = This content can only be viewed in the Reading Room* of a UK Legal Deposit Library.
-noresults.text = <p>* To access a reading room you will require a reader's pass from the library in question. See links below for details on the UK Legal deposit libraries and how to obtain access to a reading room. Note: Access is via Library terminals and digital copies of content cannot be taken.</p><ul><li><a href=https://www.bl.uk/reshelp/inrrooms/readingrooms.html>The British Library (Sites in both London and Boston Spa, Yorkshire)</a></li><li><a href=https://www.nls.uk/using-the-library/reading-rooms>National Library of Scotland</a></li><li><a href=https://www.library.wales/visit/before-your-visit/opening-times>National Library of Wales</a></li><li><a href=http://www.bodleian.ox.ac.uk/bodley/finding-resources/rooms>Bodleian Library, University of Oxford</a></li><li><a href=http://www.lib.cam.ac.uk/deptserv/readingroom/>Cambridge University Libraries</a></li><li><a href=https://www.tcd.ie/library/>Trinity College, Dublin</a></li></ul>
+noresults.text = <p>* To access a reading room you will require a reader's pass from the library in question. See links below for details on the UK Legal deposit libraries and how to obtain access to a reading room. Note: Access is via Library terminals and digital copies of content cannot be taken.</p><ul><li><a href=https://www.bl.uk/reshelp/inrrooms/readingrooms.html>The British Library (Sites in both London and Boston Spa, Yorkshire)</a></li><li><a href=https://www.nls.uk/using-the-library/reading-rooms>National Library of Scotland</a></li><li><a href=https://www.library.wales/visit/before-your-visit/opening-times>National Library of Wales</a></li><li><a href=http://www.bodleian.ox.ac.uk/bodley/finding-resources/rooms>Bodleian Library, University of Oxford</a></li><li><a href="https://libguides.cam.ac.uk/e-legal-deposit/access">Cambridge University Libraries</a></li><li><a href=https://www.tcd.ie/library/>Trinity College, Dublin</a></li></ul>
 faq.title = UKWA FAQ
 faq.main.heading = Frequently asked questions
 faq.subtitle = If your question isn't answered below then please <a href=info/contact>contact us</a>.

src/main/resources/i18n/messages_cy.properties

@@ -260,7 +260,7 @@ collection.titlecountwithin = o deitlau yn y casgliad hwn.
 noresults.title = UKWA Dim canlyniadau
 noresults.back.button = Yn ol i'r rhestr
 noresults.main.heading = Gall y deunydd hwn gael ei ddarllen mewn Ystafell Ddarllen* un o Lyfrgelloedd Adnau Cyfreithiol y DG yn unig.
-noresults.text = <p>* Er mwyn cael mynediad i ystafell ddarllen bydd angen tocyn darllen arnoch o un o&#8217;r llyfrgelloedd dan sylw. Gweler y dolenni cyswllt isod am fanylion Llyfrgelloedd Adnau Cyfreithiol y DG a sut i gael mynediad i ystafell ddarllen. Noder: Bydd y mynediad trwy derfynellau llyfrgell ac ni fydd modd gwneud copïau digidol.</p><ul><li><a href="https://www.bl.uk/reshelp/inrrooms/readingrooms.html">Y Llyfrgell Brydeinig (Safleoedd yn Llundain a Boston Spa, Swydd Efrog)</a></li><li><a href="https://www.nls.uk/using-the-library/reading-rooms">Llyfrgell genedlaethol yr Alban</a></li><li><a href=https://www.library.wales/visit/before-your-visit/opening-times>Llyfrgell Genedlaethol Cymru</a></li><li><a href="http://www.bodleian.ox.ac.uk/bodley/finding-resources/rooms">Llyfrgell y Bodley, Rhydychen</a></li><li><a href="http://www.lib.cam.ac.uk/deptserv/readingroom/">Llyfrgelloedd Prifysgol Caergrawnt</a></li><li><a href="https://www.tcd.ie/library/">Coleg y Drindod, Dulyn</a></li></ul>
+noresults.text = <p>* Er mwyn cael mynediad i ystafell ddarllen bydd angen tocyn darllen arnoch o un o&#8217;r llyfrgelloedd dan sylw. Gweler y dolenni cyswllt isod am fanylion Llyfrgelloedd Adnau Cyfreithiol y DG a sut i gael mynediad i ystafell ddarllen. Noder: Bydd y mynediad trwy derfynellau llyfrgell ac ni fydd modd gwneud copïau digidol.</p><ul><li><a href="https://www.bl.uk/reshelp/inrrooms/readingrooms.html">Y Llyfrgell Brydeinig (Safleoedd yn Llundain a Boston Spa, Swydd Efrog)</a></li><li><a href="https://www.nls.uk/using-the-library/reading-rooms">Llyfrgell genedlaethol yr Alban</a></li><li><a href=https://www.library.wales/visit/before-your-visit/opening-times>Llyfrgell Genedlaethol Cymru</a></li><li><a href="http://www.bodleian.ox.ac.uk/bodley/finding-resources/rooms">Llyfrgell y Bodley, Rhydychen</a></li><li><a href="https://libguides.cam.ac.uk/e-legal-deposit/access">Llyfrgelloedd Prifysgol Caergrawnt</a></li><li><a href="https://www.tcd.ie/library/">Coleg y Drindod, Dulyn</a></li></ul>
 faq.title = UKWA Cwestiynau cyffredin
 faq.main.heading = Cwestiynau cyffredin
 faq.subtitle = Os na chewch ateb i&#039;ch cwestiwn isod, <a href="info/contact";>cysylltwch &acirc; ni</a>.
@@ -310,7 +310,7 @@ nominate.list1 = <ol><li>Sydd ar .uk neu ar barth gwe lefel uchel daearyddol ara
 nominate.subtitle2 = Nid ydym yn archifo gwefannau:
 nominate.list2 = <ol><li>Ar safleoedd ar-lein Sain neu Fideo sydd &#226; chynnwys clyweled yn bennaf</li><li>Safleoedd mewnrwyd preifet ac e-byst</li><li>Data personol ar safleoedd cyfryngau cymdeithasol neu wefannau sydd yn gae&#235;dig i grwpiau cyfyngedig.</li></ol>
 nominate.form.heading = Diogelwch wefan o&#8217;r DG
-nominate.form.notice = <p>Mae meysydd gyda <span class="light-blue">*</span> yn orfodol</p>\
+nominate.form.notice = <p>Mae meysydd gyda <span class="light-blue">*</span> yn orfodol</p>
 nominate.form.input.name = Enw
 nominate.form.input.name.placeholder = Rhowch eich enw os gwelwch yn dda
 nominate.form.input.title = Teitl y wefan

src/main/resources/i18n/messages_gd.properties

@@ -260,7 +260,7 @@ collection.titlecountwithin = Tha an cruinneachadh le agus air a rianachd le
 noresults.title = UKWA Chan eil toradh ann
 noresults.back.button = Air ais chun na liosta
 noresults.main.heading = Chan urrainn dhut an t-susbaint seo fhaicinn ach anns an t-Seòmar Leughaidh aig fear de Leabharlannan Tasgaidh na RA.
-noresults.text = <p>* Gus seòmar leughaidh a chleachdadh, bidh feum agad air pas-leughadair bhon leabharlann sin. Faic na ceanglaichean gu h-ìosal airson fios mu Leabharlannan Tasgaidh na RA agus mar a gheibhear cothrom air na seòmraichean leughaidh aca. Nòta: Gheibhear cothrom air an t-susbaint tro choimpiutairean nan Leabharlannan agus chan fhaodar lethbhreacan didseatach a dhèanamh den t-susbaint.</p><ul><li><a href=https://www.bl.uk/reshelp/inrrooms/readingrooms.html>Leabharlann Bhreatainn (Làraichean an dà chuid ann an Lunnainn agus Boston Spa, Siorrachd York)</a></li><li><a href=https://www.nls.uk/using-the-library/reading-rooms>Leabharlann Nàiseanta na h-Alba</a></li><li><a href=https://www.library.wales/visit/before-your-visit/opening-times>National Library of Wales</a></li><li><a href=http://www.bodleian.ox.ac.uk/bodley/finding-resources/rooms>Leabharlann Bodleian, Oilthigh Oxford</a></li><li><a href=http://www.lib.cam.ac.uk/deptserv/readingroom/>Leabharlann Oilthigh Cambridge </a></li><li><a href=https://www.tcd.ie/library/>Coláiste na Tríonóide, Baile Átha Cliath</a></li></ul>
+noresults.text = <p>* Gus seòmar leughaidh a chleachdadh, bidh feum agad air pas-leughadair bhon leabharlann sin. Faic na ceanglaichean gu h-ìosal airson fios mu Leabharlannan Tasgaidh na RA agus mar a gheibhear cothrom air na seòmraichean leughaidh aca. Nòta: Gheibhear cothrom air an t-susbaint tro choimpiutairean nan Leabharlannan agus chan fhaodar lethbhreacan didseatach a dhèanamh den t-susbaint.</p><ul><li><a href=https://www.bl.uk/reshelp/inrrooms/readingrooms.html>Leabharlann Bhreatainn (Làraichean an dà chuid ann an Lunnainn agus Boston Spa, Siorrachd York)</a></li><li><a href=https://www.nls.uk/using-the-library/reading-rooms>Leabharlann Nàiseanta na h-Alba</a></li><li><a href=https://www.library.wales/visit/before-your-visit/opening-times>National Library of Wales</a></li><li><a href=http://www.bodleian.ox.ac.uk/bodley/finding-resources/rooms>Leabharlann Bodleian, Oilthigh Oxford</a></li><li><a href="https://libguides.cam.ac.uk/e-legal-deposit/access">Leabharlann Oilthigh Cambridge </a></li><li><a href=https://www.tcd.ie/library/>Coláiste na Tríonóide, Baile Átha Cliath</a></li></ul>
 faq.title = Ceistean Cumanta mu UKWA
 faq.main.heading = Ceistean Cumanta
 faq.subtitle = Mur a h-eil a&rsquo; cheist agad air a freagairt gu h-ìosal,<a href=info/contact>cuir fios thugainn</a>.
@@ -307,10 +307,10 @@ nominate.text = <p>Tha Tasglann-lìn na RA ag amas air an uiread &rsquo;s a ghab
 nominate.sent.message = Chaidh am moladh a thaobh làraich-lìn a chur a-steach gu soirbheachail. Mòran taing airson do mholadh.
 nominate.subtitle1 = Bidh sinn a&rsquo; tasgadh làraichean-lìn:
 nominate.list1 = <ol><li>Aig a bheil àrainn .uk no àrainn chruinn-eòlach eile na RA aig an ìre as àirde mar eisimpleir .scot no .cymru.</li></ol>A tha air am foillseachadh san Rìoghachd Aonaichte.</li></ol>
-nominate.subtitle2 = <em>Cha bhi<em> sinn a&rsquo; tasgadh:
+nominate.subtitle2 = Cha bhi sinn a&rsquo; tasgadh:
 nominate.list2 = <ol><li>Àrd-ùrlaran fuaim no bhidio air-loidhne, anns a bheil stuth clais-lèirsinneach mar phrìomh shusbaint</li><li>Eadra-lìontan agus puist-d prìobhaideach.</li><li>Dàta pearsanta ann an làraichean lìonraidh shòisealta no làraichean a tha dìreach fosgailte do bhuidhnean cuingichte.</li></ol>
 nominate.form.heading = Sàbhail làrach-lìn às an RA
-nominate.form.notice = <p>Tha raointean a tha comharraichte le * <span class=light-blue>*</span>riatanach. </p><p>Tha fiosrachadh pearsanta a bheir thu dhuinn air a dhìon le Lagh Dìon Dàta na RA. Faic an <a href=info/privacy>Aithris Prìobhaideachd</a> againn.</p>
+nominate.form.notice = <p>Tha raointean a tha comharraichte le <span class=light-blue>*</span> riatanach. </p><p>Tha fiosrachadh pearsanta a bheir thu dhuinn air a dhìon le Lagh Dìon Dàta na RA. Faic an <a href=info/privacy>Aithris Prìobhaideachd</a> againn.</p>
 nominate.form.input.name = Ainm
 nominate.form.input.name.placeholder = Cuir a-steach d&rsquo; ainm
 nominate.form.input.title = Tiotal na làraich-lìn

src/main/webapp/WEB-INF/jsp/nominate.jsp

@@ -158,6 +158,7 @@ $(document).ready(function(e) {
         form.classList.add('was-validated');
       }, false);
     });
+	
 
 	$("#nominate-form").submit(function(e) {
     	var response = grecaptcha.getResponse();