Merge branch 'develop' of github.com:OS2web/os2web8 into develop

Author: Simon L. Lange

.docksal/docksal.yml

@@ -14,6 +14,16 @@ services:
       - PMA_PASSWORD=${MYSQL_ROOT_PASSWORD:-root}
     labels:
       - io.docksal.virtual-host=pma.${VIRTUAL_HOST}
+  solr:
+    image: docksal/solr:7.5-edge
+    volumes:
+      - ${PROJECT_ROOT}/.docksal/etc/solr/conf:/var/lib/solr/conf:ro
+    extends:
+      file: ${HOME}/.docksal/stacks/services.yml
+      service: solr
+    labels:
+      - 'io.docksal.virtual-host=solr.${VIRTUAL_HOST}'
+
 
 #  blackfire:
 #    extends:

web/sites/default/dev.settings.php

@@ -161,3 +161,5 @@
   'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
   'driver' => 'mysql',
 );
+
+$settings['file_private_path'] = 'private';

web/themes/custom/fds_faxe_theme/dist/stylesheets/stylesheet.css

@@ -8,11 +8,26 @@ use Drupal\node\Entity\Node;
 use Drupal\taxonomy\Entity\Term;
 
 
+/**
+ * Implements hook_theme_suggestions_page().
+ */
+function fds_faxe_theme_theme_suggestions_block_alter(array &$suggestions, array $variables) {
+  if ($variables['elements']['#id'] == 'lastupdated') {
+    if (file_exists(__DIR__ . '/templates/block/block--lastupdated.html.twig')) {
+      $suggestions = ["block__lastupdated"];
+    }
+  }
+}
+
+
+
+
 /**
  * Implements hook_preprocess_block().
  */
 function fds_faxe_theme_preprocess_block(&$variables) {
-  if ($variables['elements']['#id']  == 'fds_faxe_theme_indholdfield') {
+
+  if ($variables['elements']['#id'] == 'fds_faxe_theme_indholdfield') {
     $node = $variables['content']['field']['#object'];
     $ext_links =  $node->get('field_ext_links')->getValue();
     foreach( $ext_links as $ext_link) {
@@ -21,6 +36,14 @@ function fds_faxe_theme_preprocess_block(&$variables) {
       $variables['content']['field'][] = $link->toRenderable();
     }
   }
+
+  if ($variables['elements']['#id'] == 'lastupdated') {
+    $node = \Drupal::routeMatch()->getParameter('node');
+    if ($node && !empty($node->getType()) && $node->getType() == 'os2web_page') {
+      $variables['lastupdated'] = strftime("%d.%m.%Y", $node->getChangedTime());
+    }
+  }
+
 }
 
 /**
@@ -31,6 +54,7 @@ function fds_faxe_theme_preprocess_page(array &$variables) {
   $variables['theme_settings']['footer']['footer_show_latest_content'] = theme_get_setting('footer_show_latest_content');
   $variables['theme_settings']['branding']['branding_toggle'] = theme_get_setting('branding_toggle');
   $variables['theme_settings']['branding']['branding_text'] = theme_get_setting('branding_text');
+  $variables['lastupdated'] = time();
 }
 
 /**
@@ -206,6 +230,12 @@ function fds_faxe_theme_preprocess_node(array &$variables) {
       $variables['content']['field_os2web_event_end_date'][0]['#text'] = 'til ' . $newEndDate;
     }
   }
+
+//  if ($node->getType() == 'os2web_page') {
+    $variables['#lastupdated'] = time();
+//  }
+
+
 }
 
 /**

web/themes/custom/fds_faxe_theme/fds_faxe_theme.theme

@@ -0,0 +1,7 @@
+
+.block-last-updated {
+  background-color: $background-normal;
+  color: rgb(65, 65, 65);
+  padding: 12px;
+  text-align: center;
+}

web/themes/custom/fds_faxe_theme/src/styles/theme/components/_last_updated.scss

@@ -33,3 +33,4 @@
 @import "pace-loading-bar";
 @import "field--name-field-os2web-banner-links";
 @import "entity-default--os2web-news-block";
+@import "last_updated";

web/themes/custom/fds_faxe_theme/src/styles/theme/components/_loader.scss

@@ -0,0 +1,14 @@
+{%
+    set classes = [
+    'block',
+    'block-' ~ configuration.provider|clean_class,
+    'block-' ~ plugin_id|clean_class,
+    'block-last-updated'
+]
+%}
+{% if lastupdated %}
+<div{{ attributes.addClass(classes) }}>
+    {{ "Last updated"|trans }}<br>
+{{ lastupdated }}
+</div>
+{% endif %}