Merge pull request #433 from vrk-kpa/LIKA-597_remove-contact-form

LIKA-597: Replace contact form with laatutyökalut link
vrk-kpa · Feb 20, 2024 · f91e103 · f91e103
2 parents 54dec9c + 09b60fa
commit f91e103
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 66 deletions.
diff --git a/ansible/deploy-all.yml b/ansible/deploy-all.yml
@@ -33,7 +33,6 @@
     - { role: ckan-extension, ckanext: ckanext-scheming }
     - { role: ckan-extension, ckanext: ckanext-fluent }
     - { role: ckan-extension, ckanext: ckanext-pages }
-    - { role: ckan-extension, ckanext: ckanext-contact }
     - { role: ckan-extension, ckanext: ckanext-harvest }
     - { role: ckan-extension, ckanext: ckanext-xroad_integration }
     - { role: ckan-extension, ckanext: ckanext-validate_links }
@@ -50,4 +49,4 @@
     - solr-reindex
     - diagnostics
   handlers:
-    - import_tasks: handlers/handlers.yml
+    - import_tasks: handlers/handlers.yml
diff --git a/ansible/deploy-extensions.yml b/ansible/deploy-extensions.yml
@@ -15,7 +15,6 @@
     - { role: ckan-extension, ckanext: ckanext-scheming }
     - { role: ckan-extension, ckanext: ckanext-fluent }
     - { role: ckan-extension, ckanext: ckanext-pages }
-    - { role: ckan-extension, ckanext: ckanext-contact }
     - { role: ckan-extension, ckanext: ckanext-harvest }
     - { role: ckan-extension, ckanext: ckanext-xroad_integration }
     - { role: ckan-extension, ckanext: ckanext-validate_links }
@@ -26,4 +25,4 @@
     - ckan
     - ckan-translations
   handlers:
-    - import_tasks: handlers/handlers.yml
+    - import_tasks: handlers/handlers.yml
diff --git a/ansible/roles/ckan/templates/ckan.ini.j2 b/ansible/roles/ckan/templates/ckan.ini.j2
@@ -101,11 +101,6 @@ smtp.server = {{ email.smtp_server }}
 smtp.starttls = False
 smtp.mail_from = no-reply
 
-ckanext.contact.mail_to = {{ email.contact }}
-ckanext.contact.recipient_name =
-ckanext.contact.subject = Palautetta Liityntäkatalogista
-ckanext.contact.captcha_implementation = simple
-
 ckan.harvest.mq.type = redis
 ckan.harvest.mq.hostname = {{ redis.host }}
 ckan.harvest.mq.port = {{ redis.port }}

diff --git a/ansible/roles/nginx/templates/nginx_site_config.j2 b/ansible/roles/nginx/templates/nginx_site_config.j2
@@ -25,6 +25,9 @@ server {
       return 301 /en_GB$1;
     }
 
+  location ~ (/en|/fi|/sv|/en_GB)?/contact {
+    return 301 https://laatutyokalut.suomi.fi/p/jTVC;
+  }
   location / {
     proxy_pass http://127.0.0.1:8080/;
     proxy_set_header X-Url-Scheme $scheme;

diff --git a/ansible/vars/environment-specific/prod.yml b/ansible/vars/environment-specific/prod.yml
@@ -112,7 +112,6 @@ ckan_plugins:
   - apicatalog_pages
   - pages
   - apicatalog_admin_dashboard
-  - contact
   - apicatalog_harvesterstatus
   - harvest
   - xroad_harvester

diff --git a/ansible/vars/environment-specific/qa.yml b/ansible/vars/environment-specific/qa.yml
@@ -112,7 +112,6 @@ ckan_plugins:
   - apicatalog_pages
   - pages
   - apicatalog_admin_dashboard
-  - contact
   - apicatalog_harvesterstatus
   - harvest
   - xroad_harvester

diff --git a/ansible/vars/environment-specific/test.yml b/ansible/vars/environment-specific/test.yml
@@ -107,7 +107,6 @@ ckan_plugins:
   - apicatalog_pages
   - pages
   - apicatalog_admin_dashboard
-  - contact
   - apicatalog_harvesterstatus
   - harvest
   - xroad_harvester

diff --git a/ansible/vars/environment-specific/vagrant.yml b/ansible/vars/environment-specific/vagrant.yml
@@ -119,7 +119,6 @@ ckan_plugins:
   - apicatalog_pages
   - pages
   - apicatalog_admin_dashboard
-  - contact
   - apicatalog_harvesterstatus
   - harvest
   - xroad_harvester

diff --git a/ckanext/ckanext-apicatalog/ckanext/apicatalog/templates/contact/form.html b/ckanext/ckanext-apicatalog/ckanext/apicatalog/templates/contact/form.html
diff --git a/ckanext/ckanext-apicatalog/ckanext/apicatalog/templates/contact/snippets/form_simple.html b/ckanext/ckanext-apicatalog/ckanext/apicatalog/templates/contact/snippets/form_simple.html
diff --git a/ckanext/ckanext-apicatalog/ckanext/apicatalog/templates/footer.html b/ckanext/ckanext-apicatalog/ckanext/apicatalog/templates/footer.html
@@ -12,7 +12,7 @@
 					<ul class="nav navbar footer-nav">
 						{{ h.build_nav_main() }}
 						<li><a href="{{'https://palveluhallinta.suomi.fi/%s/sivut/palveluvayla/palvelukuvaus/tietosuoja' % lang_code}}" target="_blank">{{_('Privacy statement')}}&nbsp;<i class="fal fa-external-link"></i></a></li>
-						{{ h.build_nav('contact.form', _('Give feedback')) }}
+						<li><a href="https://laatutyokalut.suomi.fi/p/jTVC" target="_blank">{{_('Give feedback')}}&nbsp;<i class="fal fa-external-link"></i></a></li>
 					</ul>
 				</div>
 			</div>

diff --git a/...ext/ckanext-apicatalog/ckanext/apicatalog/templates/home/snippets/apicatalog_navmenu.html b/...ext/ckanext-apicatalog/ckanext/apicatalog/templates/home/snippets/apicatalog_navmenu.html
@@ -5,7 +5,7 @@
       {{ h.build_nav('dataset.search', _('Datasets')) }}
       {{ h.build_nav('organization.index', _('Organizations')) }}
       {{ h.build_nav_main() }}
-      {{ h.build_nav('contact_form', _('Feedback')) }}
+			<li><a href="https://laatutyokalut.suomi.fi/p/jTVC" target="_blank">{{_('Feedback')}}&nbsp;<i class="fal fa-external-link"></i></a></li>
     </ul>
   </div>
 {% endblock %}