From 9e9bf8eb9d5cb0b52ff1c659218cbc6edf226b08 Mon Sep 17 00:00:00 2001
From: "valentin.wacker" <valentin.wacker@f459cee4-fb09-11de-96c3-f9c5f16c3c76>
Date: Tue, 28 Nov 2017 09:08:29 +0000
Subject: [PATCH] =?UTF-8?q?#1343=20-=20au=C3=9Ferdem=20wurde=20nun=20das?=
 =?UTF-8?q?=20Menu=20"Reiseziele"=20entfernt,=20sollte=20eine=20Page=20kei?=
 =?UTF-8?q?ne=20Geschwister=20haben.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3360 f459cee4-fb09-11de-96c3-f9c5f16c3c76
---
 .../default/components/sidebar.html.twig      |  4 +-
 .../sidebar/navSidebarWidget.html.twig        | 58 ++++++++++---------
 .../sidebar/pageSliderSidebarWidget.html.twig |  2 +-
 .../sidebar/textSliderSidebarWidget.html.twig |  2 +-
 trunk/src/AppBundle/Entity/PageRepository.php | 13 ++++-
 5 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/trunk/app/Resources/views/default/components/sidebar.html.twig b/trunk/app/Resources/views/default/components/sidebar.html.twig
index 3137cfc7..26a612ac 100644
--- a/trunk/app/Resources/views/default/components/sidebar.html.twig
+++ b/trunk/app/Resources/views/default/components/sidebar.html.twig
@@ -1,5 +1,5 @@
 {# @var page \AppBundle\Entity\Page #}
-<div id="sidebar" class="col-md-3 col-sm-4 col-xs-12 hidden-xs">
+<div id="sidebar" class="col-md-3 col-sm-4 col-xs-12">
 
     {% if show_search_sidebar_widget ?? true %}
         {% if search_sidebar_widget_block is null %}
@@ -27,7 +27,7 @@
         {% endif %}
     {% endif %}
 
-    <div class="widget clearfix">
+    <div class="widget clearfix hidden-xs">
         <div class="widget-title">
             TOP bewertet
         </div><!-- end title -->
diff --git a/trunk/app/Resources/views/default/components/sidebar/navSidebarWidget.html.twig b/trunk/app/Resources/views/default/components/sidebar/navSidebarWidget.html.twig
index 48cc3480..616e3b28 100644
--- a/trunk/app/Resources/views/default/components/sidebar/navSidebarWidget.html.twig
+++ b/trunk/app/Resources/views/default/components/sidebar/navSidebarWidget.html.twig
@@ -1,36 +1,38 @@
-<div class="widget clearfix">
+{% if nav_pages %}
+    <div class="widget clearfix">
 
-    <div class="widget-title visible-xs">
-        <a class="collapse-widget" href="#side-navigation" data-toggle="collapse">Reiseziele</a>
-    </div><!-- end title -->
+        <div class="widget-title visible-xs">
+            <a class="collapse-widget" href="#side-navigation" data-toggle="collapse">Reiseziele</a>
+        </div><!-- end title -->
 
-    <nav id="side-navigation" class="navbar collapse in" role="navigation" itemscope
-         itemtype="https://schema.org/SiteNavigationElement"
-    >
-        <ul class="side-menu" role="menu">
+        <nav id="side-navigation" class="navbar collapse in" role="navigation" itemscope
+             itemtype="https://schema.org/SiteNavigationElement"
+        >
+            <ul class="side-menu" role="menu">
 
-            {% for nav_page in nav_pages if nav_page.status == 1 and nav_page.showInNavi == 1 %}
+                {% for nav_page in nav_pages %}
 
-                <li {% if nav_page == nav_open_node or nav_page == page %}class ="active"{% endif %} itemprop="name">
-                    <a itemprop="url" href="{{ nav_page.urlPath }}" title="{{ nav_page.title }}">
-                        {{ nav_page.title }}
-                    </a>
-                </li>
+                    <li {% if nav_page == nav_open_node or nav_page == page %}class ="active"{% endif %} itemprop="name">
+                        <a itemprop="url" href="{{ nav_page.urlPath }}" title="{{ nav_page.title }}">
+                            {{ nav_page.title }}
+                        </a>
+                    </li>
 
-                {% if nav_page == nav_open_node %}
-                    {% for nav_child_page in nav_child_pages if nav_child_page.status == 1 and nav_child_page.showInNavi == 1 %}
-                        <li class="sub-menu-item{% if nav_child_page == page %} active{% endif %}" itemprop="name">
-                            <i class="fa fa-star"></i>
-                            <a itemprop="url" href="{{ nav_child_page.urlPath }}" title="{{ nav_child_page.title }}">
-                                {{ nav_child_page.title }}
-                            </a>
-                        </li>
-                    {% endfor %}
-                {% endif %}
+                    {% if nav_page == nav_open_node %}
+                        {% for nav_child_page in nav_child_pages if nav_child_page.status == 1 and nav_child_page.showInNavi == 1 %}
+                            <li class="sub-menu-item{% if nav_child_page == page %} active{% endif %}" itemprop="name">
+                                <i class="fa fa-star"></i>
+                                <a itemprop="url" href="{{ nav_child_page.urlPath }}" title="{{ nav_child_page.title }}">
+                                    {{ nav_child_page.title }}
+                                </a>
+                            </li>
+                        {% endfor %}
+                    {% endif %}
 
-            {% endfor %}
+                {% endfor %}
 
-        </ul>
-    </nav>
+            </ul>
+        </nav>
 
-</div>
\ No newline at end of file
+    </div>
+{% endif %}
\ No newline at end of file
diff --git a/trunk/app/Resources/views/default/components/sidebar/pageSliderSidebarWidget.html.twig b/trunk/app/Resources/views/default/components/sidebar/pageSliderSidebarWidget.html.twig
index e26cd33b..1b9b0c17 100644
--- a/trunk/app/Resources/views/default/components/sidebar/pageSliderSidebarWidget.html.twig
+++ b/trunk/app/Resources/views/default/components/sidebar/pageSliderSidebarWidget.html.twig
@@ -1,5 +1,5 @@
 {% if pages is not empty %}
-    <div class="widget clearfix">
+    <div class="widget clearfix hidden-xs">
 
         <div class="widget-title">
             {{ slider_title }}
diff --git a/trunk/app/Resources/views/default/components/sidebar/textSliderSidebarWidget.html.twig b/trunk/app/Resources/views/default/components/sidebar/textSliderSidebarWidget.html.twig
index 0a8a8d10..578508f5 100644
--- a/trunk/app/Resources/views/default/components/sidebar/textSliderSidebarWidget.html.twig
+++ b/trunk/app/Resources/views/default/components/sidebar/textSliderSidebarWidget.html.twig
@@ -1,5 +1,5 @@
 {% if slides is not empty %}
-    <div class="widget clearfix">
+    <div class="widget clearfix hidden-xs">
 
         <div class="widget-title">
             {{ slider_title }}
diff --git a/trunk/src/AppBundle/Entity/PageRepository.php b/trunk/src/AppBundle/Entity/PageRepository.php
index c29b5088..56ff9b7d 100644
--- a/trunk/src/AppBundle/Entity/PageRepository.php
+++ b/trunk/src/AppBundle/Entity/PageRepository.php
@@ -143,6 +143,17 @@ class PageRepository extends NestedTreeRepository
         {
             $sibling->setParent($parent);
         }
-        return $siblings;
+
+        // Da diese Methode nur für die Navigation verwendet wird, kann man hier vorfiltern
+        $filteredSiblings = [];
+        foreach ($siblings as &$sibling)
+        {
+            if($sibling->getStatus() == 1 && $sibling->getShowInNavi() == 1)
+            {
+                $filteredSiblings[] = $sibling;
+            }
+        }
+
+        return $filteredSiblings;
     }
 }