4 files changed, 17 insertions, 12 deletions
diff --git a/cgi/templates/base_top.html b/cgi/templates/base_top.html
index a1f0431..d6a30e8 100644
--- a/cgi/templates/base_top.html
+++ b/cgi/templates/base_top.html
@@ -36,12 +36,7 @@
   <script type="text/javascript" src="#{static_url}js/autorefresh.js"></script>
 </head>
 <body#{' class="res"' if replythread else ''} data-brd="#{board}">
-  <div id="main_nav"><span>[<a href="/" target="_top">Bienvenido a Internet</a>] [<?py include('templates/navbar.html') ?>]</span>
-  <?py if not force_css: ?>
-  <span>[Estilo: <select id="styles">
-  <?py for title in styles: ?><option value="#{title}">#{title}</option><?py #endfor ?>
-  </select>]</span>
-<?py #endif ?></div>
+  <div id="main_nav"><span>[<a href="/" target="_top">Bienvenido a Internet</a>] [<?py include('templates/navbar.html') ?>]</span></div>
   <div class="logo">
   <?py if board: ?>
     #{board_long}
@@ -49,4 +44,4 @@
     <img src="/static/img/default.png" width="500" height="81" />
   <?py #endif ?>
   </div>
-  <hr width="90%" size="1" />
+  <hr width="90%" size="1" />
+\ No newline at end of file
diff --git a/cgi/templates/board.html b/cgi/templates/board.html
index ffd0ef8..74ed3ee 100644
--- a/cgi/templates/board.html
+++ b/cgi/templates/board.html
@@ -100,7 +100,7 @@
     <?py #endif ?>
     <tr class="pass">
     <td class="postblock">Clave</td>
-    <td><input type="password" name="password" size="8" accesskey="p" /> (para eliminar el post)</td>
+    <td><input type="password" name="password" size="8" accesskey="p" /> (para eliminar el post)</form></td>
     </tr>
     <tr>
     <td colspan="2" id="rules">
@@ -114,11 +114,16 @@
         <li>Los hilos son automáticamente eliminados a los <b>#{maxage}</b> días de edad.</li>
       <?py #endif ?>
         <li>¿Eres nuevo? <a href="/guia.html">Leer antes de postear</a> · <a href="/faq.html">Preguntas frecuentes</a> · <a href="/bai/">Contacto</a></li>
+        <li id="search"><form method="get" action="/tools/search.py" style="display: inline-block;"><input type="hidden" name="board" value="${board}"><label for="searchin">Buscar: </label><input type="text" name="q" id="searchin" value="" size="10"> <input type="submit" value="Ir"></form>
+        <?py if not force_css: ?>
+          · <span>Estilo: <select id="styles">
+            <?py for title in styles: ?><option value="#{title}">#{title}</option><?py #endfor ?>
+          </select></span>
+        <?py #endif ?></li>
       </ul>
     </td>
     </tr>
   </table>
-</form>
 </div>
 <hr />
 <?py if postarea_extra: ?>
diff --git a/cgi/templates/board.jp.html b/cgi/templates/board.jp.html
index d0c2dd0..044d9f6 100644
--- a/cgi/templates/board.jp.html
+++ b/cgi/templates/board.jp.html
@@ -100,7 +100,7 @@
     <?py #endif ?>
     <tr class="pass">
     <td class="postblock">削除キー</td>
-    <td><input type="password" name="password" size="8" accesskey="p" /> (削除用)</td>
+    <td><input type="password" name="password" size="8" accesskey="p" /> (削除用)</form></td>
     </tr>
     <tr>
     <td colspan="2" id="rules">
@@ -114,11 +114,16 @@
         <li>スレは<b>#{maxage}</b>日間経つと自動的に消されられます.</li>
       <?py #endif ?>
         <li><a href="/guia.html">使い方</a> · <a href="/faq.html">よくある質問</a> · <a href="/bai/">管理人への連絡</a></li>
+        <li id="search"><form method="get" action="/tools/search.py" style="display: inline-block;"><input type="hidden" name="board" value="${board}"><label for="searchin">検索：</label><input type="text" name="q" id="searchin" value="" size="10"> <input type="submit" value="GO"></form>
+        <?py if not force_css: ?>
+          · <span>スタイル：<select id="styles">
+            <?py for title in styles: ?><option value="#{title}">#{title}</option><?py #endfor ?>
+          </select></span>
+        <?py #endif ?></li>
       </ul>
     </td>
     </tr>
   </table>
-</form>
 </div>
 <hr />
 <?py if postarea_extra: ?>
diff --git a/cgi/templates/navbar.html b/cgi/templates/navbar.html
index ef0096e..077075d 100644
--- a/cgi/templates/navbar.html
+++ b/cgi/templates/navbar.html
@@ -14,4 +14,4 @@
 <a href="/o/">Oekaki</a>
 <a href="/0/">Cero</a>
 |
-<a href="/bai/">Meta</a>
+<a href="/bai/">Meta</a>
+\ No newline at end of file