From 05c79b58e7570a4ceeb51e1bb92b01d4232fdef8 Mon Sep 17 00:00:00 2001
From: craigh <craigh@mac.com>
Date: Wed, 23 Dec 2015 16:49:37 -0500
Subject: [PATCH] correct undefined var in template and fix 'admin only' menu
 type. fixes #2681.

---
 .../views/Include/admin_menu.html.twig        | 39 +++++++++++++++++++
 .../views/Include/main_menu.html.twig         | 29 +-------------
 .../Resources/views/admin.html.twig           |  2 +-
 .../Resources/views/home.html.twig            |  2 +-
 4 files changed, 42 insertions(+), 30 deletions(-)
 create mode 100644 src/themes/BootstrapTheme/Resources/views/Include/admin_menu.html.twig

diff --git a/src/themes/BootstrapTheme/Resources/views/Include/admin_menu.html.twig b/src/themes/BootstrapTheme/Resources/views/Include/admin_menu.html.twig
new file mode 100644
index 0000000000..646c221317
--- /dev/null
+++ b/src/themes/BootstrapTheme/Resources/views/Include/admin_menu.html.twig
@@ -0,0 +1,39 @@
+<div class="navbar navbar-inverse navbar-fixed-top">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="{{ pagevars.homepath }}">{{ getModVar('ZConfig', 'sitename') }}</a>
+        </div>
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li>{{ adminPanelMenu() }}</li>
+            <li><a href="{{ pagevars.homepath }}">{{ __('Home') }}</a></li>
+            {% if hasPermission('ZikulaSettingsModule::', '::', 'ACCESS_ADMIN') %}
+            <li><a href="{{ path('zikulasettingsmodule_admin_index') }}">{{ __('Settings') }}</a></li>
+            {% endif %}
+            {% if hasPermission('ZikulaExtensionsModule::', '::', 'ACCESS_ADMIN') %}
+            <li><a href="{{ path('zikulaextensionsmodule_admin_index') }}">{{ __('Extensions') }}</a></li>
+            {% endif %}
+            {% if hasPermission('ZikulaBlocksModule::', '::', 'ACCESS_EDIT') %}
+            <li><a href="{{ path('zikulablocksmodule_admin_view') }}">{{ __('Blocks') }}</a></li>
+            {% endif %}
+            {% if hasPermission('ZikulaUsersModule::', '::', 'ACCESS_MODERATE') %}
+            <li><a href="{{ path('zikulausersmodule_admin_index') }}">{{ __('Users') }}</a></li>
+            {% endif %}
+            {% if hasPermission('ZikulaGroupsModule::', '::', 'ACCESS_EDIT') %}
+            <li><a href="{{ path('zikulagroupsmodule_admin_index') }}">{{ __('Groups') }}</a></li>
+            {% endif %}
+            {% if hasPermission('ZikulaPermissionsModule::', '::', 'ACCESS_ADMIN') %}
+            <li><a href="{{ path('zikulapermissionsmodule_admin_index') }}">{{ __('Permission rules') }}</a></li>
+            {% endif %}
+            {% if hasPermission('ZikulaThemeModule::', '::', 'ACCESS_EDIT') %}
+            <li><a href="{{ path('zikulathememodule_admin_index') }}">{{ __('Themes') }}</a></li>
+            {% endif %}
+          </ul>
+        </div><!--/.navbar-collapse -->
+      </div>
+    </div>
\ No newline at end of file
diff --git a/src/themes/BootstrapTheme/Resources/views/Include/main_menu.html.twig b/src/themes/BootstrapTheme/Resources/views/Include/main_menu.html.twig
index 4c39336321..cf5aab57b0 100644
--- a/src/themes/BootstrapTheme/Resources/views/Include/main_menu.html.twig
+++ b/src/themes/BootstrapTheme/Resources/views/Include/main_menu.html.twig
@@ -9,37 +9,11 @@
           <a class="navbar-brand" href="{{ pagevars.homepath }}">{{ getModVar('ZConfig', 'sitename') }}</a>
         </div>
         <div class="navbar-collapse collapse">
-        {% if pagetype == 'admin' %}
           <ul class="nav navbar-nav">
             <li>{{ adminPanelMenu() }}</li>
-            <li><a href="{{ pagevars.homepath }}">{{ __('Home') }}</a></li>
-            {% if hasPermission('ZikulaSettingsModule::', '::', 'ACCESS_ADMIN') %}
-            <li><a href="{{ path('zikulasettingsmodule_admin_index') }}">{{ __('Settings') }}</a></li>
-            {% endif %}
-            {% if hasPermission('ZikulaExtensionsModule::', '::', 'ACCESS_ADMIN') %}
-            <li><a href="{{ path('zikulaextensionsmodule_admin_index') }}">{{ __('Extensions') }}</a></li>
-            {% endif %}
-            {% if hasPermission('ZikulaBlocksModule::', '::', 'ACCESS_EDIT') %}
-            <li><a href="{{ path('zikulablocksmodule_admin_view') }}">{{ __('Blocks') }}</a></li>
-            {% endif %}
-            {% if hasPermission('ZikulaUsersModule::', '::', 'ACCESS_MODERATE') %}
-            <li><a href="{{ path('zikulausersmodule_admin_index') }}">{{ __('Users') }}</a></li>
-            {% endif %}
-            {% if hasPermission('ZikulaGroupsModule::', '::', 'ACCESS_EDIT') %}
-            <li><a href="{{ path('zikulagroupsmodule_admin_index') }}">{{ __('Groups') }}</a></li>
-            {% endif %}
-            {% if hasPermission('ZikulaPermissionsModule::', '::', 'ACCESS_ADMIN') %}
-            <li><a href="{{ path('zikulapermissionsmodule_admin_index') }}">{{ __('Permission rules') }}</a></li>
-            {% endif %}
-            {% if hasPermission('ZikulaThemeModule::', '::', 'ACCESS_EDIT') %}
-            <li><a href="{{ path('zikulathememodule_admin_index') }}">{{ __('Themes') }}</a></li>
-            {% endif %}
-          </ul>
-        {% else %}
-          <ul class="nav navbar-nav">
             <li class="active"><a href="{{ pagevars.homepath }}" title="{{ __('Go to the sites home page') }}">{{ __('Home') }}</a></li>
             <li><a href="{{ path('zikulausersmodule_user_index') }}" title="{{ __('Go to your account panel') }}">{{ __('My Account') }}</a></li>
-            <li><a href="{{ path('zikulasearchmodule_user_main') }}" title="{{ __('Search this site') }}">{{ __('Site search') }}</a></li>
+            <li><a href="{{ path('zikulasearchmodule_user_form') }}" title="{{ __('Search this site') }}">{{ __('Site search') }}</a></li>
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
               <ul class="dropdown-menu">
@@ -62,7 +36,6 @@
             </div>
             <button type="submit" class="btn btn-success">Sign in</button>
           </form>
-        {% endif %}
         </div><!--/.navbar-collapse -->
       </div>
     </div>
\ No newline at end of file
diff --git a/src/themes/BootstrapTheme/Resources/views/admin.html.twig b/src/themes/BootstrapTheme/Resources/views/admin.html.twig
index 1fee9a482f..ef561ef473 100644
--- a/src/themes/BootstrapTheme/Resources/views/admin.html.twig
+++ b/src/themes/BootstrapTheme/Resources/views/admin.html.twig
@@ -1,4 +1,4 @@
 {% include 'ZikulaBootstrapTheme:Include:header.html.twig' %}
-{% include 'ZikulaBootstrapTheme:Include:main_menu.html.twig' %}
+{% include 'ZikulaBootstrapTheme:Include:admin_menu.html.twig' %}
 {% include "ZikulaBootstrapTheme:Body:" ~ themevars.admin ~ ".html.twig" %}
 {% include 'ZikulaBootstrapTheme:Include:footer.html.twig' %}
diff --git a/src/themes/BootstrapTheme/Resources/views/home.html.twig b/src/themes/BootstrapTheme/Resources/views/home.html.twig
index 57767c5421..d156b6a5c7 100644
--- a/src/themes/BootstrapTheme/Resources/views/home.html.twig
+++ b/src/themes/BootstrapTheme/Resources/views/home.html.twig
@@ -1,4 +1,4 @@
 {% include 'ZikulaBootstrapTheme:Include:header.html.twig' %}
 {% include 'ZikulaBootstrapTheme:Include:main_menu.html.twig' %}
 {% include "ZikulaBootstrapTheme:Body:" ~ themevars.home ~ ".html.twig" %}
-{% include 'ZikulaBootstrapTheme:Include:footer.html.twig' %}
+{% include 'ZikulaBootstrapTheme:Include:footer.html.twig' %}
\ No newline at end of file