diff options
| author | czaks <marcin@6irc.net> | 2013-07-31 19:25:04 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-31 19:25:04 -0400 |
| commit | b35ea557634af42c3f63b7219cd1bfd46cf486a6 (patch) | |
| tree | 0530d3025764e09265fa934f8ae1e906efcad7c6 /templates | |
| parent | dc9df2b9b3d2994bce02474503b3ebbb56c38ece (diff) | |
| parent | 6bbe407e18681f2812db4345036bb5ae639f5973 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
templates/thread.html
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/page.html | 2 | ||||
| -rw-r--r-- | templates/thread.html | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/templates/page.html b/templates/page.html index a7c6a300..0d33c16f 100644 --- a/templates/page.html +++ b/templates/page.html @@ -22,4 +22,4 @@ <p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright © 2010-2013 Tinyboard Development Group</p> </footer> </body> -</html> +</html>
\ No newline at end of file diff --git a/templates/thread.html b/templates/thread.html index 619480b4..38be37ab 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -23,12 +23,13 @@ {% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %} </div> </header> - + <div class="banner">{% trans %}Posting mode: Reply{% endtrans %} <a class="unimportant" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a></div> {% include 'attention_bar.html' %} + {% include 'post_form.html' %} - + {% if config.blotter %}<hr /><div class="blotter">{{ config.blotter }}</div>{% endif %} <hr /> <form name="postcontrols" action="{{ config.post_url }}" method="post"> |