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

Conflicts: templates/index.html
11 years ago · e53481f93e
2 changed files with 9 additions and 2 deletions
--- a/js/quick-reply.js
+++ b/js/quick-reply.js
@ -17,7 +17,7 @@ $(document).ready(function(){
 		return; // not index
 	
 	txt_new_topic = $('form[name=post] input[type=submit]').val();
-	txt_new_reply = txt_new_topic == 'Submit' ? txt_new_topic : 'New Reply';
+	txt_new_reply = txt_new_topic == 'Submit' ? txt_new_topic : new_reply_string;
 	
 	undo_quick_reply = function() {
 		$('div.banner').remove();
--- 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>