diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..da020198 --- /dev/null +++ b/.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 diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties index b4fbcd8a..5b33f4eb 100644 --- a/src/main/resources/i18n/messages.properties +++ b/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 =

* 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.

+noresults.text =

* 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.

faq.title = UKWA FAQ faq.main.heading = Frequently asked questions faq.subtitle = If your question isn't answered below then please contact us. diff --git a/src/main/resources/i18n/messages_cy.properties b/src/main/resources/i18n/messages_cy.properties index d2119c93..1f417c16 100644 --- a/src/main/resources/i18n/messages_cy.properties +++ b/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 =

* Er mwyn cael mynediad i ystafell ddarllen bydd angen tocyn darllen arnoch o un o’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.

+noresults.text =

* Er mwyn cael mynediad i ystafell ddarllen bydd angen tocyn darllen arnoch o un o’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.

faq.title = UKWA Cwestiynau cyffredin faq.main.heading = Cwestiynau cyffredin faq.subtitle = Os na chewch ateb i'ch cwestiwn isod, cysylltwch â ni. @@ -310,7 +310,7 @@ nominate.list1 =
  1. Sydd ar .uk neu ar barth gwe lefel uchel daearyddol ara nominate.subtitle2 = Nid ydym yn archifo gwefannau: nominate.list2 =
    1. Ar safleoedd ar-lein Sain neu Fideo sydd â chynnwys clyweled yn bennaf
    2. Safleoedd mewnrwyd preifet ac e-byst
    3. Data personol ar safleoedd cyfryngau cymdeithasol neu wefannau sydd yn gaeëdig i grwpiau cyfyngedig.
    nominate.form.heading = Diogelwch wefan o’r DG -nominate.form.notice =

    Mae meysydd gyda * yn orfodol

    \ +nominate.form.notice =

    Mae meysydd gyda * yn orfodol

    nominate.form.input.name = Enw nominate.form.input.name.placeholder = Rhowch eich enw os gwelwch yn dda nominate.form.input.title = Teitl y wefan diff --git a/src/main/resources/i18n/messages_gd.properties b/src/main/resources/i18n/messages_gd.properties index c4a4700f..d8908348 100644 --- a/src/main/resources/i18n/messages_gd.properties +++ b/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 =

    * 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.

    +noresults.text =

    * 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.

    faq.title = Ceistean Cumanta mu UKWA faq.main.heading = Ceistean Cumanta faq.subtitle = Mur a h-eil a’ cheist agad air a freagairt gu h-ìosal,cuir fios thugainn. @@ -307,10 +307,10 @@ nominate.text =

    Tha Tasglann-lìn na RA ag amas air an uiread ’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’ tasgadh làraichean-lìn: nominate.list1 =

    1. Aig a bheil àrainn .uk no àrainn chruinn-eòlach eile na RA aig an ìre as àirde mar eisimpleir .scot no .cymru.
    A tha air am foillseachadh san Rìoghachd Aonaichte.
-nominate.subtitle2 = Cha bhi sinn a’ tasgadh: +nominate.subtitle2 = Cha bhi sinn a’ tasgadh: nominate.list2 =
  1. Àrd-ùrlaran fuaim no bhidio air-loidhne, anns a bheil stuth clais-lèirsinneach mar phrìomh shusbaint
  2. Eadra-lìontan agus puist-d prìobhaideach.
  3. Dàta pearsanta ann an làraichean lìonraidh shòisealta no làraichean a tha dìreach fosgailte do bhuidhnean cuingichte.
nominate.form.heading = Sàbhail làrach-lìn às an RA -nominate.form.notice =

Tha raointean a tha comharraichte le * *riatanach.

Tha fiosrachadh pearsanta a bheir thu dhuinn air a dhìon le Lagh Dìon Dàta na RA. Faic an Aithris Prìobhaideachd againn.

+nominate.form.notice =

Tha raointean a tha comharraichte le * riatanach.

Tha fiosrachadh pearsanta a bheir thu dhuinn air a dhìon le Lagh Dìon Dàta na RA. Faic an Aithris Prìobhaideachd againn.

nominate.form.input.name = Ainm nominate.form.input.name.placeholder = Cuir a-steach d’ ainm nominate.form.input.title = Tiotal na làraich-lìn diff --git a/src/main/webapp/WEB-INF/jsp/nominate.jsp b/src/main/webapp/WEB-INF/jsp/nominate.jsp index 4e2b7b61..c3839c7d 100644 --- a/src/main/webapp/WEB-INF/jsp/nominate.jsp +++ b/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();