From 2a760de2896a02af98caa013537166b5d3fcc717 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Wed, 14 Mar 2012 21:44:41 +1100
Subject: Multiple changes. Added $config['minify_js'] to compress Javascript
 with minify Added $config['additional_javascript_compile'] to put all
 Javascript files/addons into one file. Moved delete/report post controls to a
 shared template. Ability to have different Javascript files between boards.

---
 templates/index.html | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index 19798292..6c9b8dab 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8,7 +8,12 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
 	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}" />{% endif %}
 	<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}" />
-	{% if not nojavascript %}<script type="text/javascript" src="{{ config.url_javascript }}"></script>{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ javascript }}"></script>{% endfor %}{% endif %}
+	{% if not nojavascript %}
+		<script type="text/javascript" src="{{ config.url_javascript }}"></script>
+		{% if not config.additional_javascript_compile %}
+		{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
+		{% endif %}
+	{% endif %}
 	{% if config.recaptcha %}<style type="text/css">{% raw %}
 		.recaptcha_image_cell {
 			background: none !important;
@@ -44,18 +49,7 @@
 	{% if config.javascript_local_time %}
 	<script>{% raw %}init_localtime();{% endraw %}</script>
 	{% endif %}
-	
-	<div class="delete">
-		{% trans %}Delete Post{% endtrans %} [<input title="Delete file only" type="checkbox" name="file" id="delete_file" />
-		 <label for="delete_file">{% trans %}File{% endtrans %}</label>] <label for="password">{% trans %}Password{% endtrans %}</label> 
-			<input id="password" type="password" name="password" size="12" maxlength="18" />
-			<input type="submit" name="delete" value="{% trans %}Delete{% endtrans %}" />
-	</div>
-	<div class="delete" style="clear:both">
-		<label for="reason">{% trans %}Reason{% endtrans %}</label> 
-			<input id="reason" type="text" name="reason" size="20" maxlength="30" />
-			<input type="submit" name="report" value="{% trans %}Report{% endtrans %}" />
-	</div>
+	{% include 'report_delete.html' %}
 	</form>
 	<div class="pages">{{ btn.prev }} {% for page in pages %}
 		 [<a {% if page.selected %}class="selected"{% endif %}{% if not page.selected %}href="{{ page.link }}"{% endif %}>{{ page.num }}</a>]{% if loop.last %} {% endif %}
-- 
cgit v1.3