Merge branch 'master' of github.com:ukwa/w3act

app/uk/bl/Const.java

@@ -96,7 +96,7 @@ private Const() {}
 	public static final String URL_PLACE_HOLDER   = "||URL||";
 	public static final String LINK_PLACE_HOLDER  = "||LINK||";
 	public static final String LICENCE_PLACE_HOLDER = "||licence||";
-	public static final String ACKNOWLEDGEMENT    = "Acknowledgement";
+	public static final String ACKNOWLEDGEMENT    = "BL Acknowledgement";
     public static final String HTTP_PREFIX        = "http://";
 	public static final String SERVER_NAME        = "server_name";
 	public static final String UND                = "und";
@@ -298,8 +298,8 @@ private Const() {}
 	public static final String PLACE_HOLDERS     = "placeHolders";
 	public static final String DEFAULT_EMAIL_FLAG = "defaultEmail";
 	public static final String TEMPLATES_PATH    = "conf" + System.getProperty("file.separator") +
-													"templates" + System.getProperty("file.separator");
-	public static final String DEFAULT_TEMPLATE  = "General";
+												   "templates" + System.getProperty("file.separator");
+	public static final String DEFAULT_TEMPLATE  = "BL Permission to Harvest (non NPLD Content)";
 	public static final String LICENCE_ACK       = "License";
 	public static final String WEBSITE_TITLE_ACK = "Title of Website";
 	public static final String WEB_ADDRESS_ACK   = "Web Address (URL)";

app/views/crawlpermissions/list.scala.html

@@ -223,7 +223,7 @@ <h1><a href="@routes.CrawlPermissionController.index()">Archivist Tasks > </a>Cr
 				<div class="form-group">
 					<label for="selectTemplate" class="control-label">Template</label>
 
-					<select id="selectTemplate" name="template" value="General" class="form-control">
+					<select id="selectTemplate" name="template" class="form-control">
 							<option value="" selected>&lt;Use default&gt;</option>
 						@for(template <- templates) {
 							<option value="@template.name">@template.name</option>

conf/evolutions/default/4.sql

@@ -11,6 +11,12 @@ ALTER TABLE watched_target ALTER COLUMN document_url_scheme TYPE text;
 ALTER TABLE watched_target ALTER COLUMN login_page_url TYPE text;
 ALTER TABLE watched_target ALTER COLUMN logout_url TYPE text;
 
+DELETE FROM public.mail_template
+WHERE name IN (
+  'Acknowledgement',
+  'General'
+);
+
 INSERT INTO public.mail_template(
   id, created_at, name, ttype, subject, from_email, place_holders,
   text, updated_at)
@@ -53,6 +59,34 @@ VALUES (nextval('mail_template_seq'), CURRENT_TIMESTAMP, 'NLS Permission to Harv
         'PERMISSION_REQUEST', 'UK Web Archive', '[email protected]', 'URL, LINK',
         '6_NLS_nonUK_nonLD.txt', CURRENT_TIMESTAMP);
 
+INSERT INTO public.mail_template(
+  id, created_at, name, ttype, subject, from_email, place_holders,
+  text, updated_at)
+VALUES (nextval('mail_template_seq'), CURRENT_TIMESTAMP, 'NLW Acknowledgement',
+        'THANK_YOU_ONLINE_PERMISSION_FORM', 'British Library UKWA Licence Received', '[email protected]', 'URL, LINK',
+        '7_NLW_acknowledgement.txt', CURRENT_TIMESTAMP);
+
+INSERT INTO public.mail_template(
+  id, created_at, name, ttype, subject, from_email, place_holders,
+  text, updated_at)
+VALUES (nextval('mail_template_seq'), CURRENT_TIMESTAMP, 'NLW Open Access Permission Request (LD Content)',
+        'PERMISSION_REQUEST', 'UK Web Archive', '[email protected]', 'URL, LINK',
+        '8_NLW_LD_openAccess.txt', CURRENT_TIMESTAMP);
+
+INSERT INTO public.mail_template(
+  id, created_at, name, ttype, subject, from_email, place_holders,
+  text, updated_at)
+VALUES (nextval('mail_template_seq'), CURRENT_TIMESTAMP, 'NLW Permission to Harvest (non NPLD Content)',
+        'PERMISSION_REQUEST', 'UK Web Archive', '[email protected]', 'URL, LINK',
+        '9_NLW_nonUK_nonLD.txt', CURRENT_TIMESTAMP);
+
+INSERT INTO public.mail_template(
+  id, created_at, name, ttype, subject, from_email, place_holders,
+  text, updated_at)
+VALUES (nextval('mail_template_seq'), CURRENT_TIMESTAMP, 'NLW Covering letter Welsh Translation',
+        'PERMISSION_REQUEST', 'UK Web Archive', '[email protected]', 'URL, LINK',
+        'NLWCovering.letter.Welsh.Translation.txt', CURRENT_TIMESTAMP);
+
 ALTER TABLE public.crawl_permission DROP CONSTRAINT fk_crawl_permission_mailtempla_4;
 ALTER TABLE public.crawl_permission DROP COLUMN mailtemplate_id;
 
@@ -80,9 +114,27 @@ WHERE name IN (
   'BL Open Access Permission Request (LD Content)',
   'NLS Open Access Permission Request (LD Content)',
   'BL Permission to Harvest (non NPLD Content)',
-  'NLS Permission to Harvest (non NPLD Content)'
+  'NLS Permission to Harvest (non NPLD Content)',
+  'NLW Acknowledgement',
+  'NLW Open Access Permission Request (LD Content)',
+  'NLW Permission to Harvest (non NPLD Content)',
+  'NLWCovering letter Welsh Translation'
 );
 
+INSERT INTO public.mail_template(
+  id, created_at, name, ttype, subject, from_email, place_holders,
+  text, url, updated_at)
+VALUES (nextval('mail_template_seq'), CURRENT_TIMESTAMP, 'General',
+        'PERMISSION_REQUEST', 'UK Web Archive', '[email protected]', 'URL, LINK',
+        'default.txt', 'act-8941244207889366776', CURRENT_TIMESTAMP);
+
+INSERT INTO public.mail_template(
+  id, created_at, name, ttype, subject, from_email, place_holders,
+  text, url, updated_at)
+VALUES (nextval('mail_template_seq'), CURRENT_TIMESTAMP, 'Acknowledgement', 'THANK_YOU_ONLINE_PERMISSION_FORM',
+        'British Library UKWA Licence Received', '[email protected]', 'URL',
+        'acknowledgement.txt', 'act-284155755923027765', CURRENT_TIMESTAMP);
+
 ALTER TABLE public.crawl_permission ADD COLUMN mailtemplate_id bigint;
 ALTER TABLE public.crawl_permission
   ADD CONSTRAINT fk_crawl_permission_mailtempla_4 FOREIGN KEY (mailtemplate_id)

conf/templates/7_NLW_acknowledgement.txt

@@ -0,0 +1,25 @@
+Your completed licence form has been submitted successfully, thank you.
+
+||URL||
+
+The National Library of Wales is very pleased to have received your submission for the UK Web Archive which we will process as soon as possible.
+
+Please note that although we make every effort to archive websites as completely as possible there is much that cannot be archived for technical reasons. Further details can be found in the Technical information section http://www.webarchive.org.uk/ukwa/info/technical.
+
+Your website may not be available to view in the public archive for some time as we archive many thousands of websites and perform quality assurance checks on each instance. Due to the high number of submissions we receive, regrettably we cannot inform you when individual websites will be available to view in the archive at http://www.webarchive.org.uk/ but please do check the archive regularly as new sites are added every day.
+
+In the meantime many thanks for participating in the UK Web Archive and please do nominate other websites that you think may be in scope for us, http://www.webarchive.org.uk/ukwa/info/nominate.
+
+Kind regards,
+
+Aled Betts
+
+Llyfrgellydd Cynorthwyol/Assistant Librarian 
+Datblygu Casgliadau/ Collection Development 
+Llyfrgell Genedlaethol Cymru/National Library of Wales Aberystwyth Ceredigion
+SY23 3BU
+
+Ffôn/Tel: 01970 632515
+[email protected]
+
+

conf/templates/8_NLW_LD_openAccess.txt

@@ -0,0 +1,31 @@
+The British Library would like to provide public access to archived copies of the following website:
+
+||URL||
+
+Dear Sir/Madam,
+
+The National Library of Wales would like your permission to provide public access to copies of your website held within the UK Web Archive. The Library, working with our legal deposit partners, archives UK websites under the terms of the Legal Deposit Libraries (Non-Print Works) Regulations 2013.  This content is collected at least once a year, building up an archive of UK websites as they change over time.  
+
+Under legal deposit legislation, access to the archived content is restricted to the premises of the legal deposit libraries. To highlight the importance of the archive, and to widen access to the archived content, we seek permission from selected website owners to provide public access to their content within the archive.  Where permission is granted, access to the archived websites is made available freely across the web. The public archive can be seen at www.webarchive.org.uk.
+
+If you are happy for your site to be made publicly accessible via the archive, please complete the online licence form ||LINK|| that will permit us to proceed.  Other than providing your permission, this will require no further effort on your part. 
+
+If there are any other of your sites which you would like to be made publicly accessible via the archive, please list them in Any other information or alternatively nominate them for archiving at www.webarchive.org.uk/ukwa/info/nominate.  Information about legal deposit, copyright and how your archived website will be made available can be found in our FAQ pages at www.webarchive.org.uk/ukwa/info/faq.   
+
+Should you require any additional information, please do not hesitate to contact us.
+
+We look forward to your hearing from you.
+
+Kind regards
+
+Aled Betts
+
+Llyfrgellydd Cynorthwyol/Assistant Librarian 
+Datblygu Casgliadau/ Collection Development 
+Llyfrgell Genedlaethol Cymru/National Library of Wales Aberystwyth Ceredigion
+SY23 3BU
+
+Ffôn/Tel: 01970 632515
+[email protected]
+
+

conf/templates/9_NLW_nonUK_nonLD.txt

@@ -0,0 +1,25 @@
+The British Library would like to archive the following website:
+||URL||
+
+Dear Sir/Madam,
+
+The National Library of Wales would like to archive your website in the UK Web Archive and to make it publicly available. The UK Web Archive was established in 2004 to capture and archive websites from the UK domain and across the web, responding to the challenge of a digital black hole in the nations memory. It contains specially selected websites that represent different aspects of UK heritage on the web, as well as important global events.  We work closely with leading international institutions to collect and permanently preserve the web, and the open UK Web Archive can be seen at http://www.webarchive.org.uk/.
+
+If you are happy for your site to be archived and made publicly available, please complete the online licence form ||LINK|| that will permit us to proceed.  Archiving is free and does not normally require any effort on your part. If there are any other of your sites which you would like to be considered for archiving, you are most welcome to nominate them at www.webarchive.org.uk/ukwa/info/nominate.
+Information about copyright and how your archived website will be made available can be found in our FAQs at www.webarchive.org.uk/ukwa/info/faq . Should you require any additional information, please do not hesitate to contact us.
+
+We look forward to hearing from you.
+
+Kind regards
+
+Aled Betts
+
+Llyfrgellydd Cynorthwyol/Assistant Librarian 
+Datblygu Casgliadau/ Collection Development 
+Llyfrgell Genedlaethol Cymru/National Library of Wales Aberystwyth Ceredigion
+SY23 3BU
+
+Ffôn/Tel: 01970 632515
+[email protected]
+
+

conf/templates/NLWCovering.letter.Welsh.Translation.txt

@@ -0,0 +1,21 @@
+Hoffai Llyfrgell Genedlaethol Cymru ddarparu mynediad cyhoeddus i gopiau wedi’u harchifo o’r wefan ganlynol: 
+||URL||
+Annwyl Syr/Fadam,
+Hoffai Llyfrgell Genedlaethol Cymru gael eich caniatâd i ddarparu mynediad cyhoeddus i gopiau o’ch gwefan a ddelir o fewn Archif We y Deyrnas Unedig. 
+Mae’r Llyfrgell, drwy gydweithio â’n partneriaid adnau cyfreithiol, yn archifo gwefannau’r Deyrnas Unedig o dan delerau Rheoliadau (Gweithiau Di-brint) y Llyfrgelloedd Adnau Cyfreithiol 2013. Cesglir y cynnwys hwn o leiaf unwaith y flwyddyn, gan greu archif o wefannau’r DU, wrth iddynt newid gydag amser. 
+O dan ddeddfwriaeth adnau cyfreithiol, cyfyngir mynediad i gynnwys sydd wedi’i archifo i safle’r llyfrgelloedd adnau cyfreithiol. Er mwyn tynnu sylw at bwysigrwydd yr archif, ac er mwyn ehangu mynediad i gynnwys yr archif, ceisiwn ganiatâd oddi wrth berchnogion gwefannau dethol i roi mynediad cyhoeddus i’w cynnwys yn yr archif.  Lle rhoddir caniatâd, ceir mynediad rhydd dros y we i’r gwefannau sydd wedi’u harchifo. Gellir gweld yr archif gyhoeddus yma:  www.webarchive.org.uk. 
+Os ydych yn fodlon i’ch gwefan fod ar gael yn gyhoeddus drwy’r archif, a wnewch chi, os gwelwch yn dda, lanw’r ffurflen drwydded ar-lein ||LINK|| a fydd yn ein caniatau i symud ymlaen. Ar ôl ichi roi eich caniatâd ni bydd angen ichi wneud dim byd pellach. 
+Os oes gennych unrhyw wefannau eraill yr hoffech iddynt fod ar gael yn gyhoeddus drwy’r archif, rhestrwch nhw ar bob cyfrif o dan Unrhyw wybodaeth bellach neu fe allwch eu henwebu yma: www.webarchive.org.uk/ukwa/info/nominate.  Gellir dod o hyd i wybodaeth am adnau cyfreithiol, hawlfraint a sut y rhoddir mynediad i’ch gwefan ar ein tudalennau, Cwestiynau a ofynnir yn aml, yma:  www.webarchive.org.uk/ukwa/info/faq.   
+Cysylltwch, da chi, os oes angen gwybodaeth bellach arnoch. 
+Edrychwn ymlaen at glywed gennych.
+Yn gywir
+Aled Betts
+
+Llyfrgellydd Cynorthwyol/Assistant Librarian 
+Datblygu Casgliadau/ Collection Development 
+Llyfrgell Genedlaethol Cymru/National Library of Wales Aberystwyth Ceredigion
+SY23 3BU
+
+Ffôn/Tel: 01970 632515
+[email protected]
+