Mejor forma de ocultar posts

9 files changed, 48 insertions, 60 deletions

diff --git a/cgi/templates/board.html b/cgi/templates/board.html
index 43cefd9..7173fde 100644
--- a/cgi/templates/board.html
+++ b/cgi/templates/board.html
@@ -107,11 +107,9 @@
       <ul>
         #{postarea_desc}
       <?py if supported_filetypes: ?>
-        <li>Archivos permitidos: <span id="filetypes">#{', '.join(supported_filetypes).upper()}</span>. Hasta <span id="maxsize">#{maxsize}</span>KB. Miniaturas: #{maxdimensions}x#{maxdimensions}px</li>
+        <li>Archivos permitidos: #{', '.join(supported_filetypes).upper()}. Hasta #{maxsize}KB. Miniaturas: #{maxdimensions}x#{maxdimensions}px</li>
       <?py #endif ?>
-      <?py if not replythread: ?>
         <li><a href="/cgi/catalog/${board}">Catálogo de hilos</a> (Orden: <a href="/cgi/catalog/${board}?sort=1">Nuevo</a>/<a href="/cgi/catalog/${board}?sort=2">Viejo</a>/<a href="/cgi/catalog/${board}?sort=3">Más</a>/<a href="/cgi/catalog/${board}?sort=4">Menos</a>)</li>
-      <?py #endif ?>
       <?py if int(maxage) != 0: ?>
         <li>Los hilos son automáticamente eliminados a los <b>#{maxage}</b> días de edad.</li>
       <?py #endif ?>
@@ -131,14 +129,14 @@
   <input type="hidden" name="board" value="#{board}" />
   <?py if threads: ?>
   <?py for thread in threads: ?>
+    <div id="t#{thread['id']}" class="thread" data-length="#{thread['length']}">
     <?py if not replythread: ?>
-      <span id="unhide#{thread['id']}#{board}" style="display:none;">Hilo <a href="#{boards_url}#{board}/res/#{thread['id']}.html">#{thread['id']}</a> oculto. <a class="tt" href="#">Ver hilo</a></span>
+      <span class="unhide" style="display:none;">Hilo <a href="#{boards_url}#{board}/res/#{thread['id']}.html">#{thread['id']}</a> oculto. <a class="tt" href="#">Ver hilo</a></span>
     <?py #endif ?>
-    <div id="thread#{thread['id']}#{board}" class="thread" data-length="#{thread['length']}">
     <?py for post in thread['posts']: ?>
       <?py if int(post['parentid']) != 0: ?>
         <table><tr><td class="ell">…</td>
-        <td class="reply" id="reply#{post['id']}">
+        <td class="reply" id="p#{post['id']}">
       <?py elif post['file']: ?>
         <?py if post['image_width'] != '0': ?>
           <div class="fs"><span>Nombre de archivo:</span><a href="#{images_url}#{board}/src/#{post['file']}" class="expimg" target="_blank" data-id="#{post['id']}" data-thumb="#{images_url}#{board}/thumb/#{post['thumb']}" data-w="#{post['image_width']}" data-h="#{post['image_height']}" data-tw="#{post['thumb_width']}" data-th="#{post['thumb_height']}">#{post['file']}</a>-(#{post['file_size']} B, #{post['image_width']}x#{post['image_height']})
diff --git a/cgi/templates/board.jp.html b/cgi/templates/board.jp.html
index a595780..f463dee 100644
--- a/cgi/templates/board.jp.html
+++ b/cgi/templates/board.jp.html
@@ -107,11 +107,9 @@
       <ul>
         #{postarea_desc}
       <?py if supported_filetypes: ?>
-        <li>添付可能：<span id="filetypes">#{', '.join(supported_filetypes).upper()}</span>. <span id="maxsize">#{maxsize}</span>KBまで. #{maxdimensions}x#{maxdimensions}以上は縮小.</li>
+        <li>添付可能：#{', '.join(supported_filetypes).upper()}. #{maxsize}KBまで. #{maxdimensions}x#{maxdimensions}以上は縮小.</li>
       <?py #endif ?>
-        <?py if not replythread: ?>
         <li><a href="#{cgi_url}catalog/${board}">カタログ</a> (ソート：<a href="/cgi/catalog/${board}?sort=1">新順</a>/<a href="/cgi/catalog/${board}?sort=2">古順</a>/<a href="/cgi/catalog/${board}?sort=3">多順</a>/<a href="/cgi/catalog/${board}?sort=4">少順</a>)</li>
-        <?py #endif ?>
       <?py if int(maxage) != 0: ?>
         <li>スレは<b>#{maxage}</b>日間経つと自動的に消されられます.</li>
       <?py #endif ?>
@@ -131,14 +129,14 @@
   <input type="hidden" name="board" value="#{board}" />
   <?py if threads: ?>
   <?py for thread in threads: ?>
+    <div id="t#{thread['id']}" class="thread" data-length="#{thread['length']}">
     <?py if not replythread: ?>
-      <span id="unhide#{thread['id']}#{board}" style="display:none">スレ<a href="#{boards_url}#{board}/res/#{thread['id']}.html">#{thread['id']}</a>は隠しました. <a class="tt" href="#">スレを表示</a></span>
+      <span class="unhide" style="display:none;">スレ<a href="#{boards_url}#{board}/res/#{thread['id']}.html">#{thread['id']}</a>は隠しました. <a class="tt" href="#">スレを表示</a></span>
     <?py #endif ?>
-    <div id="thread#{thread['id']}#{board}" class="thread" data-length="#{thread['length']}">
     <?py for post in thread['posts']: ?>
       <?py if int(post['parentid']) != 0: ?>
         <table><tr><td class="ell">…</td>
-        <td class="reply" id="reply#{post['id']}">
+        <td class="reply" id="p#{post['id']}">
       <?py elif post['file']: ?>
         <?py if post['image_width'] != '0': ?>
         <div class="fs"><span>画像ファイル名：</span><a href="#{images_url}#{board}/src/#{post['file']}" class="expimg" target="_blank" data-id="#{post['id']}" data-thumb="#{images_url}#{board}/thumb/#{post['thumb']}" data-w="#{post['image_width']}" data-h="#{post['image_height']}" data-tw="#{post['thumb_width']}" data-th="#{post['thumb_height']}">#{post['file']}</a>-(#{post['file_size']} B, #{post['image_width']}x#{post['image_height']})
diff --git a/cgi/templates/catalog.html b/cgi/templates/catalog.html
index 4faa2d2..8c0d80e 100644
--- a/cgi/templates/catalog.html
+++ b/cgi/templates/catalog.html
@@ -2,29 +2,31 @@
 <div id="ctrl">
   &#91;<a href="#{boards_url}#{board}/">Volver al IB</a>&#93;
   &#91;Orden:
-  <a class="cat_sort" data-sort="0" href="?sort=0">#{"<b>Normal</b>" if i_sort == "" else "Normal"}</a>
-  <a class="cat_sort" data-sort="1" href="?sort=1">#{"<b>Nuevo</b>" if i_sort == "1" else "Nuevo"}</a>
-  <a class="cat_sort" data-sort="2" href="?sort=2">#{"<b>Viejo</b>" if i_sort == "2" else "Viejo"}</a>
-  <a class="cat_sort" data-sort="3" href="?sort=3">#{"<b>Más</b>" if i_sort == "3" else "Más"}</a>
-  <a class="cat_sort" data-sort="4" 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;Texto: <a id="cat_hide" href="#">Ocultar</a>&#93;
-  &#91;Buscar: <input id="cat_search" type="text"><input type="hidden" name="board" value="#{board}" />
+  <a href="?sort=0">#{"<b>Normal</b>" if i_sort == "" else "Normal"}</a>
+  <a href="?sort=1">#{"<b>Nuevo</b>" if i_sort == "1" else "Nuevo"}</a>
+  <a href="?sort=2">#{"<b>Viejo</b>" if i_sort == "2" else "Viejo"}</a>
+  <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;Texto: <a id="cat-hide" href="#">Ocultar</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>
 <div id="catalog" style="margin:1em auto;">
   <?py i = 1 ?>
-  <?py for thread in threads: ?><div id="cat#{thread['id']}#{board}" class="thread" data-num="${i}" data-id="#{thread['id']}" data-res="${thread['length']}">
+  <?py for thread in threads: ?>
+  <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 />
+      <a href="#{boards_url}#{board}/res/#{thread['id']}.html" rel="nofollow"><img src="#{images_url}#{board}/cat/#{thread['thumb']}" alt="#{thread['id']}" /></a>
     <?py #endif ?>
-    <div class="replies">Respuestas: ${thread['length']}</div>
     <?py if thread['thumb'] != '': ?>
-      <p><span class="subj">${thread['subject']}</span><br />${thread['message']}</p>
+      <p><strong class="subj">${thread['subject']} <span>(${thread['length']})</span></strong><br />${thread['message']}</p>
     <?py else: ?>
-      <p><a href="#{boards_url}#{board}/res/#{thread['id']}.html" rel="nofollow" class="subj">${thread['subject']}</a><br />${thread['message']}</p>
+      <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>
     <?py #endif ?>
     <?py i += 1 ?>
-  </div><?py #endfor ?>
+  </div>
+  <?py #endfor ?>
 </div>
 <?py include('templates/base_bottom.html') ?>
\ No newline at end of file
diff --git a/cgi/templates/txt_archive.html b/cgi/templates/txt_archive.html
index 6749352..2b5caa3 100644
--- a/cgi/templates/txt_archive.html
+++ b/cgi/templates/txt_archive.html
@@ -44,15 +44,11 @@
   <h3>#{thread['subject']} <span>(${(str(thread['length'])+" respuestas") if thread['length'] > 1 else "Una respuesta"})</span></h3>
   <?py for post in thread['posts']: ?>
     <?py if post['IS_DELETED'] == '1': ?>
-      <h4 class="deleted">#{post['num']} : Mensaje eliminado por el usuario.</h4>
+    <div class="reply deleted" data-n="#{post['num']}"><h4>#{post['num']} : Mensaje eliminado por usuario.</h4></div>
     <?py elif post['IS_DELETED'] == '2': ?>
-      <h4 class="deleted">#{post['num']} : Mensaje eliminado por miembro del staff.</h4>
+    <div class="reply deleted" data-n="#{post['num']}"><h4>#{post['num']} : Mensaje eliminado por staff.</h4></div>
     <?py else: ?>
-    <?py if post['num'] == 1: ?>
-      <div class="reply first" data-n="#{post['num']}">
-    <?py else: ?>
-      <div class="reply" data-n="#{post['num']}">
-    <?py #endif ?>
+    <div class="reply#{' first' if post['num'] == 1 else ''}" data-n="#{post['num']}">
         <h4>#{post['num']} :
         <?py if post['email']: ?>
           <?py if post['tripcode']: ?>
@@ -95,4 +91,4 @@
 <div class="end">weabot.py ver <?py include('templates/revision.html') ?> Bienvenido a Internet BBS/IB</div>
 <a name="bottom"></a>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/cgi/templates/txt_board.en.html b/cgi/templates/txt_board.en.html
index 1f7de9c..8c94361 100644
--- a/cgi/templates/txt_board.en.html
+++ b/cgi/templates/txt_board.en.html
@@ -45,11 +45,11 @@
 <h2><small>[#{titer}:#{thread['length']}]</small><a href="#{boards_url}#{board}/read/#{thread['timestamp']}/#{'l50' if thread['length'] > 50 else ''}">#{thread['posts'][0]['subject']}</a></h2>
 <?py for post in thread['posts']: ?>
 <?py if post['IS_DELETED'] == '1': ?>
-  <h4 class="deleted">#{post['num']} : Post deleted by user.</h4>
+  <div class="reply deleted" id="p#{post['id']}" data-n="#{post['num']}"><h4>#{post['num']} : Post deleted by user.</h4></div>
 <?py elif post['IS_DELETED'] == '2': ?>
-  <h4 class="deleted">#{post['num']} : Post deleted by staff.</h4>
+  <div class="reply deleted" id="p#{post['id']}" data-n="#{post['num']}"><h4>#{post['num']} : Post deleted by staff.</h4></div>
 <?py else: ?>
-  <div class="reply#{' first' if post['num'] == 1 else ''}" data-n="#{post['num']}">
+  <div class="reply#{' first' if post['num'] == 1 else ''}" id="p#{post['id']}" data-n="#{post['num']}">
   <h4>#{post['num']} :
     <?py if post['email']: ?>
       <?py if post['tripcode']: ?>
diff --git a/cgi/templates/txt_board.html b/cgi/templates/txt_board.html
index a165ac1..7b0207b 100644
--- a/cgi/templates/txt_board.html
+++ b/cgi/templates/txt_board.html
@@ -46,11 +46,11 @@
 <h2><span>[#{titer}:#{thread['length']}]</span><a href="#{boards_url}#{board}/read/#{thread['timestamp']}/#{'l50' if thread['length'] > 50 else ''}">#{thread['posts'][0]['subject']}</a></h2>
 <?py for post in thread['posts']: ?>
 <?py if post['IS_DELETED'] == '1': ?>
-  <h4 class="deleted">#{post['num']} : Mensaje eliminado por usuario.</h4>
+  <div class="reply deleted" id="p#{post['id']}" data-n="#{post['num']}"><h4>#{post['num']} : Mensaje eliminado por usuario.</h4></div>
 <?py elif post['IS_DELETED'] == '2': ?>
-  <h4 class="deleted">#{post['num']} : Mensaje eliminado por staff.</h4>
+  <div class="reply deleted" id="p#{post['id']}" data-n="#{post['num']}"><h4>#{post['num']} : Mensaje eliminado por staff.</h4></div>
 <?py else: ?>
-  <div class="reply#{' first' if post['num'] == 1 else ''}" data-id="#{post['id']}" data-n="#{post['num']}">
+  <div class="reply#{' first' if post['num'] == 1 else ''}" id="p#{post['id']}" data-n="#{post['num']}">
   <h4>#{post['num']} :
     <?py if post['email']: ?>
       <?py if post['tripcode']: ?>
diff --git a/cgi/templates/txt_error.html b/cgi/templates/txt_error.html
index 8a16a63..d8ae7cd 100644
--- a/cgi/templates/txt_error.html
+++ b/cgi/templates/txt_error.html
@@ -20,7 +20,8 @@ ul {padding-left:40px;}
 <body>
 <div class="h err">ERROR: #{error}</div>
 <blockquote>
-  Host <b>${info['host']}</b><br>
+  Host <b>${info['host']}</b>
+  <br>
   <blockquote>
     Nombre: <b>${info['name']}</b><br>
     E-mail: ${info['email']}<br>
@@ -39,9 +40,10 @@ ul {padding-left:40px;}
     [<a href="#{boards_url}#{board}">Ir a la sección</a>]<br />
     [<a href="#{cgi_url}threadlist/#{board}">Ir a la lista de hilos</a>]<br />
     </b>
-    </ul><br>
-    <div class="h sub2">Contacto</div>
-    <ul style="line-height:1.5;">
+  </ul>
+  <br>
+  <div class="h sub2">Contacto</div>
+  <ul style="line-height:1.5;">
     Cualquier problema con el sitio por favor hacerlo llegar al staff de BaI.<br />
     Para ello contáctanos en la <a href="/bai/">sección de discusión</a>.
   </ul>
diff --git a/cgi/templates/txt_thread.en.html b/cgi/templates/txt_thread.en.html
index 84c3fc1..45f8f8e 100644
--- a/cgi/templates/txt_thread.en.html
+++ b/cgi/templates/txt_thread.en.html
@@ -27,16 +27,12 @@
   <h3>#{thread['subject']} <span>(${(str(thread['length'])+" replies") if thread['length']>1 else "1 reply"})</span></h3>
   <?py for post in thread['posts']: ?>
   <?py if post['IS_DELETED'] == '1': ?>
-    <h4 class="deleted">#{post['num']} : Post deleted by user.</h4>
+    <div class="reply deleted" id="p#{post['id']}" data-n="#{post['num']}"><h4>#{post['num']} : Post deleted by user.</h4></div>
   <?py elif post['IS_DELETED'] == '2': ?>
-    <h4 class="deleted">#{post['num']} : Post deleted by staff.</h4>
+    <div class="reply deleted" id="p#{post['id']}" data-n="#{post['num']}"><h4>#{post['num']} : Post deleted by staff.</h4></div>
   <?py else: ?>
-    <?py if post['num'] == 1: ?>
-      <div class="reply first" data-n="#{post['num']}">
-    <?py else: ?>
-      <div class="reply" data-n="#{post['num']}">
-    <?py #endif ?>
-      <h4><a href="#" class="num">#{post['num']}</a> :
+    <div class="reply#{' first' if post['num'] == 1 else ''}" id="p#{post['id']}" data-n="#{post['num']}">
+      <h4>#{post['num']} :
       <?py if post['email']: ?>
         <?py if post['tripcode']: ?>
           <a href="mailto:#{post['email']}"><span class="name"><b>#{post['name']}</b> #{post['tripcode']}</span></a>
diff --git a/cgi/templates/txt_thread.html b/cgi/templates/txt_thread.html
index 1d70f59..18293c1 100644
--- a/cgi/templates/txt_thread.html
+++ b/cgi/templates/txt_thread.html
@@ -27,16 +27,12 @@
   <h3>#{thread['subject']} <span>(${(str(thread['length'])+" respuestas") if thread['length']>1 else "Una respuesta"})</span></h3>
   <?py for post in thread['posts']: ?>
   <?py if post['IS_DELETED'] == '1': ?>
-    <h4 class="deleted">#{post['num']} : Mensaje eliminado por usuario.</h4>
+    <div class="reply deleted" id="p#{post['id']}" data-n="#{post['num']}"><h4>#{post['num']} : Mensaje eliminado por usuario.</h4></div>
   <?py elif post['IS_DELETED'] == '2': ?>
-    <h4 class="deleted">#{post['num']} : Mensaje eliminado por staff.</h4>
+    <div class="reply deleted" id="p#{post['id']}" data-n="#{post['num']}"><h4>#{post['num']} : Mensaje eliminado por staff.</h4></div>
   <?py else: ?>
-    <?py if post['num'] == 1: ?>
-      <div class="reply first" data-n="#{post['num']}">
-    <?py else: ?>
-      <div class="reply" data-n="#{post['num']}">
-    <?py #endif ?>
-      <h4><a href="#" class="num">#{post['num']}</a> :
+    <div class="reply#{' first' if post['num'] == 1 else ''}" id="p#{post['id']}" data-n="#{post['num']}">
+      <h4>#{post['num']} :
       <?py if post['email']: ?>
         <?py if post['tripcode']: ?>
           <a href="mailto:#{post['email']}"><span class="name"><b>#{post['name']}</b> #{post['tripcode']}</span></a>