Allow for HTML in the board subtitle

Conflicts:
	inc/config.php
This commit is contained in:
ctrlcctrlv 2013-08-08 18:58:44 +00:00 committed by Michael Foster
parent 4bce3d7584
commit acb4c47a9f
4 changed files with 21 additions and 4 deletions

View File

@ -615,6 +615,9 @@
// Number of reports you can create at once.
$config['report_limit'] = 3;
// Allow unfiltered HTML in board subtitles. This is useful for placing icons and links.
$config['allow_subtitle_html'] = false;
/*
* ====================
* Display settings

View File

@ -13,7 +13,11 @@
<h1>{{ board.url }} - {{ board.title|e }}</h1>
<div class="subtitle">
{% if board.subtitle %}
{{ board.subtitle|e }}
{% if config.allow_subtitle_html %}
{{ board.subtitle }}
{% else %}
{{ board.subtitle|e }}
{% endif %}
{% endif %}
{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
</div>

View File

@ -8,7 +8,13 @@
-
{{ board.title|e }}
{% if board.subtitle %}
<small>&mdash; {{ board.subtitle|e }}</small>
<small>&mdash;
{% if config.allow_subtitle_html %}
{{ board.subtitle }}
{% else %}
{{ board.subtitle|e }}
{% endif %}
</small>
{% endif %}
{% if mod|hasPermission(config.mod.manageboards) %}
<a href="?/edit/{{ board.uri }}"><small>[{% trans 'edit' %}]</small></a>

View File

@ -13,7 +13,11 @@
<h1>{{ board.url }} - {{ board.title|e }}</h1>
<div class="subtitle">
{% if board.subtitle %}
{{ board.subtitle|e }}
{% if config.allow_subtitle_html %}
{{ board.subtitle }}
{% else %}
{{ board.subtitle|e }}
{% endif %}
{% endif %}
{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
</div>
@ -42,4 +46,4 @@
ready();
{% endraw %}</script>
</body>
</html>
</html>