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

Author: Simon L. Lange

web/themes/custom/fds_faxe_theme/fds_faxe_theme.theme

@@ -304,7 +304,62 @@ function node2box(&$node, $showImages, $incPromoted) {
     return $refNode;
 }
 
+function tax2box(&$taxonomy, $showImages, $showRelated) {
 
+  $aliasManager = \Drupal::service('path_alias.manager');
+
+  $refNode = new stdClass();
+  $refNode->title = (string) $taxonomy->name->value;
+  $refNode->url = $aliasManager->getAliasByPath('/taxonomy/term/' . $taxonomy->id());
+  $refNode->image = null;
+  $refNode->children = array();
+
+  if ($showImages) {
+    if ($taxonomy->hasField('field_primaryicon')
+      && $taxonomy->field_primaryicon instanceof EntityReferenceFieldItemListInterface
+      && $taxonomy->field_primaryicon->referencedEntities()
+    ) {
+      $refNode->image = $taxonomy->field_primaryicon->view([
+        'label' => 'hidden',
+        'type' => 'image',
+        'settings' => [
+          'image_style' => 'thumbnail'
+        ],
+      ]);
+    }
+    elseif ($taxonomy->hasField('field_primaryimage')
+      && $taxonomy->field_primaryimage instanceof EntityReferenceFieldItemListInterface
+      && $taxonomy->field_primaryimage->referencedEntities()
+    ) {
+      $refNode->image = $taxonomy->field_primaryimage->view([
+        'label' => 'hidden',
+        'type' => 'image',
+        'settings' => [
+          'image_style' => 'thumbnail'
+        ],
+      ]);
+    }
+  }
+
+  if ($showRelated && $taxonomy->hasField('field_os2web_base_field_related')) {
+    $relatedes = $taxonomy->get('field_os2web_base_field_related')->referencedEntities();
+    if (count($relatedes) > 0) {
+      foreach ( $relatedes AS $related ) {
+        if ( $related->getType() == 'os2web_page') {
+          $relatedNode = \Drupal\node\Entity\Node::load($related->id());
+          $refNode->children[] = (object) array(
+            'title' => $relatedNode->getTitle(),
+            'url' => $relatedNode->toUrl()->toString()
+          );
+        }
+      }
+    }
+  }
+
+
+  return $refNode;
+
+}
 function fds_faxe_theme_preprocess_paragraph(&$variables) {
 
   $paragraph = $variables['paragraph'];
@@ -314,6 +369,7 @@ function fds_faxe_theme_preprocess_paragraph(&$variables) {
     $showImages = ($paragraph->field_os2web_menu_box_vm->value == 'image');
     $incPromoted = ($paragraph->field_os2web_menu_links_inc_pr_p->value == 1);
     $onlyTaxonomy = ($paragraph->field_only_taxonomy->value == 1);
+    $showTaxonomyRelated = ($paragraph->field_show_taxonomy_related->value == 1);
 
     $showReferences = null;
     if ($paragraph->hasField('field_show_references')) {
@@ -323,19 +379,35 @@ function fds_faxe_theme_preprocess_paragraph(&$variables) {
     $variables['menubox'] = [];
     $node = \Drupal::routeMatch()->getParameter('node');
 
+    // if current page is a node
     if ($node instanceof \Drupal\node\NodeInterface) {
 
+      if ($node->hasField('field_os2web_page_section')) {
+        $sections = $node->get('field_os2web_page_section')->referencedEntities();
+        if (count($sections) > 0) {
+          // there is only one but can be change in future ..
+          foreach ($sections as $section) {
+            $children = \Drupal::entityTypeManager()
+              ->getStorage('taxonomy_term')
+              ->loadTree('os2web_sektion', $section->tid->value, 1, true);
+
+            foreach( $children AS $child ) {
+              $variables['menubox'][] = tax2box($child, $showImages, $showTaxonomyRelated);
+            }
+          }
+        }
+      }
+
+      // Get all in section list
       $aliasManager = \Drupal::service('path_alias.manager');
       foreach ($paragraph->field_sektion->referencedEntities() as $taxonomy) {
-
         $refNode = new stdClass();
         $refNode->title = (string) $taxonomy->name->value;
         $refNode->url = $aliasManager->getAliasByPath('/taxonomy/term/' . $taxonomy->id());
         $refNode->image = null;
         $refNode->children = array();
 
         if ($showImages) {
-
           if ($taxonomy->hasField('field_primaryicon')
             && $taxonomy->field_primaryicon instanceof EntityReferenceFieldItemListInterface
             && $taxonomy->field_primaryicon->referencedEntities()
@@ -378,10 +450,11 @@ function fds_faxe_theme_preprocess_paragraph(&$variables) {
       }
 
       if (!$onlyTaxonomy && $node->hasField('field_link_til_andet_indhold')) {
-
         $refs = $node->get('field_link_til_andet_indhold');
         foreach ($refs->referencedEntities() as $idx => $ref) {
-          $variables['menubox'][] = node2box($ref, $showImages, $incPromoted);;
+          if ($ref->getType() == 'os2web_page') {
+            $variables['menubox'][] = node2box($ref, $showImages, $incPromoted);;
+          }
         }
       }
 
@@ -405,7 +478,6 @@ function fds_faxe_theme_preprocess_paragraph(&$variables) {
           }
         }
       }
-
     }
   }
 

web/themes/custom/fds_faxe_theme/templates/paragraph/menu-box-paragraph/paragraph--os2web-menu-box-paragraph.html.twig

@@ -10,7 +10,7 @@
 
         <div class="row">
             {% for menu_link in menubox %}
-            <div class="col-12 col-sm-6 col-md-4">
+            <div class="col-12 col-sm-6 col-md-3">
                 <div class="box box--section-link">
                     <div class="box__heading" >
                         {% set rendered_content = menu_link.image|render %}
@@ -33,35 +33,6 @@
             {% endfor %}
         </div>
 
-{#        <div class="row">#}
-{#            {% for menu_link in _context['#menu_links'] %}#}
-                <div class="col-12 col-sm-6 col-md-4">
-                    <div class="box box--section-link">
-                        <div class="box__heading" >
-                            {% set rendered_content = menu_link.content.field_os2web_icon|render %}
-                            {% if rendered_content %}
-                                {{ rendered_content }}
-                            {% endif %}
-                        </div>
-
-{#                        <div class="box__body">#}
-{#                            <a href="{{ menu_link.url }}">{{ menu_link.title }}</a>#}
-
-{#                            {% if menu_link['children']|length %}#}
-{#                                <ul>#}
-{#                                    {% for node_link in menu_link['children'] %}#}
-{#                                        <li><a href="{{ node_link.url }}">{{ node_link.title }}</a></li>#}
-{#                                    {% endfor %}#}
-{#                                </ul>#}
-{#                            {% endif %}#}
-{#                        </div>#}
-{#                    </div>#}
-{#                </div>#}
-{#            {% endfor %}#}
-{#        </div>#}
-
-
-
     {% endblock %}
 </div>
 {% endblock paragraph %}