Separando .trip de .name

1 files changed, 14 insertions, 12 deletions

diff --git a/cgi/templates/board.jp.html b/cgi/templates/board.jp.html
index 372141d..5ce2017 100644
--- a/cgi/templates/board.jp.html
+++ b/cgi/templates/board.jp.html
@@ -14,7 +14,7 @@
   <div class="replymode">レス送信モード</div>
 <?py #endif ?>
 <a name="postbox"></a>
-<div class="postarea">
+<div id="postarea">
 <?py if allow_oekaki and not oek_finish: ?>
   <center>
     <form id="oekform" action="#{cgi_url}oekaki/paint" method="post" enctype="multipart/form-data">
@@ -66,7 +66,7 @@
       <td>
         <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" />
+          <input id="sendbtn" type="submit" value="#{'返信' if replythread else 'スレッドを立てる'}" accesskey="z" />
         <?py #endif ?>
       </td>
     </tr>
@@ -75,7 +75,7 @@
       <td class="postblock">題　　名</td>
       <td>
         <input type="text" name="subject" id="f-sub" size="35" maxlength="100" accesskey="s" />
-        <input type="submit" value="#{'返信' if replythread else 'スレッドを立てる'}" accesskey="z" />
+        <input id="sendbtn" type="submit" value="#{'返信' if replythread else 'スレッドを立てる'}" accesskey="z" />
       </td>
     </tr>
     <?py #endif ?>
@@ -118,7 +118,7 @@
           <li>スレは<b>#{maxage}</b>日間経つと自動的に消されられます.</li>
         <?py #endif ?>
           <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>
+          <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 id="searchbtn" type="submit" value="GO"></form></li>
         </ul>
       </td>
     </tr>
@@ -180,15 +180,17 @@
             <?py #endif ?>
           </label>
           <?py if post['email']: ?>
-            Name <a href="mailto:#{post['email']}"><span class="name">
-              <b>#{post['name']}</b>
-              #{post['tripcode'] if post['tripcode'] else ''}
-            </span></a>
+            <?py if post['tripcode']: ?>
+              Name <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span> <span class="trip">#{post['tripcode']}</span></a>
+            <?py else: ?>
+              Name <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span></a>
+            <?py #endif ?>
           <?py else: ?>
-            Name <span class="name">
-              <b>#{post['name']}</b>
-              #{post['tripcode'] if post['tripcode'] else ''}
-            </span>
+            <?py if post['tripcode']: ?>
+              Name <span class="name">#{post['name']} <span class="trip">#{post['tripcode']}</span></span>
+            <?py else: ?>
+              Name <span class="name">#{post['name']}</span>
+            <?py #endif ?>
           <?py #endif ?>
           <span class="date" data-unix="#{post['timestamp']}">#{post['timestamp_formatted']}</span>
           <?py if post['posterid']: ?>