diff options
| author | czaks <marcin@6irc.net> | 2013-08-03 19:05:25 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-08-03 19:05:25 -0400 |
| commit | a0855cdcf5634d64fbb1ba294b05c8365ce37338 (patch) | |
| tree | fa1217beedf487c321405432ea746343ec6afcec /templates/generic_page.html | |
| parent | 7d5fef9ace3bba46de40604b04ea2dee1dac7cb3 (diff) | |
| parent | a3fbff225927469e68efc7ab31977736f34c7480 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
inc/config.php
inc/functions.php
templates/generic_page.html
templates/index.html
Diffstat (limited to 'templates/generic_page.html')
| -rw-r--r-- | templates/generic_page.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/generic_page.html b/templates/generic_page.html index 41300f6b..70cb15aa 100644 --- a/templates/generic_page.html +++ b/templates/generic_page.html @@ -22,7 +22,8 @@ {% include 'attention_bar.html' %} {% include 'post_form.html' %} - {% if config.blotter %}<hr /><div class="blotter">{{ config.blotter }}</div>{% endif %} + + {% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %} <hr /> <form name="postcontrols" action="{{ config.post_url }}" method="post"> <input type="hidden" name="board" value="{{ board.uri }}" /> |