5 files changed, 28 insertions, 169 deletions
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index cf189f979f..f9846ea7cd 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -56,6 +56,7 @@
 
 	<fieldset>
 		<legend>{L_GROUP_OPTIONS_SAVE}</legend>
+	<!-- EVENT acp_group_options_before -->
 	<!-- IF S_USER_FOUNDER -->
 	<dl>
 		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}{L_COLON}</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>
@@ -78,6 +79,7 @@
 		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}{L_COLON}</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>
 		<dd><input name="group_receive_pm" type="checkbox" value="1" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>
 	</dl>
+	<!-- EVENT acp_group_options_after -->
 	</fieldset>
 
 	<fieldset>
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index d32f6b7eac..4439f519e0 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -2,29 +2,7 @@
 
 <a id="maincontent"></a>
 
-<!-- IF S_SELECT_METHOD -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_SELECT_DOWNLOAD_FORMAT}</h1>
-
-	<form id="selectmethod" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_DOWNLOAD_AS}</legend>
-	<dl>
-		<dt><label for="use_method">{L_DOWNLOAD_AS}{L_COLON}</label></dt>
-		<dd>{RADIO_BUTTONS}</dd>
-	</dl>
-
-	<p class="quick">
-		<input type="submit" class="button2" value="{L_DOWNLOAD}" name="download" />
-	</p>
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_DETAILS -->
+<!-- IF S_DETAILS -->
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
@@ -58,153 +36,32 @@
 	</fieldset>
 	</form>
 
-	<br /><br />
+	<!-- IF .missing_files -->
+		<h3 class="error">{L_MISSING_FILES}</h3>
 
-	<!-- IF S_MISSING_FILES -->
-		<div class="errorbox">
-			<h3>{L_MISSING_FILES}</h3>
-			<p>{MISSING_FILES}</p>
-		</div>
-		<br /><br />
-	<!-- ENDIF -->
-
-	<!-- IF S_MISSING_VARS -->
-		<h1>{L_MISSING_LANG_VARIABLES}</h1>
-
-		<p>{L_MISSING_VARS_EXPLAIN}</p>
-
-		<form id="missing" method="post" action="{U_MISSING_ACTION}">
-
-		<table class="table1">
-		<thead>
-		<tr>
-			<th>{L_LANGUAGE_KEY}</th>
-			<th>{L_LANGUAGE_VARIABLE}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN missing -->
-			<tr class="row4">
-				<td><strong>{missing.FILE}</strong></td>
-				<td style="text-align: right;"><input type="submit" name="missing_file[{missing.KEY}]" value="{L_SELECT}" class="button2" /></td>
-			</tr>
-			{missing.TPL}
-		<!-- END missing -->
-		</tbody>
-		</table>
-		<div>{S_FORM_TOKEN}</div>
-		</form>
-
-		<br /><br />
-	<!-- ENDIF -->
-
-	<a id="entries"></a>
-
-	<h1>{L_LANGUAGE_ENTRIES}</h1>
-
-	<p>{L_LANGUAGE_ENTRIES_EXPLAIN}</p>
-
-	<form id="lang_entries" method="post" action="{U_ENTRY_ACTION}">
-
-	<!-- IF S_FROM_STORE -->
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-			<input type="submit" name="remove_store" value="{L_REMOVE_FROM_STORAGE_FOLDER}" class="button2" /> 
+		<fieldset>
+			<legend>{L_MISSING_LANG_FILES}</legend>
+			<!-- BEGIN missing_files -->
+			&raquo; {missing_files.FILE_NAME}<br />
+			<!-- END missing_files -->
 		</fieldset>
 	<!-- ENDIF -->
 
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<select name="language_file">{S_LANG_OPTIONS}</select>&nbsp;<input type="submit" class="button2" name="change" value="{L_SELECT}" />
-	</fieldset>
-
-	<p>&nbsp;<br />&nbsp;</p>
-
-
-	<!--[if lt IE 8]>
-	<style type="text/css">
-	/* <![CDATA[ */
-		input.langvalue, textarea.langvalue {
-		width: 450px;
-		}
-	/* ]]> */
-	</style>
-	<![endif]-->
-
-	<table class="table1">
-	<thead>
-	<!-- IF S_EMAIL_FILE -->
-		<tr>
-			<th colspan="2">{L_FILE_CONTENTS}</th>
-		</tr>
-	<!-- ELSE -->
-		<tr>
-			<th>{L_LANGUAGE_KEY}</th>
-			<th>{L_LANGUAGE_VARIABLE}</th>
-		</tr>
-	<!-- ENDIF -->
-	<tr>
-		<td rowspan="2" class="row3"><strong>{PRINT_MESSAGE}<!-- IF S_FROM_STORE --><br /><span style="color: red;">{L_FILE_FROM_STORAGE}</span><!-- ENDIF --></strong></td>
-		<td class="row3" style="text-align: right;"><input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
-	</tr>
-	<tr>
-		<td class="row3" style="text-align: right;">	
-		<!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}{L_COLON}&nbsp;<!-- BEGIN buttons --><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" />&nbsp;{buttons.VALUE}&nbsp;<!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- IF S_EMAIL_FILE -->
-		<tr>
-			<td class="row2" colspan="2" style="text-align: center;"><textarea name="entry" id="entry" cols="80" rows="20">{LANG}</textarea></td>
-		</tr>
-	<!-- ELSE -->
-		{TPL}
-	<!-- ENDIF -->
-	<tr>
-		<td class="row3" colspan="3" style="text-align: right;">{S_FORM_TOKEN}<input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
-	</tr>
-	</tbody>
-	</table>
-	</form>
-
-<!-- ELSEIF S_UPLOAD -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_UPLOAD_SETTINGS}</h1>
-
-	<form id="upload" method="post" action="{U_ACTION}">
-
-	<!-- IF S_CONNECTION_SUCCESS -->
-		<div class="successbox">
-			<p>{L_CONNECTION_SUCCESS}</p>
-		</div>
-	<!-- ELSEIF S_CONNECTION_FAILED -->
-		<div class="errorbox">
-			<p>{L_CONNECTION_FAILED}</p>
-		</div>
+	<!-- IF .missing_varfile -->
+		<h3 class="error">{L_MISSING_VARS_EXPLAIN}</h3>
+
+		<fieldset>
+			<legend>{L_MISSING_LANG_VARIABLES}</legend>
+			<!-- BEGIN missing_varfile -->
+			<dl>
+				<dt><label>{missing_varfile.FILE_NAME}</label></dt>
+				<!-- BEGIN variable -->
+				<dd>{missing_varfile.variable.VAR_NAME}</dd>
+				<!-- END variable -->
+			</dl>
+			<!-- END missing_varfile -->
+		</fieldset>
 	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_UPLOAD_SETTINGS}</legend>
-	<dl>
-		<dt><label>{L_UPLOAD_METHOD}{L_COLON}</label></dt>
-		<dd><strong>{NAME}</strong></dd>
-	</dl>
-	<!-- BEGIN data -->
-	<dl>
-		<dt><label for="{data.DATA}">{data.NAME}{L_COLON}</label><br /><span>{data.EXPLAIN}</span></dt>
-		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
-	</dl>
-	<!-- END data -->
-	</fieldset>
-	
-	<fieldset class="quick">
-		{HIDDEN}
-		{S_FORM_TOKEN}
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
-	</fieldset>
-	</form>
-
 <!-- ELSE -->
 
 	<h1>{L_ACP_LANGUAGE_PACKS}</h1>
@@ -231,7 +88,7 @@
 		<td>{lang.LOCAL_NAME}</td>
 		<td style="text-align: center;"><strong>{lang.ISO}</strong></td>
 		<td style="text-align: center;">{lang.USED_BY}</td>
-		<td style="text-align: center;">&nbsp;<a href="{lang.U_DOWNLOAD}">{L_DOWNLOAD}</a>&nbsp;|&nbsp;<a href="{lang.U_DELETE}">{L_DELETE}</a></td>
+		<td style="text-align: center;"><a href="{lang.U_DELETE}">{L_DELETE}</a></td>
 	</tr>
 	<!-- END lang -->
 	<!-- IF .notinst -->
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index 822ab76313..c3d148966d 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -10,7 +10,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 8810414fc2..0f4589f5d4 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -32,7 +32,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index d3f2f17bc7..c08fd931a0 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -17,7 +17,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 
 <!-- EVENT acp_simple_footer_after -->