From 6961f5b8b5da98413468bb888eb24254e78970ae Mon Sep 17 00:00:00 2001
From: Marcin Łabanowski <marcin@6irc.net>
Date: Tue, 2 Jul 2013 18:05:18 -0400
Subject: post_form: move submit button upper when thread field is disabled

---
 templates/post_form.html | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'templates/post_form.html')

diff --git a/templates/post_form.html b/templates/post_form.html
index 1727250b..e5cb423c 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -24,24 +24,22 @@
 			<td>
 				<input type="text" name="email" size="25" maxlength="40" autocomplete="off">
 				{{ antibot.html() }}
+				{% if not (not (config.field_disable_subject or (id and config.field_disable_reply_subject)) or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri))) %}
+				<input accesskey="s" style="margin-left:2px;" type="submit" name="post" value="{% if id %}{{ config.button_reply }}{% else %}{{ config.button_newtopic }}{% endif %}" />{% if config.spoiler_images %} <input id="spoiler" name="spoiler" type="checkbox"> <label for="spoiler">{% trans %}Spoiler Image{% endtrans %}</label>{% endif %}
+				{% endif %}
 			</td>
 		</tr>{% endif %}
-		<tr>
-			{% if not (config.field_disable_subject or (id and config.field_disable_reply_subject)) or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri)) %}<th>
+		{% if not (config.field_disable_subject or (id and config.field_disable_reply_subject)) or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri)) %}<tr>
+			<th>
 				{% trans %}Subject{% endtrans %}
 				{{ antibot.html() }}
 			</th>
 			<td>
 				<input style="float:left;" type="text" name="subject" size="25" maxlength="100" autocomplete="off">
-			{% else %}<th>
-				{% trans %}Submit{% endtrans %}
-				{{ antibot.html() }}
-			</th>
-			<td>
-			{% endif %}
 				<input accesskey="s" style="margin-left:2px;" type="submit" name="post" value="{% if id %}{{ config.button_reply }}{% else %}{{ config.button_newtopic }}{% endif %}" />{% if config.spoiler_images %} <input id="spoiler" name="spoiler" type="checkbox"> <label for="spoiler">{% trans %}Spoiler Image{% endtrans %}</label>{% endif %}
 			</td>
 		</tr>
+		{% endif %}
 		<tr>
 			<th>
 				{% trans %}Comment{% endtrans %}
@@ -50,6 +48,11 @@
 			<td>
 				<textarea name="body" id="body" rows="5" cols="35"></textarea>
 				{{ antibot.html() }}
+				{% if not (not (config.field_disable_subject or (id and config.field_disable_reply_subject)) or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri))) %}
+				{% if not (not config.field_disable_email or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri))) %}
+				<input accesskey="s" style="margin-left:2px;" type="submit" name="post" value="{% if id %}{{ config.button_reply }}{% else %}{{ config.button_newtopic }}{% endif %}" />{% if config.spoiler_images %} <input id="spoiler" name="spoiler" type="checkbox"> <label for="spoiler">{% trans %}Spoiler Image{% endtrans %}</label>{% endif %}
+				{% endif %}
+				{% endif %}
 			</td>
 		</tr>
 		{% if config.recaptcha %}
-- 
cgit v1.3


From 786ac5c55cf151ffcb942d78554c5ae06471eda0 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 16 Jul 2013 13:18:55 -0400
Subject: recaptcha: fix for https

---
 templates/post_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/post_form.html')

diff --git a/templates/post_form.html b/templates/post_form.html
index e5cb423c..07b53a9f 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -62,7 +62,7 @@
 				{{ antibot.html() }}
 			</th>
 			<td>
-				<script type="text/javascript" src="http://www.google.com/recaptcha/api/challenge?k={{ config.recaptcha_public }}"></script>
+				<script type="text/javascript" src="//www.google.com/recaptcha/api/challenge?k={{ config.recaptcha_public }}"></script>
 				{{ antibot.html() }}
 			</td>
 		</tr>
-- 
cgit v1.3