diff --git a/drupal/modules/avoindata-explore/avoindata_explore.module b/drupal/modules/avoindata-explore/avoindata_explore.module
index 9966f1771c..153152c6a7 100644
--- a/drupal/modules/avoindata-explore/avoindata_explore.module
+++ b/drupal/modules/avoindata-explore/avoindata_explore.module
@@ -33,6 +33,10 @@ function avoindata_explore_theme($existing, $type, $theme, $path) {
'variables' => ['language' => NULL,],
'template' => 'avoindata_support_block',
],
+ 'avoindata_external' => [
+ 'variables' => ['language' => NULL,],
+ 'template' => 'avoindata_external_block'
+ ]
];
}
diff --git a/drupal/modules/avoindata-explore/src/Plugin/Block/ExternalBlock.php b/drupal/modules/avoindata-explore/src/Plugin/Block/ExternalBlock.php
new file mode 100644
index 0000000000..8e917412a6
--- /dev/null
+++ b/drupal/modules/avoindata-explore/src/Plugin/Block/ExternalBlock.php
@@ -0,0 +1,28 @@
+ \Drupal::languageManager()->getCurrentLanguage()->getId(),
+ '#theme' => 'avoindata_external',
+ ];
+ }
+
+}
diff --git a/drupal/modules/avoindata-explore/templates/avoindata_external_block.html.twig b/drupal/modules/avoindata-explore/templates/avoindata_external_block.html.twig
new file mode 100644
index 0000000000..2ab1ee5ca2
--- /dev/null
+++ b/drupal/modules/avoindata-explore/templates/avoindata_external_block.html.twig
@@ -0,0 +1,51 @@
+{#
+/**
+ * @file
+ * Avoindata External Block
+ *
+ * @ingroup themeable
+ */
+#}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% trans %}
+ Suomi.fi-suojattudata
+ {% endtrans %}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/drupal/modules/avoindata-header/templates/avoindata_header.html.twig b/drupal/modules/avoindata-header/templates/avoindata_header.html.twig
index c00d2ad1e6..d6e471e58a 100644
--- a/drupal/modules/avoindata-header/templates/avoindata_header.html.twig
+++ b/drupal/modules/avoindata-header/templates/avoindata_header.html.twig
@@ -27,6 +27,12 @@
{{ drupal_region('navigation') }}
+
+
+ Suomi.fi-suojattudata
+
+
+
{# Navigation (collapsible) #}
{{ drupal_region('navigation_collapsible') }}
diff --git a/drupal/modules/avoindata-theme/config/install/block.block.avoindata_external.yml b/drupal/modules/avoindata-theme/config/install/block.block.avoindata_external.yml
new file mode 100644
index 0000000000..494ff42a69
--- /dev/null
+++ b/drupal/modules/avoindata-theme/config/install/block.block.avoindata_external.yml
@@ -0,0 +1,24 @@
+langcode: fi
+status: true
+dependencies:
+ module:
+ - system
+ theme:
+ - avoindata
+id: avoindata_external
+theme: avoindata
+region: content
+weight: 5
+provider: null
+plugin: avoindata_external
+settings:
+ id: avoindata_external
+ label: 'Avoindata External'
+ provider: avoindata_external
+ label_display: '0'
+visibility:
+ request_path:
+ id: request_path
+ pages: '
'
+ negate: false
+ context_mapping: { }
diff --git a/opendata-assets/src/images/logo-suomifi.svg b/opendata-assets/src/images/logo-suomifi.svg
new file mode 100644
index 0000000000..0766a40424
--- /dev/null
+++ b/opendata-assets/src/images/logo-suomifi.svg
@@ -0,0 +1,11 @@
+
diff --git a/opendata-assets/src/less/drupal/overrides.less b/opendata-assets/src/less/drupal/overrides.less
index 4fb0239ffc..6fdbda31a2 100644
--- a/opendata-assets/src/less/drupal/overrides.less
+++ b/opendata-assets/src/less/drupal/overrides.less
@@ -417,14 +417,20 @@ p:last-child,
}
}
-.block-avoindata-support {
+.block-avoindata-support,
+.block-avoindata-external {
margin-top: 30px;
}
.avoindata-explore,
.avoindata-support {
background-color: @suomi-highlightLight3;
+}
+
+.avoindata-explore,
+.avoindata-support,
+.avoindata-external {
h2 {
font-family: @font-family-sans-serif-semibold;
font-size: @font-size__module-h1;
@@ -480,6 +486,24 @@ p:last-child,
}
}
+.avoindata-external {
+ background-color: @suomi-highlightLight2;
+
+ .avoindata-block-card {
+ width: 470px;
+ }
+
+ .avoindata-block-card-icon {
+ max-width: 125px;
+ }
+
+ .avoindata-block-card-content {
+ width: max-content;
+ padding-right: 20px;
+ }
+}
+
+
.avoindata-block-card-icon {
height: 100%;
width: 35%;
@@ -528,6 +552,10 @@ p:last-child,
background-color: @suomi-depthLight3;
}
+.avoindata-external-service{
+ background-color: @suomi-depthSecondaryDark1;
+}
+
.avoindata-datasetlist {
padding: 10px 50px 25px;
background-color: #f7f7f8;
diff --git a/opendata-assets/src/less/navbars.less b/opendata-assets/src/less/navbars.less
index 4cd16db395..c23d8a9604 100644
--- a/opendata-assets/src/less/navbars.less
+++ b/opendata-assets/src/less/navbars.less
@@ -376,6 +376,45 @@ End of dropdown CSS
font-size: 18px;
}
+ .link-button {
+ color: @link-default-color;
+ border: 1px solid @link-default-color;
+ background: transparent;
+ padding: 0 20px;
+ margin: 10px;
+ border-radius: 2px;
+ box-shadow: none;
+ display: flex;
+ line-height: 40px;
+ font-weight: @font-weight-heavier;
+ letter-spacing: 0.4px;
+ font-size: @font-size-smaller-base;
+ text-decoration: none;
+ align-items: center;
+ gap: 8px;
+ float: right;
+
+ &.borderless {
+ border: 1px solid transparent;
+ }
+
+ &.external {
+ &::before {
+ font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", sans-serif;
+ font-size: 16px;
+ align-self: center;
+ content: "\f35d"
+ }
+ }
+
+ &:hover {
+ color: @link-default-color;
+ border: 1px solid @suomi-depthBase;
+ background: linear-gradient(to top, transparent 0%, rgb(255 255 255 / 8.5%) 100%);
+ text-decoration: none;
+ }
+ }
+
.navbar-collapse {
border: 0;
}