Config para el usuario

13 files changed, 52 insertions, 76 deletions

diff --git a/cgi/post.py b/cgi/post.py
index a34bb39..e8c6444 100644
--- a/cgi/post.py
+++ b/cgi/post.py
@@ -256,7 +256,7 @@ def regenerateFrontPages():
     posts_to_fetch = 0
     for t in allthreads[:threads_to_fetch]:
       posts_to_fetch += int(t["length"])
-    more_threads = allthreads[threads_to_fetch:50]
+    more_threads = allthreads[threads_to_fetch:40]
     
     # get the needed posts for the front page and order them
     posts_query = "SELECT * FROM `posts` WHERE `boardid` = %s ORDER BY `bumped` DESC, CASE parentid WHEN 0 THEN id ELSE parentid END ASC, `id` ASC LIMIT %s"
diff --git a/cgi/templates/base_top.html b/cgi/templates/base_top.html
index dcf3d65..3e86e44 100644
--- a/cgi/templates/base_top.html
+++ b/cgi/templates/base_top.html
@@ -36,7 +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></div>
+  <div id="main_nav"><span>[<a href="/home.html">Bienvenido a Internet</a>] [<?py include('templates/navbar.html') ?>]</span></div>
   <div id="logo">
   <?py if board: ?>
     #{board_long}
diff --git a/cgi/templates/board.html b/cgi/templates/board.html
index ee0ae59..d0e001a 100644
--- a/cgi/templates/board.html
+++ b/cgi/templates/board.html
@@ -17,7 +17,7 @@
 <div class="postarea">
 <?py if allow_oekaki and not oek_finish: ?>
   <center>
-    <form class="oekform" action="#{cgi_url}oekaki/paint" method="post" enctype="multipart/form-data">
+    <form id="oekform" action="#{cgi_url}oekaki/paint" method="post" enctype="multipart/form-data">
     <input type="hidden" name="board" value="#{board}" />
     <?py if replythread: ?>
       <input type="hidden" name="parent" value="#{replythread}" />
@@ -52,7 +52,7 @@
     <input type="hidden" name="default_subject" value="#{default_subject}" />
   <?py #endif ?>
   <div style="display:none">No tocar: <input type="text" name="name" size="25" /> <input type="text" name="email" size="25" /></div>
-  <table class="postform">
+  <table id="postform-t">
     <?py if not disable_name: ?>
     <tr>
       <td class="postblock">Nombre</td>
@@ -115,14 +115,8 @@
         <?py if maxage: ?>
           <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>
+          <li>¿Eres nuevo? <a href="/guia.html" target="_blank">Leer antes de postear</a> · <a href="/faq.html" target="_blank">Preguntas frecuentes</a> · <a href="/bai/" target="_blank">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></li>
         </ul>
       </td>
     </tr>
diff --git a/cgi/templates/board.jp.html b/cgi/templates/board.jp.html
index db24cc1..372141d 100644
--- a/cgi/templates/board.jp.html
+++ b/cgi/templates/board.jp.html
@@ -17,7 +17,7 @@
 <div class="postarea">
 <?py if allow_oekaki and not oek_finish: ?>
   <center>
-    <form class="oekform" action="#{cgi_url}oekaki/paint" method="post" enctype="multipart/form-data">
+    <form id="oekform" action="#{cgi_url}oekaki/paint" method="post" enctype="multipart/form-data">
     <input type="hidden" name="board" value="#{board}" />
     <?py if replythread: ?>
       <input type="hidden" name="parent" value="#{replythread}" />
@@ -54,17 +54,17 @@
     <input type="hidden" name="default_subject" value="#{default_subject}" />
   <?py #endif ?>
   <div style="display:none;">Trampa: <input type="text" name="name" size="25" /> <input type="text" name="email" size="25" /></div>
-  <table class="postform">
+  <table id="postform-t">
     <?py if not disable_name: ?>
     <tr>
       <td class="postblock">おなまえ</td>
-      <td><input type="text" name="fielda" size="25" accesskey="n" /></td>
+      <td><input type="text" name="fielda" id="f-name" size="25" accesskey="n" /></td>
     </tr>
     <?py #endif ?>
     <tr>
       <td class="postblock">E-mail</td>
       <td>
-        <input type="text" name="fieldb" size="25" accesskey="e" />
+        <input type="text" name="fieldb" id="f-mail" size="25" accesskey="e" />
         <?py if disable_subject: ?>
           <input type="submit" value="#{'返信' if replythread else 'スレッドを立てる'}" accesskey="z" />
         <?py #endif ?>
@@ -74,14 +74,14 @@
     <tr>
       <td class="postblock">題　　名</td>
       <td>
-        <input type="text" name="subject" size="35" maxlength="100" accesskey="s" />
+        <input type="text" name="subject" id="f-sub" size="35" maxlength="100" accesskey="s" />
         <input type="submit" value="#{'返信' if replythread else 'スレッドを立てる'}" accesskey="z" />
       </td>
     </tr>
     <?py #endif ?>
     <tr>
       <td class="postblock">コメント</td>
-      <td><textarea name="message" cols="50" rows="6" accesskey="m"></textarea></td>
+      <td><textarea name="message" id="f-msg" cols="50" rows="6" accesskey="m"></textarea></td>
     </tr>
     <?py if not oek_finish: ?>
       <?py if (replythread and allow_image_replies) or (not replythread and allow_images): ?>
@@ -104,7 +104,7 @@
     <?py #endif ?>
     <tr class="pass">
       <td class="postblock">削除キー</td>
-      <td><input type="password" name="password" size="8" accesskey="p" /> (削除用)</form></td>
+      <td><input type="password" name="password" id="f-pass" size="8" accesskey="p" /> (削除用)</form></td>
     </tr>
     <tr>
       <td colspan="2" id="rules">
@@ -117,14 +117,8 @@
         <?py if maxage: ?>
           <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>
+          <li><a href="/guia.html" target="_blank">使い方</a> · <a href="/faq.html" target="_blank">よくある質問</a> · <a href="/bai/" target="_blank">管理人への連絡</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></li>
         </ul>
       </td>
     </tr>
diff --git a/cgi/templates/catalog.html b/cgi/templates/catalog.html
index 204f43a..5e71a0c 100644
--- a/cgi/templates/catalog.html
+++ b/cgi/templates/catalog.html
@@ -8,7 +8,6 @@
   <a href="?sort=3">#{"<b>Más</b>" if i_sort == "3" else "Más"}</a>
   <a href="?sort=4">#{"<b>Menos</b>" if i_sort == "4" else "Menos"}</a>&#93;
   &#91;Tamaño: <a id="cat-size" href="#">Pequeño</a>&#93;
-  &#91;Filtrar: <input id="cat-srch" type="text">
   <span id="hid-label" style="display:none;">[Hilos ocultos: <a id="hid-num" href="#"></a>]</span>
 </div>
 <div class="extramode">Modo Catálogo</div>
@@ -18,12 +17,14 @@
   <div id="t#{thread['id']}" class="thread">
     <?py if thread['thumb'] != '': ?>
       <a href="#{boards_url}#{board}/res/#{thread['id']}.html" rel="nofollow"><img src="#{images_url}#{board}/cat/#{thread['thumb']}" alt="#{thread['id']}" /></a>
+      <br />
     <?py #endif ?>
     <?py if thread['thumb'] != '': ?>
-      <p><strong class="subj">${thread['subject']} <span>(${thread['length']})</span></strong><br />${thread['message']}</p>
+      <div class="subj">${thread['subject']} <span>(${thread['length']})</span></div>
     <?py else: ?>
-      <p><a href="#{boards_url}#{board}/res/#{thread['id']}.html" rel="nofollow"><strong class="subj">${thread['subject']} <span>(${thread['length']})</span></strong></a><br />${thread['message']}</p>
+      <a href="#{boards_url}#{board}/res/#{thread['id']}.html" rel="nofollow"><div class="subj">${thread['subject']} <span>(${thread['length']})</span></div></a>
     <?py #endif ?>
+    ${thread['message']}
     <?py i += 1 ?>
   </div>
   <?py #endfor ?>
diff --git a/cgi/templates/navbar.html b/cgi/templates/navbar.html
index 1a42334..7fb1107 100644
--- a/cgi/templates/navbar.html
+++ b/cgi/templates/navbar.html
@@ -1,17 +1,17 @@
-<a href="/noticias/">Actualidad</a>
-<a href="/tech/">Tecnolog&iacute;a</a>
-<a href="/juegos/">Juegos</a>
-<a href="/letras/">Humanidades</a>
-<a href="/drogas/">Psicotrópicos</a>
-<a href="/zonavip/">Club VIP</a>
-<a href="/consejos/">Consejos</a>
-<a href="/world/">World</a>
+<a id="b-noticias" href="/noticias/">Actualidad</a>
+<a id="b-tech" href="/tech/">Tecnolog&iacute;a</a>
+<a id="b-juegos" href="/juegos/">Juegos</a>
+<a id="b-letras" href="/letras/">Humanidades</a>
+<a id="b-drogas" href="/drogas/">Psicotrópicos</a>
+<a id="b-zonavip" href="/zonavip/">Club VIP</a>
+<a id="b-consejos" href="/consejos/">Consejos</a>
+<a id="b-world" href="/world/">World</a>
 |
-<a href="/dqn/">Club DQN</a>
-<a href="/2d/">二次元画像</a>
-<a href="/z/">BaIAZ</a>
-<a href="/a/">Artes</a>
-<a href="/o/">Oekaki</a>
-<a href="/0/">Cero</a>
+<a id="b-dqn" href="/dqn/">Club DQN</a>
+<a id="b-2d" href="/2d/">二次元画像</a>
+<a id="b-z" href="/z/">BaIAZ</a>
+<a id="b-a" href="/a/">Artes</a>
+<a id="b-o" href="/o/">Oekaki</a>
+<a id="b-0" href="/0/">Cero</a>
 |
-<a href="/bai/">Meta</a>
+<a id="b-bai" href="/bai/">Meta</a>
diff --git a/cgi/templates/txt_archive.html b/cgi/templates/txt_archive.html
index cf7077b..2526f44 100644
--- a/cgi/templates/txt_archive.html
+++ b/cgi/templates/txt_archive.html
@@ -27,7 +27,7 @@
 <?py if threads: ?>
 <?py for thread in threads: ?>
 <div id="thread_nav">
-  <a href="/" name="top" target="_top">Bienvenido a Internet</a>
+  <a href="/home.html" name="top">Bienvenido a Internet</a>
   <a href="#{boards_url}#{board}/">■Volver al BBS■</a>
   <a href="#{boards_url}#{board}/read/#{thread['timestamp']}/">Hilo completo</a>
   <?py if thread['length'] > 100: ?>
diff --git a/cgi/templates/txt_base_top.html b/cgi/templates/txt_base_top.html
index 41ce920..285fc4d 100644
--- a/cgi/templates/txt_base_top.html
+++ b/cgi/templates/txt_base_top.html
@@ -28,9 +28,8 @@
   <link rel="stylesheet" type="text/css" href="#{force_css}" />
 <?py #endif ?>
   <script type="text/javascript" src="#{static_url}js/weabotxt.js"></script>
-  <script type="text/javascript" src="#{static_url}js/aquiencitas.js"></script>
-  <script type="text/javascript" src="#{static_url}js/shobon.js"></script>
+  <script type="text/javascript" src="#{static_url}js/aquiencitas.js" defer></script>
 <?py if replythread: ?>
-  <script type="text/javascript" src="#{static_url}js/autorefresh.js"></script>
+  <script type="text/javascript" src="#{static_url}js/autorefresh.js" defer></script>
 <?py #endif ?>
 </head>
diff --git a/cgi/templates/txt_board.en.html b/cgi/templates/txt_board.en.html
index 55d78ab..16fe616 100644
--- a/cgi/templates/txt_board.en.html
+++ b/cgi/templates/txt_board.en.html
@@ -1,6 +1,6 @@
 <?py include('templates/txt_base_top.html') ?>
 <body class="mainpage" data-brd="#{board}">
-<div id="main_nav"><a href="/" target="_top">Bienvenido a Internet</a> | <?py include('templates/navbar.html') ?></div>
+<div id="main_nav"><a href="/home.html">Bienvenido a Internet</a> | <?py include('templates/navbar.html') ?></div>
 <?py if banner_url: ?>
   <img id="banner" src="#{banner_url}" width="#{banner_width}" height="#{banner_height}" />
 <?py #endif ?>
@@ -13,11 +13,7 @@
     <?py #endif ?>
     <form method="get" action="/tools/search.py" id="search"><input type="text" name="q" value="" /><input type="hidden" name="board" value="#{board}" /><input type="submit" value="Search active posts" /><input type="submit" value="Search archives" formaction="/tools/search_kako.py" /></form>
   </div>
-  <div class="innerbox links"><b>¿Eres nuevo?</b> <a href="/guia.html"><b>C&oacute;mo postear</b></a> | <a href="/faq.html"><b>Preguntas frecuentes</b></a> | <a href="/bai/"><b>Contacto</b></a>
-  <?py if not force_css: ?>| <b>Theme: </b><select id="styles">
-  <?py for title in txt_styles: ?><option value="#{title}">#{title}</option><?py #endfor ?></select>
-  <?py #endif ?>
-</div>
+  <div class="innerbox" id="bailinks"><b>¿Eres nuevo?</b> <a href="/guia.html" target="_blank"><b>C&oacute;mo postear</b></a> | <a href="/faq.html" target="_blank"><b>Preguntas frecuentes</b></a> | <a href="/bai/" target="_blank"><b>Contacto</b></a></div>
 </div>
 <?py if postarea_extra: ?>
 <div class="outerbox"><div class="innerbox">#{postarea_extra}</div></div>
@@ -29,11 +25,11 @@
   <div id="threadlist">
   <?py iter = 1 ?>
   <?py for thread in threads: ?>
-    <a href="##{iter}">#{iter}: <b>#{thread["subject"]}</b> (#{thread['length']})</a><br />
+    <a href="##{iter}">#{iter}: <b>#{thread["subject"]}</b> (#{thread['length']})</a>
     <?py iter += 1 ?>
   <?py #endfor ?>
   <?py for thread in more_threads: ?>
-    <a href="#{boards_url}#{board}/read/#{thread['timestamp']}/#{'l50' if thread['length'] > 50 else ''}">#{iter}: <b>#{thread["subject"]}</b> (#{thread["length"]})</a><br />
+    <a href="#{boards_url}#{board}/read/#{thread['timestamp']}/#{'l50' if thread['length'] > 50 else ''}">#{iter}: <b>#{thread["subject"]}</b> (#{thread["length"]})</a>
     <?py iter += 1 ?>
   <?py #endfor ?>
   </div>
diff --git a/cgi/templates/txt_board.html b/cgi/templates/txt_board.html
index 0d386f1..8d01490 100644
--- a/cgi/templates/txt_board.html
+++ b/cgi/templates/txt_board.html
@@ -1,6 +1,6 @@
 <?py include('templates/txt_base_top.html') ?>
 <body class="mainpage" data-brd="#{board}">
-<div id="main_nav"><a href="/" target="_top">Bienvenido a Internet</a> | <?py include('templates/navbar.html') ?></div>
+<div id="main_nav"><a href="/home.html">Bienvenido a Internet</a> | <?py include('templates/navbar.html') ?></div>
 <?py if banner_url: ?>
   <img id="banner" src="#{banner_url}" width="#{banner_width}" height="#{banner_height}" />
 <?py #endif ?>
@@ -13,11 +13,7 @@
     <?py #endif ?>
     <form method="get" action="/tools/search.py" id="search"><input type="text" name="q" value="" /><input type="hidden" name="board" value="#{board}" /><input type="submit" value="Buscar en mensajes activos" /><input type="submit" value="Buscar en archivo" formaction="/tools/search_kako.py" /></form>
   </div>
-  <div class="innerbox links"><b>¿Eres nuevo?</b> <a href="/guia.html"><b>C&oacute;mo postear</b></a> | <a href="/faq.html"><b>Preguntas frecuentes</b></a> | <a href="/bai/"><b>Contacto</b></a>
-  <?py if not force_css: ?>| <b>Estilo: </b><select id="styles">
-  <?py for title in txt_styles: ?><option value="#{title}">#{title}</option><?py #endfor ?></select>
-  <?py #endif ?>
-</div>
+  <div class="innerbox" id="bailinks"><b>¿Eres nuevo?</b> <a href="/guia.html" target="_blank"><b>C&oacute;mo postear</b></a> | <a href="/faq.html" target="_blank"><b>Preguntas frecuentes</b></a> | <a href="/bai/" target="_blank"><b>Contacto</b></a></div>
 </div>
 <?py if postarea_extra: ?>
 <div class="outerbox"><div class="innerbox">#{postarea_extra}</div></div>
@@ -33,11 +29,11 @@
   <div id="threadlist">
   <?py iter = 1 ?>
   <?py for thread in threads: ?>
-    <a href="##{iter}">#{iter}: <b>#{thread["subject"]}</b> (#{thread['length']})</a><br />
+    <a href="##{iter}">#{iter}: <b>#{thread["subject"]}</b> (#{thread['length']})</a>
     <?py iter += 1 ?>
   <?py #endfor ?>
   <?py for thread in more_threads: ?>
-    <a href="#{boards_url}#{board}/read/#{thread['timestamp']}/#{'l50' if thread['length'] > 50 else ''}">#{iter}: <b>#{thread["subject"]}</b> (#{thread["length"]})</a><br />
+    <a href="#{boards_url}#{board}/read/#{thread['timestamp']}/#{'l50' if thread['length'] > 50 else ''}">#{iter}: <b>#{thread["subject"]}</b> (#{thread["length"]})</a>
     <?py iter += 1 ?>
   <?py #endfor ?>
   </div>
diff --git a/cgi/templates/txt_error.html b/cgi/templates/txt_error.html
index d8ae7cd..76b9d2a 100644
--- a/cgi/templates/txt_error.html
+++ b/cgi/templates/txt_error.html
@@ -49,4 +49,4 @@ ul {padding-left:40px;}
   </ul>
 </ul>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/cgi/templates/txt_thread.html b/cgi/templates/txt_thread.html
index 77c3101..ad1bce6 100644
--- a/cgi/templates/txt_thread.html
+++ b/cgi/templates/txt_thread.html
@@ -3,7 +3,7 @@
 <?py if threads: ?>
 <?py for thread in threads: ?>
 <div id="thread_nav">
-  <a href="/" name="top" target="_top">Bienvenido a Internet</a>
+  <a href="/home.html" name="top">Bienvenido a Internet</a>
   <a href="#{boards_url}#{board}/">■Volver al BBS■</a>
   <a href="#{boards_url}#{board}/read/#{thread['timestamp']}/">Hilo completo</a>
   <?py if thread['length'] > 100: ?>
diff --git a/cgi/templates/txt_threadlist.html b/cgi/templates/txt_threadlist.html
index 8cbd693..1504177 100644
--- a/cgi/templates/txt_threadlist.html
+++ b/cgi/templates/txt_threadlist.html
@@ -1,26 +1,22 @@
 <?py include('templates/txt_base_top.html') ?>
 <body class="mainpage" data-brd="#{board}">
-<div id="main_nav"><a href="/" target="_top">Bienvenido a Internet</a> | <?py include('templates/navbar.html') ?></div>
+<div id="main_nav"><a href="/home.html">Bienvenido a Internet</a> | <?py include('templates/navbar.html') ?></div>
 <?py if banner_url: ?>
-  <img id="banner" src="#{banner_url}" style="width:#{banner_width}px;height:#{banner_height}px;" />
+  <img id="banner" src="#{banner_url}" width="#{banner_width}" height="#{banner_height}" />
 <?py #endif ?>
 <div id="titlebox" class="outerbox">
   <div class="innerbox">
-    <div class="threadnav"><a href="#menu" title="Ir a lista de hilos">&#9632;</a><a href="#1" title="Ir a primer hilo">&#9660;</a></div>
+    <div class="threadnav"><a href="#menu" title="Ir a lista de hilos">&#9632;</a></div>
     <h1>#{board_long}</h1>
     <?py if postarea_desc: ?>
     <div id="rules">#{postarea_desc}</div>
     <?py #endif ?>
     <form method="get" action="/tools/search.py" id="search"><input type="text" name="q" value="" /><input type="hidden" name="board" value="#{board}" /><input type="submit" value="Buscar en mensajes activos" /><input type="submit" value="Buscar en archivo" formaction="/tools/search_kako.py" /></form>
   </div>
-  <div class="innerbox links"><b>¿Eres nuevo?</b> <a href="/guia.html"><b>C&oacute;mo postear</b></a> | <a href="/faq.html"><b>Preguntas frecuentes</b></a> | <a href="/bai/"><b>Contacto</b></a>
-  <?py if not force_css: ?>| <b>Estilo: </b><select id="styles">
-  <?py for title in txt_styles: ?><option value="#{title}">#{title}</option><?py #endfor ?></select>
-  <?py #endif ?>
-</div>
+  <div class="innerbox" id="bailinks"><b>¿Eres nuevo?</b> <a href="/guia.html" target="_blank"><b>C&oacute;mo postear</b></a> | <a href="/faq.html" target="_blank"><b>Preguntas frecuentes</b></a> | <a href="/bai/" target="_blank"><b>Contacto</b></a></div>
 </div>
 <?py if postarea_extra: ?>
-<div class="outerbox"><div class="innerbox">#{postarea_extra}</div></div>
+  <div class="outerbox"><div class="innerbox">#{postarea_extra}</div></div>
 <?py #endif ?>
 <a name="menu"></a>
 <div id="threadbox" class="outerbox"><div class="innerbox">