UHF-9762: Merge branch 'main' of https://github.com/City-of-Helsinki/…

…drupal-hdbt into UHF-9762
City-of-Helsinki · Apr 3, 2024 · 97384d3 · 97384d3
2 parents aa1fce0 + 732c694
commit 97384d3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -21,11 +21,16 @@
 * [ ] Check that this feature works
 * [ ] Check that code follows our standards
 
-## Designers review
+## Continuous documentation
 <!-- One of the checkboxes below needs to be checked like this: `[x]` (or click when not in edit mode) -->
 
-* [ ] This PR does not need designers review
-* [ ] This PR has been visually reviewed by a designer (Name of the designer)
+* [ ] This feature has been documented/the documentation has been updated
+* [ ] This change doesn't require updates to the documentation
+
+## Translations
+<!-- The checkbox below needs to be checked like this: `[x]` (or click when not in edit mode). Not needed if the translations were not affected. -->
+
+* [ ] Translations have been added to .po -files and included in this PR
 
 ## Other PRs
 <!-- For example an related PR in another repository -->

diff --git a/.github/workflows/visual.yml b/.github/workflows/visual.yml
@@ -48,7 +48,7 @@ jobs:
 
       - name: Start project
         working-directory: ${{ env.DRUPAL_ROOT }}
-        run: docker compose --profile testing up -d --wait && sleep 5
+        run: docker compose --profile testing up -d --wait && sleep 10
 
       - name: Restore files folder
         id: drupal-cache

diff --git a/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig b/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig
@@ -33,18 +33,13 @@
         {% endif %}
       </div>
     {% endif %}
-    {% if unit_email_link and content.email|render %}
-      {% set link_attributes = {
-        'class': [
-          'service-channel__email-link',
-        ],
-      } %}
+    {% if content.email|render %}
       <div class="unit__contact-row unit__contact-row--email">
         <label class="unit__contact-row__label">
           {% include '@hdbt/misc/icon.twig' ignore missing with {icon: 'glyph-at'} %}
           {{ 'E-mail'|t }}:
         </label>
-        {{ link(content.email, unit_email_link, link_attributes) }}
+        {{ content.email }}
       </div>
     {% endif %}
     {% if content.phone|render %}