diff options
| author | czaks <marcin@6irc.net> | 2013-06-15 00:08:11 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-06-15 00:08:11 -0400 |
| commit | e53481f93e6cb0e912aa31a4a256c80be2c28f9a (patch) | |
| tree | 3a941f3929a728638f3a0ef7c8dc7ca0ec1326d0 | |
| parent | 8b952fe97fc0ead62eb944e8aa62b71852d9adf5 (diff) | |
| parent | a2c215d5d0f606dc8a7af2d5e2c695d2bfda0de2 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
templates/index.html
| -rw-r--r-- | js/quick-reply.js | 2 | ||||
| -rw-r--r-- | templates/index.html | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/js/quick-reply.js b/js/quick-reply.js index dc48a743..bc36ca48 100644 --- 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(); diff --git a/templates/index.html b/templates/index.html index 059abc5e..9dec93e0 100644 --- 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>
|