Weblinted reply.html. Added reply form into topic.html

diff --git a/templates/basicset/reply.html b/templates/basicset/reply.html
index 77c8360579d1897061ac50f437afe18fd059f782..55c4060267ff2278262f977f4bd66fb9b405b3e0 100644 (file)
--- a/templates/basicset/reply.html
+++ b/templates/basicset/reply.html
@@ -23,7 +23,7 @@
 <tr> <td rowspan=2>Пароль:</td><td><input type="password" name
 ="password"></td></tr>
 <tr><td><input type="checkbox" name="bindip" value="1"> Только с этого IP-адреса
-</td><tr>
+</td></tr>
 <tr><td colspan=2  class="error"></td></tr>
 <tr><td>Тема: </td><td><input name="subject" size="40"></td></tr>
 <tr><td>Текст:</td><td><textarea name="text" rows=10
@@ -31,10 +31,10 @@ cols=72></textarea></td></tr>
 <tr><td>Формат:</td><td><select name="text_format"><option value="text"
 selected>Без разметки</option>
 <option value="bbcode">BBCode</option>
-<option value="html">Html</option></select</td></tr>
+<option value="html">Html</option></select></td></tr>
 <tr><td>Картинка</td> <td><input onchange="addPictureInput(this);" type=file name="image1"></td></tr>
 <tr><td colspan=2 align=right"><input type=submit name="reply"
-value="Высказаться">
+value="Высказаться"></td></tr>
 </table>
 
 </form>

diff --git a/templates/basicset/topic.html b/templates/basicset/topic.html
index aa451d92819070074c7d9565b03c551a7f581ece..afba906ba4cf04446daec18b51626cab85564ff3 100644 (file)
--- a/templates/basicset/topic.html
+++ b/templates/basicset/topic.html
@@ -18,29 +18,7 @@ class="login" href="forum?login=1">Войти</a>
 Создана <a class="author"></a> <span class="date"></span>
 <div class="abstract">
 </div>
-<a href="forum?reply=1">Высказаться</a>
-</div>
-<div id="loginform" style="display: none;">
-<form action="forum" method="POST">
-<table border=0>
-<tr><td>Имя пользователя:</td><td><input type=text name="user" size=30>
-</td></tr>
-<tr><td>Сайт на котором вы зарегистрированы</td><td> <select
-name="openid_site" onChange="selectSite(this)">
-<option selected value="">Этот сайт</option>
-<option value="http://livejournal.com/users/%s">LiveJournal.com</option>
-<option value="http://diary.ru/~%s">Diary.ru</option>
-<option value="http://lj.rossija.org/users/%s">LJ.Rossija.org</option>
-<option value="http://%s">Другой Open-ID сайт</option> 
-</select></td></tr>
-<tr><td>Пароль:</td><td><input type="password" name="password"
-size=20></td></tr>
-<tr><td></td><td><input type="checkbox" name="bindip" value="1"> Только с этого IP-адреса
-</td></tr>
-<tr><td colspan=2 align=right"><input type=submit name="login"
-value="Вoйти"></td></tr>
-</table>
-</form>
+<a href="forum?reply=1" onClick="showForm('replyform')">Высказаться</a>
 </div>
 <div class="messagelist">
 <div class="message">
@@ -65,8 +43,41 @@ Email: <span class="ap-email"></span><br>
 <input type="submit" name="edit" value="Редакт">
 <input type="submit" name="move" value="Переместить">
 <input type="submit" name="delete" value="Удалить">
-<input type="submit" name="reply" value="Высказаться">
+<input type="submit" name="reply" value="Высказаться" onClick="showForm('replyform');">
 </form></td></tr></table>
 </div></div>
+<div id="replyform">
+<form method="POST" enctype="multipart/form-data" name="reply" action="forum"
+       onSubmit="hideForm('replyform')">
+<input type="hidden" name="id" value="">
+<table border=0>
+<tr><td rowspan=2>Пользователь:</td><td> <a class="userurl" href="forum?register=1">Зарегистрироваться</a><br></td></tr>
+<tr><td><input type=text name="user" size=30> 
+<select name="openid_site" onchange="selectSite(this)">
+<option selected value="">Этот сайт</option>
+<option value="http://livejournal.com/users/%s">LiveJournal.com</option>
+<option value="http://diary.ru/~%s">Diary.ru</option>
+<option value="http://lj.rossija.org/users/%s">LJ.Rossija.org</option>
+<option value="http://%s">Другой Open-ID сайт</option> 
+</select></td></tr>
+<tr> <td rowspan=2>Пароль:</td><td><input type="password" name
+="password"></td></tr>
+<tr><td><input type="checkbox" name="bindip" value="1"> Только с этого IP-адреса
+</td></tr>
+<tr><td colspan=2  class="error"></td></tr>
+<tr><td>Тема: </td><td><input name="subject" size="40"></td></tr>
+<tr><td>Текст:</td><td><textarea name="text" rows=10
+cols=72></textarea></td></tr> 
+<tr><td>Формат:</td><td><select name="text_format"><option value="text"
+selected>Без разметки</option>
+<option value="bbcode">BBCode</option>
+<option value="html">Html</option></select></td></tr>
+<tr><td>Картинка</td> <td><input onchange="addPictureInput(this);" type=file name="image1"></td></tr>
+<tr><td colspan=2 align=right"><input type=submit name="reply"
+value="Высказаться"></td></tr>
+</table>
+
+</form>
+</div>
 </BODY>
 </HTML>