do not show search box when no search adapter configured

diff --git a/data/templates/base.htm b/data/templates/base.htm
index 906453eda57f576714bd4006790d18d090d76920..8c6b4b0340079d8370d480760f71a7f353d38a78 100644 (file)
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -23,11 +23,13 @@
       <li>
        <a href="/list">List all</a>
       </li>
       <li>
        <a href="/list">List all</a>
       </li>

+      {% if db.adapter %}

       <li>
        <form class="navbar-search pull-left" action="/search" method="get">
         <input type="text" class="search-query" name="q" placeholder="Search" value="{{query}}"/>
        </form>
       </li>
       <li>
        <form class="navbar-search pull-left" action="/search" method="get">
         <input type="text" class="search-query" name="q" placeholder="Search" value="{{query}}"/>
        </form>
       </li>

+      {% endif %}

      </ul>
     </div>
    </div>
      </ul>
     </div>
    </div>

diff --git a/src/phorkie/Database.php b/src/phorkie/Database.php
index 786cfe0695ece7bd49b858cabd5ddb53e0e80609..1f214e8a6622ede5d64b08373951323e01e3138f 100644 (file)
--- a/src/phorkie/Database.php
+++ b/src/phorkie/Database.php
@@ -3,12 +3,14 @@ namespace phorkie;
 
 class Database
 {
 
 class Database
 {

+    public $adapter = null;

     public $prefix = '\phorkie\Database_Adapter_Null';
 
     public function __construct()
     {
         if ($GLOBALS['phorkie']['cfg']['elasticsearch'] != '') {
     public $prefix = '\phorkie\Database_Adapter_Null';
 
     public function __construct()
     {
         if ($GLOBALS['phorkie']['cfg']['elasticsearch'] != '') {

-            $this->prefix = '\phorkie\Database_Adapter_Elasticsearch';
+            $this->adapter = 'Elasticsearch';
+            $this->prefix  = '\phorkie\Database_Adapter_Elasticsearch';

         }
     }
     public function getSearch()
         }
     }
     public function getSearch()

diff --git a/www/www-header.php b/www/www-header.php
index c0b18d35b54b4de06057fa0d837ea14f8f5a7d73..72a2e670578149cc5ac97d6430bb5390550b4c38 100644 (file)
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -63,6 +63,7 @@ function render($tplname, $vars)
     $vars['css'] = $GLOBALS['phorkie']['cfg']['css'];
     $vars['title'] = $GLOBALS['phorkie']['cfg']['title'];
     $vars['topbar'] = $GLOBALS['phorkie']['cfg']['topbar'];
     $vars['css'] = $GLOBALS['phorkie']['cfg']['css'];
     $vars['title'] = $GLOBALS['phorkie']['cfg']['title'];
     $vars['topbar'] = $GLOBALS['phorkie']['cfg']['topbar'];

+    $vars['db'] = new Database();

 
     $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
     echo $template->render($vars);
 
     $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
     echo $template->render($vars);