From d601356b404602569adb14f710cc20947d2cd43c Mon Sep 17 00:00:00 2001
From: Ismael Ambrosi <ismaambrosi@gmail.com>
Date: Thu, 10 Jan 2013 13:42:55 -0200
Subject: [PATCH] Using the search for on every view of the frontend

---
 src/ServerGrove/KbBundle/Controller/ArticlesController.php    | 4 +---
 src/ServerGrove/KbBundle/Controller/DefaultController.php     | 1 -
 .../KbBundle/Resources/views/Articles/view.html.twig          | 4 ----
 .../KbBundle/Resources/views/Categories/index.html.twig       | 4 ----
 .../KbBundle/Resources/views/Default/search.html.twig         | 1 -
 src/ServerGrove/KbBundle/Resources/views/layout.html.twig     | 2 +-
 6 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/ServerGrove/KbBundle/Controller/ArticlesController.php b/src/ServerGrove/KbBundle/Controller/ArticlesController.php
index abf397d..a6ed46e 100644
--- a/src/ServerGrove/KbBundle/Controller/ArticlesController.php
+++ b/src/ServerGrove/KbBundle/Controller/ArticlesController.php
@@ -29,12 +29,11 @@ class ArticlesController extends Controller
      * @param Article  $article
      * @param Category $category
      * @param bool     $registerView
-     * @param bool     $searchForm
      * @param bool     $showComments
      *
      * @return array
      */
-    public function viewAction(Article $article, Category $category, $registerView = true, $searchForm = false, $showComments = true)
+    public function viewAction(Article $article, Category $category, $registerView = true, $showComments = true)
     {
         if ($registerView) {
             $this->registerView($article);
@@ -45,7 +44,6 @@ public function viewAction(Article $article, Category $category, $registerView =
         return array(
             'category'     => $category,
             'article'      => $article,
-            'searchForm'   => $searchForm,
             'showComments' => $showComments
         );
     }
diff --git a/src/ServerGrove/KbBundle/Controller/DefaultController.php b/src/ServerGrove/KbBundle/Controller/DefaultController.php
index 52b3a24..ffae82b 100644
--- a/src/ServerGrove/KbBundle/Controller/DefaultController.php
+++ b/src/ServerGrove/KbBundle/Controller/DefaultController.php
@@ -40,7 +40,6 @@ function (Article $article) use ($keyword) {
                     'article'      => $article,
                     'category'     => $article->getDefaultCategory(),
                     'registerView' => false,
-                    'searchForm'   => true,
                     'showComments' => false
                 )
             );
diff --git a/src/ServerGrove/KbBundle/Resources/views/Articles/view.html.twig b/src/ServerGrove/KbBundle/Resources/views/Articles/view.html.twig
index e3127c7..84a9981 100644
--- a/src/ServerGrove/KbBundle/Resources/views/Articles/view.html.twig
+++ b/src/ServerGrove/KbBundle/Resources/views/Articles/view.html.twig
@@ -9,10 +9,6 @@
 
 {% block content %}
     {% spaceless %}
-        {% if searchForm is defined and searchForm %}
-            {% render "ServerGroveKbBundle:Default:searchForm" %}
-        {% endif %}
-
         {% set showComments = showComments is defined ? showComments : true %}
         {% render "ServerGroveKbBundle:Articles:articleContent" with { 'article': article, 'category': category, 'showComments': showComments } %}
     {% endspaceless %}
diff --git a/src/ServerGrove/KbBundle/Resources/views/Categories/index.html.twig b/src/ServerGrove/KbBundle/Resources/views/Categories/index.html.twig
index 63d29ed..e948659 100644
--- a/src/ServerGrove/KbBundle/Resources/views/Categories/index.html.twig
+++ b/src/ServerGrove/KbBundle/Resources/views/Categories/index.html.twig
@@ -1,5 +1 @@
 {% extends "ServerGroveKbBundle:Default:layout.html.twig" %}
-
-{% block content %}
-{% render "ServerGroveKbBundle:Default:searchForm" %}
-{% endblock %}
diff --git a/src/ServerGrove/KbBundle/Resources/views/Default/search.html.twig b/src/ServerGrove/KbBundle/Resources/views/Default/search.html.twig
index 3f71a53..34dc736 100644
--- a/src/ServerGrove/KbBundle/Resources/views/Default/search.html.twig
+++ b/src/ServerGrove/KbBundle/Resources/views/Default/search.html.twig
@@ -1,6 +1,5 @@
 {% extends "ServerGroveKbBundle:Default:layout.html.twig" %}
 {% block content %}
-{% render "ServerGroveKbBundle:Default:searchForm" %}
 <h2>{% trans %}Articles{% endtrans %}</h2>
 <ul class="unstyled">
     {% for article in results %}
diff --git a/src/ServerGrove/KbBundle/Resources/views/layout.html.twig b/src/ServerGrove/KbBundle/Resources/views/layout.html.twig
index 687bba0..e61bee7 100644
--- a/src/ServerGrove/KbBundle/Resources/views/layout.html.twig
+++ b/src/ServerGrove/KbBundle/Resources/views/layout.html.twig
@@ -43,7 +43,6 @@
                     {% block postheader %}{% endblock postheader %}
                 </div>
                 {% include "ServerGroveKbBundle:Default:breadcrumb.html.twig" %}
-                {% render "ServerGroveKbBundle:Default:searchForm" %}
                 <div class="span2">
                     {% render "ServerGroveKbBundle:Categories:selector" with { 'topCategory': category is defined ?
                     category.getTopCategory() :
@@ -52,6 +51,7 @@
                     } %}
                 </div>
                 <div class="span10">
+                    {% render "ServerGroveKbBundle:Default:searchForm" %}
                     {% block content %}{% endblock content %}
                 </div>