git.cweiske.de / phinde.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dcdbb21)
make search bar visible on status page
authorChristian Weiske <cweiske@cweiske.de>
Thu, 24 Nov 2016 21:20:43 +0000 (22:20 +0100)
committerChristian Weiske <cweiske@cweiske.de>
Thu, 24 Nov 2016 21:20:43 +0000 (22:20 +0100)
data/templates/base.htm patch | blob | history
data/templates/search.htm patch | blob | history

diff --git a/data/templates/base.htm b/data/templates/base.htm
index de3a5fb814b6c1d38b5c9eb687d820f0fe5dcd25..f4bb38a1262875a167fcb08f2c5229542237b9bd 100644 (file)
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -13,6 +13,25 @@
   {% block meta %}{% endblock %}
  </head>
  <body>
   {% block meta %}{% endblock %}
  </head>
  <body>
+  <div class="navbar navbar-inverse navbar-static-top">
+   <div class="navbar-inner">
+    <div class="container">
+     <ul class="nav">
+      <li>
+       <a class="brand" href="{{baseUrl}}">{{apptitle}}</a>
+      </li>
+     </ul>
+     <form class="navbar-form pull-left" method="get" action="/">
+      <input type="text" name="q" placeholder="Search"
+             value="{{query}}" class="input-xxlarge"/>
+      {% if siteParam %}
+      <input type="hidden" name="site" value="{{site}}"/>
+      {% endif %}
+      <button type="submit" class="btn">Find</button>
+     </form>
+    </div>
+   </div>
+  </div>
 
   {% block maincontent %}{% endblock %}
 
 
   {% block maincontent %}{% endblock %}
 
diff --git a/data/templates/search.htm b/data/templates/search.htm
index f0481a9c73ab4f954b14c0f5863a8de418dab453..b1a4c2a59aff5ab37a657b35ecb9b3fa5ff07c2c 100644 (file)
--- a/data/templates/search.htm
+++ b/data/templates/search.htm
@@ -13,25 +13,6 @@
 {% endblock %}
 
 {% block maincontent %}
 {% endblock %}
 
 {% block maincontent %}
-  <div class="navbar navbar-inverse navbar-static-top">
-   <div class="navbar-inner">
-    <div class="container">
-     <ul class="nav">
-      <li>
-       <a class="brand" href="{{baseUrl}}">{{apptitle}}</a>
-      </li>
-     </ul>
-     <form class="navbar-form pull-left">
-      <input type="text" name="q" placeholder="Search"
-             value="{{query}}" class="input-xxlarge"/>
-      {% if siteParam %}
-      <input type="hidden" name="site" value="{{site}}"/>
-      {% endif %}
-      <button type="submit" class="btn">Find</button>
-     </form>
-    </div>
-   </div>
-  </div>
   <div class="container">
    <div class="row">
     {% if query %}
   <div class="container">
    <div class="row">
     {% if query %}
Website search in PHP and elasticsearch