Add warning without ban, joke capcode support, SC editor support, home link support, table for calender theme / extension, removing boardalias duplicate citations in markup and other features

6 files changed, 20 insertions, 0 deletions

diff --git a/templates/header.html b/templates/header.html
index 06bc95d9..aecff50b 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -7,6 +7,7 @@
                 {% if config.default_code_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="code_stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_code_stylesheet.1 }}">{% endif %}
 		{% if config.font_awesome %}<link rel="stylesheet" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
 		{% if config.country_flags_condensed %}<link rel="stylesheet" href="{{ config.root }}{{ config.country_flags_condensed_css }}">{% endif %}
+		{% if config.sc_editor %} <link rel="stylesheet" href="{{ config.uri_stylesheets }}sceditor/themes/{{ config.sc_editor_theme }}.css" media="all" /> {% endif %}
 		<script type="text/javascript">
 			var configRoot="{{ config.root }}";
 			var inMod = {% if mod %}true{% else %}false{% endif %};
diff --git a/templates/index.html b/templates/index.html
index dda024cf..6dc4803b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -64,6 +64,10 @@
 		{% if config.catalog_link %}
 		 |  <a href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">Catalog</a>
 		{% endif %}
+
+		{% if config.home_link %}
+		 |  <a href="{{ config.root }}">Home</a>
+		{% endif %}
 	<hr />
 
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
@@ -100,6 +104,9 @@
 			{% if config.catalog_link %}
 			 |  <a href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">Catalog</a>
 			{% endif %}
+			{% if config.home_link %}
+			 |  <a href="{{ config.root }}">Home</a>
+			{% endif %}
 		</div>
 	</div>
 
diff --git a/templates/post/post_controls.html b/templates/post/post_controls.html
index eed76702..1b084e27 100644
--- a/templates/post/post_controls.html
+++ b/templates/post/post_controls.html
@@ -1,6 +1,9 @@
 {% if mod %}
 
 <span class="controls {% if not post.thread %}op{% endif %}">
+{% if mod|hasPermission(config.mod.warning, board.uri) %}
+	<a title="{% trans %}Warn{% endtrans %}" href="?/{{ board.dir }}warning/{{ post.id }}{% if post.thread %}&amp;thread={{ post.thread }}{% endif %}">{{ config.mod.link_warning }}</a>&nbsp;
+{% endif %}
 {% if mod|hasPermission(config.mod.delete, board.uri) %}
     <a title="{% trans %}Delete{% endtrans %}" onclick="if (event.which==2) return true;if (confirm('{% trans %}Are you sure you want to delete this?{% endtrans %}')) document.location='?/{{ secure_link(board.dir ~ 'delete/' ~ post.id) }}{% if post.thread %}&amp;thread={{ post.thread }}{% endif %}';return false;" href="?/{{ board.dir }}delete/{{ post.id }}{% if post.thread %}&amp;thread={{ post.thread }}{% endif %}">{{ config.mod.link_delete }}</a>&nbsp;
 {% endif %}
diff --git a/templates/post_reply.html b/templates/post_reply.html
index 04d53d5f..14aea5c3 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -24,6 +24,9 @@
 			{% if post.modifiers['ban message'] %}
 				{{ config.mod.ban_message|sprintf(post.modifiers['ban message']) }}
 			{% endif %}
+			{% if post.modifiers['warning message'] %}
+				{{ config.mod.warning_message|sprintf(post.modifiers['warning message']) }}
+			{% endif %}
 		</div>
 	</div>
 </div>
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 5bcdbe20..c0e91c96 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -62,6 +62,9 @@
 		{% if post.modifiers['ban message'] %}
 			{{ config.mod.ban_message|sprintf(post.modifiers['ban message']) }}
 		{% endif %}
+		{% if post.modifiers['warning message'] %}
+			{{ config.mod.warning_message|sprintf(post.modifiers['warning message']) }}
+		{% endif %}
 	</div>
 	{% if post.omitted or post.omitted_images %}
 		<span class="omitted">
diff --git a/templates/thread.html b/templates/thread.html
index 5613cb47..0ba7c81a 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -74,6 +74,9 @@
                 		{% if config.catalog_link %}
 					<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
 		                {% endif %}
+				{% if config.home_link %}
+				|  <a id="thread-home" href="{{ config.root }}">[{% trans %}Home{% endtrans %}]</a>
+				{% endif %}
 			</span>
 			
 			<span id="thread-quick-reply">