Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts: templates/index.html
2013-06-15 00:08:11 -04:00
parent 8b952fe97f a2c215d5d0
commit e53481f93e
2 changed files with 9 additions and 2 deletions
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,8 +1,15 @@
 <!doctype html>
 <html>
 <head>
-	{% include 'header.html' %}
 	<meta charset="utf-8">
+
+        {% if config.quick_reply %}
+          <script type="text/javascript">
+            var new_reply_string = "{{ config.button_reply }}";
+          </script>           
+        {% endif %}
+
+	{% include 'header.html' %}
 	<title>{{ board.url }} - {{ board.name }}</title>
 </head>
 <body>