kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	templates/index.html
This commit is contained in:
czaks 2013-06-15 00:08:11 -04:00
commit e53481f93e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/quick-reply.js
View File

@ -17,7 +17,7 @@ $(document).ready(function(){
return; // not index return; // not index
txt_new_topic = $('form[name=post] input[type=submit]').val(); 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() { undo_quick_reply = function() {
$('div.banner').remove(); $('div.banner').remove();

9
templates/index.html
View File

@ -1,8 +1,15 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
{% include 'header.html' %}
<meta charset="utf-8"> <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> <title>{{ board.url }} - {{ board.name }}</title>
</head> </head>
<body> <body>