From 4b5fab372ff69a809144dee3a0a7f90c219fe400 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 30 Jan 2008 16:14:39 +0000
Subject: merge with revision #r8350

git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_language.html        | 2 ++
 phpBB/adm/style/colour_swatch.html       | 4 ++--
 phpBB/adm/style/install_update_diff.html | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index 815ebb024a..95ac1d5852 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -121,9 +121,11 @@
 
 	<!--[if lt IE 8]>
 	<style type="text/css">
+	/* <![CDATA[ */
 		input.langvalue, textarea.langvalue {
 		width: 450px;
 		}
+	/* ]]> */
 	</style>
 	<![endif]-->
 
diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
index f3c5a812dc..c9e89980d8 100644
--- a/phpBB/adm/style/colour_swatch.html
+++ b/phpBB/adm/style/colour_swatch.html
@@ -8,7 +8,7 @@
 <title>{L_COLOUR_SWATCH}</title>
 
 <style type="text/css">
-<!--
+/* <![CDATA[ */
 	body {
 		background-color: #404040;
 		color: #fff;
@@ -29,7 +29,7 @@
 	img {
 		border: 0;
 	}
-//-->
+/* ]]> */
 </style>
 </head>
 
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index b9ac19ae5d..efbe1d045c 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -32,7 +32,7 @@ function resize_panel()
 </script>
 
 <style type="text/css">
-<!--
+/* <![CDATA[ */
 
 #main {
 	font-size: 1em;
@@ -198,7 +198,7 @@ table.hrdiff caption span {
 
 <!-- ENDIF -->
 
-//-->
+/* ]]> */
 </style>
 
 </head>
-- 
cgit v1.2.1


From 3b669aedfde10b95996d529da9b21e31c46cc8a6 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 3 Feb 2008 22:39:38 +0000
Subject: adding a new option to hide the entire list of subforums on
 listforums

git-svn-id: file:///svn/phpbb/trunk@8373 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_forums.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 560bc195bc..0a8c9b4c8a 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -202,6 +202,11 @@
 			<dt><label for="forum_status">{L_FORUM_STATUS}:</label></dt>
 			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
 		</dl>
+		<dl>
+			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}:</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_subforum_list" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
 		<dl>
 			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-- 
cgit v1.2.1


From b33ec670a29299aafca4f591226b57268b6ad615 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 4 Feb 2008 12:14:03 +0000
Subject: Minor stuff: #20925, #20815

git-svn-id: file:///svn/phpbb/trunk@8376 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_forums.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 0a8c9b4c8a..e4662d9280 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -450,7 +450,7 @@
 					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
 						{ICON_MOVE_UP_DISABLED}
 						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW-->
+					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
 						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
 						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
 					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
-- 
cgit v1.2.1


From 2cedbbac0944da85a01f3a3afbac65756610f29d Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 23 Feb 2008 14:23:34 +0000
Subject: merge revisions #r8384, #r8387, #r8388, #r8389 and #r8390

git-svn-id: file:///svn/phpbb/trunk@8391 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_database.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html
index 8165efe9a2..e64c5ed437 100644
--- a/phpBB/adm/style/acp_database.html
+++ b/phpBB/adm/style/acp_database.html
@@ -77,7 +77,7 @@
 			<option value="{tables.TABLE}">{tables.TABLE}</option>
 		<!-- END tables -->
 		</select></dd>
-		<dd><a href="#" onclick="selector(true)">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false)">{L_DESELECT_ALL}</a></dd>
+		<dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd>
 	</dl>
 
 	<p class="submit-buttons">
-- 
cgit v1.2.1


From 8c64d7c32afa5a8c28522ac0d99faa78a75ebefc Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 13 Mar 2008 15:25:20 +0000
Subject: merging #r8426 to #r8430

git-svn-id: file:///svn/phpbb/trunk@8431 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_attachments.html      |  6 +++---
 phpBB/adm/style/acp_bbcodes.html          |  4 ++++
 phpBB/adm/style/acp_database.html         | 22 +++++++++++++---------
 phpBB/adm/style/acp_icons.html            | 20 ++++++++++++--------
 phpBB/adm/style/acp_permission_roles.html | 15 ++++++++++-----
 phpBB/adm/style/acp_prune_forums.html     |  2 +-
 phpBB/adm/style/acp_styles.html           |  2 +-
 phpBB/adm/style/acp_words.html            |  4 ++++
 8 files changed, 48 insertions(+), 27 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index a002ad19ac..9573c34248 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -122,11 +122,11 @@
 			{
 				if (newimage == 'no_image')
 				{
-					document.image_upload_icon.src = "{PHPBB_ROOT_PATH}images/spacer.gif";
+					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}images/spacer.gif";
 				}
 				else
 				{
-					document.image_upload_icon.src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
+					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
 				}
 			}
 
@@ -192,7 +192,7 @@
 			<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">
 					<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}
 			</select></dd>
-			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> name="image_upload_icon" alt="" title="" />&nbsp;</dd>
+			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
 		</dl>
 		<dl>
 			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt>
diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index a0b0016a11..c81c198fd5 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -103,6 +103,10 @@
 			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td>
 			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}">{ICON_DELETE}</a></td>
 		</tr>
+	<!-- BEGINELSE -->
+		<tr class="row3">
+			<td colspan="2">{L_ACP_NO_ITEMS}</td>
+		</tr>
 	<!-- END bbcodes -->
 	</tbody>
 	</table>
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html
index e64c5ed437..ebc76c36a3 100644
--- a/phpBB/adm/style/acp_database.html
+++ b/phpBB/adm/style/acp_database.html
@@ -7,8 +7,9 @@
 
 	<p>{L_ACP_RESTORE_EXPLAIN}</p>
 
+	<!-- IF .files -->
 	<form id="acp_backup" method="post" action="{U_ACTION}">
-	
+
 	<fieldset>
 		<legend>{L_RESTORE_OPTIONS}</legend>
 	<dl>
@@ -16,16 +17,19 @@
 		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
 	</dl>
 
-	<!-- IF .files -->
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" />&nbsp;
-			<input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" />&nbsp;
-			<input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" />
-		</p>
-	<!-- ENDIF -->
-		{S_FORM_TOKEN}
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" />&nbsp;
+		<input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" />&nbsp;
+		<input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" />
+	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
 	</form>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_ACP_NO_ITEMS}</p>
+		</div>
+	<!-- ENDIF -->
 
 <!-- ELSE -->
 	<h1>{L_ACP_BACKUP}</h1>
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index 8bb8257318..86500ae047 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -43,19 +43,19 @@
 	
 	function toggle_select(icon, display, select)
 	{
-		var disp = document.getElementById('order_disp[' + icon + ']');
-		var nodisp = document.getElementById('order_no_disp[' + icon + ']');
+		var disp = document.getElementById('order_disp_' + select);
+		var nodisp = document.getElementById('order_no_disp_' + select);
 		disp.disabled = !display;
 		nodisp.disabled = display;
 		if (display)
 		{
-			document.getElementById(select).selectedIndex = 0;
+			document.getElementById('order_' + select).selectedIndex = 0;
 			nodisp.className = 'disabled-options';
 			disp.className = '';
 		}
 		else
 		{
-			document.getElementById(select).selectedIndex = {S_ORDER_LIST_DISPLAY_COUNT};
+			document.getElementById('order_' + select).selectedIndex = {S_ORDER_LIST_DISPLAY_COUNT};
 			disp.className = 'disabled-options';
 			nodisp.className = '';
 		}
@@ -111,15 +111,15 @@
 		<td><input class="text post" type="text" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
 		<td><input class="text post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
 		<td>
-			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, 'order[{items.A_IMG}]');"/>
+			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>
 			<!-- IF items.S_ID -->
 				<input type="hidden" name="id[{items.IMG}]" value="{items.ID}" />
 			<!-- ENDIF -->
 		</td>
 		<!-- IF ID or S_ADD -->
-			<td><select id="order[{items.IMG}]" name="order[{items.IMG}]">
-				<optgroup id="order_disp[{items.IMG}]" label="{L_DISPLAY_POSTING}" <!-- IF not items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_DISPLAY}</optgroup>
-				<optgroup id="order_no_disp[{items.IMG}]" label="{L_DISPLAY_POSTING_NO}" <!-- IF  items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_UNDISPLAY}</optgroup>
+			<td><select id="order_{items.S_ROW_COUNT}" name="order[{items.IMG}]">
+				<optgroup id="order_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING}" <!-- IF not items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_DISPLAY}</optgroup>
+				<optgroup id="order_no_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING_NO}" <!-- IF  items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_UNDISPLAY}</optgroup>
 			</select></td>
 		<!-- ENDIF -->	
 		<!-- IF S_ADD -->
@@ -248,6 +248,10 @@
 				&nbsp;<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}">{ICON_DELETE}</a>
 			</td>
 		</tr>
+	<!-- BEGINELSE -->
+		<tr class="row3">
+			<td colspan="{COLSPAN}">{L_ACP_NO_ITEMS}</td>
+		</tr>
 	<!-- END items -->
 	</tbody>
 	</table>
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index 725c7a5ec1..220e7dafbe 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -28,11 +28,11 @@
 
 	<p>{L_EXPLAIN}</p>
 
-	<form id="acp_roles" method="post" action="{U_ACTION}">
-
 	<br />
 	<a href="#acl">&raquo; {L_SET_ROLE_PERMISSIONS}</a>
 
+	<form id="acp_roles" method="post" action="{U_ACTION}">
+
 	<fieldset>
 		<legend>{L_ROLE_DETAILS}</legend>
 	<dl>
@@ -46,6 +46,7 @@
 
 	<p class="quick">
 		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
 
@@ -57,11 +58,15 @@
 
 	<!-- ENDIF -->
 
+	<p>
+
 	<a name="acl"></a>
 
 	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
 	<br /><br />
 
+	</p>
+
 	<h1>{L_ACL_TYPE}</h1>
 
 	<fieldset class="perm nolegend">
@@ -107,9 +112,9 @@
 						<!-- IF auth.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
 						<th class="permissions-name<!-- IF auth.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->">{auth.mask.PERMISSION}</th>
 							
-						<td class="permissions-yes"><label for="{auth.mask.FIELD_NAME}_y"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting[{auth.mask.FIELD_NAME}]_y" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
-						<td class="permissions-no"><label for="{auth.mask.FIELD_NAME}_u"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting[{auth.mask.FIELD_NAME}]_u" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
-						<td class="permissions-never"><label for="{auth.mask.FIELD_NAME}_n"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting[{auth.mask.FIELD_NAME}]_n" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
+						<td class="permissions-yes"><label for="setting_{auth.mask.FIELD_NAME}_y"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_y" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
+						<td class="permissions-no"><label for="setting_{auth.mask.FIELD_NAME}_u"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_u" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
+						<td class="permissions-never"><label for="setting_{auth.mask.FIELD_NAME}_n"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_n" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
 					</tr>
 					<!-- END mask -->
 					</tbody>
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html
index 890a3ba569..069d2c91c3 100644
--- a/phpBB/adm/style/acp_prune_forums.html
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -44,7 +44,7 @@
 		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
 	<dl>
 		<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
-		<dd><select name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
+		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
 		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>
 	</dl>
 	
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 4b3bcddf1d..a1363fce8d 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -459,7 +459,7 @@
 	</dl>
 	<dl>
 		<dt><label for="copyright">{L_COPYRIGHT}:</label></dt>
-		<dd><!-- IF S_INSTALL --><b id="name">{COPYRIGHT}</b><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd>
+		<dd><!-- IF S_INSTALL --><b id="copyright">{COPYRIGHT}</b><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd>
 	</dl>
 	<!-- IF S_STYLE and not S_BASIS -->
 		<dl>
diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html
index 9bd0bf11a0..3fa4cfc91c 100644
--- a/phpBB/adm/style/acp_words.html
+++ b/phpBB/adm/style/acp_words.html
@@ -62,6 +62,10 @@
 		<td style="text-align: center;">{words.REPLACEMENT}</td>
 		<td>&nbsp;<a href="{words.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{words.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
 	</tr>
+	<!-- BEGINELSE -->
+	<tr class="row3">
+		<td colspan="3">{L_ACP_NO_ITEMS}</td>
+	</tr>
 	<!-- END words -->
 	</tbody>
 	</table>
-- 
cgit v1.2.1


From 52400baafa8bf429a43cc36740720668833982ca Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Fri, 2 May 2008 14:45:19 +0000
Subject: merge

git-svn-id: file:///svn/phpbb/trunk@8535 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_forums.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index e4662d9280..636d4ded7b 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -96,7 +96,7 @@
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
-	<h1>{L_TITLE} :: {FORUM_NAME}</h1>
+	<h1>{L_TITLE} <!-- IF FORUM_NAME -->:: {FORUM_NAME}<!-- ENDIF --></h1>
 
 	<p>{L_FORUM_EDIT_EXPLAIN}</p>
 
-- 
cgit v1.2.1


From 65fb840b761cb04d52bd03ef0d5ed20053ae16ba Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Tue, 3 Jun 2008 16:33:02 +0000
Subject: merge

git-svn-id: file:///svn/phpbb/trunk@8587 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_login.html      | 46 +++++++++++++++++++++++++++++++++++++
 phpBB/adm/style/overall_header.html |  6 +++--
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100755 phpBB/adm/style/acp_login.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_login.html b/phpBB/adm/style/acp_login.html
new file mode 100755
index 0000000000..015f3ec908
--- /dev/null
+++ b/phpBB/adm/style/acp_login.html
@@ -0,0 +1,46 @@
+<!-- INCLUDE overall_header.html -->
+<h1>{PAGE_TITLE}</h1>
+<p><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></p>
+
+<!-- IF LOGIN_ERROR -->
+	<div class="errorbox">
+		<h3>{L_WARNING}</h3>
+		<p>{LOGIN_ERROR}</p>
+	</div>
+<!-- ENDIF -->
+<form action="{S_LOGIN_ACTION}" method="post" id="login">
+ 
+	<fieldset>
+		<dl>
+			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
+			<dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
+			<dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
+			<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
+				<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
+				<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
+			<!-- ENDIF -->
+		</dl>
+			
+		<!-- IF S_CONFIRM_CODE -->
+		<dl>
+			<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label><br /><span>{L_CONFIRM_CODE_EXPLAIN}</span></dt>
+				<dd><input type="hidden" name="confirm_id" value="{CONFIRM_ID}" />{CONFIRM_IMAGE}</dd>
+				<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="3" class="inputbox narrow" title="{L_CONFIRM_CODE}" /></dd>
+		</dl>
+		<!-- ENDIF -->
+	
+		<p class="submit-buttons">
+			<!-- IF S_DISPLAY_FULL_LOGIN -->
+				<!-- IF S_AUTOLOGIN_ENABLED --><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label><!-- ENDIF -->
+				<label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label>
+			<!-- ENDIF -->
+				&nbsp;
+				{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" />
+		</p>
+	</fieldset> 
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index e883e66d80..adafc0aa6d 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -181,11 +181,12 @@ function switch_menu()
 			<span class="corners-top"><span></span></span>
 				<div id="content">
 					<!-- IF not S_USER_NOTICE --> 
-					<div id="toggle">						
+					<div id="toggle">
 						<a id="toggle-handle" accesskey="m" title="{L_MENU_TOGGLE}" onclick="switch_menu(); return false;" href="#"></a></div>
 					<!-- ENDIF -->
 					<div id="menu">
-						<p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;]</p>
+						<p><!-- IF S_USER_LOGGED_IN --> {L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;]<!-- ENDIF --><!-- IF S_USER_ADMIN -->[&nbsp;<a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a>&nbsp;]<!-- ENDIF --></p>
+						<!-- IF S_USER_ADMIN --> 
 						<ul>
 						<!-- BEGIN l_block1 -->
 							<!-- IF l_block1.S_SELECTED -->
@@ -203,6 +204,7 @@ function switch_menu()
 							<!-- ENDIF -->
 						<!-- END l_block1 -->
 						</ul>
+						<!-- ENDIF -->
 					</div>
 	
 					<div id="main">
-- 
cgit v1.2.1


From 150c6c4c245ac2728bca78aee998da9fe8ca7bb8 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Wed, 4 Jun 2008 15:38:14 +0000
Subject: removed executable props [Bug #6464]

git-svn-id: file:///svn/phpbb/trunk@8599 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_inactive.html    | 0
 phpBB/adm/style/acp_login.html       | 0
 phpBB/adm/style/install_convert.html | 0
 phpBB/adm/style/install_error.html   | 0
 phpBB/adm/style/install_footer.html  | 0
 phpBB/adm/style/install_header.html  | 0
 phpBB/adm/style/install_install.html | 0
 phpBB/adm/style/install_main.html    | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 phpBB/adm/style/acp_inactive.html
 mode change 100755 => 100644 phpBB/adm/style/acp_login.html
 mode change 100755 => 100644 phpBB/adm/style/install_convert.html
 mode change 100755 => 100644 phpBB/adm/style/install_error.html
 mode change 100755 => 100644 phpBB/adm/style/install_footer.html
 mode change 100755 => 100644 phpBB/adm/style/install_header.html
 mode change 100755 => 100644 phpBB/adm/style/install_install.html
 mode change 100755 => 100644 phpBB/adm/style/install_main.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
old mode 100755
new mode 100644
diff --git a/phpBB/adm/style/acp_login.html b/phpBB/adm/style/acp_login.html
old mode 100755
new mode 100644
diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html
old mode 100755
new mode 100644
diff --git a/phpBB/adm/style/install_error.html b/phpBB/adm/style/install_error.html
old mode 100755
new mode 100644
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
old mode 100755
new mode 100644
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
old mode 100755
new mode 100644
diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html
old mode 100755
new mode 100644
diff --git a/phpBB/adm/style/install_main.html b/phpBB/adm/style/install_main.html
old mode 100755
new mode 100644
-- 
cgit v1.2.1


From d8f2c4a1c4468440cf6c8657891e179bf7d222f5 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 28 Jul 2008 13:21:53 +0000
Subject: add warning to ACP index if config file is writeable

git-svn-id: file:///svn/phpbb/trunk@8689 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_main.html | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index bad15bef30..6126c16d63 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -21,6 +21,13 @@
 		</div>
 	<!-- ENDIF -->
 
+	<!-- IF S_WRITEABLE_CONFIG -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{L_WRITEABLE_CONFIG}</p>
+		</div>
+	<!-- ENDIF -->
+
 	<table cellspacing="1">
 		<caption>{L_FORUM_STATS}</caption>
 		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-- 
cgit v1.2.1


From 15e04808fc3a6699ac857c2252cce70090df80ba Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 16 Aug 2008 13:11:50 +0000
Subject: writeable -> writable merge

git-svn-id: file:///svn/phpbb/trunk@8762 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_main.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 6126c16d63..3bfa7602c7 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -21,10 +21,10 @@
 		</div>
 	<!-- ENDIF -->
 
-	<!-- IF S_WRITEABLE_CONFIG -->
+	<!-- IF S_WRITABLE_CONFIG -->
 		<div class="errorbox">
 			<h3>{L_WARNING}</h3>
-			<p>{L_WRITEABLE_CONFIG}</p>
+			<p>{L_WRITABLE_CONFIG}</p>
 		</div>
 	<!-- ENDIF -->
 
-- 
cgit v1.2.1


From 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Thu, 4 Sep 2008 11:39:25 +0000
Subject: Remove caching of templates from the database completely, themes is
 cut down ready for a complete chop, and fix the installer :)

git-svn-id: file:///svn/phpbb/trunk@8812 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_styles.html | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index a1363fce8d..3f25ded9f7 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -475,13 +475,6 @@
 			<dd><!-- IF S_INSTALL --><b id="imageset_id">{IMAGESET_NAME}</b><!-- ELSE --><select id="imageset_id" name="imageset_id">{S_IMAGESET_OPTIONS}</select><!-- ENDIF --></dd>
 		</dl>
 	<!-- ENDIF -->
-	<!-- IF S_TEMPLATE or S_THEME -->
-		<dl>
-			<dt><label for="store_db">{L_LOCATION}:</label><br /><span>{L_LOCATION_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> /> {L_STORE_FILESYSTEM}</label>
-				<label><input type="radio" class="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> /> {L_STORE_DATABASE}</label></dd>
-		</dl>
-	<!-- ENDIF -->
 	<!-- IF S_STYLE -->
 		</fieldset>
 
-- 
cgit v1.2.1


From 44416f4744b9a55e35c7945a13759d3e7d71fd3d Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 4 Sep 2008 14:04:30 +0000
Subject: - queue trigger feature - queued posts do not affect user_posts -
 show links to MCP + queued posts in ucp and acp

git-svn-id: file:///svn/phpbb/trunk@8816 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_users_overview.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 0611ccba46..e3eff369cc 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -30,7 +30,7 @@
 </dl>
 <dl>
 	<dt><label>{L_POSTS}:</label></dt>
-	<dd><strong>{USER_POSTS}</strong></dd>
+	<dd><strong>{USER_POSTS}</strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd>
 </dl>
 <dl>
 	<dt><label>{L_WARNINGS}:</label></dt>
@@ -138,7 +138,7 @@
 	</p>
 
 	</fieldset>
-	
+
 	</form>
 
 <!-- ENDIF -->
-- 
cgit v1.2.1


From 235f55297495c05ae9642dece363a9862f37d0e6 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 17 Sep 2008 14:50:48 +0000
Subject: Expand shown ban reason in unban screen to fully show long entries.
 (Bug #16234)

git-svn-id: file:///svn/phpbb/trunk@8863 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_ban.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
index acb6e46df1..bc326345b0 100644
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -97,11 +97,11 @@
 	</dl>
 	<dl>
 		<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
-		<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbanreason" id="unbanreason" /></dd>
+		<dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbanreason" id="unbanreason" rows="5" cols="80">&nbsp;</textarea></dd>
 	</dl>
 	<dl>
 		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
-		<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbangivereason" id="unbangivereason" /></dd>
+		<dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbangivereason" id="unbangivereason" rows="5" cols="80">&nbsp;</textarea></dd>
 	</dl>
 
 	<p class="submit-buttons">
-- 
cgit v1.2.1


From 461be11e8d0f5d4bd879cf95bd1472dbe985e0b6 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Fri, 19 Sep 2008 13:17:30 +0000
Subject: Okay, that is pretty raw, but better to have it in place than trying
 to play catch-up. Introducing an early stage of CAPTCHA modules.

git-svn-id: file:///svn/phpbb/trunk@8889 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_captcha.html              | 47 +++++++++---------------
 phpBB/adm/style/captcha_default_acp_demo.html |  5 +++
 phpBB/adm/style/captcha_gd_acp.html           | 53 +++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 30 deletions(-)
 create mode 100755 phpBB/adm/style/captcha_default_acp_demo.html
 create mode 100755 phpBB/adm/style/captcha_gd_acp.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index d9d087d6ba..5d04938778 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -22,47 +22,34 @@
 	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
 		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
 </dl>
-<!-- IF GD -->
-<dl>
-	<dt><label for="captcha_gd">{L_CAPTCHA_GD}:</label><br /><span>{L_CAPTCHA_GD_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd" name="captcha_gd" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}:</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
+
+</fieldset>
+
+<fieldset>
+<legend>{L_AVAILABLE_CAPTCHAS}</legend>
+
 <dl>
-	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd>
+	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}:</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
+	<dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd>
+	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}:</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
+	<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd>
 </dl>
-<!-- ENDIF -->
-
+	
 </fieldset>
+
+<!-- IF CAPTCHA_PREVIEW -->
 <fieldset>
 	<legend>{L_PREVIEW}</legend>
-<!-- IF PREVIEW -->
-	<div class="successbox">
-		<h3>{L_WARNING}</h3>
-		<p>{L_CAPTCHA_PREVIEW_MSG}</p>
-	</div>
-<!-- ENDIF -->
-<dl>
-	<dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
-	<dd><img src="{CAPTCHA_PREVIEW}" alt="{L_PREVIEW}" <!-- IF CAPTCHA_GD_PREVIEWED -->width="360" height="96"<!-- ELSE --> width="320" height="50"<!-- ENDIF --> id="captcha_preview" /></dd>
-</dl>
+{CAPTCHA_PREVIEW}
 </fieldset>
+<!-- ENDIF -->
 
 <fieldset class="submit-buttons">
 	<legend>{L_SUBMIT}</legend>
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
-	<input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" />
+	<input class="button1" type="submit" id="main_submit" name="main_submit" value="{L_SUBMIT}" />&nbsp;
+	<input class="button2" type="reset" id="form_reset" name="reset" value="{L_RESET}" />&nbsp;
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html
new file mode 100755
index 0000000000..a714386e51
--- /dev/null
+++ b/phpBB/adm/style/captcha_default_acp_demo.html
@@ -0,0 +1,5 @@
+
+<dl>
+	<dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
+	<dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd>
+</dl>
\ No newline at end of file
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html
new file mode 100755
index 0000000000..ff1500e7d0
--- /dev/null
+++ b/phpBB/adm/style/captcha_gd_acp.html
@@ -0,0 +1,53 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_VC_SETTINGS}</h1>
+
+<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
+
+
+<form id="acp_captcha" method="post" action="{U_ACTION}">
+
+<fieldset>
+<legend>{L_GENERAL_OPTIONS}</legend>
+
+<dl>
+	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}:</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>
+	<dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+</dl>
+<dl>
+	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
+	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd>
+</dl>
+<dl>
+	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
+	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd>
+</dl>
+
+
+</fieldset>
+<fieldset>
+	<legend>{L_PREVIEW}</legend>
+<!-- IF PREVIEW -->
+	<div class="successbox">
+		<h3>{L_WARNING}</h3>
+		<p>{L_CAPTCHA_PREVIEW_MSG}</p>
+	</div>
+<!-- ENDIF -->
+{CAPTCHA_PREVIEW}
+</fieldset>
+
+<fieldset class="submit-buttons">
+	<legend>{L_SUBMIT}</legend>
+	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
+	<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" />
+	<input type="hidden" name="configure" value="1" />
+
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 01c1c27f2c148b38ce9f3f73980cba27a525d30f Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Fri, 19 Sep 2008 16:18:59 +0000
Subject: meh

git-svn-id: file:///svn/phpbb/trunk@8892 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/captcha_default_acp_demo.html | 0
 phpBB/adm/style/captcha_gd_acp.html           | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 phpBB/adm/style/captcha_default_acp_demo.html
 mode change 100755 => 100644 phpBB/adm/style/captcha_gd_acp.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html
old mode 100755
new mode 100644
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html
old mode 100755
new mode 100644
-- 
cgit v1.2.1


From 0f14f278d0fa9d765bb141ab79242a34fa73a883 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 22 Sep 2008 12:37:42 +0000
Subject: fixing some vC bugs (attempt counting and posting) and introducing
 prototype for reCaptcha

git-svn-id: file:///svn/phpbb/trunk@8903 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/captcha_recaptcha.html     | 19 ++++++++++++
 phpBB/adm/style/captcha_recaptcha_acp.html | 48 ++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 phpBB/adm/style/captcha_recaptcha.html
 create mode 100644 phpBB/adm/style/captcha_recaptcha_acp.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html
new file mode 100644
index 0000000000..f325c3727d
--- /dev/null
+++ b/phpBB/adm/style/captcha_recaptcha.html
@@ -0,0 +1,19 @@
+<!-- IF S_RECAPTCHA_AVAILABLE -->
+	<dl>
+		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
+		// <![CDATA[
+		var RecaptchaOptions = {
+		   lang : {L_RECAPTCHA_LANG}
+		};
+		// ]]>
+		</script>
+
+	<noscript>
+  		<iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br/>
+  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
+  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
+	</noscript>
+	</dl>
+<!-- ELSE -->
+{L_RECAPTCHA_NOT_AVAILABLE}
+<!-- ENDIF -->
\ No newline at end of file
diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html
new file mode 100644
index 0000000000..07751d1d03
--- /dev/null
+++ b/phpBB/adm/style/captcha_recaptcha_acp.html
@@ -0,0 +1,48 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_VC_SETTINGS}</h1>
+
+<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
+
+
+<form id="acp_captcha" method="post" action="{U_ACTION}">
+
+<fieldset>
+<legend>{L_GENERAL_OPTIONS}</legend>
+
+<dl>
+	<dt><label for="recaptcha_pubkey">{L_RECAPTCHA_PUBLIC}:</label><br /><span>{L_RECAPTCHA_PUBLIC_EXPLAIN}</span></dt>
+	<dd><input id="recaptcha_pubkey" name="recaptcha_pubkey" value="{RECAPTCHA_PUBKEY}" size="50" type="text" /></dd>
+</dl>
+<dl>
+	<dt><label for="recaptcha_privkey">{L_RECAPTCHA_PRIVATE}:</label><br /><span>{L_RECAPTCHA_PRIVATE_EXPLAIN}</span></dt>
+	<dd><input id="recaptcha_privkey" name="recaptcha_privkey" value="{RECAPTCHA_PRIVKEY}" size="50" type="text" /></dd>
+</dl>
+
+
+</fieldset>
+<fieldset>
+	<legend>{L_PREVIEW}</legend>
+<!-- IF PREVIEW -->
+	<div class="successbox">
+		<h3>{L_WARNING}</h3>
+		<p>{L_CAPTCHA_PREVIEW_MSG}</p>
+	</div>
+<!-- ENDIF -->
+{CAPTCHA_PREVIEW}
+</fieldset>
+
+<fieldset class="submit-buttons">
+	<legend>{L_SUBMIT}</legend>
+	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
+	<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" />
+	<input type="hidden" name="configure" value="1" />
+
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From ce6b87ccec8a92c5455871446f88b122019672e9 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 23 Sep 2008 13:11:34 +0000
Subject: - Automatically add users/groups to the PM recipient list, if entered
 or selected. - Reply to PM now includes all previous recipients and not only
 the original sender. - Added 'max_recipients' setting for private messages.
 This setting allows admins to define the maximum number of recipients per
 private message with a board-wide setting and a group-specific setting. -
 Added new permission setting for sending private messages to groups. Now
 there are two permissions to define sending private messages to multiple
 recipients and private messages to groups.

git-svn-id: file:///svn/phpbb/trunk@8914 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_groups.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index c90a075f9e..5df8a16a39 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -74,6 +74,10 @@
 		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
 		<dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd>
 	</dl>
+	<dl>
+		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}:</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
+		<dd><input name="group_max_recipients" type="text" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
+	</dl>
 	<dl>
 		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
 		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
-- 
cgit v1.2.1


From 89f1b88fe15da4fc8c25f456ef594f20a5357476 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 6 Oct 2008 05:52:49 +0000
Subject: merge r8970 and r8971

git-svn-id: file:///svn/phpbb/trunk@8972 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_users.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index 2e4b3ef8f2..34e4147356 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -197,7 +197,7 @@
 		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 	</div>
 	<!-- ENDIF -->
-	
+
 	<fieldset class="quick">
 		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
 		<p class="small"><a href="#" onclick="marklist('user_attachments', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('user_attachments', 'mark', false);">{L_UNMARK_ALL}</a></p>
@@ -215,7 +215,7 @@
 	<form id="select_forum" method="post" action="{U_ACTION}">
 
 		<fieldset class="quick" style="text-align: left;">
-			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select> 
+			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select>
 			<input class="button2" type="submit" value="{L_GO}" name="select" />
 			{S_FORM_TOKEN}
 		</fieldset>
-- 
cgit v1.2.1


From 9d9d61b1a209098dc30d0905d88575a4f84cb197 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 8 Oct 2008 12:51:43 +0000
Subject: Merge revisions: r8974, r8975, r8976, r8977, r8978, r8979

git-svn-id: file:///svn/phpbb/trunk@8980 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/admin.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 8e6f0b7295..219ff20eba 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1333,18 +1333,21 @@ fieldset.permissions .permissions-switch {
 fieldset.permissions .padding {
 }
 
+.permissions-switch {
+	margin-top: -6px;
+	font-size: .9em;
+}
+
 .permissions-switch a {
 	text-decoration: underline;
-	font-size: 0.90em;
 }
 
 .permissions-reset {
-	margin-top: -6px;
 	padding-bottom: 10px;
 }
 
 .permissions-reset a {
-	font-size: .8em;
+	font-size: .85em;
 }
 
 /* Tabbed menu */
-- 
cgit v1.2.1


From c903b453fa00871a11ea988b5e348c3a2741b251 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 2 Nov 2008 11:22:30 +0000
Subject: i had these changes sitting... must've been a merge not committed
 (and because we do not use svn 1.5 as the client version i am not able to say
 which they were)

git-svn-id: file:///svn/phpbb/trunk@9042 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/install_update.html | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index 318795f4cf..2448f1d39b 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -186,7 +186,7 @@
 				<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
 
 				<strong>{NO_UPDATE_FILES}</strong>
-				
+
 			</div>
 		<!-- ENDIF -->
 
@@ -226,7 +226,7 @@
 							<!-- IF files.S_CUSTOM -->
 								<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
 							<!-- ENDIF -->
-							
+
 							<!-- IF files.STATUS eq 'modified' -->
 							</dl>
 							<dl>
@@ -295,7 +295,7 @@
 		<p>{L_UPDATE_METHOD_EXPLAIN}</p>
 
 		<fieldset class="submit-buttons">
-			<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD}" />
+			<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD_BUTTON}" />
 		</fieldset>
 
 		</form>
@@ -360,9 +360,18 @@
 			<p>{L_CONNECTION_SUCCESS}</p>
 		</div>
 	<!-- ELSEIF S_CONNECTION_FAILED -->
+		<div class="successbox">
+			<p>{L_TRY_DOWNLOAD_METHOD}</p>
+
+			<fieldset class="quick">
+				<input class="button1" type="submit" name="download" value="{L_TRY_DOWNLOAD_METHOD_BUTTON}" />
+			</fieldset>
+		</div>
+
 		<div class="errorbox">
 			<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
 		</div>
+
 	<!-- ENDIF -->
 
 	<fieldset>
@@ -378,7 +387,7 @@
 	</dl>
 	<!-- END data -->
 	</fieldset>
-	
+
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
 		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
-- 
cgit v1.2.1


From d46e8e6f98054fc58a126c865184369198d9a2ed Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 22 Nov 2008 19:38:25 +0000
Subject: merge revisions i missed... hopefully not breaking things - did not
 check every change.

git-svn-id: file:///svn/phpbb/trunk@9077 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_main.html        | 3 +--
 phpBB/adm/style/admin.css            | 4 ++++
 phpBB/adm/style/permission_mask.html | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 3bfa7602c7..4b6bc1910d 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -22,8 +22,7 @@
 	<!-- ENDIF -->
 
 	<!-- IF S_WRITABLE_CONFIG -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+		<div class="errorbox notice">
 			<p>{L_WRITABLE_CONFIG}</p>
 		</div>
 	<!-- ENDIF -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 219ff20eba..344b5cacf0 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1175,6 +1175,10 @@ input.disabled {
 	font-weight: bold;
 }
 
+.notice {
+	background-color: #62A5CC;
+}
+
 /* Special cases for the error page */
 #errorpage #page-header a {
 	font-weight: bold;
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 19a24a48b8..fb4d3ef143 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -68,7 +68,7 @@
 		<!-- ELSE -->
 			<li class="permissions-preset-custom<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
 		<!-- ENDIF -->
-		<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '{p_mask.f_mask.category.S_ROW_COUNT}', false<!-- IF p_mask.S_VIEW -->, true<!-- ENDIF -->); return false;"><span class="tabbg"><span class="colour"></span>{category.CAT_NAME}</span></a></li>
+		<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '{p_mask.f_mask.category.S_ROW_COUNT}', false<!-- IF p_mask.S_VIEW -->, true<!-- ENDIF -->); return false;"><span class="tabbg"><span class="colour"></span>{p_mask.f_mask.category.CAT_NAME}</span></a></li>
 	<!-- END category -->
 				</ul>
 			</div>
-- 
cgit v1.2.1


From 20cc28bfea5c7b9a486d2d7710966b5598ef1dfa Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 16 Jan 2009 17:44:39 +0000
Subject: add new subfolder for installation

git-svn-id: file:///svn/phpbb/trunk@9275 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/install/install.html         |  0
 phpBB/adm/style/install/snippet_checks.html  | 21 +++++++++++++++++++++
 phpBB/adm/style/install/snippet_options.html | 23 +++++++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 phpBB/adm/style/install/install.html
 create mode 100644 phpBB/adm/style/install/snippet_checks.html
 create mode 100644 phpBB/adm/style/install/snippet_options.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install/install.html b/phpBB/adm/style/install/install.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/phpBB/adm/style/install/snippet_checks.html b/phpBB/adm/style/install/snippet_checks.html
new file mode 100644
index 0000000000..2b711bb77c
--- /dev/null
+++ b/phpBB/adm/style/install/snippet_checks.html
@@ -0,0 +1,21 @@
+<!-- IF .checks -->
+	<fieldset>
+	<!-- BEGIN checks -->
+		<!-- IF checks.S_LEGEND -->
+			<!-- IF not checks.S_FIRST_ROW -->
+			</fieldset>
+
+			<fieldset>
+			<!-- ENDIF -->
+				<legend>{checks.LEGEND}</legend>
+				<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
+		<!-- ELSE -->
+
+			<dl>
+				<dt>{checks.TITLE}:<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dd>{checks.RESULT}</dd>
+			</dl>
+		<!-- ENDIF -->
+	<!-- END checks -->
+	</fieldset>
+<!-- ENDIF -->
diff --git a/phpBB/adm/style/install/snippet_options.html b/phpBB/adm/style/install/snippet_options.html
new file mode 100644
index 0000000000..a887a1da83
--- /dev/null
+++ b/phpBB/adm/style/install/snippet_options.html
@@ -0,0 +1,23 @@
+<!-- IF .options -->
+	<fieldset>
+
+	<!-- BEGIN options -->
+		<!-- IF options.S_LEGEND -->
+			<!-- IF not options.S_FIRST_ROW -->
+				</fieldset>
+		
+				<fieldset>
+			<!-- ENDIF -->
+				<legend>{options.LEGEND}</legend>
+		<!-- ELSE -->
+
+			<dl>
+				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dd>{options.CONTENT}</dd>
+			</dl>
+
+		<!-- ENDIF -->
+	<!-- END options -->
+
+	</fieldset>
+<!-- ENDIF -->
-- 
cgit v1.2.1


From bac6a3c0e286318715f1e388144afb2d5b348f53 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 16 Jan 2009 17:47:27 +0000
Subject: move files around :P

git-svn-id: file:///svn/phpbb/trunk@9276 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/install/convert.html     | 134 +++++++++++
 phpBB/adm/style/install/error.html       |   8 +
 phpBB/adm/style/install/footer.html      |  26 ++
 phpBB/adm/style/install/header.html      |  81 +++++++
 phpBB/adm/style/install/main.html        |   6 +
 phpBB/adm/style/install/update.html      | 402 +++++++++++++++++++++++++++++++
 phpBB/adm/style/install/update_diff.html | 253 +++++++++++++++++++
 phpBB/adm/style/install_convert.html     | 134 -----------
 phpBB/adm/style/install_error.html       |   8 -
 phpBB/adm/style/install_footer.html      |  26 --
 phpBB/adm/style/install_header.html      |  81 -------
 phpBB/adm/style/install_install.html     |  77 ------
 phpBB/adm/style/install_main.html        |   6 -
 phpBB/adm/style/install_update.html      | 402 -------------------------------
 phpBB/adm/style/install_update_diff.html | 253 -------------------
 15 files changed, 910 insertions(+), 987 deletions(-)
 create mode 100644 phpBB/adm/style/install/convert.html
 create mode 100644 phpBB/adm/style/install/error.html
 create mode 100644 phpBB/adm/style/install/footer.html
 create mode 100644 phpBB/adm/style/install/header.html
 create mode 100644 phpBB/adm/style/install/main.html
 create mode 100644 phpBB/adm/style/install/update.html
 create mode 100644 phpBB/adm/style/install/update_diff.html
 delete mode 100644 phpBB/adm/style/install_convert.html
 delete mode 100644 phpBB/adm/style/install_error.html
 delete mode 100644 phpBB/adm/style/install_footer.html
 delete mode 100644 phpBB/adm/style/install_header.html
 delete mode 100644 phpBB/adm/style/install_install.html
 delete mode 100644 phpBB/adm/style/install_main.html
 delete mode 100644 phpBB/adm/style/install_update.html
 delete mode 100644 phpBB/adm/style/install_update_diff.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install/convert.html b/phpBB/adm/style/install/convert.html
new file mode 100644
index 0000000000..783e89d6bf
--- /dev/null
+++ b/phpBB/adm/style/install/convert.html
@@ -0,0 +1,134 @@
+<!-- INCLUDE install_header.html -->
+
+<!-- IF S_NOT_INSTALLED -->
+
+	<h1>{TITLE}</h1>
+
+	<p>{BODY}</p>
+
+<!-- ELSE -->
+
+	<form id="install_convert" method="post" action="{U_ACTION}">
+
+	<h1>{TITLE}</h1>
+
+	<p>{BODY}</p>
+
+	<!-- IF S_ERROR_BOX -->
+	<div class="errorbox">
+		<h3>{ERROR_TITLE}</h3>
+		<p>{ERROR_MSG}</p>
+	</div>
+	<!-- ENDIF -->
+
+	<!-- IF S_LIST -->
+		<table cellspacing="1">
+			<caption>{L_AVAILABLE_CONVERTORS}</caption>
+			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+		<thead>
+		<tr>
+			<th>{L_SOFTWARE}</th>
+			<th>{L_VERSION}</th>
+			<th>{L_AUTHOR}</th>
+			<th>{L_OPTIONS}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- IF .convertors -->
+			<!-- BEGIN convertors -->
+			<tr>
+				<td>{convertors.SOFTWARE}</td>
+				<td>{convertors.VERSION}</td>
+				<td>{convertors.AUTHOR}</td>
+				<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
+			</tr>
+			<!-- END convertors -->
+		<!-- ELSE -->
+			<tr>
+				<td>{L_NO_CONVERTORS}</td>
+				<td>-</td>
+				<td>-</td>
+				<td>-</td>
+			</tr>
+		<!-- ENDIF -->
+		</tbody>
+		</table>
+	<!-- ENDIF -->
+
+	<!-- IF S_CONTINUE -->
+		</form>
+
+		<fieldset class="submit-buttons">
+			<form method="post" action="{U_NEW_ACTION}">
+				<input class="button1" type="submit" name="submit_new" value="{L_NEW}" />
+			</form>
+			<br />
+			<form method="post" action="{U_CONTINUE_ACTION}">
+				<input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}" />
+			</form>
+		</fieldset>
+
+		<form method="post" action="{U_ACTION}">
+	<!-- ENDIF -->
+
+	<!-- IF .checks -->
+		<fieldset>
+
+		<!-- BEGIN checks -->
+			<!-- IF checks.S_LEGEND -->
+				<!-- IF not checks.S_FIRST_ROW -->
+				</fieldset>
+
+				<fieldset>
+				<!-- ENDIF -->
+					<legend>{checks.LEGEND}</legend>
+					<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
+			<!-- ELSE -->
+
+				<dl>
+					<dt><label>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dd>{checks.RESULT}</dd>
+				</dl>
+			<!-- ENDIF -->
+		<!-- END checks -->
+
+		</fieldset>
+	<!-- ENDIF -->
+
+	<!-- IF .options -->
+		<fieldset>
+
+		<!-- BEGIN options -->
+			<!-- IF options.S_LEGEND -->
+				<!-- IF not options.S_FIRST_ROW -->
+					</fieldset>
+
+					<fieldset>
+				<!-- ENDIF -->
+					<legend>{options.LEGEND}</legend>
+			<!-- ELSE -->
+
+				<dl>
+					<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dd>{options.CONTENT}</dd>
+				</dl>
+
+			<!-- ENDIF -->
+		<!-- END options -->
+
+		</fieldset>
+	<!-- ENDIF -->
+
+	<!-- IF L_SUBMIT -->
+		<!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF -->
+
+		<fieldset class="submit-buttons">
+			{S_HIDDEN}
+			<!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
+		</fieldset>
+	<!-- ENDIF -->
+
+	</form>
+<!-- ENDIF -->
+
+<!-- INCLUDE install_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install/error.html b/phpBB/adm/style/install/error.html
new file mode 100644
index 0000000000..ad53433207
--- /dev/null
+++ b/phpBB/adm/style/install/error.html
@@ -0,0 +1,8 @@
+<!-- INCLUDE install_header.html -->
+
+<div class="errorbox">
+	<h3>{MESSAGE_TITLE}</h3>
+	<p>{MESSAGE_TEXT}</p>
+</div>
+
+<!-- INCLUDE install_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install/footer.html b/phpBB/adm/style/install/footer.html
new file mode 100644
index 0000000000..2ec3581ef4
--- /dev/null
+++ b/phpBB/adm/style/install/footer.html
@@ -0,0 +1,26 @@
+
+					</div>
+				</div>
+			<span class="corners-bottom"><span></span></span>
+		</div>
+		</div>
+	</div>
+	
+	<!--
+		We request you retain the full copyright notice below including the link to www.phpbb.com.
+		This not only gives respect to the large amount of time given freely by the developers
+		but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
+		the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
+		"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
+		forums may be affected.
+	
+		The phpBB Group : 2006
+	// -->
+	
+	<div id="page-footer">
+		Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
+	</div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/phpBB/adm/style/install/header.html b/phpBB/adm/style/install/header.html
new file mode 100644
index 0000000000..fbb6a7b409
--- /dev/null
+++ b/phpBB/adm/style/install/header.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta http-equiv="imagetoolbar" content="no" />
+<!-- IF META -->{META}<!-- ENDIF -->
+<title>{PAGE_TITLE}</title>
+
+<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+
+<script type="text/javascript">
+// <![CDATA[
+
+/**
+* Set display of page element
+* s[-1,0,1] = hide,toggle display,show
+*/
+function dE(n, s, type)
+{
+	if (!type)
+	{
+		type = 'block';
+	}
+
+	var e = document.getElementById(n);
+	if (!s)
+	{
+		s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
+	}
+	e.style.display = (s == 1) ? type : 'none';
+}
+
+// ]]>
+</script>
+
+</head>
+
+<body class="{S_CONTENT_DIRECTION}">
+<div id="wrap">
+	<div id="page-header">
+		<h1>{L_INSTALL_PANEL}</h1>
+		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
+		<!-- IF S_LANG_SELECT -->
+		<form method="post" action="">
+			<fieldset class="nobg">
+				<label for="language">{L_SELECT_LANG}:</label>
+				{S_LANG_SELECT}
+				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
+			</fieldset>
+		</form>
+		<!-- ENDIF -->
+	</div>
+	
+	<div id="page-body">
+		<div id="tabs">
+			<ul>
+			<!-- BEGIN t_block1 -->
+				<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
+			<!-- END t_block1 -->
+			</ul>
+		</div>
+
+		<div id="acp">
+		<div class="panel">
+			<span class="corners-top"><span></span></span>
+				<div id="content">
+					<div id="menu">
+						<ul>
+						<!-- BEGIN l_block1 -->
+							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
+						<!-- END l_block1 -->
+						<!-- BEGIN l_block2 -->
+							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>
+						<!-- END l_block2 -->
+						</ul>
+					</div>
+	
+					<div id="main" class="install-body">
diff --git a/phpBB/adm/style/install/main.html b/phpBB/adm/style/install/main.html
new file mode 100644
index 0000000000..2c318bfd65
--- /dev/null
+++ b/phpBB/adm/style/install/main.html
@@ -0,0 +1,6 @@
+<!-- INCLUDE install_header.html -->
+
+	<h1>{TITLE}</h1>
+	<p>{BODY}</p>
+
+<!-- INCLUDE install_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install/update.html b/phpBB/adm/style/install/update.html
new file mode 100644
index 0000000000..2448f1d39b
--- /dev/null
+++ b/phpBB/adm/style/install/update.html
@@ -0,0 +1,402 @@
+<!-- INCLUDE install_header.html -->
+
+<script type="text/javascript">
+// <![CDATA[
+	function popup(url, width, height, name)
+	{
+		if (!name)
+		{
+			name = '_popup';
+		}
+
+		window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
+		return false;
+	}
+
+	function diff_popup(url)
+	{
+		popup(url, 950, 600, '_diff');
+		return false;
+	}
+// ]]>
+</script>
+
+<!-- IF S_ERROR -->
+	<div class="errorbox" style="margin-top: 0;">
+		<h3>{L_NOTICE}</h3>
+		<p>{ERROR_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
+<!-- IF S_IN_PROGRESS -->
+
+	<div class="successbox" style="margin-top: 0;">
+		<h3>{L_IN_PROGRESS}</h3>
+		<p>{L_IN_PROGRESS_EXPLAIN}</p>
+	</div>
+
+<!-- ELSEIF S_INTRO -->
+
+	<!-- IF S_WARNING -->
+	<div class="successbox" style="margin-top: 0;">
+		<h3>{L_NOTICE}</h3>
+		<p>{WARNING_MSG}</p>
+	</div>
+	<!-- ENDIF -->
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<h1>{L_UPDATE_INSTALLATION}</h1>
+	<p>{L_UPDATE_INSTALLATION_EXPLAIN}</p>
+
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" name="submit" value="{L_NEXT_STEP}" />
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_UPLOAD_SUCCESS -->
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<h1>{L_UPDATE_SUCCESS}</h1>
+	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
+
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
+	</fieldset>
+
+	</form>
+
+<!-- ENDIF -->
+
+<!-- IF S_VERSION_CHECK -->
+
+	<h1>{L_VERSION_CHECK}</h1>
+
+	<p>{L_VERSION_CHECK_EXPLAIN}</p>
+
+	<!-- IF S_UP_TO_DATE -->
+		<div class="successbox">
+			<p>{L_VERSION_UP_TO_DATE}</p>
+		</div>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_VERSION_NOT_UP_TO_DATE}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend></legend>
+	<dl>
+		<dt><label>{L_CURRENT_VERSION}</label></dt>
+		<dd><strong>{CURRENT_VERSION}</strong></dd>
+	</dl>
+	<dl>
+		<dt><label>{L_LATEST_VERSION}</label></dt>
+		<dd><strong>{LATEST_VERSION}</strong></dd>
+	</dl>
+	<!-- IF PACKAGE_VERSION and not S_UP_TO_DATE -->
+	<dl>
+		<dt><label>{L_PACKAGE_UPDATES_TO}</label></dt>
+		<dd><strong>{PACKAGE_VERSION}</strong></dd>
+	</dl>
+	<!-- ENDIF -->
+	</fieldset>
+
+	<!-- IF not S_UP_TO_DATE -->
+
+		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<p>{L_UPDATE_DATABASE_EXPLAIN}</p>
+			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
+		</fieldset>
+
+		</form>
+
+	<!-- ELSE -->
+		<form id="install_update" method="post" action="{U_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<p>{L_CHECK_FILES_UP_TO_DATE}</p>
+			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
+		</fieldset>
+
+		</form>
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_DB_UPDATE -->
+
+	<!-- IF not S_DB_UPDATE_FINISHED -->
+
+		<h1>{L_PERFORM_DATABASE_UPDATE}</h1>
+
+		<p>
+			{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
+		</p>
+
+		<br /><br />
+
+		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<a href="{U_DB_UPDATE}" class="button1">{L_RUN_DATABASE_SCRIPT}</a>
+
+			<!-- input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" / -->
+		</fieldset>
+
+		</form>
+
+	<!-- ELSE -->
+
+		<h1>{L_UPDATE_DB_SUCCESS}</h1>
+
+		<br /><br />
+
+		<form id="install_update" method="post" action="{U_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<p>{L_CHECK_FILES_EXPLAIN}</p>
+			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
+		</fieldset>
+
+		</form>
+
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_FILE_CHECK -->
+
+	<!-- IF S_ALL_UP_TO_DATE -->
+
+		<div class="successbox">
+			<h3>{L_UPDATE_SUCCESS}</h3>
+			<p>{L_ALL_FILES_UP_TO_DATE}</p>
+		</div>
+
+	<!-- ELSE -->
+		<h1>{L_COLLECTED_INFORMATION}</h1>
+
+		<p>{L_COLLECTED_INFORMATION_EXPLAIN}</p>
+
+		<!-- IF S_NO_UPDATE_FILES -->
+			<div class="errorbox">
+				<h3>{L_NO_UPDATE_FILES}</h3>
+
+				<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
+
+				<strong>{NO_UPDATE_FILES}</strong>
+
+			</div>
+		<!-- ENDIF -->
+
+		<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
+
+		<!-- IF .files -->
+			<!-- BEGIN files -->
+				<!-- IF files.S_STATUS -->
+					<!-- IF not files.S_FIRST_ROW -->
+						</fieldset></div>
+					<!-- ENDIF -->
+
+					<h2>{files.TITLE}</h2>
+
+					<!-- IF files.STATUS eq 'not_modified' --><div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div><!-- ENDIF -->
+					<p>{files.EXPLAIN}</p>
+
+					<div style="display: <!-- IF files.STATUS neq 'not_modified' -->block<!-- ELSE -->none<!-- ENDIF -->;" id="{files.STATUS}">
+
+					<fieldset>
+						<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
+				<!-- ELSE -->
+					<dl>
+						<!-- IF files.STATUS eq 'up_to_date' -->
+							<dd class="full" style="text-align: left;"><strong>{files.FILENAME}</strong></dd>
+						<!-- ELSE -->
+							<dt style="width: 60%;">
+								<strong><!-- IF files.DIR_PART -->{files.DIR_PART}<br /><!-- ENDIF -->{files.FILE_PART}</strong>
+								<!-- IF files.S_CUSTOM -->
+								<br /><span><em>{L_FILE_USED}: </em>{files.CUSTOM_ORIGINAL}</span>
+								<!-- ENDIF -->
+								<!-- IF files.NUM_CONFLICTS -->
+								<br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span>
+								<!-- ENDIF -->
+							</dt>
+							<dd style="margin-left: 60%;"><!-- IF files.STATUS eq 'modified' -->&nbsp;<!-- ELSE --><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --><!-- ENDIF --></dd>
+							<!-- IF files.S_CUSTOM -->
+								<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+							<!-- ENDIF -->
+
+							<!-- IF files.STATUS eq 'modified' -->
+							</dl>
+							<dl>
+								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
+								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
+							</dl>
+							<dl>
+								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+							</dl>
+							<dl>
+								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
+								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+							</dl>
+							<!-- IF not files.S_LAST_ROW -->
+							</fieldset>
+
+							<fieldset>
+								<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
+							<!-- ENDIF -->
+
+							<!-- ENDIF -->
+
+							<!-- IF files.STATUS eq 'conflict' -->
+							</dl>
+							<dl>
+								<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+							</dl>
+								<!-- IF not files.S_BINARY -->
+									<dl>
+										<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
+										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+									</dl>
+									<dl>
+										<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
+										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+									</dl>
+								<!-- ENDIF -->
+							<!-- IF not files.S_LAST_ROW -->
+							</fieldset>
+
+							<fieldset>
+								<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
+							<!-- ENDIF -->
+
+							<!-- ENDIF -->
+						<!-- ENDIF -->
+					<!-- IF files.STATUS neq 'conflict' and files.STATUS neq 'modified' --></dl><!-- ENDIF -->
+				<!-- ENDIF -->
+			<!-- END files -->
+
+			</fieldset></div>
+		<!-- ENDIF -->
+
+		<br />
+
+		<fieldset class="quick">
+			<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
+		</fieldset>
+
+		<br />
+
+		<h1>{L_UPDATE_METHOD}</h1>
+
+		<p>{L_UPDATE_METHOD_EXPLAIN}</p>
+
+		<fieldset class="submit-buttons">
+			<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD_BUTTON}" />
+		</fieldset>
+
+		</form>
+
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_DOWNLOAD_FILES -->
+
+	<h1>{L_DOWNLOAD_UPDATE_METHOD}</h1>
+
+	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
+	<dl>
+		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
+		<dd>{RADIO_BUTTONS}</dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		{S_HIDDEN_FIELDS}
+		<input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
+	</fieldset>
+
+	</form>
+
+	<br /><br />
+
+	<p>{L_MAPPING_FILE_STRUCTURE}</p>
+
+	<table cellspacing="1">
+		<col class="row1" /><col class="row2" /><col class="row1" />
+	<thead>
+	<tr>
+		<th style="width: 49%">{L_ARCHIVE_FILE}</th>
+		<th style="width: 2%">&nbsp;</th>
+		<th style="width: 49%">{L_DESTINATION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN location -->
+	<tr>
+		<td>{location.SOURCE}</td>
+		<td><strong>&raquo;</strong></td>
+		<td>{location.DESTINATION}</td>
+	</tr>
+	<!-- END location -->
+	</tbody>
+	</table>
+
+<!-- ELSEIF S_FTP_UPLOAD -->
+
+	<h1>{L_SELECT_FTP_SETTINGS}</h1>
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<!-- IF S_CONNECTION_SUCCESS -->
+		<div class="successbox">
+			<p>{L_CONNECTION_SUCCESS}</p>
+		</div>
+	<!-- ELSEIF S_CONNECTION_FAILED -->
+		<div class="successbox">
+			<p>{L_TRY_DOWNLOAD_METHOD}</p>
+
+			<fieldset class="quick">
+				<input class="button1" type="submit" name="download" value="{L_TRY_DOWNLOAD_METHOD_BUTTON}" />
+			</fieldset>
+		</div>
+
+		<div class="errorbox">
+			<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
+		</div>
+
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_FTP_SETTINGS}</legend>
+	<dl>
+		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
+		<dd><strong>{UPLOAD_METHOD}</strong></dd>
+	</dl>
+	<!-- BEGIN data -->
+	<dl>
+		<dt><label for="{data.DATA}">{data.NAME}:</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="submit-buttons">
+		{S_HIDDEN_FIELDS}
+		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
+		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
+		<input class="button1" type="submit" name="submit" value="{L_UPDATE_FILES}" />
+	</fieldset>
+
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install/update_diff.html b/phpBB/adm/style/install/update_diff.html
new file mode 100644
index 0000000000..efbe1d045c
--- /dev/null
+++ b/phpBB/adm/style/install/update_diff.html
@@ -0,0 +1,253 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta http-equiv="imagetoolbar" content="no" />
+<!-- IF META -->{META}<!-- ENDIF -->
+<title>{PAGE_TITLE}</title>
+
+<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+
+<script type="text/javascript">
+// <![CDATA[
+function resize_panel()
+{
+	var block = document.getElementById('codepanel');	
+	var height;
+	
+	if (window.innerHeight)
+	{
+		height = window.innerHeight - 150;
+		block.style.height = height + 'px';
+	}
+	else
+	{
+		//whatever IE needs to do this
+	}	
+}
+// ]]>
+</script>
+
+<style type="text/css">
+/* <![CDATA[ */
+
+#main {
+	font-size: 1em;
+	line-height: 0.7em;
+	margin: 0;
+	padding: 0;
+	width: 99%;
+}
+
+#diff_content {
+	padding: 30px 10px 10px;
+}
+
+<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
+div#codepanel {
+	overflow: auto;
+	width: 100%;
+	height: 350px;
+	display: inline-block;
+}
+<!-- ELSE -->
+div#codepanel {	
+	background-color: #eee;
+}
+<!-- ENDIF -->
+
+<!-- IF not S_DIFF_NEW_FILE -->
+/**
+* Unified Diff
+*/
+.file {
+	line-height: .7em;
+}
+
+.diff {
+	margin: 0;
+}
+
+.added {
+	background-color: #dfd;
+}
+
+.removed {
+	background-color: #fdd;
+}
+
+.info {
+	color: #888;
+}
+
+.context {
+	background-color: #eee;
+}
+
+/**
+* Inline Diff
+*/
+.ins {
+	background-color: #dfd;
+	text-decoration: underline;
+}
+
+.del {
+	background-color: #fdd;
+	text-decoration: line-through;
+}
+
+/**
+* Column Diff
+*/
+table.hrdiff {
+	margin: 0 0 8px 5px;
+	width: 100%;
+	overflow: hidden;
+	border-bottom: 1px solid #999;
+	table-layout: fixed;
+}
+
+table.hrdiff th {
+	text-align: left;
+	width: 50%;
+	color: #333;
+	font-family: Verdana,Helvetica,sans-serif;
+	font-size: 11px;
+	border-bottom: 1px solid #999;
+	background: transparent;
+}
+
+table.hrdiff thead th {
+	font-weight: bold;
+	font-size: 110%;
+	padding: 2px;
+}
+
+table.hrdiff tr:first-child th {
+	border-top: none;
+}
+
+table.hrdiff tbody th {
+	padding: 2em 1px 1px 1px;
+	font-size: 80%;
+	border-top: 1px solid #999;
+}
+
+table.hrdiff tbody td.old {
+	border-left: 1px solid #999;
+	border-right: 1px solid #999;	
+}
+table.hrdiff tbody td.new {
+	border-right: 1px solid #999;	
+}
+
+table.hrdiff td pre {
+	overflow: auto;
+	display: block;
+	width: 100%;
+	overflow: auto;
+	display: block;
+}
+
+table.hrdiff .unmodified {
+	background: #fff;
+}
+
+table.hrdiff .added {
+	background: #9f9;
+}
+
+table.hrdiff .added_empty {
+	background: #cfc;
+}
+
+table.hrdiff .modified {
+	background: #fd9;
+}
+
+table.hrdiff .removed {
+	background: #f99;
+}
+
+table.hrdiff .removed_empty {
+	background: #fcc;
+}
+
+table.hrdiff caption {
+	caption-side: top;
+	text-align: left;
+	margin: 0 0 8px 5px;
+	font-size: 90%;
+	font-weight: bold;
+	padding: 5px;
+}
+
+table.hrdiff caption span {
+	height: 10px;
+	width: 10px;
+	line-height: 10px;
+	letter-spacing: 10px;
+	border: 1px solid #000;
+	margin-left: 0.5em;
+	vertical-align: baseline;
+}
+
+<!-- ENDIF -->
+
+/* ]]> */
+</style>
+
+</head>
+
+
+<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
+<body onresize="resize_panel();" onload="resize_panel();">
+<!-- ELSE -->
+<body>
+<!-- ENDIF -->
+
+<div id="wrap">
+	<div id="page-header">
+<!-- IF S_DIFF_NEW_FILE -->
+
+		<h1>{L_VIEWING_FILE_CONTENTS}</h1>
+<!-- ELSE -->
+		<h1>{L_VIEWING_FILE_DIFF}</h1>
+<!-- ENDIF -->
+<!-- IF not S_DIFF_NEW_FILE -->
+		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
+		<form method="post">
+		<fieldset class="quick">
+			<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
+			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
+
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
+		</fieldset>
+		</form>
+<!-- ENDIF -->
+	</div>
+	
+	<div id="page-body">
+		<div id="acp">
+		<div class="panel" id="codepanel">
+			<span class="corners-top"><span></span></span>
+				<div id="diff_content">
+					<div id="main">
+
+<!-- IF S_DIFF_CONFLICT_FILE -->
+		<div style="float: {S_CONTENT_FLOW_END};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
+<!-- ENDIF -->
+						{DIFF_CONTENT}
+					</div>
+				</div>
+			<span class="corners-bottom"><span></span></span>
+		</div>
+		</div>
+	</div>
+	
+
+<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html
deleted file mode 100644
index 783e89d6bf..0000000000
--- a/phpBB/adm/style/install_convert.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!-- INCLUDE install_header.html -->
-
-<!-- IF S_NOT_INSTALLED -->
-
-	<h1>{TITLE}</h1>
-
-	<p>{BODY}</p>
-
-<!-- ELSE -->
-
-	<form id="install_convert" method="post" action="{U_ACTION}">
-
-	<h1>{TITLE}</h1>
-
-	<p>{BODY}</p>
-
-	<!-- IF S_ERROR_BOX -->
-	<div class="errorbox">
-		<h3>{ERROR_TITLE}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_LIST -->
-		<table cellspacing="1">
-			<caption>{L_AVAILABLE_CONVERTORS}</caption>
-			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-		<thead>
-		<tr>
-			<th>{L_SOFTWARE}</th>
-			<th>{L_VERSION}</th>
-			<th>{L_AUTHOR}</th>
-			<th>{L_OPTIONS}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- IF .convertors -->
-			<!-- BEGIN convertors -->
-			<tr>
-				<td>{convertors.SOFTWARE}</td>
-				<td>{convertors.VERSION}</td>
-				<td>{convertors.AUTHOR}</td>
-				<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
-			</tr>
-			<!-- END convertors -->
-		<!-- ELSE -->
-			<tr>
-				<td>{L_NO_CONVERTORS}</td>
-				<td>-</td>
-				<td>-</td>
-				<td>-</td>
-			</tr>
-		<!-- ENDIF -->
-		</tbody>
-		</table>
-	<!-- ENDIF -->
-
-	<!-- IF S_CONTINUE -->
-		</form>
-
-		<fieldset class="submit-buttons">
-			<form method="post" action="{U_NEW_ACTION}">
-				<input class="button1" type="submit" name="submit_new" value="{L_NEW}" />
-			</form>
-			<br />
-			<form method="post" action="{U_CONTINUE_ACTION}">
-				<input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}" />
-			</form>
-		</fieldset>
-
-		<form method="post" action="{U_ACTION}">
-	<!-- ENDIF -->
-
-	<!-- IF .checks -->
-		<fieldset>
-
-		<!-- BEGIN checks -->
-			<!-- IF checks.S_LEGEND -->
-				<!-- IF not checks.S_FIRST_ROW -->
-				</fieldset>
-
-				<fieldset>
-				<!-- ENDIF -->
-					<legend>{checks.LEGEND}</legend>
-					<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-			<!-- ELSE -->
-
-				<dl>
-					<dt><label>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-					<dd>{checks.RESULT}</dd>
-				</dl>
-			<!-- ENDIF -->
-		<!-- END checks -->
-
-		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF .options -->
-		<fieldset>
-
-		<!-- BEGIN options -->
-			<!-- IF options.S_LEGEND -->
-				<!-- IF not options.S_FIRST_ROW -->
-					</fieldset>
-
-					<fieldset>
-				<!-- ENDIF -->
-					<legend>{options.LEGEND}</legend>
-			<!-- ELSE -->
-
-				<dl>
-					<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-					<dd>{options.CONTENT}</dd>
-				</dl>
-
-			<!-- ENDIF -->
-		<!-- END options -->
-
-		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF L_SUBMIT -->
-		<!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF -->
-
-		<fieldset class="submit-buttons">
-			{S_HIDDEN}
-			<!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
-		</fieldset>
-	<!-- ENDIF -->
-
-	</form>
-<!-- ENDIF -->
-
-<!-- INCLUDE install_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install_error.html b/phpBB/adm/style/install_error.html
deleted file mode 100644
index ad53433207..0000000000
--- a/phpBB/adm/style/install_error.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- INCLUDE install_header.html -->
-
-<div class="errorbox">
-	<h3>{MESSAGE_TITLE}</h3>
-	<p>{MESSAGE_TEXT}</p>
-</div>
-
-<!-- INCLUDE install_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
deleted file mode 100644
index 2ec3581ef4..0000000000
--- a/phpBB/adm/style/install_footer.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-					</div>
-				</div>
-			<span class="corners-bottom"><span></span></span>
-		</div>
-		</div>
-	</div>
-	
-	<!--
-		We request you retain the full copyright notice below including the link to www.phpbb.com.
-		This not only gives respect to the large amount of time given freely by the developers
-		but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
-		the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-		"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-		forums may be affected.
-	
-		The phpBB Group : 2006
-	// -->
-	
-	<div id="page-footer">
-		Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
-	</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
deleted file mode 100644
index fbb6a7b409..0000000000
--- a/phpBB/adm/style/install_header.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<!-- IF META -->{META}<!-- ENDIF -->
-<title>{PAGE_TITLE}</title>
-
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-<script type="text/javascript">
-// <![CDATA[
-
-/**
-* Set display of page element
-* s[-1,0,1] = hide,toggle display,show
-*/
-function dE(n, s, type)
-{
-	if (!type)
-	{
-		type = 'block';
-	}
-
-	var e = document.getElementById(n);
-	if (!s)
-	{
-		s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
-	}
-	e.style.display = (s == 1) ? type : 'none';
-}
-
-// ]]>
-</script>
-
-</head>
-
-<body class="{S_CONTENT_DIRECTION}">
-<div id="wrap">
-	<div id="page-header">
-		<h1>{L_INSTALL_PANEL}</h1>
-		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
-		<!-- IF S_LANG_SELECT -->
-		<form method="post" action="">
-			<fieldset class="nobg">
-				<label for="language">{L_SELECT_LANG}:</label>
-				{S_LANG_SELECT}
-				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
-			</fieldset>
-		</form>
-		<!-- ENDIF -->
-	</div>
-	
-	<div id="page-body">
-		<div id="tabs">
-			<ul>
-			<!-- BEGIN t_block1 -->
-				<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
-			<!-- END t_block1 -->
-			</ul>
-		</div>
-
-		<div id="acp">
-		<div class="panel">
-			<span class="corners-top"><span></span></span>
-				<div id="content">
-					<div id="menu">
-						<ul>
-						<!-- BEGIN l_block1 -->
-							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
-						<!-- END l_block1 -->
-						<!-- BEGIN l_block2 -->
-							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>
-						<!-- END l_block2 -->
-						</ul>
-					</div>
-	
-					<div id="main" class="install-body">
diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html
deleted file mode 100644
index 79006fba69..0000000000
--- a/phpBB/adm/style/install_install.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- INCLUDE install_header.html -->
-
-<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-<!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF -->
-<!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
-
-<!-- IF .checks -->
-	<fieldset>
-
-	<!-- BEGIN checks -->
-		<!-- IF checks.S_LEGEND -->
-			<!-- IF not checks.S_FIRST_ROW -->
-			</fieldset>
-
-			<fieldset>
-			<!-- ENDIF -->
-				<legend>{checks.LEGEND}</legend>
-				<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-		<!-- ELSE -->
-
-			<dl>
-				<dt>{checks.TITLE}:<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-				<dd>{checks.RESULT}</dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- END checks -->
-
-	</fieldset>
-<!-- ENDIF -->
-
-<!-- IF .options -->
-	<fieldset>
-
-	<!-- BEGIN options -->
-		<!-- IF options.S_LEGEND -->
-			<!-- IF not options.S_FIRST_ROW -->
-				</fieldset>
-		
-				<fieldset>
-			<!-- ENDIF -->
-				<legend>{options.LEGEND}</legend>
-		<!-- ELSE -->
-
-			<dl>
-				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-				<dd>{options.CONTENT}</dd>
-			</dl>
-
-		<!-- ENDIF -->
-	<!-- END options -->
-
-	</fieldset>
-<!-- ENDIF -->
-
-<!-- IF S_SHOW_DOWNLOAD -->
-	<h1>{L_DL_CONFIG}</h1>
-	<p>{L_DL_CONFIG_EXPLAIN}</p>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_DL_CONFIG}</legend>
-		{S_HIDDEN}
-		<input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}" />&nbsp;<input class="button1" type="submit" id="dldone" name="dldone" value="{L_DL_DONE}" />
-	</fieldset>
-<!-- ENDIF -->
-
-<!-- IF L_SUBMIT -->
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		{S_HIDDEN}
-		<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
-	</fieldset>
-<!-- ENDIF -->
-
-</form>
-
-<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install_main.html b/phpBB/adm/style/install_main.html
deleted file mode 100644
index 2c318bfd65..0000000000
--- a/phpBB/adm/style/install_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- INCLUDE install_header.html -->
-
-	<h1>{TITLE}</h1>
-	<p>{BODY}</p>
-
-<!-- INCLUDE install_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
deleted file mode 100644
index 2448f1d39b..0000000000
--- a/phpBB/adm/style/install_update.html
+++ /dev/null
@@ -1,402 +0,0 @@
-<!-- INCLUDE install_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-	function popup(url, width, height, name)
-	{
-		if (!name)
-		{
-			name = '_popup';
-		}
-
-		window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
-		return false;
-	}
-
-	function diff_popup(url)
-	{
-		popup(url, 950, 600, '_diff');
-		return false;
-	}
-// ]]>
-</script>
-
-<!-- IF S_ERROR -->
-	<div class="errorbox" style="margin-top: 0;">
-		<h3>{L_NOTICE}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_IN_PROGRESS -->
-
-	<div class="successbox" style="margin-top: 0;">
-		<h3>{L_IN_PROGRESS}</h3>
-		<p>{L_IN_PROGRESS_EXPLAIN}</p>
-	</div>
-
-<!-- ELSEIF S_INTRO -->
-
-	<!-- IF S_WARNING -->
-	<div class="successbox" style="margin-top: 0;">
-		<h3>{L_NOTICE}</h3>
-		<p>{WARNING_MSG}</p>
-	</div>
-	<!-- ENDIF -->
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<h1>{L_UPDATE_INSTALLATION}</h1>
-	<p>{L_UPDATE_INSTALLATION_EXPLAIN}</p>
-
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_UPLOAD_SUCCESS -->
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<h1>{L_UPDATE_SUCCESS}</h1>
-	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
-
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
-
-<!-- IF S_VERSION_CHECK -->
-
-	<h1>{L_VERSION_CHECK}</h1>
-
-	<p>{L_VERSION_CHECK_EXPLAIN}</p>
-
-	<!-- IF S_UP_TO_DATE -->
-		<div class="successbox">
-			<p>{L_VERSION_UP_TO_DATE}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_VERSION_NOT_UP_TO_DATE}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend></legend>
-	<dl>
-		<dt><label>{L_CURRENT_VERSION}</label></dt>
-		<dd><strong>{CURRENT_VERSION}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_LATEST_VERSION}</label></dt>
-		<dd><strong>{LATEST_VERSION}</strong></dd>
-	</dl>
-	<!-- IF PACKAGE_VERSION and not S_UP_TO_DATE -->
-	<dl>
-		<dt><label>{L_PACKAGE_UPDATES_TO}</label></dt>
-		<dd><strong>{PACKAGE_VERSION}</strong></dd>
-	</dl>
-	<!-- ENDIF -->
-	</fieldset>
-
-	<!-- IF not S_UP_TO_DATE -->
-
-		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<p>{L_UPDATE_DATABASE_EXPLAIN}</p>
-			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-		<form id="install_update" method="post" action="{U_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<p>{L_CHECK_FILES_UP_TO_DATE}</p>
-			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
-		</fieldset>
-
-		</form>
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_DB_UPDATE -->
-
-	<!-- IF not S_DB_UPDATE_FINISHED -->
-
-		<h1>{L_PERFORM_DATABASE_UPDATE}</h1>
-
-		<p>
-			{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
-		</p>
-
-		<br /><br />
-
-		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<a href="{U_DB_UPDATE}" class="button1">{L_RUN_DATABASE_SCRIPT}</a>
-
-			<!-- input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" / -->
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-
-		<h1>{L_UPDATE_DB_SUCCESS}</h1>
-
-		<br /><br />
-
-		<form id="install_update" method="post" action="{U_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<p>{L_CHECK_FILES_EXPLAIN}</p>
-			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_FILE_CHECK -->
-
-	<!-- IF S_ALL_UP_TO_DATE -->
-
-		<div class="successbox">
-			<h3>{L_UPDATE_SUCCESS}</h3>
-			<p>{L_ALL_FILES_UP_TO_DATE}</p>
-		</div>
-
-	<!-- ELSE -->
-		<h1>{L_COLLECTED_INFORMATION}</h1>
-
-		<p>{L_COLLECTED_INFORMATION_EXPLAIN}</p>
-
-		<!-- IF S_NO_UPDATE_FILES -->
-			<div class="errorbox">
-				<h3>{L_NO_UPDATE_FILES}</h3>
-
-				<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
-
-				<strong>{NO_UPDATE_FILES}</strong>
-
-			</div>
-		<!-- ENDIF -->
-
-		<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
-
-		<!-- IF .files -->
-			<!-- BEGIN files -->
-				<!-- IF files.S_STATUS -->
-					<!-- IF not files.S_FIRST_ROW -->
-						</fieldset></div>
-					<!-- ENDIF -->
-
-					<h2>{files.TITLE}</h2>
-
-					<!-- IF files.STATUS eq 'not_modified' --><div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div><!-- ENDIF -->
-					<p>{files.EXPLAIN}</p>
-
-					<div style="display: <!-- IF files.STATUS neq 'not_modified' -->block<!-- ELSE -->none<!-- ENDIF -->;" id="{files.STATUS}">
-
-					<fieldset>
-						<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
-				<!-- ELSE -->
-					<dl>
-						<!-- IF files.STATUS eq 'up_to_date' -->
-							<dd class="full" style="text-align: left;"><strong>{files.FILENAME}</strong></dd>
-						<!-- ELSE -->
-							<dt style="width: 60%;">
-								<strong><!-- IF files.DIR_PART -->{files.DIR_PART}<br /><!-- ENDIF -->{files.FILE_PART}</strong>
-								<!-- IF files.S_CUSTOM -->
-								<br /><span><em>{L_FILE_USED}: </em>{files.CUSTOM_ORIGINAL}</span>
-								<!-- ENDIF -->
-								<!-- IF files.NUM_CONFLICTS -->
-								<br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span>
-								<!-- ENDIF -->
-							</dt>
-							<dd style="margin-left: 60%;"><!-- IF files.STATUS eq 'modified' -->&nbsp;<!-- ELSE --><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --><!-- ENDIF --></dd>
-							<!-- IF files.S_CUSTOM -->
-								<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-							<!-- ENDIF -->
-
-							<!-- IF files.STATUS eq 'modified' -->
-							</dl>
-							<dl>
-								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
-							</dl>
-							<dl>
-								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-							</dl>
-							<dl>
-								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-							</dl>
-							<!-- IF not files.S_LAST_ROW -->
-							</fieldset>
-
-							<fieldset>
-								<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
-							<!-- ENDIF -->
-
-							<!-- ENDIF -->
-
-							<!-- IF files.STATUS eq 'conflict' -->
-							</dl>
-							<dl>
-								<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-							</dl>
-								<!-- IF not files.S_BINARY -->
-									<dl>
-										<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
-										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-									</dl>
-									<dl>
-										<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
-										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-									</dl>
-								<!-- ENDIF -->
-							<!-- IF not files.S_LAST_ROW -->
-							</fieldset>
-
-							<fieldset>
-								<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
-							<!-- ENDIF -->
-
-							<!-- ENDIF -->
-						<!-- ENDIF -->
-					<!-- IF files.STATUS neq 'conflict' and files.STATUS neq 'modified' --></dl><!-- ENDIF -->
-				<!-- ENDIF -->
-			<!-- END files -->
-
-			</fieldset></div>
-		<!-- ENDIF -->
-
-		<br />
-
-		<fieldset class="quick">
-			<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
-		</fieldset>
-
-		<br />
-
-		<h1>{L_UPDATE_METHOD}</h1>
-
-		<p>{L_UPDATE_METHOD_EXPLAIN}</p>
-
-		<fieldset class="submit-buttons">
-			<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD_BUTTON}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_DOWNLOAD_FILES -->
-
-	<h1>{L_DOWNLOAD_UPDATE_METHOD}</h1>
-
-	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
-	<dl>
-		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
-		<dd>{RADIO_BUTTONS}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}
-		<input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
-	</fieldset>
-
-	</form>
-
-	<br /><br />
-
-	<p>{L_MAPPING_FILE_STRUCTURE}</p>
-
-	<table cellspacing="1">
-		<col class="row1" /><col class="row2" /><col class="row1" />
-	<thead>
-	<tr>
-		<th style="width: 49%">{L_ARCHIVE_FILE}</th>
-		<th style="width: 2%">&nbsp;</th>
-		<th style="width: 49%">{L_DESTINATION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN location -->
-	<tr>
-		<td>{location.SOURCE}</td>
-		<td><strong>&raquo;</strong></td>
-		<td>{location.DESTINATION}</td>
-	</tr>
-	<!-- END location -->
-	</tbody>
-	</table>
-
-<!-- ELSEIF S_FTP_UPLOAD -->
-
-	<h1>{L_SELECT_FTP_SETTINGS}</h1>
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<!-- IF S_CONNECTION_SUCCESS -->
-		<div class="successbox">
-			<p>{L_CONNECTION_SUCCESS}</p>
-		</div>
-	<!-- ELSEIF S_CONNECTION_FAILED -->
-		<div class="successbox">
-			<p>{L_TRY_DOWNLOAD_METHOD}</p>
-
-			<fieldset class="quick">
-				<input class="button1" type="submit" name="download" value="{L_TRY_DOWNLOAD_METHOD_BUTTON}" />
-			</fieldset>
-		</div>
-
-		<div class="errorbox">
-			<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
-		</div>
-
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_FTP_SETTINGS}</legend>
-	<dl>
-		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
-		<dd><strong>{UPLOAD_METHOD}</strong></dd>
-	</dl>
-	<!-- BEGIN data -->
-	<dl>
-		<dt><label for="{data.DATA}">{data.NAME}:</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="submit-buttons">
-		{S_HIDDEN_FIELDS}
-		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
-		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
-		<input class="button1" type="submit" name="submit" value="{L_UPDATE_FILES}" />
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
deleted file mode 100644
index efbe1d045c..0000000000
--- a/phpBB/adm/style/install_update_diff.html
+++ /dev/null
@@ -1,253 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<!-- IF META -->{META}<!-- ENDIF -->
-<title>{PAGE_TITLE}</title>
-
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-<script type="text/javascript">
-// <![CDATA[
-function resize_panel()
-{
-	var block = document.getElementById('codepanel');	
-	var height;
-	
-	if (window.innerHeight)
-	{
-		height = window.innerHeight - 150;
-		block.style.height = height + 'px';
-	}
-	else
-	{
-		//whatever IE needs to do this
-	}	
-}
-// ]]>
-</script>
-
-<style type="text/css">
-/* <![CDATA[ */
-
-#main {
-	font-size: 1em;
-	line-height: 0.7em;
-	margin: 0;
-	padding: 0;
-	width: 99%;
-}
-
-#diff_content {
-	padding: 30px 10px 10px;
-}
-
-<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
-div#codepanel {
-	overflow: auto;
-	width: 100%;
-	height: 350px;
-	display: inline-block;
-}
-<!-- ELSE -->
-div#codepanel {	
-	background-color: #eee;
-}
-<!-- ENDIF -->
-
-<!-- IF not S_DIFF_NEW_FILE -->
-/**
-* Unified Diff
-*/
-.file {
-	line-height: .7em;
-}
-
-.diff {
-	margin: 0;
-}
-
-.added {
-	background-color: #dfd;
-}
-
-.removed {
-	background-color: #fdd;
-}
-
-.info {
-	color: #888;
-}
-
-.context {
-	background-color: #eee;
-}
-
-/**
-* Inline Diff
-*/
-.ins {
-	background-color: #dfd;
-	text-decoration: underline;
-}
-
-.del {
-	background-color: #fdd;
-	text-decoration: line-through;
-}
-
-/**
-* Column Diff
-*/
-table.hrdiff {
-	margin: 0 0 8px 5px;
-	width: 100%;
-	overflow: hidden;
-	border-bottom: 1px solid #999;
-	table-layout: fixed;
-}
-
-table.hrdiff th {
-	text-align: left;
-	width: 50%;
-	color: #333;
-	font-family: Verdana,Helvetica,sans-serif;
-	font-size: 11px;
-	border-bottom: 1px solid #999;
-	background: transparent;
-}
-
-table.hrdiff thead th {
-	font-weight: bold;
-	font-size: 110%;
-	padding: 2px;
-}
-
-table.hrdiff tr:first-child th {
-	border-top: none;
-}
-
-table.hrdiff tbody th {
-	padding: 2em 1px 1px 1px;
-	font-size: 80%;
-	border-top: 1px solid #999;
-}
-
-table.hrdiff tbody td.old {
-	border-left: 1px solid #999;
-	border-right: 1px solid #999;	
-}
-table.hrdiff tbody td.new {
-	border-right: 1px solid #999;	
-}
-
-table.hrdiff td pre {
-	overflow: auto;
-	display: block;
-	width: 100%;
-	overflow: auto;
-	display: block;
-}
-
-table.hrdiff .unmodified {
-	background: #fff;
-}
-
-table.hrdiff .added {
-	background: #9f9;
-}
-
-table.hrdiff .added_empty {
-	background: #cfc;
-}
-
-table.hrdiff .modified {
-	background: #fd9;
-}
-
-table.hrdiff .removed {
-	background: #f99;
-}
-
-table.hrdiff .removed_empty {
-	background: #fcc;
-}
-
-table.hrdiff caption {
-	caption-side: top;
-	text-align: left;
-	margin: 0 0 8px 5px;
-	font-size: 90%;
-	font-weight: bold;
-	padding: 5px;
-}
-
-table.hrdiff caption span {
-	height: 10px;
-	width: 10px;
-	line-height: 10px;
-	letter-spacing: 10px;
-	border: 1px solid #000;
-	margin-left: 0.5em;
-	vertical-align: baseline;
-}
-
-<!-- ENDIF -->
-
-/* ]]> */
-</style>
-
-</head>
-
-
-<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
-<body onresize="resize_panel();" onload="resize_panel();">
-<!-- ELSE -->
-<body>
-<!-- ENDIF -->
-
-<div id="wrap">
-	<div id="page-header">
-<!-- IF S_DIFF_NEW_FILE -->
-
-		<h1>{L_VIEWING_FILE_CONTENTS}</h1>
-<!-- ELSE -->
-		<h1>{L_VIEWING_FILE_DIFF}</h1>
-<!-- ENDIF -->
-<!-- IF not S_DIFF_NEW_FILE -->
-		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
-		<form method="post">
-		<fieldset class="quick">
-			<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
-			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
-
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
-		</fieldset>
-		</form>
-<!-- ENDIF -->
-	</div>
-	
-	<div id="page-body">
-		<div id="acp">
-		<div class="panel" id="codepanel">
-			<span class="corners-top"><span></span></span>
-				<div id="diff_content">
-					<div id="main">
-
-<!-- IF S_DIFF_CONFLICT_FILE -->
-		<div style="float: {S_CONTENT_FLOW_END};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
-<!-- ENDIF -->
-						{DIFF_CONTENT}
-					</div>
-				</div>
-			<span class="corners-bottom"><span></span></span>
-		</div>
-		</div>
-	</div>
-	
-
-<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
-- 
cgit v1.2.1


From 5a263f76a936dc6f1dba446b5ec1a1c3f5075a84 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 16 Jan 2009 17:57:28 +0000
Subject: "are you serious?" - "yes, sure" - "wow, install works, you are
 right" - "i told you"

git-svn-id: file:///svn/phpbb/trunk@9277 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/install/convert.html |   4 +-
 phpBB/adm/style/install/error.html   |   4 +-
 phpBB/adm/style/install/install.html | 187 +++++++++++++++++++++++++++++++++++
 phpBB/adm/style/install/main.html    |   4 +-
 phpBB/adm/style/install/update.html  |   4 +-
 5 files changed, 195 insertions(+), 8 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install/convert.html b/phpBB/adm/style/install/convert.html
index 783e89d6bf..a9ff57da29 100644
--- a/phpBB/adm/style/install/convert.html
+++ b/phpBB/adm/style/install/convert.html
@@ -1,4 +1,4 @@
-<!-- INCLUDE install_header.html -->
+<!-- INCLUDE install/header.html -->
 
 <!-- IF S_NOT_INSTALLED -->
 
@@ -131,4 +131,4 @@
 	</form>
 <!-- ENDIF -->
 
-<!-- INCLUDE install_footer.html -->
\ No newline at end of file
+<!-- INCLUDE install/footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install/error.html b/phpBB/adm/style/install/error.html
index ad53433207..f6982650c8 100644
--- a/phpBB/adm/style/install/error.html
+++ b/phpBB/adm/style/install/error.html
@@ -1,8 +1,8 @@
-<!-- INCLUDE install_header.html -->
+<!-- INCLUDE install/header.html -->
 
 <div class="errorbox">
 	<h3>{MESSAGE_TITLE}</h3>
 	<p>{MESSAGE_TEXT}</p>
 </div>
 
-<!-- INCLUDE install_footer.html -->
\ No newline at end of file
+<!-- INCLUDE install/footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install/install.html b/phpBB/adm/style/install/install.html
index e69de29bb2..a08b52eb7a 100644
--- a/phpBB/adm/style/install/install.html
+++ b/phpBB/adm/style/install/install.html
@@ -0,0 +1,187 @@
+<!-- INCLUDE install/header.html -->
+
+<!-- IF S_SUB eq 'intro' -->
+
+	<h1>{L_INSTALL_INTRO}</h1>
+	<p>{L_INSTALL_INTRO_BODY}</p>
+
+
+	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
+
+	<fieldset class="submit-buttons">
+		<legend>{L_NEXT_STEP}</legend>
+		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_SUB eq 'requirements' -->
+	<h1>{L_REQUIREMENTS_TITLE}</h1>
+	<p>{L_REQUIREMENTS_EXPLAIN}</p>
+
+	<!-- INCLUDE install/snippet_checks.html -->
+
+	<!-- IF S_FAILED -->
+
+		<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
+
+		<fieldset class="submit-buttons">
+			<legend>{L_INSTALL_TEST}</legend>
+			<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_INSTALL_TEST}" />
+		</fieldset>
+
+		</form>
+
+	<!-- ELSE -->
+
+		<form id="install_install" method="post" action="{U_ACTION_TEST}" onsubmit="submit.disabled = 'disabled';">
+
+		<fieldset class="submit-buttons" style="float: left;">
+			<legend>{L_INSTALL_TEST}</legend>
+			<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_INSTALL_TEST}" />
+		</fieldset>
+
+		</form>
+
+		<form id="install_start" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
+
+		<fieldset class="submit-buttons" style="float: right;">
+			<legend>{L_INSTALL_START}</legend>
+			{S_HIDDEN}
+			<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_INSTALL_START}" />
+		</fieldset>
+
+		</form>
+
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_SUB eq 'database' -->
+
+	<!-- IF S_CONNECT_TEST -->
+		<fieldset>
+			<legend>{L_DB_CONNECTION}</legend>
+
+		<!-- IF S_SUCCESS -->
+			<dl>
+				<dt>{L_DB_TEST}:</dt>
+				<dd><strong style="color:green">{L_SUCCESSFUL_CONNECT}</strong></dd>
+			</dl>
+		<!-- ELSE -->
+			<dl>
+				<dt>{L_DB_TEST}:</dt>
+				<dd><strong style="color:red">{ERROR}</strong></dd>
+			</dl>
+		<!-- ENDIF -->
+		</fieldset>
+	<!-- ENDIF -->
+
+	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
+
+	<!-- INCLUDE install/snippet_options.html -->
+
+	<fieldset class="submit-buttons">
+		<legend>{L_NEXT_STEP}</legend>
+		{S_HIDDEN}
+		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
+	</fieldset>
+
+	</form>
+<!-- ELSEIF S_SUB eq 'administrator' -->
+
+	<!-- INCLUDE install/snippet_checks.html -->
+
+	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
+
+	<!-- INCLUDE install/snippet_options.html -->
+
+	<fieldset class="submit-buttons">
+		<legend>{L_NEXT_STEP}</legend>
+		{S_HIDDEN}
+		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_SUB eq 'config_file' -->
+
+	<!-- IF S_WRITTEN -->
+		<p>{L_CONFIG_FILE_WRITTEN}</p>
+
+		<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
+
+		<fieldset class="submit-buttons">
+			<legend>{L_NEXT_STEP}</legend>
+			{S_HIDDEN}
+			<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
+		</fieldset>
+
+		</form>
+
+	<!-- ELSE -->
+		<p>{L_CONFIG_FILE_UNABLE_WRITE}</p>
+
+		<h1>{L_DL_CONFIG}</h1>
+		<p>{L_DL_CONFIG_EXPLAIN}</p>
+
+		<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
+
+		<fieldset class="submit-buttons">
+			<legend>{L_DL_CONFIG}</legend>
+			{S_HIDDEN}
+			<input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}" />&nbsp;<input class="button1" type="submit" id="dldone" name="dldone" value="{L_DONE}" />
+		</fieldset>
+
+		</form>
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_SUB eq 'advanced' -->
+
+	<p>{L_STAGE_ADVANCED_EXPLAIN}</p>
+
+	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
+
+	<!-- INCLUDE install/snippet_options.html -->
+
+	<fieldset class="submit-buttons">
+		<legend>{L_NEXT_STEP}</legend>
+		{S_HIDDEN}
+		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_SUB eq 'create_table' -->
+
+	<p>{L_STAGE_CREATE_TABLE_EXPLAIN}</p>
+
+	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
+
+	<fieldset class="submit-buttons">
+		<legend>{L_NEXT_STEP}</legend>
+		{S_HIDDEN}
+		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_SUB eq 'final' -->
+
+	<!-- INCLUDE install/snippet_checks.html -->
+
+	<h1>{L_INSTALL_CONGRATS}</h1>
+
+	<p>{L_BODY}</p>
+
+	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
+
+	<fieldset class="submit-buttons">
+		<legend>{L_INSTALL_LOGIN}</legend>
+		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_INSTALL_LOGIN}" />
+	</fieldset>
+
+	</form>
+
+<!-- ENDIF -->
+
+
+<!-- INCLUDE install/footer.html -->
diff --git a/phpBB/adm/style/install/main.html b/phpBB/adm/style/install/main.html
index 2c318bfd65..64c1a58f37 100644
--- a/phpBB/adm/style/install/main.html
+++ b/phpBB/adm/style/install/main.html
@@ -1,6 +1,6 @@
-<!-- INCLUDE install_header.html -->
+<!-- INCLUDE install/header.html -->
 
 	<h1>{TITLE}</h1>
 	<p>{BODY}</p>
 
-<!-- INCLUDE install_footer.html -->
\ No newline at end of file
+<!-- INCLUDE install/footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install/update.html b/phpBB/adm/style/install/update.html
index 2448f1d39b..640a02d57d 100644
--- a/phpBB/adm/style/install/update.html
+++ b/phpBB/adm/style/install/update.html
@@ -1,4 +1,4 @@
-<!-- INCLUDE install_header.html -->
+<!-- INCLUDE install/header.html -->
 
 <script type="text/javascript">
 // <![CDATA[
@@ -399,4 +399,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE install_footer.html -->
+<!-- INCLUDE install/footer.html -->
-- 
cgit v1.2.1


From 4cbf6bc703bdadf716197b68a89b3438247ff022 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 22 Mar 2009 16:34:26 +0000
Subject: Merge most changes from 3.0.x branch since the 25th december.
 (Captcha changes for refreshing captcha image not included)

git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_captcha.html    |  43 +++++--
 phpBB/adm/style/acp_forums.html     |   2 +-
 phpBB/adm/style/acp_styles.html     |  28 +++--
 phpBB/adm/style/install/update.html | 237 ++++++++++++++++++++++++------------
 4 files changed, 210 insertions(+), 100 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index 5d04938778..af67de16ea 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -22,12 +22,12 @@
 	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
 		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
 </dl>
-
-</fieldset>
-
-<fieldset>
-<legend>{L_AVAILABLE_CAPTCHAS}</legend>
-
+<dl>
+	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}:</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"<!-- IF CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
+	<label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+</dl>
+<!-- IF GD -->
 <dl>
 	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}:</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
 	<dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd>
@@ -36,7 +36,36 @@
 	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}:</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
 	<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd>
 </dl>
-	
+<dl>
+	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
+	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd>
+</dl>
+<dl>
+	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
+	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd>
+</dl>
+<dl>
+	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}:</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>
+	<dd><label><input id="captcha_gd_wave" name="captcha_gd_wave" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input name="captcha_gd_wave" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+</dd>
+</dl>
+<dl>
+	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}:</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt>
+	<dd><label><input id="captcha_gd_3d_noise" name="captcha_gd_3d_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input name="captcha_gd_3d_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+</dd>
+</dl>
+<dl>
+	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}:</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt>
+	<dd><label><input id="captcha_gd_fonts" name="captcha_gd_fonts" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 1 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_DEFAULT}</label>
+		<label><input name="captcha_gd_fonts" value="2" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 2 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_NEW}</label>
+		<label><input name="captcha_gd_fonts" value="3" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 3 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_LOWER}</label>
+
+</dd>
+</dl>
+<!-- ENDIF -->
+
 </fieldset>
 
 <!-- IF CAPTCHA_PREVIEW -->
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 636d4ded7b..547ac66e3c 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -444,7 +444,7 @@
 					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
 					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>
 					<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
-					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}: <b>{forums.FORUM_POSTS}</b></span><!-- ENDIF -->
+					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}: <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
 				</td>
 				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 3f25ded9f7..4c738ad618 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -54,7 +54,7 @@
 	// <![CDATA[
 		function update_image(newimage)
 		{
-			document.getElementById('newimg').src = (newimage) ? '../styles/{A_NAME}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
+			document.getElementById('newimg').src = (newimage) ? '../styles/{A_PATH}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
 		}
 	// ]]>
 	</script>
@@ -261,11 +261,11 @@
 <!-- ELSEIF S_CACHE -->
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	
+
 	<h1>{L_TEMPLATE_CACHE}</h1>
-	
+
 	<p>{L_TEMPLATE_CACHE_EXPLAIN}</p>
-	
+
 	<form name="acp_styles" method="post" action="{U_ACTION}">
 	<fieldset class="tabulated">
 	<legend>{L_TEMPLATE_CACHE}</legend>
@@ -361,7 +361,7 @@
 	</p>
 	</fieldset>
 
-	
+
 	</form>
 
 <!-- ELSEIF S_FRONTEND -->
@@ -455,24 +455,30 @@
 		<legend>{L_TITLE}</legend>
 	<dl>
 		<dt><label for="name">{L_NAME}:</label></dt>
-		<dd><!-- IF S_INSTALL --><b id="name">{NAME}</b><!-- ELSE --><input type="text" id="name" name="name" value="{NAME}" /><!-- ENDIF --></dd>
+		<dd><!-- IF S_INSTALL --><strong id="name">{NAME}</strong><!-- ELSE --><input type="text" id="name" name="name" value="{NAME}" /><!-- ENDIF --></dd>
 	</dl>
 	<dl>
 		<dt><label for="copyright">{L_COPYRIGHT}:</label></dt>
-		<dd><!-- IF S_INSTALL --><b id="copyright">{COPYRIGHT}</b><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd>
+		<dd><!-- IF S_INSTALL --><strong id="copyright">{COPYRIGHT}</strong><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd>
 	</dl>
+	<!-- IF S_SUPERTEMPLATE -->
+	<dl>
+		<dt><label for="inheriting">{L_INHERITING_FROM}:</label></dt>
+		<dd><strong id="inheriting">{S_SUPERTEMPLATE}</strong></dd>
+	</dl>
+	<!-- ENDIF -->
 	<!-- IF S_STYLE and not S_BASIS -->
 		<dl>
 			<dt><label for="template_id">{L_STYLE_TEMPLATE}:</label></dt>
-			<dd><!-- IF S_INSTALL --><b id="template_id">{TEMPLATE_NAME}</b><!-- ELSE --><select id="template_id" name="template_id">{S_TEMPLATE_OPTIONS}</select><!-- ENDIF --></dd>
+			<dd><!-- IF S_INSTALL --><strong id="template_id">{TEMPLATE_NAME}</strong><!-- ELSE --><select id="template_id" name="template_id">{S_TEMPLATE_OPTIONS}</select><!-- ENDIF --></dd>
 		</dl>
 		<dl>
 			<dt><label for="theme_id">{L_STYLE_THEME}:</label></dt>
-			<dd><!-- IF S_INSTALL --><b id="theme_id">{THEME_NAME}</b><!-- ELSE --><select id="theme_id" name="theme_id">{S_THEME_OPTIONS}</select><!-- ENDIF --></dd>
+			<dd><!-- IF S_INSTALL --><strong id="theme_id">{THEME_NAME}</strong><!-- ELSE --><select id="theme_id" name="theme_id">{S_THEME_OPTIONS}</select><!-- ENDIF --></dd>
 		</dl>
 		<dl>
 			<dt><label for="imageset_id">{L_STYLE_IMAGESET}:</label></dt>
-			<dd><!-- IF S_INSTALL --><b id="imageset_id">{IMAGESET_NAME}</b><!-- ELSE --><select id="imageset_id" name="imageset_id">{S_IMAGESET_OPTIONS}</select><!-- ENDIF --></dd>
+			<dd><!-- IF S_INSTALL --><strong id="imageset_id">{IMAGESET_NAME}</strong><!-- ELSE --><select id="imageset_id" name="imageset_id">{S_IMAGESET_OPTIONS}</select><!-- ENDIF --></dd>
 		</dl>
 	<!-- ENDIF -->
 	<!-- IF S_STYLE -->
@@ -500,7 +506,7 @@
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 		{S_FORM_TOKEN}
 	</fieldset>
-	
+
 	</form>
 
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/install/update.html b/phpBB/adm/style/install/update.html
index 640a02d57d..3d0ce31ffd 100644
--- a/phpBB/adm/style/install/update.html
+++ b/phpBB/adm/style/install/update.html
@@ -192,94 +192,170 @@
 
 		<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
 
-		<!-- IF .files -->
-			<!-- BEGIN files -->
-				<!-- IF files.S_STATUS -->
-					<!-- IF not files.S_FIRST_ROW -->
-						</fieldset></div>
+		<!-- IF .up_to_date -->
+			<h2>{L_FILES_UP_TO_DATE}</h2>
+			<p>{L_FILES_UP_TO_DATE_EXPLAIN}</p>
+
+			<fieldset>
+				<legend><img src="{T_IMAGE_PATH}file_up_to_date.gif" alt="{L_STATUS_UP_TO_DATE}" /></legend>
+			<!-- BEGIN up_to_date -->
+				<dl>
+					<dd class="full" style="text-align: left;"><strong>{up_to_date.FILENAME}</strong></dd>
+				</dl>
+			<!-- END up_to_date -->
+			</fieldset>
+
+		<!-- ENDIF -->
+
+		<!-- IF .new -->
+			<h2>{L_FILES_NEW}</h2>
+			<p>{L_FILES_NEW_EXPLAIN}</p>
+
+			<fieldset>
+				<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
+			<!-- BEGIN new -->
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br /><!-- ENDIF -->{new.FILE_PART}</strong>
+					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+				</dt>
+				<dd style="margin-left: 60%;">
+					<!-- IF not new.S_BINARY -->[ <a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>
+					<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+				</dd>
+				<!-- IF new.S_CUSTOM -->
+					<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+				<!-- ENDIF -->
+				</dl>
+			<!-- END new -->
+			</fieldset>
+
+		<!-- ENDIF -->
+
+		<!-- IF .not_modified -->
+			<h2>{L_FILES_NOT_MODIFIED}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
+
+			<fieldset id="not_modified" style="display: none;">
+				<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
+			<!-- BEGIN not_modified -->
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong>
+						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+					</dt>
+					<dd style="margin-left: 60%;"><!-- IF not not_modified.S_BINARY -->[ <a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
+					<!-- IF not_modified.S_CUSTOM -->
+						<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
 					<!-- ENDIF -->
+				</dl>
+			<!-- END not_modified -->
+			</fieldset>
 
-					<h2>{files.TITLE}</h2>
+		<!-- ENDIF -->
 
-					<!-- IF files.STATUS eq 'not_modified' --><div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div><!-- ENDIF -->
-					<p>{files.EXPLAIN}</p>
+		<!-- IF .modified -->
+			<h2>{L_FILES_MODIFIED}</h2>
+			<p>{L_FILES_MODIFIED_EXPLAIN}</p>
+
+			<!-- BEGIN modified -->
+			<fieldset>
+				<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong>
+					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+				</dt>
+				<dd style="margin-left: 60%;">&nbsp;</dd>
+				<!-- IF modified.S_CUSTOM -->
+					<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+				<!-- ENDIF -->
+				</dl>
+				<dl>
+					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
+					<dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[ <a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
+				</dl>
+				<dl>
+					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+					<dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+				</dl>
+				<dl>
+					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
+					<dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+				</dl>
+			</fieldset>
+			<!-- END modified -->
 
-					<div style="display: <!-- IF files.STATUS neq 'not_modified' -->block<!-- ELSE -->none<!-- ENDIF -->;" id="{files.STATUS}">
+		<!-- ENDIF -->
 
-					<fieldset>
-						<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
+		<!-- IF .new_conflict -->
+			<h2>{L_FILES_NEW_CONFLICT}</h2>
+			<p>{L_FILES_NEW_CONFLICT_EXPLAIN}</p>
+
+			<fieldset>
+				<legend><img src="{T_IMAGE_PATH}file_new_conflict.gif" alt="{L_STATUS_NEW_CONFLICT}" /></legend>
+			<!-- BEGIN new_conflict -->
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong>
+					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+				</dt>
+				<dd style="margin-left: 60%;">
+					<!-- IF not new_conflict.S_BINARY -->[ <a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>
+					<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+				</dd>
+				<!-- IF new_conflict.S_CUSTOM -->
+					<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+				<!-- ENDIF -->
+				</dl>
+			<!-- END new_conflict -->
+			</fieldset>
+
+		<!-- ENDIF -->
+
+		<!-- IF .conflict -->
+			<h2>{L_FILES_CONFLICT}</h2>
+			<p>{L_FILES_CONFLICT_EXPLAIN}</p>
+
+			<!-- BEGIN conflict -->
+			<fieldset>
+				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong>
+						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}: {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
+					</dt>
+					<dd style="margin-left: 60%;">
+						<!-- IF not conflict.S_BINARY -->[ <a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a> ]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
+						<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+					</dd>
+					<!-- IF conflict.S_CUSTOM -->
+						<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+					<!-- ENDIF -->
+				</dl>
+				<!-- IF conflict.S_BINARY -->
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+						<dd style="margin-left: 60%;">&nbsp;</dd>
+					</dl>
 				<!-- ELSE -->
 					<dl>
-						<!-- IF files.STATUS eq 'up_to_date' -->
-							<dd class="full" style="text-align: left;"><strong>{files.FILENAME}</strong></dd>
-						<!-- ELSE -->
-							<dt style="width: 60%;">
-								<strong><!-- IF files.DIR_PART -->{files.DIR_PART}<br /><!-- ENDIF -->{files.FILE_PART}</strong>
-								<!-- IF files.S_CUSTOM -->
-								<br /><span><em>{L_FILE_USED}: </em>{files.CUSTOM_ORIGINAL}</span>
-								<!-- ENDIF -->
-								<!-- IF files.NUM_CONFLICTS -->
-								<br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span>
-								<!-- ENDIF -->
-							</dt>
-							<dd style="margin-left: 60%;"><!-- IF files.STATUS eq 'modified' -->&nbsp;<!-- ELSE --><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --><!-- ENDIF --></dd>
-							<!-- IF files.S_CUSTOM -->
-								<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-							<!-- ENDIF -->
-
-							<!-- IF files.STATUS eq 'modified' -->
-							</dl>
-							<dl>
-								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
-							</dl>
-							<dl>
-								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-							</dl>
-							<dl>
-								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-							</dl>
-							<!-- IF not files.S_LAST_ROW -->
-							</fieldset>
-
-							<fieldset>
-								<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
-							<!-- ENDIF -->
-
-							<!-- ENDIF -->
-
-							<!-- IF files.STATUS eq 'conflict' -->
-							</dl>
-							<dl>
-								<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-							</dl>
-								<!-- IF not files.S_BINARY -->
-									<dl>
-										<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
-										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-									</dl>
-									<dl>
-										<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
-										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-									</dl>
-								<!-- ENDIF -->
-							<!-- IF not files.S_LAST_ROW -->
-							</fieldset>
-
-							<fieldset>
-								<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
-							<!-- ENDIF -->
-
-							<!-- ENDIF -->
-						<!-- ENDIF -->
-					<!-- IF files.STATUS neq 'conflict' and files.STATUS neq 'modified' --></dl><!-- ENDIF -->
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
+						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
+					</dl>
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
+						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
+					</dl>
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+					</dl>
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
+						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+					</dl>
 				<!-- ENDIF -->
-			<!-- END files -->
+			</fieldset>
+			<!-- END conflict -->
 
-			</fieldset></div>
 		<!-- ENDIF -->
 
 		<br />
@@ -371,7 +447,6 @@
 		<div class="errorbox">
 			<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
 		</div>
-
 	<!-- ENDIF -->
 
 	<fieldset>
@@ -387,7 +462,7 @@
 	</dl>
 	<!-- END data -->
 	</fieldset>
-
+	
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
 		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
-- 
cgit v1.2.1


From 1042152a55ab2d0764c446949a77f085ab7a77f3 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 18 Apr 2009 15:09:19 +0000
Subject: Merge changes made in revisions #r9405 to #r9467 2009-04-18

git-svn-id: file:///svn/phpbb/trunk@9468 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_database.html    |  4 ++--
 phpBB/adm/style/acp_email.html       |  2 +-
 phpBB/adm/style/acp_permissions.html | 30 ++++++++++++++++--------------
 phpBB/adm/style/acp_search.html      | 10 +++++++---
 phpBB/adm/style/overall_header.html  | 27 +++++++++++++++++----------
 phpBB/adm/style/simple_header.html   | 13 ++++++++++---
 6 files changed, 53 insertions(+), 33 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html
index ebc76c36a3..e839fb1bda 100644
--- a/phpBB/adm/style/acp_database.html
+++ b/phpBB/adm/style/acp_database.html
@@ -70,8 +70,8 @@
 	</dl>
 	<dl>
 		<dt><label for="where">{L_ACTION}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="where" value="store_and_download" id="where" checked="checked" /> {L_STORE_AND_DOWNLOAD}</label>
-			<label><input type="radio" class="radio" name="where" value="store" /> {L_STORE_LOCAL}</label>
+		<dd>
+			<label><input type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>
 			<label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label></dd>
 	</dl>
 	<dl>
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html
index b1d9b4af11..885809ffe2 100644
--- a/phpBB/adm/style/acp_email.html
+++ b/phpBB/adm/style/acp_email.html
@@ -44,7 +44,7 @@
 </dl>
 
 <p class="submit-buttons">
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_EMAIL}" />&nbsp;
+	<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_EMAIL}" />&nbsp;
 	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 </p>
 {S_FORM_TOKEN}
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index b4386d5f19..63583093b0 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -3,7 +3,7 @@
 <a name="maincontent"></a>
 
 <!-- IF S_INTRO -->
-	
+
 	<h1>{L_ACP_PERMISSIONS}</h1>
 
 	{L_ACP_PERMISSIONS_EXPLAIN}
@@ -12,10 +12,12 @@
 
 <!-- IF S_SELECT_VICTIM -->
 
+	<!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a><!-- ENDIF -->
+
 	<h1>{L_TITLE}</h1>
 
 	<p>{L_EXPLAIN}</p>
-	
+
 	<!-- IF S_FORUM_NAMES -->
 		<p><strong>{L_FORUMS}:</strong> {FORUM_NAMES}</p>
 	<!-- ENDIF -->
@@ -62,7 +64,7 @@
 
 			</fieldset>
 			</form>
-			
+
 		<!-- ENDIF -->
 
 	<!-- ELSEIF S_SELECT_USER and S_CAN_SELECT_USER -->
@@ -123,7 +125,7 @@
 				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_users" value="1" /> {L_ALL_USERS}</label></dd><!-- ENDIF -->
 			</dl>
 			</fieldset>
-			
+
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
 				{S_FORM_TOKEN}
@@ -154,7 +156,7 @@
 		</div>
 
 		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
-			
+
 		<!-- IF S_CAN_SELECT_GROUP -->
 
 			<h1>{L_USERGROUPS}</h1>
@@ -168,7 +170,7 @@
 				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_groups" value="1" /> {L_ALL_GROUPS}</label></dd><!-- ENDIF -->
 			</dl>
 			</fieldset>
-			
+
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
 				{S_FORM_TOKEN}
@@ -177,7 +179,7 @@
 			</form>
 
 			<form id="add_groups" method="post" action="{U_ACTION}">
-			
+
 			<fieldset>
 				<legend>{L_ADD_GROUPS}</legend>
 			<dl>
@@ -199,7 +201,7 @@
 	<!-- ELSEIF S_SELECT_USERGROUP_VIEW -->
 
 		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
-		
+
 			<h1>{L_USERS}</h1>
 
 			<form id="users" method="post" action="{U_ACTION}">
@@ -210,7 +212,7 @@
 				<dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd>
 			</dl>
 			</fieldset>
-			
+
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
 				{S_FORM_TOKEN}
@@ -240,7 +242,7 @@
 		</div>
 
 		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
-			
+
 			<h1>{L_USERGROUPS}</h1>
 
 			<form id="groups" method="post" action="{U_ACTION}">
@@ -251,7 +253,7 @@
 				<dd class="full"><select style="width: 100%;" name="group_id[]" multiple="multiple" size="5">{S_DEFINED_GROUP_OPTIONS}</select></dd>
 			</dl>
 			</fieldset>
-			
+
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
 				{S_FORM_TOKEN}
@@ -311,11 +313,11 @@
 
 	<!-- IF S_PERMISSION_DROPDOWN -->
 		<form id="pselect" method="post" action="{U_ACTION}">
-	
+
 		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
 			{S_HIDDEN_FIELDS}
 			{S_FORM_TOKEN}
-			{L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select> 
+			{L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select>
 
 			<input class="button2" type="submit" name="submit" value="{L_GO}" />
 		</fieldset>
@@ -347,7 +349,7 @@
 	</fieldset>
 
 	<br /><br />
-	
+
 	</form>
 
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index 0879780749..5fd7a23d97 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -32,6 +32,10 @@
 		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}:</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
 		<dd><input id="min_search_author_chars" type="text" size="4" maxlength="4" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
 	</dl>
+	<dl>
+		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}:</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
+		<dd><input id="max_num_search_keywords" type="text" size="4" maxlength="4" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
+	</dl>
 	<dl>
 		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}:</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
 		<dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
@@ -130,9 +134,9 @@
 				<!-- END data -->
 				</tbody>
 				</table>
-			
+
 			<!-- ENDIF -->
-			
+
 			<p class="quick">
 			<!-- IF backend.S_INDEXED -->
 				<input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
@@ -142,7 +146,7 @@
 			</p>
 			{S_FORM_TOKEN}
 			</fieldset>
-			
+
 			</form>
 		<!-- END backend -->
 
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index adafc0aa6d..93d72d5205 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -28,9 +28,16 @@ function jumpto()
 {
 	var page = prompt(jump_page, on_page);
 
-	if (page !== null && !isNaN(page) && page > 0)	
+	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
 	{
-		document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
+		if (base_url.indexOf('?') == -1)
+		{
+			document.location.href = base_url + '?start=' + ((page - 1) * per_page);
+		}
+		else
+		{
+			document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
+		}
 	}
 }
 
@@ -71,7 +78,7 @@ function marklist(id, name, state)
 	}
 
 	var rb = parent.getElementsByTagName('input');
-	
+
 	for (var r = 0; r < rb.length; r++)
 	{
 		if (rb[r].name.substr(0, name.length) == name)
@@ -166,7 +173,7 @@ function switch_menu()
 		<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 	</div>
-	
+
 	<div id="page-body">
 		<div id="tabs">
 			<ul>
@@ -180,31 +187,31 @@ function switch_menu()
 		<div class="panel">
 			<span class="corners-top"><span></span></span>
 				<div id="content">
-					<!-- IF not S_USER_NOTICE --> 
+					<!-- IF not S_USER_NOTICE -->
 					<div id="toggle">
 						<a id="toggle-handle" accesskey="m" title="{L_MENU_TOGGLE}" onclick="switch_menu(); return false;" href="#"></a></div>
 					<!-- ENDIF -->
 					<div id="menu">
 						<p><!-- IF S_USER_LOGGED_IN --> {L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;]<!-- ENDIF --><!-- IF S_USER_ADMIN -->[&nbsp;<a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a>&nbsp;]<!-- ENDIF --></p>
-						<!-- IF S_USER_ADMIN --> 
+						<!-- IF S_USER_ADMIN -->
 						<ul>
 						<!-- BEGIN l_block1 -->
 							<!-- IF l_block1.S_SELECTED -->
-	
+
 						<!-- BEGIN l_block2 -->
 							<!-- IF .l_block1.l_block2.l_block3 -->
 							<li class="header">{l_block1.l_block2.L_TITLE}</li>
 							<!-- ENDIF -->
-	
+
 							<!-- BEGIN l_block3 -->
 								<li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li>
 							<!-- END l_block3 -->
 						<!-- END l_block2 -->
-						
+
 							<!-- ENDIF -->
 						<!-- END l_block1 -->
 						</ul>
 						<!-- ENDIF -->
 					</div>
-	
+
 					<div id="main">
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 3e36c47988..e7d34c7ff4 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -39,9 +39,16 @@ function jumpto()
 {
 	var page = prompt(jump_page, on_page);
 
-	if (page !== null && !isNaN(page) && page > 0)	
+	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
 	{
-		document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
+		if (base_url.indexOf('?') == -1)
+		{
+			document.location.href = base_url + '?start=' + ((page - 1) * per_page);
+		}
+		else
+		{
+			document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
+		}
 	}
 }
 
@@ -77,7 +84,7 @@ function marklist(id, name, state)
 	}
 
 	var rb = parent.getElementsByTagName('input');
-	
+
 	for (var r = 0; r < rb.length; r++)
 	{
 		if (rb[r].name.substr(0, name.length) == name)
-- 
cgit v1.2.1


From 7909b729bbb1facce975b10da28754eb157723aa Mon Sep 17 00:00:00 2001
From: Jim Wigginton <terrafrost@phpbb.com>
Date: Sun, 12 Jul 2009 15:44:43 +0000
Subject: unified the transfer routines from the updater and from
 acp_language.php. still needs work..

git-svn-id: file:///svn/phpbb/trunk@9751 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_language.html   |  48 ++------------
 phpBB/adm/style/install/update.html | 107 +------------------------------
 phpBB/adm/style/update_options.html | 123 ++++++++++++++++++++++++++++++++++++
 3 files changed, 129 insertions(+), 149 deletions(-)
 create mode 100644 phpBB/adm/style/update_options.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index 95ac1d5852..6dbfe9e0f6 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -142,12 +142,8 @@
 		</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}:&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>
+		<td 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="submit_file" class="button2" value="{L_SUBMIT}" /></td>
 	</tr>
 	</thead>
 	<tbody>
@@ -165,45 +161,9 @@
 	</table>
 	</form>
 
-<!-- ELSEIF S_UPLOAD -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_UPLOAD_SETTINGS}</h1>
+<!-- ELSEIF S_UPDATE_OPTIONS -->
 
-	<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>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_UPLOAD_SETTINGS}</legend>
-	<dl>
-		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
-		<dd><strong>{NAME}</strong></dd>
-	</dl>
-	<!-- BEGIN data -->
-	<dl>
-		<dt><label for="{data.DATA}">{data.NAME}:</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>
+<!-- INCLUDE update_options.html -->
 
 <!-- ELSE -->
 
diff --git a/phpBB/adm/style/install/update.html b/phpBB/adm/style/install/update.html
index 3d0ce31ffd..bf60207e46 100644
--- a/phpBB/adm/style/install/update.html
+++ b/phpBB/adm/style/install/update.html
@@ -55,19 +55,6 @@
 
 	</form>
 
-<!-- ELSEIF S_UPLOAD_SUCCESS -->
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<h1>{L_UPDATE_SUCCESS}</h1>
-	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
-
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
-	</fieldset>
-
-	</form>
-
 <!-- ENDIF -->
 
 <!-- IF S_VERSION_CHECK -->
@@ -378,99 +365,9 @@
 
 	<!-- ENDIF -->
 
-<!-- ELSEIF S_DOWNLOAD_FILES -->
-
-	<h1>{L_DOWNLOAD_UPDATE_METHOD}</h1>
-
-	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
-	<dl>
-		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
-		<dd>{RADIO_BUTTONS}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}
-		<input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
-	</fieldset>
-
-	</form>
-
-	<br /><br />
-
-	<p>{L_MAPPING_FILE_STRUCTURE}</p>
-
-	<table cellspacing="1">
-		<col class="row1" /><col class="row2" /><col class="row1" />
-	<thead>
-	<tr>
-		<th style="width: 49%">{L_ARCHIVE_FILE}</th>
-		<th style="width: 2%">&nbsp;</th>
-		<th style="width: 49%">{L_DESTINATION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN location -->
-	<tr>
-		<td>{location.SOURCE}</td>
-		<td><strong>&raquo;</strong></td>
-		<td>{location.DESTINATION}</td>
-	</tr>
-	<!-- END location -->
-	</tbody>
-	</table>
-
-<!-- ELSEIF S_FTP_UPLOAD -->
-
-	<h1>{L_SELECT_FTP_SETTINGS}</h1>
+<!-- ELSEIF S_UPDATE_OPTIONS -->
 
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<!-- IF S_CONNECTION_SUCCESS -->
-		<div class="successbox">
-			<p>{L_CONNECTION_SUCCESS}</p>
-		</div>
-	<!-- ELSEIF S_CONNECTION_FAILED -->
-		<div class="successbox">
-			<p>{L_TRY_DOWNLOAD_METHOD}</p>
-
-			<fieldset class="quick">
-				<input class="button1" type="submit" name="download" value="{L_TRY_DOWNLOAD_METHOD_BUTTON}" />
-			</fieldset>
-		</div>
-
-		<div class="errorbox">
-			<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_FTP_SETTINGS}</legend>
-	<dl>
-		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
-		<dd><strong>{UPLOAD_METHOD}</strong></dd>
-	</dl>
-	<!-- BEGIN data -->
-	<dl>
-		<dt><label for="{data.DATA}">{data.NAME}:</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="submit-buttons">
-		{S_HIDDEN_FIELDS}
-		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
-		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
-		<input class="button1" type="submit" name="submit" value="{L_UPDATE_FILES}" />
-	</fieldset>
-
-	</form>
+<!-- INCLUDE update_options.html -->
 
 <!-- ENDIF -->
 
diff --git a/phpBB/adm/style/update_options.html b/phpBB/adm/style/update_options.html
new file mode 100644
index 0000000000..e3ef01582c
--- /dev/null
+++ b/phpBB/adm/style/update_options.html
@@ -0,0 +1,123 @@
+
+<!-- IF S_DOWNLOAD_FILES -->
+
+	<h1>{L_DOWNLOAD_UPDATE_METHOD}</h1>
+
+	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
+	<dl>
+		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
+		<dd>{RADIO_BUTTONS}</dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		{S_HIDDEN_FIELDS}{S_FORM_TOKEN}
+		<!-- IF S_CHECK_AGAIN --><input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<!-- ENDIF -->
+		<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
+	</fieldset>
+
+	</form>
+
+	<br /><br />
+
+	<p>{L_MAPPING_FILE_STRUCTURE}</p>
+
+	<table cellspacing="1">
+		<col class="row1" /><col class="row2" /><col class="row1" />
+	<thead>
+	<tr>
+		<th style="width: 49%">{L_ARCHIVE_FILE}</th>
+		<th style="width: 2%">&nbsp;</th>
+		<th style="width: 49%">{L_DESTINATION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN location -->
+	<tr>
+		<td>{location.SOURCE}</td>
+		<td><strong>&raquo;</strong></td>
+		<td>{location.DESTINATION}</td>
+	</tr>
+	<!-- END location -->
+	</tbody>
+	</table>
+
+<!-- ELSEIF S_FTP_UPLOAD -->
+
+	<h1>{L_SELECT_FTP_SETTINGS}</h1>
+
+	<form id="update_options" method="post" action="{U_ACTION}">
+
+	<!-- IF S_CONNECTION_SUCCESS -->
+		<div class="successbox">
+			<p>{L_CONNECTION_SUCCESS}</p>
+		</div>
+	<!-- ELSEIF S_CONNECTION_FAILED -->
+		<div class="successbox">
+			<p>{L_TRY_DOWNLOAD_METHOD}</p>
+
+			<fieldset class="quick">
+				<input class="button1" type="submit" name="download" value="{L_TRY_DOWNLOAD_METHOD_BUTTON}" />
+			</fieldset>
+		</div>
+
+		<div class="errorbox">
+			<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_FTP_SETTINGS}</legend>
+	<dl>
+		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
+		<dd><strong>{UPLOAD_METHOD}</strong></dd>
+	</dl>
+	<!-- BEGIN data -->
+	<dl>
+		<dt><label for="{data.DATA}">{data.NAME}:</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="submit-buttons">
+		{S_HIDDEN_FIELDS}{S_FORM_TOKEN}
+		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
+		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
+		<input class="button1" type="submit" name="update" value="{L_UPDATE_FILES}" />
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_UPLOAD_SUCCESS -->
+
+	<form id="update_options" method="post" action="{U_FINAL_ACTION}">
+
+	<h1>{L_UPDATE_SUCCESS}</h1>
+	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
+
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" name="clean_up" value="{L_CONTINUE_UPDATE}" />
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_UPDATE_OPTIONS -->
+
+	<form id="update_options" method="post" action="{U_INITIAL_ACTION}">
+
+	<p>{L_UPDATE_METHOD_EXPLAIN}</p>
+
+	<fieldset class="submit-buttons">
+	{S_HIDDEN_FIELDS}{S_FORM_TOKEN}
+	<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD_BUTTON}" />
+	</fieldset>
+
+	</form>
+
+<!-- ENDIF -->
\ No newline at end of file
-- 
cgit v1.2.1


From bf8ac19eaa8d74f9dfd6d597190f5664e7339382 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 4 Oct 2009 18:13:59 +0000
Subject: Move trunk/phpBB to old_trunk/phpBB

git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_attachments.html          |  376 ------
 phpBB/adm/style/acp_ban.html                  |  124 --
 phpBB/adm/style/acp_bbcodes.html              |  124 --
 phpBB/adm/style/acp_board.html                |   49 -
 phpBB/adm/style/acp_bots.html                 |  102 --
 phpBB/adm/style/acp_captcha.html              |   86 --
 phpBB/adm/style/acp_database.html             |   97 --
 phpBB/adm/style/acp_disallow.html             |   45 -
 phpBB/adm/style/acp_email.html                |   54 -
 phpBB/adm/style/acp_forums.html               |  500 --------
 phpBB/adm/style/acp_groups.html               |  350 ------
 phpBB/adm/style/acp_icons.html                |  268 ----
 phpBB/adm/style/acp_inactive.html             |   71 --
 phpBB/adm/style/acp_jabber.html               |   65 -
 phpBB/adm/style/acp_language.html             |  215 ----
 phpBB/adm/style/acp_login.html                |   46 -
 phpBB/adm/style/acp_logs.html                 |   85 --
 phpBB/adm/style/acp_main.html                 |  222 ----
 phpBB/adm/style/acp_modules.html              |  212 ----
 phpBB/adm/style/acp_permission_roles.html     |  202 ---
 phpBB/adm/style/acp_permissions.html          |  357 ------
 phpBB/adm/style/acp_php_info.html             |   13 -
 phpBB/adm/style/acp_profile.html              |  228 ----
 phpBB/adm/style/acp_prune_forums.html         |  108 --
 phpBB/adm/style/acp_prune_users.html          |   59 -
 phpBB/adm/style/acp_ranks.html                |   98 --
 phpBB/adm/style/acp_reasons.html              |  127 --
 phpBB/adm/style/acp_search.html               |  157 ---
 phpBB/adm/style/acp_styles.html               |  514 --------
 phpBB/adm/style/acp_update.html               |   46 -
 phpBB/adm/style/acp_users.html                |  230 ----
 phpBB/adm/style/acp_users_avatar.html         |   76 --
 phpBB/adm/style/acp_users_feedback.html       |   76 --
 phpBB/adm/style/acp_users_overview.html       |  144 ---
 phpBB/adm/style/acp_users_prefs.html          |  158 ---
 phpBB/adm/style/acp_users_profile.html        |   66 -
 phpBB/adm/style/acp_users_signature.html      |  117 --
 phpBB/adm/style/acp_words.html                |   77 --
 phpBB/adm/style/admin.css                     | 1644 -------------------------
 phpBB/adm/style/captcha_default_acp_demo.html |    5 -
 phpBB/adm/style/captcha_gd_acp.html           |   53 -
 phpBB/adm/style/captcha_recaptcha.html        |   19 -
 phpBB/adm/style/captcha_recaptcha_acp.html    |   48 -
 phpBB/adm/style/colour_swatch.html            |   78 --
 phpBB/adm/style/confirm_body.html             |   20 -
 phpBB/adm/style/confirm_body_prune.html       |   30 -
 phpBB/adm/style/custom_profile_fields.html    |   32 -
 phpBB/adm/style/editor.js                     |  399 ------
 phpBB/adm/style/install/convert.html          |  134 --
 phpBB/adm/style/install/error.html            |    8 -
 phpBB/adm/style/install/footer.html           |   26 -
 phpBB/adm/style/install/header.html           |   81 --
 phpBB/adm/style/install/install.html          |  187 ---
 phpBB/adm/style/install/main.html             |    6 -
 phpBB/adm/style/install/snippet_checks.html   |   21 -
 phpBB/adm/style/install/snippet_options.html  |   23 -
 phpBB/adm/style/install/update.html           |  374 ------
 phpBB/adm/style/install/update_diff.html      |  253 ----
 phpBB/adm/style/message_body.html             |    8 -
 phpBB/adm/style/overall_footer.html           |   34 -
 phpBB/adm/style/overall_header.html           |  217 ----
 phpBB/adm/style/permission_mask.html          |  139 ---
 phpBB/adm/style/permission_roles_mask.html    |   38 -
 phpBB/adm/style/permission_trace.html         |   58 -
 phpBB/adm/style/permissions.js                |  359 ------
 phpBB/adm/style/progress_bar.html             |   40 -
 phpBB/adm/style/simple_body.html              |    8 -
 phpBB/adm/style/simple_footer.html            |   31 -
 phpBB/adm/style/simple_header.html            |  112 --
 phpBB/adm/style/tooltip.js                    |  251 ----
 phpBB/adm/style/update_options.html           |  123 --
 phpBB/adm/style/viewsource.html               |   21 -
 72 files changed, 10824 deletions(-)
 delete mode 100644 phpBB/adm/style/acp_attachments.html
 delete mode 100644 phpBB/adm/style/acp_ban.html
 delete mode 100644 phpBB/adm/style/acp_bbcodes.html
 delete mode 100644 phpBB/adm/style/acp_board.html
 delete mode 100644 phpBB/adm/style/acp_bots.html
 delete mode 100644 phpBB/adm/style/acp_captcha.html
 delete mode 100644 phpBB/adm/style/acp_database.html
 delete mode 100644 phpBB/adm/style/acp_disallow.html
 delete mode 100644 phpBB/adm/style/acp_email.html
 delete mode 100644 phpBB/adm/style/acp_forums.html
 delete mode 100644 phpBB/adm/style/acp_groups.html
 delete mode 100644 phpBB/adm/style/acp_icons.html
 delete mode 100644 phpBB/adm/style/acp_inactive.html
 delete mode 100644 phpBB/adm/style/acp_jabber.html
 delete mode 100644 phpBB/adm/style/acp_language.html
 delete mode 100644 phpBB/adm/style/acp_login.html
 delete mode 100644 phpBB/adm/style/acp_logs.html
 delete mode 100644 phpBB/adm/style/acp_main.html
 delete mode 100644 phpBB/adm/style/acp_modules.html
 delete mode 100644 phpBB/adm/style/acp_permission_roles.html
 delete mode 100644 phpBB/adm/style/acp_permissions.html
 delete mode 100644 phpBB/adm/style/acp_php_info.html
 delete mode 100644 phpBB/adm/style/acp_profile.html
 delete mode 100644 phpBB/adm/style/acp_prune_forums.html
 delete mode 100644 phpBB/adm/style/acp_prune_users.html
 delete mode 100644 phpBB/adm/style/acp_ranks.html
 delete mode 100644 phpBB/adm/style/acp_reasons.html
 delete mode 100644 phpBB/adm/style/acp_search.html
 delete mode 100644 phpBB/adm/style/acp_styles.html
 delete mode 100644 phpBB/adm/style/acp_update.html
 delete mode 100644 phpBB/adm/style/acp_users.html
 delete mode 100644 phpBB/adm/style/acp_users_avatar.html
 delete mode 100644 phpBB/adm/style/acp_users_feedback.html
 delete mode 100644 phpBB/adm/style/acp_users_overview.html
 delete mode 100644 phpBB/adm/style/acp_users_prefs.html
 delete mode 100644 phpBB/adm/style/acp_users_profile.html
 delete mode 100644 phpBB/adm/style/acp_users_signature.html
 delete mode 100644 phpBB/adm/style/acp_words.html
 delete mode 100644 phpBB/adm/style/admin.css
 delete mode 100644 phpBB/adm/style/captcha_default_acp_demo.html
 delete mode 100644 phpBB/adm/style/captcha_gd_acp.html
 delete mode 100644 phpBB/adm/style/captcha_recaptcha.html
 delete mode 100644 phpBB/adm/style/captcha_recaptcha_acp.html
 delete mode 100644 phpBB/adm/style/colour_swatch.html
 delete mode 100644 phpBB/adm/style/confirm_body.html
 delete mode 100644 phpBB/adm/style/confirm_body_prune.html
 delete mode 100644 phpBB/adm/style/custom_profile_fields.html
 delete mode 100644 phpBB/adm/style/editor.js
 delete mode 100644 phpBB/adm/style/install/convert.html
 delete mode 100644 phpBB/adm/style/install/error.html
 delete mode 100644 phpBB/adm/style/install/footer.html
 delete mode 100644 phpBB/adm/style/install/header.html
 delete mode 100644 phpBB/adm/style/install/install.html
 delete mode 100644 phpBB/adm/style/install/main.html
 delete mode 100644 phpBB/adm/style/install/snippet_checks.html
 delete mode 100644 phpBB/adm/style/install/snippet_options.html
 delete mode 100644 phpBB/adm/style/install/update.html
 delete mode 100644 phpBB/adm/style/install/update_diff.html
 delete mode 100644 phpBB/adm/style/message_body.html
 delete mode 100644 phpBB/adm/style/overall_footer.html
 delete mode 100644 phpBB/adm/style/overall_header.html
 delete mode 100644 phpBB/adm/style/permission_mask.html
 delete mode 100644 phpBB/adm/style/permission_roles_mask.html
 delete mode 100644 phpBB/adm/style/permission_trace.html
 delete mode 100644 phpBB/adm/style/permissions.js
 delete mode 100644 phpBB/adm/style/progress_bar.html
 delete mode 100644 phpBB/adm/style/simple_body.html
 delete mode 100644 phpBB/adm/style/simple_footer.html
 delete mode 100644 phpBB/adm/style/simple_header.html
 delete mode 100644 phpBB/adm/style/tooltip.js
 delete mode 100644 phpBB/adm/style/update_options.html
 delete mode 100644 phpBB/adm/style/viewsource.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
deleted file mode 100644
index 9573c34248..0000000000
--- a/phpBB/adm/style/acp_attachments.html
+++ /dev/null
@@ -1,376 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF U_BACK -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-<!-- ENDIF -->
-
-<h1>{L_TITLE}</h1>
-
-<p>{L_TITLE_EXPLAIN}</p>
-
-<!-- IF S_WARNING -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{WARNING_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_NOTIFY -->
-	<div class="successbox">
-		<h3>{L_NOTIFY}</h3>
-		<p>{NOTIFY_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_UPLOADING_FILES -->
-	<h2>{L_UPLOADING_FILES}</h2>
-
-	<!-- BEGIN upload -->
-		:: {upload.FILE_INFO}<br />
-		<!-- IF upload.S_DENIED --><span class="error">{upload.DENIED}</span><!-- ELSEIF upload.ERROR_MSG --><span class="error">{upload.ERROR_MSG}</span><!-- ELSE --><span class="success">{L_SUCCESSFULLY_UPLOADED}</span><!-- ENDIF -->
-		<br /><br />
-	<!-- END upload -->
-
-<!-- ENDIF -->
-
-<!-- IF S_ATTACHMENT_SETTINGS -->
-
-	<!-- IF not S_THUMBNAIL_SUPPORT -->
-		<div class="errorbox">
-			<p>{L_NO_THUMBNAIL_SUPPORT}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="attachsettings" method="post" action="{U_ACTION}">
-	<!-- BEGIN options -->
-		<!-- IF options.S_LEGEND -->
-			<!-- IF not options.S_FIRST_ROW -->
-				</fieldset>
-			<!-- ENDIF -->
-			<fieldset>
-				<legend>{options.LEGEND}</legend>
-		<!-- ELSE -->
-
-			<dl>
-				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-				<dd>{options.CONTENT}</dd>
-			</dl>
-
-		<!-- ENDIF -->
-	<!-- END options -->
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</fieldset>
-
-	<!-- IF not S_SECURE_DOWNLOADS -->
-		<div class="errorbox">
-			<p>{L_SECURE_DOWNLOAD_NOTICE}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_SECURE_TITLE}</legend>
-		<p>{L_DOWNLOAD_ADD_IPS_EXPLAIN}</p>
-	<dl>
-		<dt><label for="ip_hostname">{L_IP_HOSTNAME}:</label></dt>
-		<dd><textarea id="ip_hostname" cols="40" rows="3" name="ips"></textarea></dd>
-	</dl>
-	<dl>
-		<dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
-		<dd><label><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES}</label>
-			<label><input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
-	</dl>
-
-	<p class="quick">
-		<input class="button1" type="submit" id="securesubmit" name="securesubmit" value="{L_SUBMIT}" />
-	</p>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_REMOVE_IPS}</legend>
-	<!-- IF S_DEFINED_IPS -->
-			<p>{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}</p>
-		<dl>
-			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}:</label></dt>
-			<dd><select name="unip[]" id="remove_ip_hostname" multiple="multiple" size="10">{DEFINED_IPS}</select></dd>
-		</dl>
-
-		<p class="quick">
-			<input class="button1" type="submit" id="unsecuresubmit" name="unsecuresubmit" value="{L_SUBMIT}" />
-		</p>
-		</fieldset>
-
-	<!-- ELSE -->
-		<p>{L_NO_IPS_DEFINED}</p>
-	<!-- ENDIF -->
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_EXTENSION_GROUPS -->
-
-	<!-- IF S_EDIT_GROUP -->
-		<script type="text/javascript" defer="defer">
-		// <![CDATA[
-			function update_image(newimage)
-			{
-				if (newimage == 'no_image')
-				{
-					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}images/spacer.gif";
-				}
-				else
-				{
-					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
-				}
-			}
-
-			function show_extensions(elem)
-			{
-				var str = '';
-
-				for (i = 0; i < elem.length; i++)
-				{
-					var element = elem.options[i];
-					if (element.selected)
-					{
-						if (str)
-						{
-							str = str + ', ';
-						}
-
-						str = str + element.innerHTML;
-					}
-				}
-
-				if (document.all)
-				{
-					document.all.ext.innerText = str;
-				}
-				else if (document.getElementById('ext').textContent)
-				{
-					document.getElementById('ext').textContent = str;
-				}
-				else if (document.getElementById('ext').firstChild.nodeValue)
-				{
-					document.getElementById('ext').firstChild.nodeValue = str;
-				}
-			}
-
-		// ]]>
-		</script>
-
-		<form id="extgroups" method="post" action="{U_ACTION}">
-		<fieldset>
-			<input type="hidden" name="action" value="{ACTION}" />
-			<input type="hidden" name="g" value="{GROUP_ID}" />
-
-			<legend>{L_LEGEND}</legend>
-		<dl>
-			<dt><label for="group_name">{L_GROUP_NAME}:</label></dt>
-			<dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="category">{L_SPECIAL_CATEGORY}:</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
-			<dd>{S_CATEGORY_SELECT}</dd>
-		</dl>
-		<dl>
-			<dt><label for="allowed">{L_ALLOWED}:</label></dt>
-			<dd><input type="checkbox" class="radio" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt>
-			<dd><input type="checkbox" class="radio" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="upload_icon">{L_UPLOAD_ICON}:</label></dt>
-			<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">
-					<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}
-			</select></dd>
-			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
-		</dl>
-		<dl>
-			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt>
-			<dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}:</label></dt>
-			<dd><div id="ext">{ASSIGNED_EXTENSIONS}</div> <span>[<a href="{U_EXTENSIONS}">{L_GO_TO_EXTENSIONS}</a> ]</span></dd>
-			<dd><select name="extensions[]" id="assigned_extensions" class="narrow" onchange="show_extensions(this);" multiple="multiple" size="8">{S_EXTENSION_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label>
-				<label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
-			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
-		</dl>
-
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		</p>
-		{S_FORM_TOKEN}
-		</fieldset>
-
-		</form>
-	<!-- ELSE -->
-
-		<form id="extgroups" method="post" action="{U_ACTION}">
-		<fieldset class="tabulated">
-		<legend>{L_TITLE}</legend>
-
-		<table cellspacing="1">
-			<col class="row1" /><col class="row1" /><col class="row2" />
-		<thead>
-		<tr>
-			<th>{L_EXTENSION_GROUP}</th>
-			<th>{L_SPECIAL_CATEGORY}</th>
-			<th>{L_OPTIONS}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN groups -->
-			<!-- IF groups.S_ADD_SPACER and not groups.S_FIRST_ROW -->
-			<tr>
-				<td class="spacer" colspan="3">&nbsp;</td>
-			</tr>
-			<!-- ENDIF -->
-			<tr>
-				<td><strong>{groups.GROUP_NAME}</strong>
-					<!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM}</span>
-					<!-- ELSEIF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br /><span>&raquo; {L_ONLY_ALLOWED_IN_PM}</span>
-					<!-- ELSEIF not groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM_POST}</span>
-					<!-- ELSE --><br /><span>&raquo; {L_ALLOWED_IN_PM_POST}</span><!-- ENDIF -->
-				</td>
-				<td>{groups.CATEGORY}</td>
-				<td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{groups.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
-			</tr>
-		<!-- END groups -->
-		</tbody>
-		</table>
-		<p class="quick">
-				{L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" />
-				<input class="button2" name="add" type="submit" value="{L_SUBMIT}" />
-		</p>
-		{S_FORM_TOKEN}
-		</fieldset>
-		</form>
-
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_EXTENSIONS -->
-
-	<form id="add_ext" method="post" action="{U_ACTION}">
-	<fieldset>
-		<legend>{L_ADD_EXTENSION}</legend>
-	<dl>
-		<dt><label for="add_extension">{L_EXTENSION}</label></dt>
-		<dd><input type="text" id="add_extension" size="20" maxlength="100" name="add_extension" value="{ADD_EXTENSION}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="extension_group">{L_EXTENSION_GROUP}</label></dt>
-		<dd>{GROUP_SELECT_OPTIONS}</dd>
-	</dl>
-
-	<p class="quick">
-		<input type="submit" id="add_extension_check" name="add_extension_check" class="button2" value="{L_SUBMIT}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-	<br />
-
-	<form id="change_ext" method="post" action="{U_ACTION}">
-
-	<fieldset class="tabulated">
-	<legend>{L_TITLE}</legend>
-
-	<table cellspacing="1">
-		<col class="row1" /><col class="row1" /><col class="row2" />
-	<thead>
-	<tr>
-		<th>{L_EXTENSION}</th>
-		<th>{L_EXTENSION_GROUP}</th>
-		<th>{L_DELETE}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN extensions -->
-		<!-- IF extensions.S_SPACER -->
-		<tr>
-			<td class="spacer" colspan="3">&nbsp;</td>
-		</tr>
-		<!-- ENDIF -->
-		<tr>
-			<td><strong>{extensions.EXTENSION}</strong></td>
-			<td>{extensions.GROUP_OPTIONS}</td>
-			<td><input type="checkbox" class="radio" name="extension_id_list[]" value="{extensions.EXTENSION_ID}" /><input type="hidden" name="extension_change_list[]" value="{extensions.EXTENSION_ID}" /></td>
-		</tr>
-	<!-- END extensions -->
-	</tbody>
-	</table>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_ORPHAN -->
-
-	<form id="orphan" method="post" action="{U_ACTION}">
-
-	<fieldset class="tabulated">
-	<legend>{L_TITLE}</legend>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_FILENAME}</th>
-		<th>{L_FILEDATE}</th>
-		<th>{L_FILESIZE}</th>
-		<th>{L_ATTACH_POST_ID}</th>
-		<th>{L_ATTACH_TO_POST}</th>
-		<th>{L_DELETE}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN orphan -->
-		<!-- IF orphan.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
-			<td>{orphan.FILETIME}</td>
-			<td>{orphan.FILESIZE}</td>
-			<td><strong>{L_ATTACH_ID}: </strong><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
-			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
-			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
-		</tr>
-	<!-- END orphan -->
-	<tr class="row4">
-		<td colspan="4">&nbsp;</td>
-		<td class="small"><a href="#" onclick="marklist('orphan', 'add', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'add', false); return false;">{L_UNMARK_ALL}</a></td>
-		<td class="small"><a href="#" onclick="marklist('orphan', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'delete', false); return false;">{L_UNMARK_ALL}</a></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<br />
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
deleted file mode 100644
index bc326345b0..0000000000
--- a/phpBB/adm/style/acp_ban.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<p>{L_ACP_BAN_EXPLAIN}</p>
-
-<h1>{L_TITLE}</h1>
-
-<p>{L_EXPLAIN}</p>
-
-<script type="text/javascript">
-// <![CDATA[
-
-	var ban_length = new Array();
-		ban_length[-1] = '';
-	<!-- BEGIN ban_length -->
-		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
-	<!-- END ban_length -->
-
-	var ban_reason = new Array();
-		ban_reason[-1] = '';
-	<!-- BEGIN ban_reason -->
-		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
-	<!-- END ban_reason -->
-
-	var ban_give_reason = new Array();
-		ban_give_reason[-1] = '';
-	<!-- BEGIN ban_give_reason -->
-		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
-	<!-- END ban_give_reason -->
-
-	function display_details(option)
-	{
-		document.getElementById('acp_unban').unbangivereason.value = ban_give_reason[option];
-		document.getElementById('acp_unban').unbanreason.value = ban_reason[option];
-		document.getElementById('acp_unban').unbanlength.value = ban_length[option];
-	}
-
-// ]]>
-</script>
-
-<form id="acp_ban" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_TITLE}</legend>
-<dl>
-	<dt><label for="ban">{L_BAN_CELL}:</label></dt>
-	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
-	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
-</dl>
-<dl>
-	<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
-	<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>
-	<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>
-</dl>
-<dl>
-	<dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES}</label>
-		<label><input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="banreason">{L_BAN_REASON}:</label></dt>
-	<dd><input name="banreason" type="text" class="text medium" maxlength="255" id="banreason" /></dd>
-</dl>
-<dl>
-	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt>
-	<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>
-</dl>
-
-<p class="submit-buttons">
-	<input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
-</p>
-{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<br /><br />
-
-<h1>{L_UNBAN_TITLE}</h1>
-
-<p>{L_UNBAN_EXPLAIN}</p>
-
-<form id="acp_unban" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_UNBAN_TITLE}</legend>
-
-<!-- IF S_BANNED_OPTIONS -->
-	<dl>
-		<dt><label for="unban">{L_BAN_CELL}:</label></dt>
-		<dd><select id="unban" name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
-		<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbanlength" id="unbanlength" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
-		<dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbanreason" id="unbanreason" rows="5" cols="80">&nbsp;</textarea></dd>
-	</dl>
-	<dl>
-		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
-		<dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbangivereason" id="unbangivereason" rows="5" cols="80">&nbsp;</textarea></dd>
-	</dl>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="unbansubmit" name="unbansubmit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="unbanreset" name="unbanreset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-
-<!-- ELSE -->
-
-	<p>{L_NO_BAN_CELL}</p>
-	{S_FORM_TOKEN}
-</fieldset>
-
-<!-- ENDIF -->
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
deleted file mode 100644
index c81c198fd5..0000000000
--- a/phpBB/adm/style/acp_bbcodes.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT_BBCODE -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_ACP_BBCODES}</h1>
-
-	<p>{L_ACP_BBCODES_EXPLAIN}</p>
-
-	<form id="acp_bbcodes" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_BBCODE_USAGE}</legend>
-		<p>{L_BBCODE_USAGE_EXPLAIN}</p>
-	<dl>
-		<dt><label for="bbcode_match">{L_EXAMPLES}</label><br /><br /><span>{L_BBCODE_USAGE_EXAMPLE}</span></dt>
-		<dd><textarea id="bbcode_match" name="bbcode_match" cols="60" rows="5">{BBCODE_MATCH}</textarea></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_HTML_REPLACEMENT}</legend>
-		<p>{L_HTML_REPLACEMENT_EXPLAIN}</p>
-	<dl>
-		<dt><label for="bbcode_tpl">{L_EXAMPLES}</label><br /><br /><span>{L_HTML_REPLACEMENT_EXAMPLE}</span></dt>
-		<dd><textarea id="bbcode_tpl" name="bbcode_tpl" cols="60" rows="8">{BBCODE_TPL}</textarea></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_BBCODE_HELPLINE}</legend>
-		<p>{L_BBCODE_HELPLINE_EXPLAIN}</p>
-	<dl>
-		<dt><label for="bbcode_helpline">{L_BBCODE_HELPLINE_TEXT}</label></dt>
-		<dd><input type="text" id="bbcode_helpline" name="bbcode_helpline" size="60" maxlength="255" value="{BBCODE_HELPLINE}" /></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_SETTINGS}</legend>
-	<dl>
-		<dt><label for="display_on_posting">{L_DISPLAY_ON_POSTING}</label></dt>
-		<dd><input type="checkbox" class="radio" name="display_on_posting" id="display_on_posting" value="1"<!-- IF DISPLAY_ON_POSTING --> checked="checked"<!-- ENDIF --> /></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	
-	<br />
-
-	<table cellspacing="1" id="down">
-	<thead>
-	<tr>
-		<th colspan="2">{L_TOKENS}</th>
-	</tr>
-	<tr>
-		<td class="row3" colspan="2">{L_TOKENS_EXPLAIN}</td>
-	</tr>
-	<tr>
-		<th>{L_TOKEN}</th>
-		<th>{L_TOKEN_DEFINITION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN token -->
-		<tr valign="top">
-			<td class="row1">{token.TOKEN}</td>
-			<td class="row2">{token.EXPLAIN}</td>
-		</tr>
-	<!-- END token -->
-	</tbody>
-	</table>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_BBCODES}</h1>
-
-	<p>{L_ACP_BBCODES_EXPLAIN}</p>
-	
-	<form id="acp_bbcodes" method="post" action="{U_ACTION}">
-	<fieldset class="tabulated">
-	<legend>{L_ACP_BBCODES}</legend>
-
-	<table cellspacing="1" id="down">
-	<thead>
-	<tr>
-		<th>{L_BBCODE_TAG}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN bbcodes -->
-		<!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td>
-			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}">{ICON_DELETE}</a></td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr class="row3">
-			<td colspan="2">{L_ACP_NO_ITEMS}</td>
-		</tr>
-	<!-- END bbcodes -->
-	</tbody>
-	</table>
-
-	<p class="quick">
-		<input class="button2" name="submit" type="submit" value="{L_ADD_BBCODE}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
deleted file mode 100644
index bb16204801..0000000000
--- a/phpBB/adm/style/acp_board.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_TITLE}</h1>
-
-<p>{L_TITLE_EXPLAIN}</p>
-
-<!-- IF S_ERROR -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<form id="acp_board" method="post" action="{U_ACTION}">
-
-<!-- BEGIN options -->
-	<!-- IF options.S_LEGEND -->
-		<!-- IF not options.S_FIRST_ROW -->
-			</fieldset>
-		<!-- ENDIF -->
-		<fieldset>
-			<legend>{options.LEGEND}</legend>
-	<!-- ELSE -->
-
-		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-			<dd>{options.CONTENT}</dd>
-		</dl>
-
-	<!-- ENDIF -->
-<!-- END options -->
-
-<!-- IF S_AUTH -->
-	<!-- BEGIN auth_tpl -->
-		{auth_tpl.TPL}
-	<!-- END auth_tpl -->
-<!-- ENDIF -->
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
deleted file mode 100644
index 7783356574..0000000000
--- a/phpBB/adm/style/acp_bots.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT_BOT -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_BOT_EDIT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="acp_bots" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TITLE}</legend>
-	<dl>
-		<dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>
-		<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
-		<dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="bot_lang">{L_BOT_LANG}:</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>
-		<dd><select id="bot_lang" name="bot_lang">{S_LANG_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="bot_active">{L_BOT_ACTIVE}:</label></dt>
-		<dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
-		<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt>
-		<dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" maxlength="255" /></dd>
-	</dl>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_BOTS}</h1>
-
-	<p>{L_BOTS_EXPLAIN}</p>
-
-	<form id="acp_bots" method="post" action="{U_ACTION}">
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_BOT_NAME}</th>
-		<th>{L_BOT_LAST_VISIT}</th>
-		<th colspan="3">{L_OPTIONS}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN bots -->
-		<!-- IF bots.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td style="width: 50%;">{bots.BOT_NAME}</td>
-			<td style="width: 15%; white-space: nowrap;" align="center">&nbsp;{bots.LAST_VISIT}&nbsp;</td>
-			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
-			<td style="text-align: center;">&nbsp;<a href="{bots.U_EDIT}">{L_EDIT}</a>&nbsp;</td>
-			<td style="text-align: center;">&nbsp;<a href="{bots.U_DELETE}">{L_DELETE}</a>&nbsp;</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{bots.BOT_ID}" /></td>
-		</tr>
-	<!-- END bots -->
-	</tbody>
-	</table>
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-		<input class="button2" name="add" type="submit" value="{L_BOT_ADD}" />
-	</fieldset>
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<select name="action">{S_BOT_OPTIONS}</select>
-		<input class="button2" name="submit" type="submit" value="{L_SUBMIT}" />
-		<p class="small"><a href="#" onclick="marklist('acp_bots', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('acp_bots', 'mark', false);">{L_UNMARK_ALL}</a></p>
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
deleted file mode 100644
index af67de16ea..0000000000
--- a/phpBB/adm/style/acp_captcha.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_VC_SETTINGS}</h1>
-
-<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
-
-
-<form id="acp_captcha" method="post" action="{U_ACTION}">
-
-<fieldset>
-<legend>{L_GENERAL_OPTIONS}</legend>
-
-<dl>
-	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}:</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
-</dl>
-<dl>
-	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
-</dl>
-<dl>
-	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}:</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"<!-- IF CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-	<label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
-</dl>
-<!-- IF GD -->
-<dl>
-	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}:</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
-	<dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd>
-</dl>
-<dl>
-	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}:</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
-	<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}:</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_wave" name="captcha_gd_wave" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_wave" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-</dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}:</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_3d_noise" name="captcha_gd_3d_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_3d_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-</dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}:</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_fonts" name="captcha_gd_fonts" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 1 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_DEFAULT}</label>
-		<label><input name="captcha_gd_fonts" value="2" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 2 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_NEW}</label>
-		<label><input name="captcha_gd_fonts" value="3" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 3 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_LOWER}</label>
-
-</dd>
-</dl>
-<!-- ENDIF -->
-
-</fieldset>
-
-<!-- IF CAPTCHA_PREVIEW -->
-<fieldset>
-	<legend>{L_PREVIEW}</legend>
-{CAPTCHA_PREVIEW}
-</fieldset>
-<!-- ENDIF -->
-
-<fieldset class="submit-buttons">
-	<legend>{L_SUBMIT}</legend>
-	<input class="button1" type="submit" id="main_submit" name="main_submit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="form_reset" name="reset" value="{L_RESET}" />&nbsp;
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html
deleted file mode 100644
index e839fb1bda..0000000000
--- a/phpBB/adm/style/acp_database.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF MODE eq 'restore' -->
-	<h1>{L_ACP_RESTORE}</h1>
-
-	<p>{L_ACP_RESTORE_EXPLAIN}</p>
-
-	<!-- IF .files -->
-	<form id="acp_backup" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_RESTORE_OPTIONS}</legend>
-	<dl>
-		<dt><label for="file">{L_SELECT_FILE}:</label></dt>
-		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
-	</dl>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" />&nbsp;
-		<input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" />&nbsp;
-		<input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_ACP_NO_ITEMS}</p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- ELSE -->
-	<h1>{L_ACP_BACKUP}</h1>
-
-	<p>{L_ACP_BACKUP_EXPLAIN}</p>
-
-	<script type="text/javascript">
-	// <![CDATA[
-
-		function selector(bool)
-		{
-			var table = document.getElementById('table');
-
-			for (var i = 0; i < table.options.length; i++)
-			{
-				table.options[i].selected = bool;
-			}
-		}
-
-	// ]]>
-	</script>
-
-	<form id="acp_backup" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_BACKUP_OPTIONS}</legend>
-	<dl>
-		<dt><label for="type">{L_BACKUP_TYPE}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>
-			<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>
-			<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="method">{L_FILE_TYPE}:</label></dt>
-		<dd><!-- BEGIN methods -->
-		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>
-		<!-- END methods --></dd>
-	</dl>
-	<dl>
-		<dt><label for="where">{L_ACTION}:</label></dt>
-		<dd>
-			<label><input type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>
-			<label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="table">{L_TABLE_SELECT}:</label></dt>
-		<dd><select id="table" name="table[]" size="10" multiple="multiple">
-		<!-- BEGIN tables -->
-			<option value="{tables.TABLE}">{tables.TABLE}</option>
-		<!-- END tables -->
-		</select></dd>
-		<dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd>
-	</dl>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html
deleted file mode 100644
index b68d3ab3c0..0000000000
--- a/phpBB/adm/style/acp_disallow.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_DISALLOW_USERNAMES}</h1>
-
-<p>{L_ACP_DISALLOW_EXPLAIN}</p>
-
-<form id="acp_disallow" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_ADD_DISALLOW_TITLE}</legend>
-<dl>
-	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
-	<dd><input id="user" type="text" class="text medium" maxlength="255" name="disallowed_user" /></dd>
-</dl>
-
-<p class="quick">
-	<input class="button1" type="submit" name="disallow" value="{L_SUBMIT}" />
-</p>
-</fieldset>
-
-<h1>{L_DELETE_DISALLOW_TITLE}</h1>
-
-<p>{L_DELETE_DISALLOW_EXPLAIN}</p>
-
-<fieldset>
-	<legend>{L_DELETE_DISALLOW_TITLE}</legend>
-<!-- IF S_DISALLOWED_NAMES -->
-	<dl>
-		<dt><label for="disallowed">{L_USERNAME}:</label></dt>
-		<dd><select name="disallowed_id" id="disallowed">{S_DISALLOWED_NAMES}</select></dd>
-	</dl>
-
-	<p class="quick">
-		<input class="button1" type="submit" name="allow" value="{L_SUBMIT}" />
-	</p>
-<!-- ELSE -->
-	<p>{L_NO_DISALLOWED}</p>
-<!-- ENDIF -->
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html
deleted file mode 100644
index 885809ffe2..0000000000
--- a/phpBB/adm/style/acp_email.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_MASS_EMAIL}</h1>
-
-<p>{L_ACP_MASS_EMAIL_EXPLAIN}</p>
-
-<!-- IF S_WARNING -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{WARNING_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<form id="acp_email" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_COMPOSE}</legend>
-<dl>
-	<dt><label for="group">{L_SEND_TO_GROUP}:</label></dt>
-	<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
-</dl>
-<dl>
-	<dt><label for="usernames">{L_SEND_TO_USERS}:</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
-	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
-	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-</dl>
-<dl>
-	<dt><label for="subject">{L_SUBJECT}:</label></dt>
-	<dd><input name="subject" type="text" id="subject" value="{SUBJECT}" /></dd>
-</dl>
-<dl>
-	<dt><label for="message">{L_MASS_MESSAGE}:</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt>
-	<dd><textarea id="message" name="message" rows="10" cols="60">{MESSAGE}</textarea></dd>
-</dl>
-<dl>
-	<dt><label for="priority">{L_MAIL_PRIORITY}:</label></dt>
-	<dd><select id="priority" name="mail_priority_flag">{S_PRIORITY_OPTIONS}</select></dd>
-</dl>
-<dl>
-	<dt><label for="send">{L_SEND_IMMEDIATELY}:</label></dt>
-	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>
-</dl>
-
-<p class="submit-buttons">
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_EMAIL}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-</p>
-{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
deleted file mode 100644
index 547ac66e3c..0000000000
--- a/phpBB/adm/style/acp_forums.html
+++ /dev/null
@@ -1,500 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT_FORUM -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-		/**
-		* Handle displaying/hiding several options based on the forum type
-		*/
-		function display_options(value)
-		{
-			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
-				if (value == {FORUM_POST})
-				{
-					dE('type_actions', -1);
-				}
-				else
-				{
-					dE('type_actions', 1);
-				}
-			<!-- ENDIF -->
-
-			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
-				if (value == {FORUM_LINK})
-				{
-					dE('cat_to_link_actions', 1);
-				}
-				else
-				{
-					dE('cat_to_link_actions', -1);
-				}
-			<!-- ENDIF -->
-
-			if (value == {FORUM_POST})
-			{
-				dE('forum_post_options', 1);
-				dE('forum_link_options', -1);
-				dE('forum_rules_options', 1);
-				dE('forum_cat_options', -1);
-			}
-			else if (value == {FORUM_LINK})
-			{
-				dE('forum_post_options', -1);
-				dE('forum_link_options', 1);
-				dE('forum_rules_options', -1);
-				dE('forum_cat_options', -1);
-			}
-			else if (value == {FORUM_CAT})
-			{
-				dE('forum_post_options', -1);
-				dE('forum_link_options', -1);
-				dE('forum_rules_options', 1);
-				dE('forum_cat_options', 1);
-			}
-		}
-
-		/**
-		* Init the wanted display functionality if javascript is enabled.
-		* If javascript is not available, the user is still able to properly administrate.
-		*/
-		onload = function()
-		{
-			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
-				<!-- IF S_FORUM_POST -->
-					dE('type_actions', -1);
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-
-			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
-				<!-- IF S_FORUM_CAT -->
-					dE('cat_to_link_actions', -1);
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-
-			<!-- IF not S_FORUM_POST -->
-				dE('forum_post_options', -1);
-			<!-- ENDIF -->
-
-			<!-- IF not S_FORUM_CAT -->
-				dE('forum_cat_options', -1);
-			<!-- ENDIF -->
-
-			<!-- IF not S_FORUM_LINK -->
-				dE('forum_link_options', -1);
-			<!-- ENDIF -->
-
-			<!-- IF S_FORUM_LINK -->
-			dE('forum_rules_options', -1);
-			<!-- ENDIF -->
-		}
-
-	// ]]>
-	</script>
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE} <!-- IF FORUM_NAME -->:: {FORUM_NAME}<!-- ENDIF --></h1>
-
-	<p>{L_FORUM_EDIT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="forumedit" method="post" action="{U_EDIT_ACTION}">
-
-	<fieldset>
-		<legend>{L_FORUM_SETTINGS}</legend>
-	<dl>
-		<dt><label for="forum_type">{L_FORUM_TYPE}:</label></dt>
-		<dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd>
-	</dl>
-	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
-	<div id="type_actions">
-		<dl>
-			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="type_action" value="delete"<!-- IF not S_MOVE_FORUM_OPTIONS --> checked="checked" id="type_action"<!-- ENDIF --> /> {L_DELETE_ALL_POSTS}</label></dd>
-			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><label><input type="radio" class="radio" name="type_action" id="type_action" value="move" checked="checked" /> {L_MOVE_POSTS_TO}</label> <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
-		</dl>
-	</div>
-	<!-- ENDIF -->
-	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
-	<div id="cat_to_link_actions">
-		<dl>
-			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}:</label></dt>
-			<!-- IF S_FORUMS_LIST -->
-				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
-			<!-- ELSE -->
-				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
-			<!-- ENDIF -->
-		</dl>
-	</div>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="parent">{L_FORUM_PARENT}:</label></dt>
-		<dd><select id="parent" name="forum_parent_id"><option value="0"<!-- IF not S_FORUM_PARENT_ID --> selected="selected"<!-- ENDIF -->>{L_NO_PARENT}</option>{S_PARENT_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="forum_name">{L_FORUM_NAME}:</label></dt>
-		<dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="forum_desc">{L_FORUM_DESC}:</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
-		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd>
-		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="forum_image">{L_FORUM_IMAGE}:</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>
-		<dd><input class="text medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255" /></dd>
-		<!-- IF FORUM_IMAGE_SRC -->
-			<dd><img src="{FORUM_IMAGE_SRC}" alt="{L_FORUM_IMAGE}" /></dd>
-		<!-- ENDIF -->
-	</dl>
-	<dl>
-		<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
-		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
-	</dl>
-	<!-- IF S_FORUM_PASSWORD_SET -->
-	<dl>
-		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}:</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt>
-		<dd><input id="forum_password_unset" name="forum_password_unset" type="checkbox" /></dd>
-	</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="forum_style">{L_FORUM_STYLE}:</label></dt>
-		<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>
-	</dl>
-	<!-- IF S_CAN_COPY_PERMISSIONS -->
-		<dl>
-			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
-			<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
-		</dl>
-	<!-- ENDIF -->
-	</fieldset>
-
-	<div id="forum_cat_options">
-		<fieldset>
-			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
-		<dl>
-			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}:</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		</fieldset>
-	</div>
-
-	<div id="forum_post_options">
-		<fieldset>
-			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
-		<dl>
-			<dt><label for="forum_status">{L_FORUM_STATUS}:</label></dt>
-			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}:</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_subforum_list" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}:</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
-			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
-		</dl>
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
-		<dl>
-			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}:</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" /> {L_DAYS}</dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}:</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" /> {L_DAYS}</dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}:</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" /> {L_DAYS}</dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		</fieldset>
-	</div>
-
-	<div id="forum_link_options">
-		<fieldset>
-			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
-		<dl>
-			<dt><label for="link_display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="forum_link">{L_FORUM_LINK}:</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>
-			<dd><input class="text medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}:</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		</fieldset>
-	</div>
-
-	<div id="forum_rules_options">
-		<fieldset>
-			<legend>{L_FORUM_RULES}</legend>
-		<dl>
-			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}:</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
-			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
-		</dl>
-	<!-- IF FORUM_RULES_PREVIEW -->
-		<dl>
-			<dt><label>{L_FORUM_RULES_PREVIEW}:</label></dt>
-			<dd>{FORUM_RULES_PREVIEW}</dd>
-		</dl>
-	<!-- ENDIF -->
-		<dl>
-			<dt><label for="forum_rules">{L_FORUM_RULES}:</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
-			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd>
-			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
-				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
-				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
-		</dl>
-		</fieldset>
-	</div>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_DELETE_FORUM -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_FORUM_DELETE}</h1>
-
-	<p>{L_FORUM_DELETE_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="acp_forum" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_FORUM_DELETE}</legend>
-	<dl>
-		<dt><label>{L_FORUM_NAME}:</label></dt>
-		<dd><strong>{FORUM_NAME}</strong></dd>
-	</dl>
-	<!-- IF S_FORUM_POST -->
-		<dl>
-			<dt><label for="delete_action">{L_ACTION}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</label></dd>
-			<!-- IF S_MOVE_FORUM_OPTIONS -->
-				<dd><label><input type="radio" class="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO}</label> <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd>
-			<!-- ENDIF -->
-		</dl>
-	<!-- ENDIF -->
-	<!-- IF S_HAS_SUBFORUMS -->
-		<dl>
-			<dt><label for="sub_delete_action">{L_ACTION}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
-			<!-- IF S_FORUMS_LIST -->
-				<dd><label><input type="radio" class="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
-			<!-- ENDIF -->
-		</dl>
-	<!-- ENDIF -->
-
-	<p class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_CONTINUE_SYNC -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-		var close_waitscreen = 0;
-		// no scrollbars...
-		popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
-	// ]]>
-	</script>
-
-	<h1>{L_FORUM_ADMIN}</h1>
-
-	<p>{L_FORUM_ADMIN_EXPLAIN}</p>
-
-	<p>{L_PROGRESS_EXPLAIN}</p>
-
-<!-- ELSE -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-		/**
-		* Popup search progress bar
-		*/
-		function popup_progress_bar()
-		{
-			var close_waitscreen = 0;
-			// no scrollbars...
-			popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
-		}
-	// ]]>
-	</script>
-
-	<h1>{L_FORUM_ADMIN}</h1>
-
-	<p>{L_FORUM_ADMIN_EXPLAIN}</p>
-
-	<!-- IF ERROR_MSG -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_RESYNCED -->
-		<script type="text/javascript">
-		// <![CDATA[
-			var close_waitscreen = 1;
-		// ]]>
-		</script>
-
-		<div class="successbox">
-			<h3>{L_NOTIFY}</h3>
-			<p>{L_FORUM_RESYNCED}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF --->]<!-- ENDIF --></strong></p>
-
-	<!-- IF .forums -->
-		<table cellspacing="1">
-			<col class="row1" /><col class="row1" /><col class="row2" />
-		<tbody>
-		<!-- BEGIN forums -->
-			<tr>
-				<td style="width: 5%; text-align: center;">{forums.FOLDER_IMAGE}</td>
-				<td>
-					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
-					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>
-					<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
-					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}: <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
-				</td>
-				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
-					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
-						{ICON_MOVE_UP_DISABLED}
-						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
-						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
-						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ELSE -->
-						{ICON_MOVE_UP_DISABLED}
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ENDIF -->
-					<a href="{forums.U_EDIT}">{ICON_EDIT}</a>
-					<!-- IF not forums.S_FORUM_LINK -->
-						<a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a>
-					<!-- ELSE -->
-						{ICON_SYNC_DISABLED}
-					<!-- ENDIF -->
-					<a href="{forums.U_DELETE}">{ICON_DELETE}</a>
-				</td>
-			</tr>
-		<!-- END forums -->
-		</tbody>
-		</table>
-	<!-- ENDIF -->
-
-	<form id="fselect" method="post" action="{U_SEL_ACTION}">
-
-	<fieldset class="quick">
-		{L_SELECT_FORUM}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
-
-		<input class="button2" type="submit" value="{L_GO}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-	<form id="forums" method="post" action="{U_ACTION}">
-
-	<fieldset class="quick">
-		<input type="hidden" name="action" value="add" />
-
-		<input type="text" name="forum_name" value="" maxlength="255" />
-		<input class="button2" name="addforum" type="submit" value="{L_CREATE_FORUM}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
deleted file mode 100644
index 5df8a16a39..0000000000
--- a/phpBB/adm/style/acp_groups.html
+++ /dev/null
@@ -1,350 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_ACP_GROUPS_MANAGE}</h1>
-
-	<p>{L_GROUP_EDIT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
-
-	<fieldset>
-		<legend>{L_GROUP_DETAILS}</legend>
-	<dl>
-		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt>
-		<dd><!-- IF S_SPECIAL_GROUP --><strong>{GROUP_NAME}</strong><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt>
-		<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd>
-		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
-	</dl>
-	<!-- IF not S_SPECIAL_GROUP -->
-		<dl>
-			<dt><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
-			<dd>
-				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>
-				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>
-				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label>
-				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label>
-			</dd>
-		</dl>
-	<!-- ELSE -->
-		<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" />
-	<!-- ENDIF -->
-
-	<!-- IF S_ADD_GROUP and S_GROUP_PERM -->
-		<dl>
-			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
-			<dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd>
-		</dl>
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
-	<!-- IF S_USER_FOUNDER -->
-	<dl>
-		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}:</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>
-		<dd><input name="group_founder_manage" type="checkbox" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE} /></dd>
-	</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt>
-		<dd><input name="group_legend" type="checkbox" class="radio" id="group_legend"{GROUP_LEGEND} /></dd>
-	</dl>
-	<dl>
-		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>
-		<dd><input name="group_receive_pm" type="checkbox" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>
-	</dl>
-	<dl>
-		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
-		<dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}:</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
-		<dd><input name="group_max_recipients" type="text" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
-		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
-	</dl>
-	<dl>
-		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
-		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_GROUP_AVATAR}</legend>
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd>{AVATAR_IMAGE}</dd>
-		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
-	</dl>
-	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_CAN_UPLOAD -->
-			<dl> 
-				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-				<dd><input type="file" id="uploadfile" name="uploadfile" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-			<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-			<dd><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>px</span></dd>
-		</dl>
-		<!-- IF S_DISPLAY_GALLERY -->
-			<dl> 
-				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
-				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_AVATAR_GALLERY}</legend>
-		<dl>
-			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
-			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-		</dl>
-		<dl>
-			<table cellspacing="1">
-			<!-- BEGIN avatar_row -->
-			<tr> 
-				<!-- BEGIN avatar_column -->
-					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
-				<!-- END avatar_column -->
-			</tr>
-			<tr>
-				<!-- BEGIN avatar_option_column -->
-					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-				<!-- END avatar_option_column -->
-			</tr>
-			<!-- END avatar_row -->
-			</table>
-		</dl>
-		</fieldset>
-		
-		<fieldset class="quick" style="margin-top: -15px;">
-			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-		</fieldset>
-	
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_LIST -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_GROUP_MEMBERS} :: {GROUP_NAME}</h1>
-
-	<p>{L_GROUP_MEMBERS_EXPLAIN}</p>
-
-	<form id="list" method="post" action="{U_ACTION}">
-
-	<fieldset class="quick">
-		<a href="{U_DEFAULT_ALL}">&raquo; {L_MAKE_DEFAULT_FOR_ALL}</a>
-	</fieldset>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_USERNAME}</th>
-		<th>{L_GROUP_DEFAULT}</th>
-		<th>{L_JOINED}</th>
-		<th>{L_POSTS}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td class="row3" colspan="5"><strong>{L_GROUP_LEAD}</strong></td>
-	</tr>
-	<!-- BEGIN leader -->
-		<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{leader.U_USER_EDIT}">{leader.USERNAME}</a></td>
-			<td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
-			<td style="text-align: center;">{leader.JOINED}</td>
-			<td style="text-align: center;">{leader.USER_POSTS}</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{leader.USER_ID}" /></td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MODS}</td>
-		</tr>
-	<!-- END leader -->
-	<tr>
-		<td class="row3" colspan="5"><strong>{L_GROUP_APPROVED}</strong></td>
-	</tr>
-	<!-- BEGIN member -->
-		<!-- IF member.S_PENDING -->
-		<tr>
-			<td class="row3" colspan="5"><strong>{L_GROUP_PENDING}</strong></td>
-		</tr>
-		<!-- ELSE -->
-			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{member.U_USER_EDIT}">{member.USERNAME}</a></td>
-			<td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
-			<td style="text-align: center;">{member.JOINED}</td>
-			<td style="text-align: center;">{member.USER_POSTS}</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{member.USER_ID}" /></td>
-		</tr>
-		<!-- ENDIF -->
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td>
-		</tr>
-	<!-- END member -->
-	</tbody>
-	</table>
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->	
-
-	<fieldset class="quick">
-		<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
-		<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
-		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>		
-	</fieldset>
-
-	<h1>{L_ADD_USERS}</h1>
-
-	<p>{L_ADD_USERS_EXPLAIN}</p>
-
-	<fieldset>
-		<legend>{L_ADD_USERS}</legend>
-	<dl>
-		<dt><label for="leader">{L_USER_GROUP_LEADER}:</label></dt>
-		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>
-			<label><input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked" /> {L_NO}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
-		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>
-			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
-		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-	</dl>
-
-	<p class="quick">
-		<input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_GROUPS_MANAGE}</h1>
-
-	<p>{L_ACP_GROUPS_MANAGE_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<h1>{L_USER_DEF_GROUPS}</h1>
-
-	<p>{L_USER_DEF_GROUPS_EXPLAIN}</p>
-
-	<form id="acp_groups" method="post" action="{U_ACTION}">
-
-	<table cellspacing="1">
-		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
-	<thead>
-	<tr>
-		<th style="width: 50%">{L_GROUP}</th>
-		<th>{L_TOTAL_MEMBERS}</th>
-		<th colspan="2">{L_OPTIONS}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN groups -->
-		<!-- IF groups.S_SPECIAL -->
-		<!-- IF groups.S_FIRST_ROW -->
-			<tr>
-				<td colspan="5" class="row3">{L_NO_GROUPS_CREATED}</td>
-			</tr>
-		<!-- ENDIF -->
-	</tbody>
-	</table>
-
-	<fieldset class="quick">
-		<!-- IF S_GROUP_ADD -->
-			{L_CREATE_GROUP}: <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-			<input type="hidden" name="add" value="1" />
-		<!-- ENDIF -->
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-	<h1>{L_SPECIAL_GROUPS}</h1>
-
-	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>
-
-	<table cellspacing="1">
-		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
-	<thead>
-	<tr>
-		<th style="width: 50%">{L_GROUP}</th>
-		<th>{L_TOTAL_MEMBERS}</th>
-		<th colspan="2">{L_OPTIONS}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-		<!-- ELSE -->
-		<tr>
-			<td><strong>{groups.GROUP_NAME}</strong></td>
-			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
-			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
-			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
-			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
-		</tr>
-		<!-- ENDIF -->
-	<!-- END groups -->
-	</tbody>
-	</table>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
deleted file mode 100644
index 86500ae047..0000000000
--- a/phpBB/adm/style/acp_icons.html
+++ /dev/null
@@ -1,268 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT -->
-
-	<script type="text/javascript" defer="defer">
-	// <![CDATA[
-	<!-- IF S_ADD_CODE -->
-	
-			var smiley = Array();
-			<!-- BEGIN smile -->
-				smiley['{smile.SMILEY_URL}'] = Array();
-				smiley['{smile.SMILEY_URL}']['code'] = '{smile.CODE}';
-				smiley['{smile.SMILEY_URL}']['emotion'] = '{smile.EMOTION}';
-				smiley['{smile.SMILEY_URL}']['width'] = {smile.WIDTH};
-				smiley['{smile.SMILEY_URL}']['height'] = {smile.HEIGHT};
-				smiley['{smile.SMILEY_URL}']['order'] = {smile.ORDER};
-			<!-- END smile -->
-
-			function update_image(newimage)
-			{
-				var use_element = smiley[newimage];
-
-				document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage);
-				document.getElementById('add_code').value = use_element['code'];
-				document.getElementById('add_emotion').value = use_element['emotion'];
-				document.getElementById('add_width').value = use_element['width'];
-				document.getElementById('add_height').value = use_element['height'];
-
-				element = document.getElementById('add_order');
-				for (var i = 0; i < element.length; i++)
-				{
-					if (element.options[i].value == use_element['order'])
-					{
-						document.getElementById('add_order').options.selectedIndex = i;
-					}
-				}
-			}
-		
-	<!-- ENDIF -->
-
-	
-	function toggle_select(icon, display, select)
-	{
-		var disp = document.getElementById('order_disp_' + select);
-		var nodisp = document.getElementById('order_no_disp_' + select);
-		disp.disabled = !display;
-		nodisp.disabled = display;
-		if (display)
-		{
-			document.getElementById('order_' + select).selectedIndex = 0;
-			nodisp.className = 'disabled-options';
-			disp.className = '';
-		}
-		else
-		{
-			document.getElementById('order_' + select).selectedIndex = {S_ORDER_LIST_DISPLAY_COUNT};
-			disp.className = 'disabled-options';
-			nodisp.className = '';
-		}
-	}
-	// ]]>
-	</script>
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<form id="acp_icons" method="post" action="{U_ACTION}">
-
-	<fieldset class="tabulated">
-	<legend>{L_TITLE}</legend>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th colspan="{COLSPAN}">{L_CONFIG}</th>
-	</tr>
-	<!-- IF .items or S_ADD_CODE -->
-	<tr class="row3">
-		<td>{L_URL}</td>
-		<td>{L_LOCATION}</td>
-	<!-- IF S_SMILIES -->
-		<td>{L_SMILIES_CODE}</td>
-		<td>{L_SMILIES_EMOTION}</td>
-	<!-- ENDIF -->
-		<td>{L_WIDTH}</td>
-		<td>{L_HEIGHT}</td>
-		<td>{L_DISPLAY_ON_POSTING}</td>
-	<!-- IF ID or S_ADD -->
-		<td>{L_ORDER}</td>
-	<!-- ENDIF -->
-	<!-- IF S_ADD -->
-		<td>{L_ADD}</td>
-	<!-- ENDIF -->
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN items -->
-		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-	
-		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
-		<td style="vertical-align: top;">[{items.IMG}]</td>
-		<!-- IF S_SMILIES -->
-			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
-			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
-		<!-- ENDIF -->
-		<td><input class="text post" type="text" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
-		<td><input class="text post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
-		<td>
-			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>
-			<!-- IF items.S_ID -->
-				<input type="hidden" name="id[{items.IMG}]" value="{items.ID}" />
-			<!-- ENDIF -->
-		</td>
-		<!-- IF ID or S_ADD -->
-			<td><select id="order_{items.S_ROW_COUNT}" name="order[{items.IMG}]">
-				<optgroup id="order_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING}" <!-- IF not items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_DISPLAY}</optgroup>
-				<optgroup id="order_no_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING_NO}" <!-- IF  items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_UNDISPLAY}</optgroup>
-			</select></td>
-		<!-- ENDIF -->	
-		<!-- IF S_ADD -->
-			<td><input type="checkbox" class="radio" name="add_img[{items.IMG}]" value="1" /></td>
-		<!-- ENDIF -->
-		</tr>
-	<!-- END items -->
-	<!-- IF S_ADD_CODE -->
-	<tr>
-		<th colspan="{COLSPAN}">{L_ADD_SMILEY_CODE}</th>
-	</tr>
-	<tr class="row1">
-		<td style="text-align: center;"><select name="add_image" id="add_image" onchange="update_image(this.options[selectedIndex].value);">{S_IMG_OPTIONS}</select></td>
-		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>
-		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>
-		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td>
-		<td><input class="text post" type="text" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
-		<td><input class="text post" type="text" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
-		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>
- 		<td><select id="add_order" name="add_order">
-				<optgroup id="order_disp[add]" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>
-				<optgroup id="order_no_disp[add]" label="{L_DISPLAY_POSTING_NO}" disabled="disabled" class="disabled-options" >{S_ADD_ORDER_LIST_UNDISPLAY}</optgroup>
-		</select></td>
-		<td><input type="checkbox" class="radio" name="add_additional_code" value="1" /></td>
-	</tr>
-	<!-- ENDIF -->
-	<!-- ELSE -->
-	<tr class="row3">
-		<td colspan="{COLSPAN}">{L_NO_ICONS}</td>
-	</tr>
-	<!-- ENDIF -->
-	</tbody>
-	</table>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_CHOOSE_PAK -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<form id="acp_icons" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_IMPORT}</legend>
-	
-	<!-- IF not S_PAK_OPTIONS -->
-		<p>{L_NO_PAK_OPTIONS}</p>
-
-	<!-- ELSE -->
-		<dl>
-			<dt><label for="pak">{L_SELECT_PACKAGE}</label></dt>
-			<dd><select id="pak" name="pak">{S_PAK_OPTIONS}</select></dd>
-		</dl>
-			<dt><label for="current">{L_CURRENT}</label><br /><span>{L_CURRENT_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" id="current" name="current" value="keep" checked="checked" /> {L_KEEP_ALL}</label>
-				<label><input type="radio" class="radio" name="current" value="replace" /> {L_REPLACE_MATCHES}</label>
-				<label><input type="radio" class="radio" name="current" value="delete" /> {L_DELETE_ALL}</label></dd>
-		</dl>
-
-	<p class="quick">
-		<input class="button1" type="submit" id="import" name="import" value="{L_IMPORT_SUBMIT}" />
-	</p>
-	<!-- ENDIF -->
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF NOTICE -->
-		<div class="successbox">
-			<h3>{L_NOTIFY}</h3>
-			<p>{NOTICE}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="acp_icons" method="post" action="{U_ACTION}">
-
-	<div style="text-align: right;"><a href="{U_IMPORT}">{L_IMPORT}</a> | <a href="{U_EXPORT}">{L_EXPORT}</a></div>
-
-	<fieldset class="tabulated">
-
-	<legend>{L_TITLE}</legend>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_TITLE}</th>
-		<!-- IF S_SMILIES -->
-		<th>{L_CODE}</th>
-		<th>{L_EMOTION}</th>
-		<!-- ENDIF -->
-		<th>{L_OPTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN items -->
-		<!-- IF items.S_SPACER -->
-			<tr>
-				<td class="row3" colspan="{COLSPAN}" style="text-align: center;">{L_NOT_DISPLAYED}</td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td style="width: 85%; text-align: center;"><img src="{items.IMG_SRC}" width="{items.WIDTH}" height="{items.HEIGHT}" alt="{items.ALT_TEXT}" title="{items.ALT_TEXT}" /></td>
-			<!-- IF S_SMILIES -->
-				<td style="text-align: center;">{items.CODE}</td>
-				<td style="text-align: center;">{items.EMOTION}</td>
-			<!-- ENDIF -->
-			<td style="text-align: right; white-space: nowrap;">
-				<!-- IF items.S_FIRST_ROW -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
-				<!-- IF items.S_LAST_ROW -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
-				&nbsp;<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}">{ICON_DELETE}</a>
-			</td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr class="row3">
-			<td colspan="{COLSPAN}">{L_ACP_NO_ITEMS}</td>
-		</tr>
-	<!-- END items -->
-	</tbody>
-	</table>
-
-	<p class="quick">
-		<input class="button2" name="add" type="submit" value="{L_ICON_ADD}" />&nbsp; &nbsp;<input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
deleted file mode 100644
index 240cec1643..0000000000
--- a/phpBB/adm/style/acp_inactive.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h2>{L_INACTIVE_USERS}</h2>
-
-<p>{L_INACTIVE_USERS_EXPLAIN}</p>
-
-<form id="inactive" method="post" action="{U_ACTION}">
-
-<div class="clearfix"></div>
-
-<!-- IF PAGINATION -->
-<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-</div>
-<!-- ENDIF -->
-
-<table cellspacing="1">
-<thead>
-<tr>
-	<th>{L_USERNAME}</th>
-	<th>{L_JOINED}</th>
-	<th>{L_INACTIVE_DATE}</th>
-	<th>{L_INACTIVE_REASON}</th>
-	<th>{L_LAST_VISIT}</th>
-	<th>{L_MARK}</th>
-</tr>
-</thead>
-<tbody>
-<!-- BEGIN inactive -->
-	<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-		<td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td>
-		<td>{inactive.JOINED}</td>
-		<td>{inactive.INACTIVE_DATE}</td>
-		<td>{inactive.REASON}</td>
-		<td>{inactive.LAST_VISIT}</td>
-		<td>&nbsp;<input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" />&nbsp;</td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td colspan="6" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
-	</tr>
-<!-- END inactive -->
-</tbody>
-</table>
-
-	<fieldset class="display-options">
-		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
-		<input class="button2" type="submit" value="{L_GO}" name="sort" />
-	</fieldset>
-	<hr />
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
-
-	<fieldset class="quick">
-		<select name="action">{S_INACTIVE_OPTIONS}</select>
-		<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-		<p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>		
-		{S_FORM_TOKEN}
-	</fieldset>
-
-
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html
deleted file mode 100644
index 2cc715493a..0000000000
--- a/phpBB/adm/style/acp_jabber.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_JABBER_SETTINGS}</h1>
-
-<p>{L_ACP_JABBER_SETTINGS_EXPLAIN}</p>
-
-<!-- IF S_WARNING -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{WARNING_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<form id="acp_jabber" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_ACP_JABBER_SETTINGS}</legend>
-<!-- IF S_GTALK_NOTE -->
-	<p>{L_JAB_GTALK_NOTE}</p>
-<!-- ENDIF -->
-<dl>
-	<dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
-</dl>
-<dl>
-	<dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd>
-</dl>
-<dl>
-	<dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
-</dl>
-<dl>
-	<dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd>
-</dl>
-<dl>
-	<dt><label for="jab_password">{L_JAB_PASSWORD}:</label></dt>
-	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
-</dl>
-<!-- IF S_CAN_USE_SSL -->
-<dl>
-	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}:</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<!-- ENDIF -->
-<dl>
-	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" /></dd>
-</dl>
-
-</fieldset>
-
-<fieldset class="submit-buttons">
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
deleted file mode 100644
index 6dbfe9e0f6..0000000000
--- a/phpBB/adm/style/acp_language.html
+++ /dev/null
@@ -1,215 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="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}:</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 -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_LANGUAGE_PACK_DETAILS}</h1>
-
-	<form id="details" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{LANG_LOCAL_NAME}</legend>
-	<dl>
-		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}:</label></dt>
-		<dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}:</label></dt>
-		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_LANG_ISO_CODE}:</label></dt>
-		<dd><strong>{LANG_ISO}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label for="lang_author">{L_LANG_AUTHOR}:</label></dt>
-		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255" /></dd>
-	</dl>
-
-	<p class="quick" style="margin-top: -15px;">
-		<input type="submit" name="update_details" class="button2" value="{L_SUBMIT}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-	<br /><br />
-
-	<!-- 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 cellspacing="1">
-		<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 name="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>
-	<!-- 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 cellspacing="1">
-	<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 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="submit_file" class="button2" value="{L_SUBMIT}" /></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_UPDATE_OPTIONS -->
-
-<!-- INCLUDE update_options.html -->
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_LANGUAGE_PACKS}</h1>
-
-	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_LANGUAGE_PACK_NAME}</th>
-		<th>{L_LANGUAGE_PACK_LOCALNAME}</th>
-		<th>{L_LANGUAGE_PACK_ISO}</th>
-		<th>{L_LANGUAGE_PACK_USED_BY}</th>
-		<th>{L_OPTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td class="row3" colspan="5"><strong>{L_INSTALLED_LANGUAGE_PACKS}</strong></td>
-	</tr>
-	<!-- BEGIN lang -->
-		<!-- IF lang.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td><a href="{lang.U_DETAILS}">{lang.ENGLISH_NAME}</a> {lang.TAG}</td>
-		<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>
-	</tr>
-	<!-- END lang -->
-	<!-- IF .notinst -->
-	<tr>
-		<td class="row3" colspan="5"><strong>{L_UNINSTALLED_LANGUAGE_PACKS}</strong></td>
-	</tr>
-	<!-- ENDIF -->
-	<!-- BEGIN notinst -->
-		<!-- IF notinst.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td>{notinst.NAME}</td>
-		<td>{notinst.LOCAL_NAME}</td>
-		<td style="text-align: center;"><strong>{notinst.ISO}</strong></td>
-		<td colspan="2" style="text-align: center;"><a href="{notinst.U_INSTALL}">{L_INSTALL}</a></td>
-	</tr>
-	<!-- END notinst -->
-	</tbody>
-	</table>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_login.html b/phpBB/adm/style/acp_login.html
deleted file mode 100644
index 015f3ec908..0000000000
--- a/phpBB/adm/style/acp_login.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-<h1>{PAGE_TITLE}</h1>
-<p><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></p>
-
-<!-- IF LOGIN_ERROR -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{LOGIN_ERROR}</p>
-	</div>
-<!-- ENDIF -->
-<form action="{S_LOGIN_ACTION}" method="post" id="login">
- 
-	<fieldset>
-		<dl>
-			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
-			<dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
-			<dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
-			<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
-				<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
-				<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
-			<!-- ENDIF -->
-		</dl>
-			
-		<!-- IF S_CONFIRM_CODE -->
-		<dl>
-			<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label><br /><span>{L_CONFIRM_CODE_EXPLAIN}</span></dt>
-				<dd><input type="hidden" name="confirm_id" value="{CONFIRM_ID}" />{CONFIRM_IMAGE}</dd>
-				<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="3" class="inputbox narrow" title="{L_CONFIRM_CODE}" /></dd>
-		</dl>
-		<!-- ENDIF -->
-	
-		<p class="submit-buttons">
-			<!-- IF S_DISPLAY_FULL_LOGIN -->
-				<!-- IF S_AUTOLOGIN_ENABLED --><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label><!-- ENDIF -->
-				<label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label>
-			<!-- ENDIF -->
-				&nbsp;
-				{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" />
-		</p>
-	</fieldset> 
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
deleted file mode 100644
index 11ab5faa9c..0000000000
--- a/phpBB/adm/style/acp_logs.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_TITLE}</h1>
-
-<p>{L_EXPLAIN}</p>
-
-<form id="list" method="post" action="{U_ACTION}">
-
-<!-- IF PAGINATION -->
-<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-</div>
-<!-- ENDIF -->
-
-<!-- IF .log -->
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_USERNAME}</th>
-		<th>{L_IP}</th>
-		<th>{L_TIME}</th>
-		<th>{L_ACTION}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN log -->
-		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-			<td>
-				{log.USERNAME}
-				<!-- IF log.REPORTEE_USERNAME -->
-				<br />&raquo; {log.REPORTEE_USERNAME}
-				<!-- ENDIF -->
-			</td>
-			<td style="text-align: center;">{log.IP}</td>
-			<td style="text-align: center;">{log.DATE}</td>
-			<td>{log.ACTION}<!-- IF log.DATA --><br /><span>{log.DATA}</span><!-- ENDIF --></td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
-		</tr>
-	<!-- END log -->
-	</tbody>
-	</table>
-
-<!-- ELSE -->
-
-	<div class="errorbox">
-		<p>{L_NO_ENTRIES}</p>
-	</div>
-
-<!-- ENDIF -->
-
-
-<fieldset class="display-options">
-	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
-	<input class="button2" type="submit" value="{L_GO}" name="sort" />
-	{S_FORM_TOKEN}
-</fieldset>
-<hr />
-<!-- IF PAGINATION -->
-<div class="pagination">
-	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-</div>
-<!-- ENDIF -->
-<!-- IF S_SHOW_FORUMS -->
-	<fieldset class="quick">
-		{L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
-		<input class="button2" type="submit" value="{L_GO}" />
-	</fieldset>
-<!-- ENDIF -->
-
-<!-- IF S_CLEARLOGS -->
-	<fieldset class="quick">
-		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
-		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /><br />
-		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
-	</fieldset>
-<!-- ENDIF -->
-
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
deleted file mode 100644
index 4b6bc1910d..0000000000
--- a/phpBB/adm/style/acp_main.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_RESTORE_PERMISSIONS -->
-
-	<h1>{L_PERMISSIONS_TRANSFERRED}</h1>
-
-	<p>{L_PERMISSIONS_TRANSFERRED_EXPLAIN}</p>
-
-<!-- ELSE -->
-
-	<h1>{L_WELCOME_PHPBB}</h1>
-
-	<p>{L_ADMIN_INTRO}</p>
-
-	<!-- IF S_REMOVE_INSTALL -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{L_REMOVE_INSTALL}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_WRITABLE_CONFIG -->
-		<div class="errorbox notice">
-			<p>{L_WRITABLE_CONFIG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<table cellspacing="1">
-		<caption>{L_FORUM_STATS}</caption>
-		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-	<thead>
-	<tr>
-		<th>{L_STATISTIC}</th>
-		<th>{L_VALUE}</th>
-		<th>{L_STATISTIC}</th>
-		<th>{L_VALUE}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td>{L_NUMBER_POSTS}: </td>
-		<td><strong>{TOTAL_POSTS}</strong></td>
-		<td>{L_POSTS_PER_DAY}: </td>
-		<td><strong>{POSTS_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_NUMBER_TOPICS}: </td>
-		<td><strong>{TOTAL_TOPICS}</strong></td>
-		<td>{L_TOPICS_PER_DAY}: </td>
-		<td><strong>{TOPICS_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_NUMBER_USERS}: </td>
-		<td><strong>{TOTAL_USERS}</strong></td>
-		<td>{L_USERS_PER_DAY}: </td>
-		<td><strong>{USERS_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_NUMBER_FILES}: </td>
-		<td><strong>{TOTAL_FILES}</strong></td>
-		<td>{L_FILES_PER_DAY}: </td>
-		<td><strong>{FILES_PER_DAY}</strong></td>
-	</tr>
-
-
-	<tr>
-		<td>{L_BOARD_STARTED}: </td>
-		<td><strong>{START_DATE}</strong></td>
-		<td>{L_AVATAR_DIR_SIZE}: </td>
-		<td><strong>{AVATAR_DIR_SIZE}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_DATABASE_SIZE}: </td>
-		<td><strong>{DBSIZE}</strong></td>
-		<td>{L_UPLOAD_DIR_SIZE}: </td>
-		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_DATABASE_SERVER_INFO}: </td>
-		<td><strong>{DATABASE_INFO}</strong></td>
-		<td>{L_GZIP_COMPRESSION}: </td>
-		<td><strong>{GZIP_COMPRESSION}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_BOARD_VERSION}: </td>
-		<td><strong>{BOARD_VERSION}</strong></td>
-	<!-- IF S_TOTAL_ORPHAN -->
-		<td>{L_NUMBER_ORPHAN}: </td>
-		<td><strong>{TOTAL_ORPHAN}</strong></td>
-	<!-- ELSE -->
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	<!-- ENDIF -->
-	</tr>
-	</tbody>
-	</table>
-
-	<!-- IF S_ACTION_OPTIONS -->
-		<fieldset>
-			<legend>{L_STATISTIC_RESYNC_OPTIONS}</legend>
-
-			<form id="action_online_form" method="post" action="{U_ACTION}">
-				<dl>
-					<dt><label for="action_online">{L_RESET_ONLINE}</label><br /><span>&nbsp;</span></dt>
-					<dd><input type="hidden" name="action" value="online" /><input class="button2" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>
-				</dl>
-			</form>
-
-			<form id="action_date_form" method="post" action="{U_ACTION}">
-				<dl>
-					<dt><label for="action_date">{L_RESET_DATE}</label><br /><span>&nbsp;</span></dt>
-					<dd><input type="hidden" name="action" value="date" /><input class="button2" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd>
-				</dl>
-			</form>
-
-			<form id="action_stats_form" method="post" action="{U_ACTION}">
-				<dl>
-					<dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_STATS_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
-				</dl>
-			</form>
-
-			<form id="action_user_form" method="post" action="{U_ACTION}">
-				<dl>
-					<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
-				</dl>
-			</form>
-
-			<form id="action_db_track_form" method="post" action="{U_ACTION}">
-				<dl>
-					<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="db_track" /><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd>
-				</dl>
-			</form>
-
-			<!-- IF S_FOUNDER -->
-			<form id="action_purge_cache_form" method="post" action="{U_ACTION}">
-				<dl>
-					<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
-				</dl>
-			</form>
-			<!-- ENDIF -->
-  		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF .log -->
-		<h2>{L_ADMIN_LOG}</h2>
-
-		<p>{L_ADMIN_LOG_INDEX_EXPLAIN}</p>
-
-		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
-
-		<table cellspacing="1">
-		<thead>
-		<tr>
-			<th>{L_USERNAME}</th>
-			<th>{L_IP}</th>
-			<th>{L_TIME}</th>
-			<th>{L_ACTION}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN log -->
-			<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-				<td>{log.USERNAME}</td>
-				<td style="text-align: center;">{log.IP}</td>
-				<td style="text-align: center;">{log.DATE}</td>
-				<td>{log.ACTION}</td>
-			</tr>
-		<!-- END log -->
-		</tbody>
-		</table>
-
-		<br />
-
-	<!-- ENDIF -->
-
-	<!-- IF S_INACTIVE_USERS -->
-		<h2>{L_INACTIVE_USERS}</h2>
-
-		<p>{L_INACTIVE_USERS_EXPLAIN_INDEX}</p>
-
-		<div style="text-align: right;"><a href="{U_INACTIVE_USERS}">&raquo; {L_VIEW_INACTIVE_USERS}</a></div>
-
-		<table cellspacing="1">
-		<thead>
-		<tr>
-			<th>{L_USERNAME}</th>
-			<th>{L_JOINED}</th>
-			<th>{L_INACTIVE_DATE}</th>
-			<th>{L_INACTIVE_REASON}</th>
-			<th>{L_LAST_VISIT}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN inactive -->
-			<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-				<td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td>
-				<td>{inactive.JOINED}</td>
-				<td>{inactive.INACTIVE_DATE}</td>
-				<td>{inactive.REASON}</td>
-				<td>{inactive.LAST_VISIT}</td>
-			</tr>
-		<!-- BEGINELSE -->
-			<tr>
-				<td colspan="5" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
-			</tr>
-		<!-- END inactive -->
-		</tbody>
-		</table>
-
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
deleted file mode 100644
index 5396e78557..0000000000
--- a/phpBB/adm/style/acp_modules.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT_MODULE -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-		function display_options(value)
-		{
-			if (value == 'category')
-			{
-				dE('modoptions', -1);
-			}
-			else
-			{
-				dE('modoptions', 1);
-			}
-		}
-
-		function display_modes(value)
-		{
-			// Find the old select tag
-			var item = document.getElementById('module_mode');
-
-			// Create the new select tag
-			var new_node = document.createElement('select');
-			new_node.setAttribute('id', 'module_mode');
-			new_node.setAttribute('name', 'module_mode');
-
-			// Substitute it for the old one
-			item.parentNode.replaceChild(new_node, item);
-
-			// Reset the variable
-			item = document.getElementById('module_mode');
-
-			var j = 0;
-<!-- BEGIN m_names -->
-		
-			if (value == '{m_names.A_NAME}')
-			{
-	<!-- BEGIN modes -->
-				item.options[j] = new Option('{m_names.modes.A_VALUE}');
-				item.options[j].value = '{m_names.modes.A_OPTION}';
-				j++;
-	<!-- END modes -->
-			}
-<!-- END m_names -->
-
-			// select first item
-			item.options[0].selected = true;
-		}
-
-	// ]]>
-	</script>
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE} :: {MODULENAME}</h1>
-
-	<p>{L_EDIT_MODULE_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="moduleedit" method="post" action="{U_EDIT_ACTION}">
-
-	<fieldset>
-		<legend>{L_GENERAL_OPTIONS}</legend>
-	<dl>
-		<dt><label for="module_langname">{L_MODULE_LANGNAME}:</label><br />
-		<span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt>
-		<dd><input name="module_langname" type="text" class="text medium" id="module_langname" value="{MODULE_LANGNAME}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="module_type">{L_MODULE_TYPE}:</label></dt>
-		<dd><select name="module_type" id="module_type" onchange="display_options(this.value);"><option value="category"<!-- IF S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_CATEGORY}</option><option value="module"<!-- IF not S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_MODULE}</option></select></dd>
-	</dl>
-	<dl>
-		<dt><label for="parent_id">{L_PARENT}:</label></dt>
-		<dd><select name="module_parent_id" id="parent_id">{S_CAT_OPTIONS}</select></dd>
-	</dl>
-	<hr />
-	<dl>
-		<dt><label for="module_enabled">{L_MODULE_ENABLED}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<div id="modoptions"<!-- IF S_IS_CAT --> style="display: none;"<!-- ENDIF -->>
-		<dl>
-			<dt><label for="module_display">{L_MODULE_DISPLAYED}:</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="module_basename">{L_CHOOSE_MODULE}:</label><br />
-			<span>{L_CHOOSE_MODULE_EXPLAIN}</span></dt>
-			<dd><select name="module_basename" id="module_basename" onchange="display_modes(this.value);">{S_MODULE_NAMES}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="module_mode">{L_CHOOSE_MODE}:</label><br />
-			<span>{L_CHOOSE_MODE_EXPLAIN}</span></dt>
-			<dd><select name="module_mode" id="module_mode">{S_MODULE_MODES}</select></dd>
-		</dl>
-	</div>
-
-	<p class="submit-buttons">
-		<input type="hidden" name="action" value="{ACTION}" />
-		<input type="hidden" name="m" value="{MODULE_ID}" />
-		
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_MODULE_MANAGEMENT}</h1>
-
-	<p>{L_ACP_MODULE_MANAGEMENT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<table cellspacing="1">
-	<tbody>
-	<tr>
-		<td class="row3">{NAVIGATION}<!-- IF S_NO_MODULES --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a> | <!-- IF MODULE_ENABLED --><a href="{U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->]<!-- ENDIF --></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<!-- IF .modules -->
-		<table cellspacing="1">
-			<col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" />
-		<tbody>
-		<!-- BEGIN modules -->
-			<tr>
-				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
-				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
-				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
-				<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;">
-					<!-- IF modules.S_FIRST_ROW && not modules.S_LAST_ROW -->
-						{ICON_MOVE_UP_DISABLED}
-						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF not modules.S_FIRST_ROW && not modules.S_LAST_ROW-->
-						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
-						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
-					<!-- ELSEIF modules.S_LAST_ROW && not modules.S_FIRST_ROW -->
-						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ELSE -->
-						{ICON_MOVE_UP_DISABLED}
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ENDIF -->
-					<a href="{modules.U_EDIT}">{ICON_EDIT}</a> 
-					<a href="{modules.U_DELETE}">{ICON_DELETE}</a>
-				</td>
-			</tr>
-		<!-- END modules -->
-		</tbody>
-		</table>
-	<!-- ENDIF -->
-
-	<div class="clearfix">&nbsp;</div>
-
-	<form id="quick" method="post" action="{U_ACTION}">
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<input type="hidden" name="action" value="quickadd" />
-
-		<select name="quick_install">{S_INSTALL_OPTIONS}</select>
-		<input class="button2" name="quickadd" type="submit" value="{L_ADD_MODULE}" />
-	</fieldset>
-	
-	</form>
-
-	<form id="module" method="post" action="{U_ACTION}">
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-		<input type="hidden" name="action" value="add" />
-		<input type="hidden" name="module_parent_id" value="{PARENT_ID}" />
-
-		<input type="text" name="module_langname" maxlength="255" /> 
-		<input class="button2" name="addmodule" type="submit" value="{L_CREATE_MODULE}" />
-	</fieldset>
-
-	</form>
-
-	<div class="clearfix">&nbsp;</div><br style="clear: both;" />
-	
-	<form id="mselect" method="post" action="{U_SEL_ACTION}">
-	<fieldset class="quick">
-		{L_SELECT_MODULE}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select> 
-
-		<input class="button2" type="submit" value="{L_GO}" />
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
deleted file mode 100644
index 220e7dafbe..0000000000
--- a/phpBB/adm/style/acp_permission_roles.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-		var active_pmask = '0';
-		var active_fmask = '0';
-		var active_cat = '0';
-
-		var id = '000';
-
-		var role_options = new Array();
-
-		<!-- IF S_ROLE_JS_ARRAY -->
-			{S_ROLE_JS_ARRAY}
-		<!-- ENDIF -->
-	// ]]>
-	</script>
-
-	<script type="text/javascript" src="style/permissions.js"></script>
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<br />
-	<a href="#acl">&raquo; {L_SET_ROLE_PERMISSIONS}</a>
-
-	<form id="acp_roles" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_ROLE_DETAILS}</legend>
-	<dl>
-		<dt><label for="role_name">{L_ROLE_NAME}:</label></dt>
-		<dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>
-		<dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd>
-	</dl>
-
-	<p class="quick">
-		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-
-	<!-- IF S_DISPLAY_ROLE_MASK -->
-
-		<h1>{L_ROLE_ASSIGNED_TO}</h1>
-
-		<!-- INCLUDE permission_roles_mask.html -->
-
-	<!-- ENDIF -->
-
-	<p>
-
-	<a name="acl"></a>
-
-	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
-	<br /><br />
-
-	</p>
-
-	<h1>{L_ACL_TYPE}</h1>
-
-	<fieldset class="perm nolegend">
-
-		<div id="advanced00">
-			<div class="permissions-category">
-				<ul>
-				<!-- BEGIN auth -->
-					<!-- IF auth.S_YES -->
-						<li class="permissions-preset-yes<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
-					<!-- ELSEIF auth.S_NEVER -->
-						<li class="permissions-preset-never<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
-					<!-- ELSEIF auth.S_NO -->
-						<li class="permissions-preset-no<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
-					<!-- ELSE -->
-						<li class="permissions-preset-custom<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
-					<!-- ENDIF -->
-						<a href="#" onclick="swap_options('0','0','{auth.S_ROW_COUNT}'); return false;"><span class="tabbg"><span class="colour"></span>{auth.CAT_NAME}</span></a></li>	
-				<!-- END auth -->
-				</ul>
-			</div>
-			<!-- BEGIN auth -->
-			<div class="permissions-panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
-				<span class="corners-top"><span></span></span>
-				<div class="tablewrap">
-					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1">
-					<colgroup>
-						<col class="permissions-name" />
-						<col class="permissions-yes" />
-						<col class="permissions-no" />
-						<col class="permissions-never" />
-					</colgroup>
-					<thead>
-					<tr>
-						<th class="name" scope="col"><strong>{L_ACL_SETTING}</strong></th>
-						<th class="value permissions-yes" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'y'); set_colours('00{auth.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
-						<th class="value permissions-no" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'u'); set_colours('00{auth.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
-						<th class="value permissions-never" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'n'); set_colours('00{auth.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
-					</tr>
-					</thead>
-					<tbody>
-					<!-- BEGIN mask -->
-						<!-- IF auth.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-						<th class="permissions-name<!-- IF auth.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->">{auth.mask.PERMISSION}</th>
-							
-						<td class="permissions-yes"><label for="setting_{auth.mask.FIELD_NAME}_y"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_y" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
-						<td class="permissions-no"><label for="setting_{auth.mask.FIELD_NAME}_u"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_u" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
-						<td class="permissions-never"><label for="setting_{auth.mask.FIELD_NAME}_n"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_n" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
-					</tr>
-					<!-- END mask -->
-					</tbody>
-					</table>
-				</div>
-				<span class="corners-bottom"><span></span></span>
-			</div>
-			<!-- END auth -->
-		</div>
-
-	</fieldset>
-
-	<fieldset class="quick">
-		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
-	<br />
-
-<!-- ELSE -->
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<form id="acp_roles" method="post" action="{U_ACTION}">
-
-	<table cellspacing="1">
-		<col class="col2" /><col class="col2" /><col class="col1" /><col class="col2" /><col class="col2" />
-	<thead>
-	<tr>
-		<th>{L_ROLE_NAME}</th>
-		<th colspan="2">{L_OPTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN roles -->
-	<tr>
-		<td style="vertical-align: top;"><strong>{roles.ROLE_NAME}</strong>
-			<!-- IF roles.ROLE_DESCRIPTION --><br /><span>{roles.ROLE_DESCRIPTION}</span><!-- ENDIF -->
-		</td>
-		<td style="width: 30%; text-align: center; vertical-align: top; white-space: nowrap;"><!-- IF roles.U_DISPLAY_ITEMS --><a href="{roles.U_DISPLAY_ITEMS}">{L_VIEW_ASSIGNED_ITEMS}</a><!-- ELSE -->{L_VIEW_ASSIGNED_ITEMS}<!-- ENDIF --></td>
-		<td style="width: 80px; text-align: right; vertical-align: top; white-space: nowrap;">
-			<!-- IF roles.S_FIRST_ROW && not roles.S_LAST_ROW -->
-				{ICON_MOVE_UP_DISABLED}
-				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-			<!-- ELSEIF not roles.S_FIRST_ROW && not roles.S_LAST_ROW-->
-				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
-				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
-			<!-- ELSEIF roles.S_LAST_ROW && not roles.S_FIRST_ROW -->
-				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
-				{ICON_MOVE_DOWN_DISABLED}
-			<!-- ELSE -->
-				{ICON_MOVE_UP_DISABLED}
-				{ICON_MOVE_DOWN_DISABLED}
-			<!-- ENDIF -->	
-			<a href="{roles.U_EDIT}" title="{L_EDIT_ROLE}">{ICON_EDIT}</a> 
-			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}">{ICON_DELETE}</a>
-		</td>
-	</tr>
-	<!-- END roles -->
-	</tbody>
-	</table>
-
-	<fieldset class="quick">
-		{L_CREATE_ROLE}: <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-	<!-- IF S_DISPLAY_ROLE_MASK -->
-
-		<a name="assigned_to"></a>
-
-		<h1>{L_ROLE_ASSIGNED_TO}</h1>
-
-		<!-- INCLUDE permission_roles_mask.html -->
-
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
deleted file mode 100644
index 63583093b0..0000000000
--- a/phpBB/adm/style/acp_permissions.html
+++ /dev/null
@@ -1,357 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_INTRO -->
-
-	<h1>{L_ACP_PERMISSIONS}</h1>
-
-	{L_ACP_PERMISSIONS_EXPLAIN}
-
-<!-- ENDIF -->
-
-<!-- IF S_SELECT_VICTIM -->
-
-	<!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a><!-- ENDIF -->
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF S_FORUM_NAMES -->
-		<p><strong>{L_FORUMS}:</strong> {FORUM_NAMES}</p>
-	<!-- ENDIF -->
-
-	<!-- IF S_SELECT_FORUM -->
-
-		<form id="select_victim" method="post" action="{U_ACTION}">
-
-		<fieldset>
-			<legend>{L_LOOK_UP_FORUM}</legend>
-			<!-- IF S_FORUM_MULTIPLE --><p>{L_LOOK_UP_FORUMS_EXPLAIN}</p><!-- ENDIF -->
-		<dl>
-			<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
-			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
-			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
-		</dl>
-
-		<p class="quick">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-		</p>
-
-		</fieldset>
-		</form>
-
-		<!-- IF S_FORUM_MULTIPLE -->
-
-			<form id="select_subforum" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_LOOK_UP_FORUM}</legend>
-				<p>{L_SELECT_FORUM_SUBFORUM_EXPLAIN}</p>
-			<dl>
-				<dt><label for="sforum">{L_LOOK_UP_FORUM}:</label></dt>
-				<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>
-			</dl>
-
-			<p class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-			</p>
-
-			</fieldset>
-			</form>
-
-		<!-- ENDIF -->
-
-	<!-- ELSEIF S_SELECT_USER and S_CAN_SELECT_USER -->
-
-		<form id="select_victim" method="post" action="{U_ACTION}">
-
-		<fieldset>
-			<legend>{L_LOOK_UP_USER}</legend>
-		<dl>
-			<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
-			<dd><input class="text medium" type="text" id="username" name="username[]" /></dd>
-			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-			<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
-		</dl>
-
-		<p class="quick">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-		</p>
-		</fieldset>
-		</form>
-
-	<!-- ELSEIF S_SELECT_GROUP and S_CAN_SELECT_GROUP -->
-
-		<form id="select_victim" method="post" action="{U_ACTION}">
-
-		<fieldset>
-			<legend>{L_LOOK_UP_GROUP}</legend>
-		<dl>
-			<dt><label for="group">{L_LOOK_UP_GROUP}:</label></dt>
-			<dd><select name="group_id[]" id="group">{S_GROUP_OPTIONS}</select></dd>
-		</dl>
-
-		<p class="quick">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-		</p>
-
-		</fieldset>
-		</form>
-
-		<!-- ELSEIF S_SELECT_USERGROUP -->
-
-		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
-
-		<!-- IF S_CAN_SELECT_USER -->
-
-			<h1>{L_USERS}</h1>
-
-			<form id="users" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_MANAGE_USERS}</legend>
-			<dl>
-				<dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd>
-				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_users" value="1" /> {L_ALL_USERS}</label></dd><!-- ENDIF -->
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input type="submit" class="button2" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;" /> &nbsp; <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;" />
-			</fieldset>
-			</form>
-
-			<form id="add_user" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_ADD_USERS}</legend>
-				<p>{L_USERNAMES_EXPLAIN}</p>
-			<dl>
-				<dd class="full"><textarea id="username" name="usernames" rows="5" cols="5" style="width: 100%; height: 60px;"></textarea></dd>
-				<dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input class="button1" type="submit" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
-			</fieldset>
-			</form>
-
-		<!-- ENDIF -->
-
-		</div>
-
-		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
-
-		<!-- IF S_CAN_SELECT_GROUP -->
-
-			<h1>{L_USERGROUPS}</h1>
-
-			<form id="groups" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_MANAGE_GROUPS}</legend>
-			<dl>
-				<dd class="full"><select style="width: 100%;" name="group_id[]" multiple="multiple" size="5">{S_DEFINED_GROUP_OPTIONS}</select></dd>
-				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_groups" value="1" /> {L_ALL_GROUPS}</label></dd><!-- ENDIF -->
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input class="button2" type="submit" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;" /> &nbsp; <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;" />
-			</fieldset>
-			</form>
-
-			<form id="add_groups" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_ADD_GROUPS}</legend>
-			<dl>
-				<dd class="full"><select name="group_id[]" style="width: 100%; height: 107px;" multiple="multiple">{S_ADD_GROUP_OPTIONS}</select></dd>
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input type="submit" class="button1" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
-			</fieldset>
-			</form>
-
-		<!-- ENDIF -->
-
-		</div>
-
-	<!-- ELSEIF S_SELECT_USERGROUP_VIEW -->
-
-		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
-
-			<h1>{L_USERS}</h1>
-
-			<form id="users" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_MANAGE_USERS}</legend>
-			<dl>
-				<dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd>
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" />
-			</fieldset>
-			</form>
-
-			<form id="add_user" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_LOOK_UP_USER}</legend>
-			<dl>
-				<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
-				<dd><input type="text" id="username" name="username[]" /></dd>
-				<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-				<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" />
-			</fieldset>
-			</form>
-
-		</div>
-
-		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
-
-			<h1>{L_USERGROUPS}</h1>
-
-			<form id="groups" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_MANAGE_GROUPS}</legend>
-			<dl>
-				<dd class="full"><select style="width: 100%;" name="group_id[]" multiple="multiple" size="5">{S_DEFINED_GROUP_OPTIONS}</select></dd>
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" />
-			</fieldset>
-			</form>
-
-			<form id="group" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_LOOK_UP_GROUP}</legend>
-			<dl>
-				<dt><label for="group_select">{L_LOOK_UP_GROUP}:</label></dt>
-				<dd><select name="group_id[]" id="group_select">{S_ADD_GROUP_OPTIONS}</select></dd>
-				<dd>&nbsp;</dd>
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" />
-			</fieldset>
-			</form>
-
-		</div>
-
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- IF S_VIEWING_PERMISSIONS -->
-
-	<h1>{L_ACL_VIEW}</h1>
-
-	<p>{L_ACL_VIEW_EXPLAIN}</p>
-
-	<fieldset class="quick">
-		<strong>&raquo; {L_PERMISSION_TYPE}</strong>
-	</fieldset>
-
-	<!-- INCLUDE permission_mask.html -->
-
-<!-- ENDIF -->
-
-<!-- IF S_SETTING_PERMISSIONS -->
-
-	<h1>{L_ACL_SET}</h1>
-
-	<p>{L_ACL_SET_EXPLAIN}</p>
-
-	<br />
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<strong>&raquo; {L_PERMISSION_TYPE}</strong>
-	</fieldset>
-
-	<!-- IF S_PERMISSION_DROPDOWN -->
-		<form id="pselect" method="post" action="{U_ACTION}">
-
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			{L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select>
-
-			<input class="button2" type="submit" name="submit" value="{L_GO}" />
-		</fieldset>
-		</form>
-	<!-- ENDIF -->
-
-	<br /><br />
-
-	<!-- include tooltip file -->
-	<script type="text/javascript" src="style/tooltip.js"></script>
-	<script type="text/javascript">
-	// <![CDATA[
-		window.onload = function(){enable_tooltips_select('set-permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
-	// ]]>
-	</script>
-
-	<form id="set-permissions" method="post" action="{U_ACTION}">
-
-	{S_HIDDEN_FIELDS}
-
-	<!-- INCLUDE permission_mask.html -->
-
-	<br /><br />
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />
-		<input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" />
-		{S_FORM_TOKEN}
-	</fieldset>
-
-	<br /><br />
-
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_php_info.html b/phpBB/adm/style/acp_php_info.html
deleted file mode 100644
index de065c4896..0000000000
--- a/phpBB/adm/style/acp_php_info.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_PHP_INFO}</h1>
-
-<p>{L_ACP_PHP_INFO_EXPLAIN}</p>
-
-<div class="phpinfo">
-	{PHPINFO}
-</div>
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
deleted file mode 100644
index eec975ad25..0000000000
--- a/phpBB/adm/style/acp_profile.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF ERROR_MSG -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="add_profile_field" method="post" action="{U_ACTION}">
-
-	<!-- IF S_STEP_ONE -->
-
-		<fieldset>
-			<legend>{L_TITLE}</legend>
-		<dl>
-			<dt><label>{L_FIELD_TYPE}:</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
-			<dd><strong>{FIELD_TYPE}</strong></dd>
-		</dl>
-		<!-- IF S_EDIT_MODE -->
-		<dl>
-			<dt><label>{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
-			<dd><input type="hidden" name="field_ident" value="{FIELD_IDENT}" /><strong>{FIELD_IDENT}</strong></dd>
-		</dl>
-		<!-- ELSE -->
-		<dl>
-			<dt><label for="field_ident">{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
-			<dd><input class="text medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>
-		</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}:</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_VISIBILITY_OPTION}</legend>
-		<dl>
-			<dt><label for="field_option_none">{L_DISPLAY_AT_PROFILE}:</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" id="field_option_none" name="field_option" value="none"<!-- IF not S_SHOW_ON_REG and not S_FIELD_REQUIRED and not S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}:</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" id="field_show_on_reg" name="field_option" value="field_show_on_reg"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" id="field_required" name="field_option" value="field_required"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}:</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" id="field_hide" name="field_option" value="field_hide"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		</fieldset>
-
-		<!-- IF S_EDIT_MODE -->
-			<fieldset class="quick">
-				<input class="button1" type="submit" name="save" value="{L_SAVE}" />
-			</fieldset>
-		<!-- ENDIF -->
-
-		<fieldset>
-			<legend>{L_LANG_SPECIFIC}</legend>
-		<dl>
-			<dt><label for="lang_name">{L_USER_FIELD_NAME}:</label></dt>
-			<dd><input class="text medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}:</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>
-			<dd><textarea id="lang_explain" name="lang_explain" rows="3" cols="80">{LANG_EXPLAIN}</textarea></dd>
-		</dl>
-		<!-- IF S_TEXT or S_STRING -->
-			<dl>
-				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}:</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>
-				<dd><!-- IF S_STRING --><input class="text medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_BOOL or S_DROPDOWN -->
-			<dl>
-				<dt><label for="lang_options">{L_ENTRIES}:</label>
-					<!-- IF S_EDIT_MODE and S_DROPDOWN -->
-						<br /><span>{L_EDIT_DROPDOWN_LANG_EXPLAIN}</span>
-					<!-- ELSE -->
-						<br /><span>{L_LANG_OPTIONS_EXPLAIN}</span>
-					<!-- ENDIF -->
-				</dt>
-			<!-- IF S_DROPDOWN -->
-				<dd><textarea id="lang_options" name="lang_options" rows="5" cols="80">{LANG_OPTIONS}</textarea></dd>
-			<!-- ELSE -->
-				<dd><input class="medium" id="lang_options" name="lang_options[0]" value="{FIRST_LANG_OPTION}" /> {L_FIRST_OPTION}</dd>
-				<dd><input class="medium" name="lang_options[1]" value="{SECOND_LANG_OPTION}" /> {L_SECOND_OPTION}</dd>
-			<!-- ENDIF -->
-			</dl>
-		<!-- ENDIF -->
-		</fieldset>
-
-		<fieldset class="quick">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input class="button1" type="submit" name="next" value="{L_PROFILE_TYPE_OPTIONS}" />
-		</fieldset>
-
-	<!-- ELSEIF S_STEP_TWO -->
-
-		<fieldset>
-			<legend>{L_TITLE}</legend>
-		<!-- BEGIN option -->
-			<dl>
-				<dt><label>{option.TITLE}:</label><!-- IF option.EXPLAIN --><br /><span>{option.EXPLAIN}</span><!-- ENDIF --></dt>
-				<dd>{option.FIELD}</dd>
-			</dl>
-		<!-- END option -->
-		</fieldset>
-
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-			<input class="button1" type="submit" name="prev" value="{L_PROFILE_BASIC_OPTIONS}" />
-		</fieldset>
-		
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input class="button1" type="submit" name="next" value="{L_NEXT_STEP}" />
-		</fieldset>
-
-	<!-- ELSEIF S_STEP_THREE -->
-
-		<!-- BEGIN options -->
-			<fieldset>
-				<legend>{options.LANGUAGE}</legend>
-			<!-- BEGIN field -->
-				<dl>
-					<dt><label>{options.field.L_TITLE}:</label><!-- IF options.field.L_EXPLAIN --><br /><span>{options.field.L_EXPLAIN}</span><!-- ENDIF --></dt>
-					{options.field.FIELD}
-				</dl>
-			<!-- END field -->
-			</fieldset>
-		<!-- END options -->
-
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-			<input class="button1" type="submit" name="prev" value="{L_PROFILE_TYPE_OPTIONS}" />
-		</fieldset>
-		
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-			{S_HIDDEN_FIELDS}
-			<input class="button1" type="submit" name="save" value="{L_SAVE}" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	
-	<!-- ENDIF -->
-	
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_CUSTOM_PROFILE_FIELDS}</h1>
-
-	<!-- IF S_NEED_EDIT -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{L_CUSTOM_FIELDS_NOT_TRANSLATED}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_FIELD_IDENT}</th>
-		<th>{L_FIELD_TYPE}</th>
-		<th colspan="2">{L_OPTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN fields -->
-		<!-- IF fields.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-		<td>{fields.FIELD_IDENT}</td>
-		<td>{fields.FIELD_TYPE}</td>
-		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>
-
-		<td style="width: 80px; text-align: right; white-space: nowrap;">
-			<!-- IF fields.S_FIRST_ROW && not fields.S_LAST_ROW -->
-				{ICON_MOVE_UP_DISABLED}
-				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-			<!-- ELSEIF not fields.S_FIRST_ROW && not fields.S_LAST_ROW-->
-				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
-				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
-			<!-- ELSEIF fields.S_LAST_ROW && not fields.S_FIRST_ROW -->
-				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-				{ICON_MOVE_DOWN_DISABLED}	
-			<!-- ENDIF -->
-			<!-- IF not fields.S_NEED_EDIT -->
-				<a href="{fields.U_EDIT}">{ICON_EDIT}</a> 
-			<!-- ELSE -->
-				{ICON_EDIT_DISABLED}
-			<!-- ENDIF -->
-			<a href="{fields.U_DELETE}">{ICON_DELETE}</a>
-		</td>
-
-	</tr>
-	<!-- END fields -->
-	</tbody>
-	</table>
-
-	<form id="profile_fields" method="post" action="{U_ACTION}">
-	
-	<fieldset class="quick">
-		<input class="text small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select>
-		<input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}" />
-		<input type="hidden" name="create" value="1" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html
deleted file mode 100644
index 069d2c91c3..0000000000
--- a/phpBB/adm/style/acp_prune_forums.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_PRUNED -->
-
-	<h1>{L_FORUM_PRUNE}</h1>
-
-	<p>{L_PRUNE_SUCCESS}</p>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_FORUM}</th>
-		<th>{L_TOPICS_PRUNED}</th>
-		<th>{L_POSTS_PRUNED}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN pruned -->
-		<!-- IF pruned.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td style="text-align: center;">{pruned.FORUM_NAME}</td>
-		<td style="text-align: center;">{pruned.NUM_TOPICS}</td>
-		<td style="text-align: center;">{pruned.NUM_POSTS}</td>
-	</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td colspan="3" class="row3" style="text-align: center;">{L_NO_PRUNE}</td>
-		</tr>
-	<!-- END pruned -->
-	</tbody>
-	</table>
-
-<!-- ELSEIF S_SELECT_FORUM -->
-
-	<h1>{L_ACP_PRUNE_FORUMS}</h1>
-
-	<p>{L_ACP_PRUNE_FORUMS_EXPLAIN}</p>
-
-	<form id="acp_prune" method="post" action="{U_ACTION}">
-	
-	<fieldset>
-		<legend>{L_SELECT_FORUM}</legend>
-		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
-	<dl>
-		<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
-		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
-		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>
-	</dl>
-	
-	<p class="quick">
-		<input class="button1" type="submit" value="{L_LOOK_UP_FORUM}" />
-	</p>
-	</fieldset>
-
-	</form>
-
-<!-- ELSE -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_ACP_PRUNE_FORUMS}</h1>
-
-	<p>{L_ACP_PRUNE_FORUMS_EXPLAIN}</p>
-
-	<h2>{L_FORUM}</h2>
-
-	<p>{L_SELECTED_FORUMS}: {FORUM_LIST}</p>
-
-	<form id="acp_prune" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_FORUM_PRUNE}</legend>
-	<dl>
-		<dt><label for="prune_days">{L_PRUNE_NOT_POSTED}:</label></dt>
-		<dd><input type="text" id="prune_days" name="prune_days" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}:</label></dt>
-		<dd><input type="text" id="prune_vieweddays" name="prune_vieweddays" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1" /> {L_YES}</label>
-			<label><input type="radio" class="radio" id="polls" name="prune_old_polls" value="0" checked="checked" /> {L_NO}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="prune_announce" value="1" /> {L_YES}</label>
-			<label><input type="radio" class="radio" id="announce" name="prune_announce" value="0" checked="checked" /> {L_NO}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="sticky">{L_PRUNE_STICKY}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES}</label>
-			<label><input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</label></dd>
-	</dl>
-	
-	<p class="quick">
-		{S_HIDDEN_FIELDS}
-		{S_FORM_TOKEN}
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
deleted file mode 100644
index 0f2b23dcef..0000000000
--- a/phpBB/adm/style/acp_prune_users.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_PRUNE_USERS}</h1>
-
-<p>{L_ACP_PRUNE_USERS_EXPLAIN}</p>
-
-<form id="acp_prune" method="post" action="{U_ACTION}">
-	
-<fieldset>
-	<legend>{L_ACP_PRUNE_USERS}</legend>
-<dl>
-	<dt><label for="username">{L_USERNAME}:</label></dt>
-	<dd><input type="text" id="username" name="username" /></dd>
-</dl>
-<dl>
-	<dt><label for="email">{L_EMAIL}:</label></dt>
-	<dd><input type="text" id="email" name="email" /></dd>
-</dl>
-<dl>
-	<dt><label for="joined">{L_JOINED}:</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
-	<dd><select name="joined_select">{S_JOINED_OPTIONS}</select> <input type="text" id="joined" name="joined" /></dd>
-</dl>
-<dl>
-	<dt><label for="active">{L_LAST_ACTIVE}:</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt>
-	<dd><select name="active_select">{S_ACTIVE_OPTIONS}</select> <input type="text" id="active" name="active" /></dd>
-</dl>
-<dl>
-	<dt><label for="count">{L_POSTS}:</label></dt>
-	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" id="count" name="count" /></dd>
-</dl>
-<dl>
-	<dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
-	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
-	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-</dl>
-<dl>
-	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}</label>
-		<label><input type="radio" class="radio" id="deleteposts" name="deleteposts" value="0" checked="checked" /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}:</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label>
-		<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd>
-</dl>
-
-<p class="submit-buttons">
-	<input type="hidden" name="prune" value="1" />
-
-	<input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	{S_FORM_TOKEN}
-</p>
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
deleted file mode 100644
index 9306e30269..0000000000
--- a/phpBB/adm/style/acp_ranks.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<script type="text/javascript">
-	// <![CDATA[
-		function update_image(newimage)
-		{
-			document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + encodeURI(newimage) : "./images/spacer.gif";
-		}
-
-	// ]]>
-	</script>
-
-	<h1>{L_ACP_MANAGE_RANKS}</h1>
-
-	<p>{L_ACP_RANKS_EXPLAIN}</p>
-
-	<form id="acp_ranks" method="post" action="{U_ACTION}">
-	
-	<fieldset>
-		<legend>{L_ACP_RANKS}</legend>
-	<dl>
-		<dt><label for="title">{L_RANK_TITLE}:</label></dt>
-		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="rank_image">{L_RANK_IMAGE}:</label></dt>
-		<dd><select name="rank_image" id="rank_image" onchange="update_image(this.options[selectedIndex].value);">{S_FILENAME_LIST}</select></dd>
-		<dd><img src="{RANK_IMAGE}" id="image" alt="" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="special_rank">{L_RANK_SPECIAL}:</label></dt>
-		<dd><label><input onchange="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-			<label><input onchange="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
-	<dl>
-		<dt><label for="min_posts">{L_RANK_MINIMUM}:</label></dt>
-		<dd><input name="min_posts" type="text" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
-	</dl>
-	</div>
-
-	<p class="submit-buttons">
-		<input type="hidden" name="action" value="save" />
-
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_MANAGE_RANKS}</h1>
-
-	<p>{L_ACP_RANKS_EXPLAIN}</p>
-
-	<form id="acp_ranks" method="post" action="{U_ACTION}">
-	<fieldset class="tabulated">
-	<legend>{L_ACP_MANAGE_RANKS}</legend>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_RANK_IMAGE}</th>
-		<th>{L_RANK_TITLE}</th>
-		<th>{L_RANK_MINIMUM}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN ranks -->
-		<!-- IF ranks.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
-		<td style="text-align: center;">{ranks.RANK_TITLE}</td>
-		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->&nbsp; - &nbsp;<!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td>
-		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}">{ICON_DELETE}</a></td>
-	</tr>
-	<!-- END ranks -->
-	</tbody>
-	</table>
-
-	<p class="quick">
-		<input class="button2" name="add" type="submit" value="{L_ADD_RANK}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html
deleted file mode 100644
index 23fcfbdeb8..0000000000
--- a/phpBB/adm/style/acp_reasons.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT_REASON -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_REASON_EDIT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF not S_TRANSLATED -->
-		<h3>{L_AVAILABLE_TITLES}</h3>
-
-		<p>{S_AVAILABLE_TITLES}</p>
-	<!-- ENDIF -->
-
-	<form id="acp_reasons" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TITLE}</legend>
-		<p><!-- IF S_TRANSLATED -->{L_IS_TRANSLATED_EXPLAIN}<!-- ELSE -->{L_IS_NOT_TRANSLATED_EXPLAIN}<!-- ENDIF --></p>
-	<dl>
-		<dt><label for="reason_title">{L_REASON_TITLE}:</label></dt>
-		<dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" maxlength="255" /></dd>
-	</dl>
-	<!-- IF S_TRANSLATED -->
-	<dl>
-		<dt>{L_REASON_TITLE_TRANSLATED}</dt>
-		<dd>{TRANSLATED_TITLE}</dd>
-	</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="reason_description">{L_REASON_DESCRIPTION}:</label></dt>
-		<dd><textarea name="reason_description" id="reason_description" rows="8" cols="80">{REASON_DESCRIPTION}</textarea></dd>
-	</dl>
-	<!-- IF S_TRANSLATED -->
-	<dl>
-		<dt>{L_REASON_DESC_TRANSLATED}</dt>
-		<dd>{TRANSLATED_DESCRIPTION}</dd>
-	</dl>
-	<!-- ENDIF -->
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_REASONS}</h1>
-
-	<p>{L_ACP_REASONS_EXPLAIN}</p>
-
-	<form id="reasons" method="post" action="{U_ACTION}">
-	<fieldset class="tabulated">
-	<legend>{L_ACP_REASONS}</legend>
-
-	<!-- IF .reasons -->
-		<table cellspacing="1">
-			<col class="row1" /><col class="row1" /><col class="row2" />
-		<thead>
-		<tr>
-			<th>{L_REASON}</th>
-			<th>{L_USED_IN_REPORTS}</th>
-			<th>{L_OPTIONS}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN reasons -->
-			<tr>
-				<td>
-					<i style="float: {S_CONTENT_FLOW_END}; font-size: .9em;"><!-- IF reasons.S_TRANSLATED -->{L_IS_TRANSLATED}<!-- ELSE -->{L_IS_NOT_TRANSLATED}<!-- ENDIF --></i>
-					<strong>{reasons.REASON_TITLE}<!-- IF reasons.S_OTHER_REASON --> *<!-- ENDIF --></strong>
-					<br /><span>{reasons.REASON_DESCRIPTION}</span>
-				</td>
-				<td style="width: 100px;">{reasons.REASON_COUNT}</td>
-				<td style="width: 80px; text-align: right; white-space: nowrap;">
-					<!-- IF reasons.S_FIRST_ROW && not reasons.S_LAST_ROW -->
-						{ICON_MOVE_UP_DISABLED}
-						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF not reasons.S_FIRST_ROW && not reasons.S_LAST_ROW-->
-						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
-						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
-					<!-- ELSEIF reasons.S_LAST_ROW && not reasons.S_FIRST_ROW -->
-						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ENDIF -->
-					<a href="{reasons.U_EDIT}">{ICON_EDIT}</a> 
-					<!-- IF reasons.U_DELETE -->
-						<a href="{reasons.U_DELETE}">{ICON_DELETE}</a>
-					<!-- ELSE -->
-						{ICON_DELETE_DISABLED}
-					<!-- ENDIF -->
-				</td>
-			</tr>
-		<!-- END reasons -->
-		</tbody>
-		</table>
-
-	<!-- ENDIF -->
-
-	<p class="quick">
-		<input type="hidden" name="action" value="add" />
-
-		<input type="text" name="reason_title" /> 
-		<input class="button2" name="addreason" type="submit" value="{L_ADD_NEW_REASON}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
deleted file mode 100644
index 5fd7a23d97..0000000000
--- a/phpBB/adm/style/acp_search.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_SETTINGS -->
-	<h1>{L_ACP_SEARCH_SETTINGS}</h1>
-
-	<p>{L_ACP_SEARCH_SETTINGS_EXPLAIN}</p>
-
-	<form id="acp_search" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>
-	<dl>
-		<dt><label for="load_search">{L_YES_SEARCH}:</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="search_interval">{L_SEARCH_INTERVAL}:</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_interval" type="text" size="4" maxlength="4" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
-	</dl>
-	<dl>
-		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}:</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_anonymous_interval" type="text" size="4" maxlength="4" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
-	</dl>
-	<dl>
-		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}:</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
-		<dd><input id="limit_search_load" type="text" size="4" maxlength="4" name="config[limit_search_load]" value="{LIMIT_SEARCH_LOAD}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}:</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
-		<dd><input id="min_search_author_chars" type="text" size="4" maxlength="4" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}:</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-		<dd><input id="max_num_search_keywords" type="text" size="4" maxlength="4" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}:</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
-		<dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_SEARCH_TYPE}</legend>
-	<dl>
-		<dt><label for="search_type">{L_SEARCH_TYPE}:</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
-		<dd><select id="search_type" name="config[search_type]">{S_SEARCH_TYPES}</select></dd>
-	</dl>
-	</fieldset>
-
-	<!-- BEGIN backend -->
-
-		<fieldset>
-			<legend>{backend.NAME}</legend>
-		{backend.SETTINGS}
-		</fieldset>
-
-	<!-- END backend -->
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_INDEX -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-		/**
-		* Popup search progress bar
-		*/
-		function popup_progress_bar(progress_type)
-		{
-			close_waitscreen = 0;
-			// no scrollbars
-			popup('{UA_PROGRESS_BAR}&amp;type=' + progress_type, 400, 240, '_index');
-		}
-	// ]]>
-	</script>
-
-	<h1>{L_ACP_SEARCH_INDEX}</h1>
-
-	<!-- IF S_CONTINUE_INDEXING -->
-		<p>{L_CONTINUE_EXPLAIN}</p>
-
-		<form id="acp_search_continue" method="post" action="{U_CONTINUE_INDEXING}">
-			<fieldset class="submit-buttons">
-				<legend>{L_SUBMIT}</legend>
-				<input class="button1" type="submit" id="continue" name="continue" value="{L_CONTINUE}" onclick="popup_progress_bar('{S_CONTINUE_INDEXING}');" />&nbsp;
-				<input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" />
-				{S_FORM_TOKEN}
-			</fieldset>
-		</form>
-	<!-- ELSE -->
-
-		<p>{L_ACP_SEARCH_INDEX_EXPLAIN}</p>
-
-		<!-- BEGIN backend -->
-
-			<!-- IF backend.S_STATS -->
-
-			<form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}">
-
-				<fieldset class="tabulated">
-
-				{backend.S_HIDDEN_FIELDS}
-
-				<legend>{L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>
-
-				<table cellspacing="1">
-					<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>
-					<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-				<thead>
-				<tr>
-					<th>{L_STATISTIC}</th>
-					<th>{L_VALUE}</th>
-					<th>{L_STATISTIC}</th>
-					<th>{L_VALUE}</th>
-				</tr>
-				</thead>
-				<tbody>
-				<!-- BEGIN data -->
-					<tr>
-						<td>{backend.data.STATISTIC_1}:</td>
-						<td>{backend.data.VALUE_1}</td>
-						<td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->:<!-- ENDIF --></td>
-						<td>{backend.data.VALUE_2}</td>
-					</tr>
-				<!-- END data -->
-				</tbody>
-				</table>
-
-			<!-- ENDIF -->
-
-			<p class="quick">
-			<!-- IF backend.S_INDEXED -->
-				<input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
-			<!-- ELSE -->
-				<input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
-			<!-- ENDIF -->
-			</p>
-			{S_FORM_TOKEN}
-			</fieldset>
-
-			</form>
-		<!-- END backend -->
-
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
deleted file mode 100644
index 4c738ad618..0000000000
--- a/phpBB/adm/style/acp_styles.html
+++ /dev/null
@@ -1,514 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_DELETE -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<form id="acp_styles" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TITLE}</legend>
-	<dl>
-		<dt><label>{L_NAME}:</label></dt>
-		<dd><strong>{NAME}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt>
-		<dd><select name="new_id">{S_REPLACE_OPTIONS}</select></dd>
-	</dl>
-
-	<p class="quick">
-		<input class="button1" type="submit" name="update" value="{L_DELETE}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_EDIT_IMAGESET -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF SUCCESS -->
-		<div class="successbox">
-			<p>{L_IMAGESET_UPDATED}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF ERROR -->
-		<div class="errorbox">
-			<p>{L_NO_IMAGE}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<script type="text/javascript" defer="defer">
-	// <![CDATA[
-		function update_image(newimage)
-		{
-			document.getElementById('newimg').src = (newimage) ? '../styles/{A_PATH}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
-		}
-	// ]]>
-	</script>
-	<script type="text/javascript">
-	// <![CDATA[
-		/**
-		* Handle displaying/hiding the dimension fields
-		*/
-		function display_options(value)
-		{
-			if (value == 0)
-			{
-				dE('img_dimensions', -1);
-			}
-			else
-			{
-				dE('img_dimensions', 1);
-			}
-		}
-
-		/**
-		* Init the wanted display functionality if javascript is enabled.
-		* If javascript is not available, the user is still able to properly administrate.
-		*/
-		onload = function()
-		{
-			<!-- IF not IMAGE_SIZE -->
-				dE('img_dimensions', -1);
-			<!-- ENDIF -->
-		}
-	// ]]>
-	</script>
-
-	<form method="post" action="{U_ACTION}">
-
-	<fieldset class="quick" style="text-align: left;">
-		<legend>{L_SELECT_IMAGE}</legend>
-		{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit();">
-		<!-- BEGIN category -->
-			<option class="sep" value="" disabled="disabled">{category.NAME}</option>
-				<!-- BEGIN images --><option value="{category.images.VALUE}"<!-- IF category.images.SELECTED--> selected="selected"<!-- ENDIF -->>&nbsp;&nbsp;&nbsp;&nbsp;{category.images.TEXT}</option>
-				<!-- END images -->
-			<!-- END category -->
-		</select>&nbsp; <input class="button1" type="submit" value="{L_SELECT}" tabindex="100" />
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_EDIT_IMAGESET}</legend>
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label></dt>
-		<dd><img src="<!-- IF IMAGE_REQUEST -->{IMAGE_REQUEST}<!-- ELSE -->images/no_image.png<!-- ENDIF -->" alt="" /></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_SELECTED_IMAGE}:</label></dt>
-		<dd><img src="{IMG_SRC}" id="newimg" alt="" /></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-	<legend>{L_IMAGE}</legend>
-	<dl>
-		<dt><label for="imgpath">{L_IMAGE}:</label></dt>
-		<dd><select id="imgpath" name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>
-			<!-- BEGIN imagesetlist -->
-			<option class="sep" value=""><!-- IF imagesetlist.TYPE -->{L_LOCALISED_IMAGES}<!-- ELSE -->{L_GLOBAL_IMAGES}<!-- ENDIF --></option>
-				<!-- BEGIN images -->
-				<option value="{imagesetlist.images.VALUE}"<!-- IF imagesetlist.images.SELECTED--> selected="selected"<!-- ENDIF -->>{imagesetlist.images.TEXT}</option>
-				<!-- END images -->
-			<!-- END imagesetlist -->
-			</select>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="imgsize">{L_INCLUDE_DIMENSIONS}:</label><br /><span>{L_DIMENSIONS_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="imgsize" id="imgsize" onclick="display_options(1);" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="imgsize" onclick="display_options(0);" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<div id="img_dimensions">
-		<dl>
-			<dt><label for="imgwidth">{L_IMAGE_WIDTH}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
-			<dd><input type="text" name="imgwidth" value="{IMAGE_SIZE}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="imgheight">{L_IMAGE_HEIGHT}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
-			<dd><input type="text" name="imgheight" value="{IMAGE_HEIGHT}" /></dd>
-		</dl>
-	</div>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="button2" type="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_EDIT}</h1>
-
-	<p>{L_EDIT_EXPLAIN}</p>
-
-	<p>{L_SELECTED}: <strong>{SELECTED_TEMPLATE}</strong></p>
-
-	<form id="acp_styles" method="post" action="{U_ACTION}">
-
-	<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
-	<fieldset>
-		<legend>{L_SELECT}</legend>
-	<dl>
-		<dt><label for="template_file">{L_FILE}:</label></dt>
-		<dd><select id="template_file" name="template_file" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_TEMPLATES}</select> <input class="button2" type="submit" value="{L_SELECT}" /></dd>
-	</dl>
-	{S_FORM_TOKEN}
-	</fieldset>
-	<!-- ENDIF -->
-	</form>
-
-	<!-- IF TEMPLATE_FILE or (S_EDIT_THEME and S_THEME_IN_DB) -->
-		<script type="text/javascript" defer="defer">
-		// <![CDATA[
-
-			function change_editor_height(height)
-			{
-				height = Number(height);
-
-				if (isNaN(height))
-				{
-					return;
-				}
-
-				editor = document.getElementById('template_data');
-				editor.rows = Math.max(5, Math.min(height, 999));
-
-				append_text_rows('acp_styles', height);
-				append_text_rows('acp_template', height);
-			}
-
-			function append_text_rows(form_name, value)
-			{
-				value = Number(value);
-
-				if (isNaN(value))
-				{
-					return;
-				}
-
-				url = document.getElementById(form_name).action;
-
-				// Make sure &amp; is actually... &
-				url = url.replace(/&amp;/g, '&');
-
-				var_start = url.indexOf('&text_rows=');
-				if (var_start == -1)
-				{
-					document.getElementById(form_name).action = url + "&text_rows=" + value;
-				}
-				else
-				{
-					url_start = url.substring(0, var_start + 1);
-					var_end = url.substring(var_start + 1).indexOf('&');
-					if (var_end == -1)
-					{
-						document.getElementById(form_name).action = url_start + "text_rows=" + value;
-					}
-					else
-					{
-						document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value;
-					}
-				}
-			}
-
-		// ]]>
-		</script>
-
-		<form id="acp_template" method="post" action="{U_ACTION}">
-
-		<fieldset>
-			<legend>{L_EDITOR}</legend>
-		<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
-		<dl>
-			<dt><label>{L_SELECTED_FILE}:</label></dt>
-			<dd>{TEMPLATE_FILE}</dd>
-		</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label for="text_rows">{L_EDITOR_HEIGHT}:</label></dt>
-			<dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button2" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd>
-		</dl>
-		<textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea>
-		</fieldset>
-
-		<fieldset class="submit-buttons">
-			<legend>{L_SUBMIT}</legend>
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" />
-		</fieldset>
-		</form>
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_CACHE -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TEMPLATE_CACHE}</h1>
-
-	<p>{L_TEMPLATE_CACHE_EXPLAIN}</p>
-
-	<form name="acp_styles" method="post" action="{U_ACTION}">
-	<fieldset class="tabulated">
-	<legend>{L_TEMPLATE_CACHE}</legend>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_CACHE_FILENAME}</th>
-		<th>{L_CACHE_FILESIZE}</th>
-		<th>{L_CACHE_CACHED}</th>
-		<th>{L_CACHE_MODIFIED}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN file -->
-		<!-- IF file.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{file.U_VIEWSOURCE}" onclick="popup(this.href, 750, 550, '_source'); return false;">{file.FILENAME}</a></td>
-			<td>{file.FILESIZE}</td>
-			<td>{file.CACHED}</td>
-			<td>{file.MODIFIED}</td>
-			<td><input type="checkbox" class="radio" name="delete[]" value="{file.FILENAME}" /></td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr class="row1">
-			<td colspan="5">{L_TEMPLATE_CACHE_EMPTY}</td>
-		</tr>
-	<!-- END file -->
-	</tbody>
-	</table>
-
-	<p class="quick">
-		<span class="small"><a href="#" onclick="marklist('acp_styles', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('acp_styles', 'delete', false); return false;">{L_UNMARK_ALL}</a></span><br />
-		{S_FORM_TOKEN}
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_DELETE_MARKED}" />
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_EXPORT -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF S_ERROR_MSG -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="acp_styles" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TITLE}</legend>
-	<dl>
-		<dt><label>{L_NAME}:</label></dt>
-		<dd><strong>{NAME}</strong></dd>
-	</dl>
-	<!-- IF S_STYLE -->
-		<dl>
-			<dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="inc_template" value="0" /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="inc_theme" value="0" /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="inc_imageset" value="0" /> {L_NO}</label></dd>
-		</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="store">{L_DOWNLOAD_STORE}:</label><br /><span>{L_DOWNLOAD_STORE_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" id="store" name="store" value="1" checked="checked" /> {L_EXPORT_STORE}</label>
-			<label><input type="radio" class="radio" name="store" value="0" /> {L_EXPORT_DOWNLOAD}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="format">{L_ARCHIVE_FORMAT}:</label></dt>
-		<dd>{FORMAT_BUTTONS}</dd>
-	</dl>
-
-	<p class="quick">
-		{S_FORM_TOKEN}
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</p>
-	</fieldset>
-
-
-	</form>
-
-<!-- ELSEIF S_FRONTEND -->
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF S_STYLE --> <!-- DEFINE $COLSPAN = 5 --> <!-- ELSE --> <!-- DEFINE $COLSPAN = 4 --> <!-- ENDIF -->
-
-	<table cellspacing="1">
-		<col class="row1" /><!-- IF S_STYLE --><col class="row1" /><!-- ENDIF --><col class="row2" /><col class="row2" />
-	<thead>
-	<tr>
-		<th>{L_NAME}</th>
-		<!-- IF S_STYLE --><th>{L_STYLE_USED_BY}</th><!-- ENDIF -->
-		<th>{L_OPTIONS}</th>
-		<th>{L_ACTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td class="row3" colspan="{$COLSPAN}"><strong>{L_INSTALLED}</strong></td>
-	</tr>
-	<!-- BEGIN installed -->
-	<tr>
-		<td><strong>{installed.NAME}</strong><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
-		<!-- IF S_STYLE -->
-			<td style="text-align: center;">{installed.STYLE_COUNT}</td>
-		<!-- ENDIF -->
-		<td style="text-align: center;">
-			{installed.S_OPTIONS}
-		</td>
-		<td style="text-align: center;">
-			<!-- IF S_STYLE -->
-				<a href="{installed.U_STYLE_ACT_DEACT}">{installed.L_STYLE_ACT_DEACT}</a> |
-			<!-- ENDIF -->
-			{installed.S_ACTIONS}
-			<!-- IF S_STYLE -->
-				| <a href="{installed.U_PREVIEW}">{L_PREVIEW}</a>
-			<!-- ENDIF -->
-		</td>
-	</tr>
-	<!-- END installed -->
-	<tr>
-		<td class="row3" colspan="{$COLSPAN}"><strong>{L_UNINSTALLED}</strong></td>
-	</tr>
-	<!-- IF not .uninstalled -->
-		<tr>
-			<td class="row1" colspan="{$COLSPAN}" style="text-align: center;">{L_NO_UNINSTALLED}</td>
-		</tr>
-	<!-- ENDIF -->
-	<!-- BEGIN uninstalled -->
-		<tr>
-			<td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><strong>{uninstalled.NAME}</strong><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td>
-			<td style="text-align: center;" colspan="2"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td>
-		</tr>
-	<!-- END uninstalled -->
-	</tbody>
-	</table>
-
-	<!-- IF S_STYLE -->
-		<form id="acp_styles" method="post" action="{U_ACTION}">
-
-		<fieldset class="quick">
-			<legend>{L_CREATE}</legend>
-			{L_CREATE}: <input type="text" name="name" value="" /> {L_FROM} <select name="basis">{S_BASIS_OPTIONS}</select> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" />
-		</fieldset>
-
-		</form>
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_DETAILS -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF S_ERROR_MSG -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="acp_styles" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TITLE}</legend>
-	<dl>
-		<dt><label for="name">{L_NAME}:</label></dt>
-		<dd><!-- IF S_INSTALL --><strong id="name">{NAME}</strong><!-- ELSE --><input type="text" id="name" name="name" value="{NAME}" /><!-- ENDIF --></dd>
-	</dl>
-	<dl>
-		<dt><label for="copyright">{L_COPYRIGHT}:</label></dt>
-		<dd><!-- IF S_INSTALL --><strong id="copyright">{COPYRIGHT}</strong><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd>
-	</dl>
-	<!-- IF S_SUPERTEMPLATE -->
-	<dl>
-		<dt><label for="inheriting">{L_INHERITING_FROM}:</label></dt>
-		<dd><strong id="inheriting">{S_SUPERTEMPLATE}</strong></dd>
-	</dl>
-	<!-- ENDIF -->
-	<!-- IF S_STYLE and not S_BASIS -->
-		<dl>
-			<dt><label for="template_id">{L_STYLE_TEMPLATE}:</label></dt>
-			<dd><!-- IF S_INSTALL --><strong id="template_id">{TEMPLATE_NAME}</strong><!-- ELSE --><select id="template_id" name="template_id">{S_TEMPLATE_OPTIONS}</select><!-- ENDIF --></dd>
-		</dl>
-		<dl>
-			<dt><label for="theme_id">{L_STYLE_THEME}:</label></dt>
-			<dd><!-- IF S_INSTALL --><strong id="theme_id">{THEME_NAME}</strong><!-- ELSE --><select id="theme_id" name="theme_id">{S_THEME_OPTIONS}</select><!-- ENDIF --></dd>
-		</dl>
-		<dl>
-			<dt><label for="imageset_id">{L_STYLE_IMAGESET}:</label></dt>
-			<dd><!-- IF S_INSTALL --><strong id="imageset_id">{IMAGESET_NAME}</strong><!-- ELSE --><select id="imageset_id" name="imageset_id">{S_IMAGESET_OPTIONS}</select><!-- ENDIF --></dd>
-		</dl>
-	<!-- ENDIF -->
-	<!-- IF S_STYLE -->
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_OPTIONS}</legend>
-		<dl>
-			<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<!-- IF not S_STYLE_DEFAULT -->
-			<dl>
-				<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt>
-				<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label>
-					<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html
deleted file mode 100644
index e82aee0e87..0000000000
--- a/phpBB/adm/style/acp_update.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-	
-<!-- IF S_VERSION_CHECK -->
-
-	<h1>{L_VERSION_CHECK}</h1>
-
-	<p>{L_VERSION_CHECK_EXPLAIN}</p>
-
-	<!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO -->
-		<div class="successbox">
-			<p>{L_VERSION_UP_TO_DATE_ACP}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_VERSION_NOT_UP_TO_DATE_ACP}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend></legend>
-	<dl>
-		<dt><label>{L_CURRENT_VERSION}</label></dt>
-		<dd><strong><!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->{AUTO_VERSION}<!-- ELSE -->{CURRENT_VERSION}<!-- ENDIF --></strong></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_LATEST_VERSION}</label></dt>
-		<dd><strong>{LATEST_VERSION}</strong></dd>
-	</dl>
-	</fieldset>
-
-	<!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->
-		{L_UPDATE_INSTRUCTIONS_INCOMPLETE}
-		<br /><br />
-		{UPDATE_INSTRUCTIONS}
-		<br /><br />
-	<!-- ENDIF -->
-	<!-- IF not S_UP_TO_DATE -->
-		{UPDATE_INSTRUCTIONS}
-		<br /><br />
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
deleted file mode 100644
index 34e4147356..0000000000
--- a/phpBB/adm/style/acp_users.html
+++ /dev/null
@@ -1,230 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_SELECT_USER -->
-
-	<h1>{L_USER_ADMIN}</h1>
-
-	<p>{L_USER_ADMIN_EXPLAIN}</p>
-
-	<form id="select_user" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_SELECT_USER}</legend>
-	<dl>
-		<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
-		<dd><input class="text medium" type="text" id="username" name="username" /></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-		<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
-	</dl>
-
-	<p class="quick">
-		<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
-	</p>
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_SELECT_FORUM -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_USER_ADMIN}</h1>
-
-	<p>{L_USER_ADMIN_EXPLAIN}</p>
-
-	<form id="select_forum" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_USER_ADMIN_MOVE_POSTS}</legend>
-	<dl>
-		<dt><label for="new_forum">{L_USER_ADMIN_MOVE_POSTS}</label><br /><span>{L_MOVE_POSTS_EXPLAIN}</span></dt>
-		<dd><select id="new_forum" name="new_f">{S_FORUM_OPTIONS}</select></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="quick">
-		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_USER_ADMIN} :: {MANAGED_USERNAME}</h1>
-
-	<p>{L_USER_ADMIN_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="mode_select" method="post" action="{U_MODE_SELECT}">
-
-	<fieldset class="quick">
-		{L_SELECT_FORM}: <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- IF S_OVERVIEW -->
-
-<!-- INCLUDE acp_users_overview.html -->
-
-<!-- ELSEIF S_FEEDBACK -->
-
-<!-- INCLUDE acp_users_feedback.html -->
-
-<!-- ELSEIF S_PROFILE -->
-
-<!-- INCLUDE acp_users_profile.html -->
-
-<!-- ELSEIF S_PREFS -->
-
-<!-- INCLUDE acp_users_prefs.html -->
-
-<!-- ELSEIF S_AVATAR -->
-
-<!-- INCLUDE acp_users_avatar.html -->
-
-<!-- ELSEIF S_RANK -->
-
-	<form id="user_prefs" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_ACP_USER_RANK}</legend>
-	<dl>
-		<dt><label for="user_rank">{L_USER_RANK}:</label></dt>
-		<dd><select name="user_rank" id="user_rank">{S_RANK_OPTIONS}</select></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_SIGNATURE -->
-
-<!-- INCLUDE acp_users_signature.html -->
-
-<!-- ELSEIF S_GROUPS -->
-
-	<form id="user_groups" method="post" action="{U_ACTION}">
-
-	<table cellspacing="1">
-	<tbody>
-	<!-- BEGIN group -->
-		<!-- IF group.S_NEW_GROUP_TYPE -->
-		<tr>
-			<td class="row3" colspan="4"><strong>{group.GROUP_TYPE}</strong></td>
-		</tr>
-		<!-- ELSE -->
-			<!-- IF group.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-				<td><a href="{group.U_EDIT_GROUP}">{group.GROUP_NAME}</a></td>
-				<td><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --></td>
-				<td><!-- IF not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
-				<td><a href="{group.U_DELETE}">{L_GROUP_DELETE}</a></td>
-			</tr>
-		<!-- ENDIF -->
-	<!-- END group -->
-	</tbody>
-	</table>
-
-	<!-- IF S_GROUP_OPTIONS -->
-		<fieldset class="quick">
-			{L_USER_GROUP_ADD}: <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	<!-- ENDIF -->
-	</form>
-
-<!-- ELSEIF S_ATTACHMENTS -->
-
-	<form id="user_attachments" method="post" action="{U_ACTION}">
-
-
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF .attach -->
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_FILENAME}</th>
-		<th>{L_POST_TIME}</th>
-		<th>{L_FILESIZE}</th>
-		<th>{L_DOWNLOADS}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN attach -->
-		<!-- IF attach.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}: </strong><!-- ELSE --><strong>{L_POST}: </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>
-		<td style="text-align: center">{attach.POST_TIME}</td>
-		<td style="text-align: center">{attach.SIZE}</td>
-		<td style="text-align: center">{attach.DOWNLOAD_COUNT}</td>
-		<td style="text-align: center"><input type="checkbox" class="radio" name="mark[]" value="{attach.ATTACH_ID}" /></td>
-	</tr>
-	<!-- END attach -->
-	</tbody>
-	</table>
-	<!-- ELSE -->
-	<div class="errorbox">
-		<p>{L_USER_NO_ATTACHMENTS}</p>
-	</div>
-	<!-- ENDIF -->
-	<fieldset class="display-options">
-		{L_SORT_BY}: <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select>
-		<input class="button2" type="submit" value="{L_GO}" name="sort" />
-	</fieldset>
-	<hr />
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
-
-	<fieldset class="quick">
-		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
-		<p class="small"><a href="#" onclick="marklist('user_attachments', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('user_attachments', 'mark', false);">{L_UNMARK_ALL}</a></p>
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_PERMISSIONS -->
-
-	<div style="float: {S_CONTENT_FLOW_END};">
-		<a href="{U_USER_PERMISSIONS}">&raquo; {L_SET_USERS_PERMISSIONS}</a><br />
-		<a href="{U_USER_FORUM_PERMISSIONS}">&raquo; {L_SET_USERS_FORUM_PERMISSIONS}</a>
-	</div>
-
-	<form id="select_forum" method="post" action="{U_ACTION}">
-
-		<fieldset class="quick" style="text-align: left;">
-			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select>
-			<input class="button2" type="submit" value="{L_GO}" name="select" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	</form>
-
-	<div class="clearfix">&nbsp;</div>
-
-	<!-- INCLUDE permission_mask.html -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
deleted file mode 100644
index 20b5b60050..0000000000
--- a/phpBB/adm/style/acp_users_avatar.html
+++ /dev/null
@@ -1,76 +0,0 @@
-	<form id="avatar_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
-
-	<fieldset>
-		<legend>{L_ACP_USER_AVATAR}</legend>
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd>{AVATAR_IMAGE}</dd>
-		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
-	</dl>
-	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_CAN_UPLOAD -->
-			<dl> 
-				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-				<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_ALLOW_REMOTE -->
-			<dl>
-				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-				<dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>px</span></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_GALLERY -->
-			<dl> 
-				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
-				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_AVATAR_GALLERY}</legend>
-		<dl>
-			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
-			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-		</dl>
-		<dl>
-			<table cellspacing="1">
-			<!-- BEGIN avatar_row -->
-			<tr> 
-				<!-- BEGIN avatar_column -->
-					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
-				<!-- END avatar_column -->
-			</tr>
-			<tr>
-				<!-- BEGIN avatar_option_column -->
-					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-				<!-- END avatar_option_column -->
-			</tr>
-			<!-- END avatar_row -->
-			</table>
-		</dl>
-		</fieldset>
-		
-		<fieldset class="quick" style="margin-top: -15px;">
-			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-		</fieldset>
-	
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	
-	</form>
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html
deleted file mode 100644
index e11a8e6ec1..0000000000
--- a/phpBB/adm/style/acp_users_feedback.html
+++ /dev/null
@@ -1,76 +0,0 @@
-	<form id="list" method="post" action="{U_ACTION}">
-
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF .log -->
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_REPORT_BY}</th>
-		<th>{L_IP}</th>
-		<th>{L_TIME}</th>
-		<th>{L_FEEDBACK}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN log -->
-		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-			<td>{log.USERNAME}</td>
-			<td style="text-align: center;">{log.IP}</td>
-			<td style="text-align: center;">{log.DATE}</td>
-			<td>
-				{log.ACTION}
-				<!-- IF log.DATA --><br />&#187; <span class="gensmall">[ {log.DATA} ]</span><!-- ENDIF -->
-			</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
-		</tr>
-	<!-- END log -->
-	</tbody>
-	</table>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_NO_ENTRIES}</p>
-		</div>
-	<!-- ENDIF -->
-	
-	<fieldset class="display-options">
-		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
-		<input class="button2" type="submit" value="{L_GO}" name="sort" />
-	</fieldset>
-	<hr />
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_CLEARLOGS -->
-		<fieldset class="quick">
-			<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
-			<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
-			<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
-		</fieldset>
-	<!-- ENDIF -->
-
-	<h1>{L_ADD_FEEDBACK}</h1>
-
-	<p>{L_ADD_FEEDBACK_EXPLAIN}</p>
-
-	<fieldset>
-		<legend>{L_ACP_USER_FEEDBACK}</legend>
-		<dl>
-			<dd class="full"><textarea name="message" id="message" rows="10" cols="76"></textarea></dd>
-		</dl>
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</fieldset>
-	{S_FORM_TOKEN}
-	</form>
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
deleted file mode 100644
index e3eff369cc..0000000000
--- a/phpBB/adm/style/acp_users_overview.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<form id="user_overview" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_ACP_USER_OVERVIEW}</legend>
-<dl>
-	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
-	<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
-	<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
-</dl>
-<!-- IF S_USER_INACTIVE -->
-<dl>
-	<dt><label>{L_USER_IS_INACTIVE}:</label></dt>
-	<dd><strong>{USER_INACTIVE_REASON}</strong></dd>
-</dl>
-<!-- ENDIF -->
-<dl>
-	<dt><label>{L_REGISTERED}:</label></dt>
-	<dd><strong>{USER_REGISTERED}</strong></dd>
-</dl>
-<!-- IF S_USER_IP -->
-<dl>
-	<dt><label>{L_REGISTERED_IP}:</label></dt>
-	<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>
-	<dd>[ <a href="{U_WHOIS}" onclick="popup(this.href, 700, 500, '_whois'); return false;">{L_WHOIS}</a> ]</dd>
-</dl>
-<!-- ENDIF -->
-<dl>
-	<dt><label>{L_LAST_ACTIVE}:</label></dt>
-	<dd><strong>{USER_LASTACTIVE}</strong></dd>
-</dl>
-<dl>
-	<dt><label>{L_POSTS}:</label></dt>
-	<dd><strong>{USER_POSTS}</strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd>
-</dl>
-<dl>
-	<dt><label>{L_WARNINGS}:</label></dt>
-	<dd><strong>{USER_WARNINGS}</strong></dd>
-</dl>
-<dl>
-	<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="user_email">{L_EMAIL}:</label></dt>
-	<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" /></dd>
-</dl>
-<dl>
-	<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
-	<dd><input class="text medium" type="text" id="email_confirm" name="email_confirm" value="" /></dd>
-</dl>
-<dl>
-	<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
-	<dd><input type="password" id="new_password" name="new_password" value="" /></dd>
-</dl>
-<dl>
-	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
-	<dd><input type="password" id="password_confirm" name="password_confirm" value="" /></dd>
-</dl>
-
-<p class="quick">
-	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	<input type="hidden" name="action" value="" />
-	{S_FORM_TOKEN}
-</p>
-
-</fieldset>
-</form>
-
-<!-- IF not S_USER_FOUNDER or S_FOUNDER -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-
-		function display_reason(option)
-		{
-			if (option != 'banuser' && option != 'banemail' && option != 'banip')
-			{
-				dE('reasons', -1);
-				return;
-			}
-
-			dE('reasons', 1);
-
-			element = document.getElementById('user_quick_tools').ban_reason;
-
-			if (element.value && element.value != '{LA_USER_ADMIN_BAN_NAME_REASON}' && element.value != '{LA_USER_ADMIN_BAN_EMAIL_REASON}' && element.value != '{LA_USER_ADMIN_BAN_IP_REASON}')
-			{
-				return;
-			}
-
-			if (option == 'banuser')
-			{
-				element.value = '{LA_USER_ADMIN_BAN_NAME_REASON}';
-			}
-			else if (option == 'banemail')
-			{
-				element.value = '{LA_USER_ADMIN_BAN_EMAIL_REASON}';
-			}
-			else if (option == 'banip')
-			{
-				element.value = '{LA_USER_ADMIN_BAN_IP_REASON}';
-			}
-		}
-
-	// ]]>
-	</script>
-
-	<form id="user_quick_tools" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_USER_TOOLS}</legend>
-	<dl>
-		<dt><label for="quicktools">{L_QUICK_TOOLS}:</label></dt>
-		<dd><select id="quicktools" name="action" onchange="display_reason(this.options[this.selectedIndex].value);">{S_ACTION_OPTIONS}</select></dd>
-	</dl>
-	<div style="display: none;" id="reasons">
-		<dl>
-			<dt><label for="ban_reason">{L_BAN_REASON}:</label></dt>
-			<dd><input name="ban_reason" type="text" class="text medium" maxlength="3000" id="ban_reason" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}:</label></dt>
-			<dd><input name="ban_give_reason" type="text" class="text medium" maxlength="3000" id="ban_give_reason" /></dd>
-		</dl>
-	</div>
-		<!-- IF not S_OWN_ACCOUNT -->
-			<dl>
-				<dt><label for="delete_user">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
-				<dd><input type="checkbox" class="radio" name="delete" value="1" /></dd>
-				<dd><select id="delete_user" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
-			</dl>
-		<!-- ENDIF -->
-
-	<p class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</p>
-
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
deleted file mode 100644
index 07a9bc5c78..0000000000
--- a/phpBB/adm/style/acp_users_prefs.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<script type="text/javascript">
-// <![CDATA[
-	var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
-// ]]>
-</script>
-
-	<form id="user_prefs" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_UCP_PREFS_PERSONAL}</legend>
-	<dl> 
-		<dt><label for="viewemail">{L_SHOW_EMAIL}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="viewemail" value="0"<!-- IF not VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="massemail">{L_ADMIN_EMAIL}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="massemail" value="1"<!-- IF MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="massemail" value="0"<!-- IF not MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="allowpm">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="allowpm" value="1"<!-- IF ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="allowpm" value="0"<!-- IF not ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="hideonline">{L_HIDE_ONLINE}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="notifymethod">{L_NOTIFY_METHOD}:</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
-			<label><input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
-			<label><input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="notifypm">{L_NOTIFY_ON_PM}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="popuppm">{L_POPUP_ON_PM}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
-		<dd><select id="lang" name="lang">{S_LANG_OPTIONS}</select></dd>
-	</dl>
-	<dl> 
-		<dt><label for="style">{L_BOARD_STYLE}:</label></dt>
-		<dd><select id="style" name="style">{S_STYLE_OPTIONS}</select></dd>
-	</dl>
-	<dl> 
-		<dt><label for="tz">{L_BOARD_TIMEZONE}:</label></dt>
-		<dd><select id="tz" name="tz" style="width: 100%;">{S_TZ_OPTIONS}</select></dd>
-	</dl>
-	<dl> 
-		<dt><label for="dst">{L_BOARD_DST}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="dst" value="1"<!-- IF DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="dst" value="0"<!-- IF not DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
-		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
-		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_UCP_PREFS_POST}</legend>
-	<dl> 
-		<dt><label for="bbcode">{L_DEFAULT_BBCODE}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="smilies">{L_DEFAULT_SMILIES}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="sig">{L_DEFAULT_ADD_SIG}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="sig" value="1"<!-- IF ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="sig" value="0"<!-- IF not ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="notify">{L_DEFAULT_NOTIFY}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_UCP_PREFS_VIEW}</legend>
-	<dl> 
-		<dt><label for="view_images">{L_VIEW_IMAGES}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_images" value="0"<!-- IF not VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_flash">{L_VIEW_FLASH}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_flash" value="1"<!-- IF VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_flash" value="0"<!-- IF not VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_smilies">{L_VIEW_SMILIES}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_smilies" value="1"<!-- IF VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_smilies" value="0"<!-- IF not VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_sigs">{L_VIEW_SIGS}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_sigs" value="1"<!-- IF VIEW_SIGS --> id="view_sigs" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_sigs" value="0"<!-- IF not VIEW_SIGS --> id="view_sigss" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_avatars">{L_VIEW_AVATARS}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_avatars" value="1"<!-- IF VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_avatars" value="0"<!-- IF not VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_wordcensor" value="1"<!-- IF VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_wordcensor" value="0"<!-- IF not VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt>
-		<dd>{S_TOPIC_SORT_DAYS}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_TOPICS_KEY}:</label></dt>
-		<dd>{S_TOPIC_SORT_KEY}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_TOPICS_DIR}:</label></dt>
-		<dd>{S_TOPIC_SORT_DIR}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_POSTS_DAYS}:</label></dt>
-		<dd>{S_POST_SORT_DAYS}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_POSTS_KEY}:</label></dt>
-		<dd>{S_POST_SORT_KEY}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_POSTS_DIR}:</label></dt>
-		<dd>{S_POST_SORT_DIR}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-
-	</form>
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
deleted file mode 100644
index 0d1c6f8e46..0000000000
--- a/phpBB/adm/style/acp_users_profile.html
+++ /dev/null
@@ -1,66 +0,0 @@
-	<form id="user_profile" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_USER_PROFILE}</legend>
-	<dl>
-		<dt><label for="icq">{L_UCP_ICQ}:</label></dt>
-		<dd><input type="text" id="icq" name="icq" value="{ICQ}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="aim">{L_UCP_AIM}:</label></dt>
-		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="msn">{L_UCP_MSNM}:</label></dt>
-		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="yim">{L_UCP_YIM}:</label></dt>
-		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="jabber">{L_UCP_JABBER}:</label></dt>
-		<dd><input type="text" id="jabber" name="jabber" value="{JABBER}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="website">{L_WEBSITE}:</label></dt>
-		<dd><input type="text" id="website" name="website" value="{WEBSITE}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="location">{L_LOCATION}:</label></dt>
-		<dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="occupation">{L_OCCUPATION}:</label></dt>
-		<dd><textarea id="occupation" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></dd>
-	</dl>
-	<dl>
-		<dt><label for="interests">{L_INTERESTS}:</label></dt>
-		<dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>
-	</dl>
-	<dl> 
-		<dt><label for="birthday">{L_BIRTHDAY}:</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
-		<dd>{L_DAY}: <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}: <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}: <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
-	</dl>
-	</fieldset>
-
-	<!-- IF .profile_fields -->
-		<fieldset>
-			<legend>{L_USER_CUSTOM_PROFILE_FIELDS}</legend>
-		<!-- BEGIN profile_fields -->
-		<dl> 
-			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
-			<dd>{profile_fields.FIELD}</dd>
-			<!-- IF profile_fields.ERROR -->
-				<dd><span class="small" style="color: red;">{profile_fields.ERROR}</span></dd>
-			<!-- ENDIF -->
-		</dl>
-		<!-- END profile_fields -->
-		</fieldset>
-	<!-- ENDIF -->
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
deleted file mode 100644
index 239d35f119..0000000000
--- a/phpBB/adm/style/acp_users_signature.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<script type="text/javascript">
-// <![CDATA[
-
-	var form_name = 'user_signature';
-	var text_name = 'signature';
-
-	// Define the bbCode tags
-	var bbcode = new Array();
-	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
-	var imageTag = false;
-
-	// Helpline messages
-	var help_line = {
-		b: '{LA_BBCODE_B_HELP}',
-		i: '{LA_BBCODE_I_HELP}',
-		u: '{LA_BBCODE_U_HELP}',
-		q: '{LA_BBCODE_Q_HELP}',
-		c: '{LA_BBCODE_C_HELP}',
-		l: '{LA_BBCODE_L_HELP}',
-		o: '{LA_BBCODE_O_HELP}',
-		p: '{LA_BBCODE_P_HELP}',
-		w: '{LA_BBCODE_W_HELP}',
-		s: '{LA_BBCODE_S_HELP}',
-		f: '{LA_BBCODE_F_HELP}',
-		e: '{LA_BBCODE_E_HELP}',
-		d: '{LA_BBCODE_D_HELP}',
-		t: '{LA_BBCODE_T_HELP}',
-		tip: '{L_STYLES_TIP}'
-		<!-- BEGIN custom_tags -->
-			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
-		<!-- END custom_tags -->
-	}
-
-// ]]>
-</script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
-
-<form id="user_signature" method="post" action="{U_ACTION}">
-
-	<!-- IF SIGNATURE_PREVIEW -->
-		<fieldset>
-			<legend>{L_ADMIN_SIG_PREVIEW}</legend>
-			<p>{SIGNATURE_PREVIEW}</p>
-		</fieldset>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_SIGNATURE}</legend>
-		<p>{L_SIGNATURE_EXPLAIN}</p>
-
-		<div id="format-buttons">
-			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="t" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
-			<!-- IF S_BBCODE_IMG -->
-				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
-			<!-- ENDIF -->
-			<!-- IF S_LINKS_ALLOWED -->
-				<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseout="helpline('tip')" />
-			<!-- ENDIF -->
-			<!-- IF S_BBCODE_FLASH -->
-				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
-			<!-- ENDIF -->
-
-			{L_FONT_SIZE}: <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}" onmouseover="helpline('f')" onmouseout="helpline('tip')">
-				<option value="50">{L_FONT_TINY}</option>
-				<option value="85">{L_FONT_SMALL}</option>
-				<option value="100" selected="selected">{L_FONT_NORMAL}</option>
-				<option value="150">{L_FONT_LARGE}</option>
-				<option value="200">{L_FONT_HUGE}</option>
-			</select>
-		<!-- IF .custom_tags -->
-			<br /><br />
-			<!-- BEGIN custom_tags -->
-				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
-			<!-- END custom_tags -->
-		<!-- ENDIF -->
-
-		</div>
-
-		<p><input type="text" class="text full" style="border: 0; background: none;" name="helpbox" value="{L_STYLES_TIP}" /></p>
-
-		<dl>
-			<dt style="width: 90px;">
-				<script type="text/javascript">
-				// <![CDATA[
-					colorPalette('v', 12, 10);
-				// ]]>
-				</script>
-			</dt>
-			<dd style="margin-left: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></dd>
-			<dd style="margin-left: 90px; margin-top: 5px;">
-			<!-- IF S_BBCODE_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
-			<!-- ENDIF -->
-			<!-- IF S_SMILIES_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label>
-			<!-- ENDIF -->
-			<!-- IF S_LINKS_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
-			<!-- ENDIF -->
-			</dd>
-			<dd style="margin-left: 90px; margin-top: 10px;"><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
-		</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-</form>
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html
deleted file mode 100644
index 3fa4cfc91c..0000000000
--- a/phpBB/adm/style/acp_words.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT_WORD -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_ACP_WORDS}</h1>
-
-	<p>{L_ACP_WORDS_EXPLAIN}</p>
-
-	<form id="acp_words" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_EDIT_WORD}</legend>
-		<dl>
-			<dt><label for="word">{L_WORD}</label></dt>
-			<dd><input id="word" type="text" name="word" value="{WORD}" maxlength="255" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="replacement">{L_REPLACEMENT}</label></dt>
-			<dd><input id="replacement" type="text" name="replacement" value="{REPLACEMENT}" maxlength="255" /></dd>
-		</dl>
-		{S_HIDDEN_FIELDS}
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="save" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_WORDS}</h1>
-
-	<p>{L_ACP_WORDS_EXPLAIN}</p>
-
-	<form id="acp_words" method="post" action="{U_ACTION}">
-
-	<fieldset class="tabulated">
-	<legend>{L_ACP_WORDS}</legend>
-	<p class="quick">
-		{S_HIDDEN_FIELDS}
-		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}" />
-	</p>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_WORD}</th>
-		<th>{L_REPLACEMENT}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN words -->
-		<!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td style="text-align: center;">{words.WORD}</td>
-		<td style="text-align: center;">{words.REPLACEMENT}</td>
-		<td>&nbsp;<a href="{words.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{words.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
-	</tr>
-	<!-- BEGINELSE -->
-	<tr class="row3">
-		<td colspan="3">{L_ACP_NO_ITEMS}</td>
-	</tr>
-	<!-- END words -->
-	</tbody>
-	</table>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
deleted file mode 100644
index 344b5cacf0..0000000000
--- a/phpBB/adm/style/admin.css
+++ /dev/null
@@ -1,1644 +0,0 @@
-/*  phpBB 3.0 Admin Style Sheet
-	------------------------------------------------------------------------
-	Original author:	subBlue ( http://www.subblue.com/ )
-	Copyright 2007 phpBB Group ( http://www.phpbb.com/ )
-	------------------------------------------------------------------------
-*/
-
-/* General markup styles
----------------------------------------- */
-* {
-	/* Reset browsers default margin, padding and font sizes */
-	margin: 0;
-	padding: 0;
-	font-size: 100%;
-}
-
-body, div, p, th, td, li, dd {
-	font-size: x-small;
-	voice-family: "\"}\"";
-	voice-family: inherit;
-	font-size: small
-}
-
-html>body, html>div, html>p, html>th, html>td, html>li, html>dd {
-	font-size: small
-}
-
-html {
-	color: #536482;
-	background: #DBD7D1;
-	/* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-ie browsers */
-	height: 100%;
-	margin-bottom: 1px;
-}
-
-body {
-	/* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */
-	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	color: #536482;
-	background: #DBD7D1;
-	font-size: 62.5%;	/* This sets the default font size to be equivalent to 10px */
-	margin: 10px 15px;
-}
-
-img {
-	border: 0;
-}
-
-h1 {
-	font-family: "Trebuchet MS", Helvetica, sans-serif;
-	font-size: 1.70em;
-	font-weight: normal;
-	color: #333333;
-}
-
-h2, caption {
-	font-family: "Trebuchet MS", Helvetica, sans-serif;
-	font-size: 1.40em;
-	font-weight: normal;
-	color: #115098;
-	text-align: left;
-	margin-top: 25px;
-}
-
-.rtl h2, .rtl caption {
-	text-align: right;
-}
-
-h3, h4 {
-	font-family: "Trebuchet MS", Helvetica, sans-serif;
-	font-size: 1.20em;
-	text-decoration: none; 
-	line-height: 1.20em; 
-	margin-top: 25px;
-}
-
-p {
-	margin-bottom: 0.7em;
-	line-height: 1.40em;
-	font-size: 0.90em;
-}
-
-ul {
-	list-style: disc;
-	margin: 0 0 1em 2em;
-}
-
-.rtl ul {
-	margin: 0 2em 1em 0;
-}
-
-hr {
-	border: 0 none;
-	border-top: 1px dashed #999999;
-	margin-bottom: 5px;
-	padding-bottom: 5px;
-	height: 1px;
-}
-
-.small { 
-	font-size: 0.85em; 
-}
-
-/* General links  */
-a:link, a:visited {
-	color: #105289;
-	text-decoration: none;
-}
-
-a:hover {
-	color: #BC2A4D;
-	text-decoration: underline;
-}
-
-a:active {
-	color: #368AD2;
-	text-decoration: none;
-}
-
-.install-body p a {
-	font-weight: bold;
-}
-
-/* Main blocks
----------------------------------------- */
-#wrap {
-	padding: 0 0 15px 0;
-	min-width: 615px;
-}
-
-#page-header {
-	clear: both;
-	text-align: right;
-	background: url("../images/phpbb_logo.gif") top left no-repeat;
-	height: 49px;
-	font-size: 0.85em;
-	margin-bottom: 10px;
-}
-
-.rtl #page-header {
-	text-align: left;
-	background: url("../images/phpbb_logo.gif") top right no-repeat;
-}
-
-#page-header h1 {
-	color: #767676;
-	font-family: "Trebuchet MS",Helvetica,sans-serif;
-	font-size: 1.70em;
-	padding-top: 10px;
-}
-
-#page-header p {
-	font-size: 1.00em;
-}
-
-#page-header p#skip {
-	display: none;
-}
-
-#page-body {
-	clear: both;
-	min-width: 700px;
-}
-
-#page-footer {
-	clear: both;
-	font-size: 0.75em;
-	text-align: center;
-}
-
-#content {
-	padding: 30px 10px 10px;
-	position: relative;
-}
-
-#content h1 {
-	color: #115098;
-	line-height: 1.2em;
-	margin-bottom: 0;
-}
-
-#main {
-	float: left;
-	width: 76%;
-	margin: 0 0 0 3%;
-	min-height: 350px;
-}
-
-.rtl #main {
-	float: right;
-	margin: 0 3% 0 0;
-}
-
-* html #main { 
-	height: 350px; 
-}
-
-#page-body.simple-page-body {
-	padding: 0;
-	padding-right: 10px;
-	min-width: 0;
-}
-
-/* Tabbed menu
-	Based on: http://www.alistapart.com/articles/slidingdoors2/
-----------------------------------------*/
-#tabs {
-	line-height: normal;
-	margin: 0 0 -6px 7px;
-	min-width: 600px;
-}
-
-.rtl #tabs {
-	margin: 0 7px -6px 0;
-}
-
-#tabs ul {
-	margin:0;
-	padding: 0;
-	list-style: none;
-}
-
-#tabs li {
-	display: inline;
-	margin: 0;
-	padding: 0;
-	font-size: 0.85em;
-	font-weight: bold;
-}
-
-#tabs a {
-	float: left;
-	background:url("../images/bg_tabs1.gif") no-repeat 0% -34px;
-	margin: 0 1px 0 0;
-	padding: 0 0 0 7px;
-	text-decoration: none;
-	position: relative;
-}
-
-.rtl #tabs a {
-	float: right;
-}
-
-#tabs a span {
-	float: left;
-	display: block;
-	background: url("../images/bg_tabs2.gif") no-repeat 100% -34px;
-	padding: 7px 10px 4px 4px;
-	color: #767676;
-	white-space: nowrap;
-	font-family: Arial, Helvetica, sans-serif;
-	text-transform: uppercase;
-	font-weight: bold;
-}
-
-.rtl #tabs a span {
-	float: right;
-}
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-#tabs a span, .rtl #tabs a span { float:none;}
-/* End hack */
-
-#tabs a:hover span {
-	color: #BC2A4D;
-}
-
-#tabs #activetab a {
-	background-position: 0 0;
-	border-bottom: 1px solid #DCDEE2;
-}
-
-#tabs #activetab a span {
-	background-position: 100% 0;
-	padding-bottom: 5px;
-	color: #23649F;
-}
-
-#tabs a:hover {
-	background-position: 0 -69px;
-}
-
-#tabs a:hover span {
-	background-position: 100% -69px;
-}
-
-#tabs #activetab a:hover span {
-	color: #115098;
-}
-
-
-/* Main Panel
----------------------------------------- */
-#acp {
-	margin: 4px 0;
-	padding: 3px 1px;
-	min-width: 550px;
-	background-color: #FFFFFF;
-	border: 1px #999999 solid;
-}
-
-.panel {
-	background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top;
-	padding: 0;
-}
-
-span.corners-top, span.corners-bottom, 
-span.corners-top span, span.corners-bottom span {
-	font-size: 1px;
-	line-height: 1px;
-	display: block;
-	height: 5px;
-	background-repeat: no-repeat;
-}
-
-span.corners-top {
-	background-image: url("../images/corners_left.gif");
-	background-position: 0 0;
-	margin: -4px -2px 0;
-}
-
-span.corners-top span {
-	background-image: url("../images/corners_right.gif");
-	background-position: 100% 0;
-}
-
-span.corners-bottom {
-	background-image: url("../images/corners_left.gif");
-	background-position: 0 100%;
-	margin: 0 -2px -4px;
-	clear: both;
-}
-
-span.corners-bottom span {
-	background-image: url("../images/corners_right.gif");
-	background-position: 100% 100%;
-}
-
-/* WinIE tweaks \*/
-* html span.corners-top, * html span.corners-bottom { background-image: url("../images/corners_left.gif"); }
-* html span.corners-top span, * html span.corners-bottom span { background-image: url("../images/corners_right.gif"); }
-/* End tweaks */
-
-/* Sub-navigation Menu
----------------------------------------- */
-
-/* Toggle */
-#toggle {
-	padding: 5px;
-	width: 5%;
-	height: 100px;
-	position: absolute;
-	left: 15%;
-	top: 28px;
-	margin-left: 2px;
-}
-
-.rtl #toggle {
-	left: 75%;
-	margin-right: 0;
-	margin-left: 6px;
-}
-
-#toggle-handle {
-	display: block;
-	width: 18px;
-	height: 19px;
-	float: right;
-	background-image: url(../images/toggle.gif);
-}
-
-.rtl #toggle-handle {
-	background-image: url(../images/toggle.gif);
-	background-position: 100% 50%;
-}
-
-/* Menu */
-#menu {
-	float: left;
-	width: 20%;
-	font-size: 1.00em;
-	padding: 0;
-	border-right: 1px solid #CCCFD3;
-}
-
-.rtl #menu {
-	float: right;
-	border: none;
-	border-left: 1px solid #CCCFD3;
-}
-
-#menu p {
-	font-size: 0.85em;
-}
-
-#menu ul {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-
-/* Default list state */
-#menu li {
-	padding: 0;
-	margin: 0;
-	font-size: 0.85em;
-	font-weight: bold;
-	display: inline;
-}
-
-/* Link styles for the sub-section links */
-#menu li span {
-	display: block;
-	padding: 3px 3px 3px 8px;
-	margin: 1px 0;
-	text-decoration: none;
-	font-weight: normal;
-	color: #138ECB;
-}
-
-.rtl #menu li span {
-	padding: 3px 8px 3px 3px;
-}
-
-#menu li a:hover, #menu li a:hover span {
-	text-decoration: none;
-	background-color: #FFFFFF;
-	color: #BC2A4D;
-}
-
-#menu li a:active, #menu li a:active span {
-	color: #F632A0;
-}
-
-#menu li#activemenu a span {
-	text-decoration: none;
-	font-weight: bold;
-	color: #1180B7;
-	background: transparent url("../images/arrow_right.gif") 0% 50% no-repeat;
-}
-
-.rtl #menu li#activemenu a span {
-	background: transparent url("../images/arrow_left.gif") 100% 50% no-repeat;
-}
-
-#menu li#activemenu a:hover span, #menu li#activemenu span {
-	text-decoration: none;
-	font-weight: bold;
-	color: #BC2A4D;
-	background: #FFFFFF url("../images/arrow_right.gif") 1% 50% no-repeat;
-}
-
-.rtl #menu li#activemenu a:hover span, .rtl #menu li#activemenu span {
-	background: #FFFFFF url("../images/arrow_left.gif") 99% 50% no-repeat;
-}
-
-#menu li a:active, #menu li a:active span, #menu li#activemenu a:active span {
-	color: #F632A0;
-}
-
-#menu li span.completed {
-	text-decoration: none;
-	padding: 3px 3px 3px 12px;
-	background: url("../images/arrow_down.gif") 1% 50% no-repeat;
-}
-
-.rtl #menu li span.completed {
-	text-decoration: none;
-	padding: 3px 12px 3px 3px;
-	background: url("../images/arrow_down.gif") 99% 50% no-repeat;
-}
-
-#menu li.header {
-	font-family: Tahoma, Helvetica, sans-serif;
-	display: block;
-	font-weight: bold;
-	color: #115098;
-	border-bottom: 1px solid #327AA5;
-	padding: 4px 0 2px;
-	margin-top: 15px;
-	text-transform: uppercase;
-	font-size: 0.75em;
-}
-
-/* Table styles
----------------------------------------- */
-
-table {
-	width: 100%;
-	border: 1px solid #CCCFD3;
-	background-color: #FFFFFF;
-	padding: 1px;
-}
-
-th {
-	padding: 3px 4px;
-	color: #FFFFFF;
-	background: #70AED3 url("../images/gradient2b.gif") bottom left repeat-x;
-	border-top: 1px solid #6DACD2;
-	border-bottom: 1px solid #327AA5;
-	text-align: left;
-	font-size: 0.75em;
-	text-transform: uppercase;
-}
-
-td {
-	text-align: left;
-	font-size: 0.85em;
-	padding: 4px;
-	line-height: 1.20em;
-}
-
-.rtl th, .rtl td {
-	text-align: right;
-}
-
-table.type2 {
-	border: none;
-	background: none;
-	padding: 0;
-}
-
-table.type2 th {
-	background: none;
-	border-top: none;
-	text-align: center;
-	color: #115098;
-	padding: 2px 0;
-}
-
-table.type2 td {
-	padding: 0;
-	font-size: 1em;
-}
-
-table.type2 td.name {
-	padding: 2px;
-	vertical-align: middle;
-}
-
-table.type3  {
-	float: right;
-	width: 300px;
-	border: none;
-	background-color: transparent;
-	padding: 0;
-}
-
-.rtl table.type3 {
-	float: left;
-}
-
-table.type3 thead th {
-	background-color: transparent;
-	border-top: none;
-	text-align: center;
-	color: #115098;
-	padding: 0 3px;
-	font-size: 0.85em;
-	font-weight: normal;
-	text-transform: none;
-}
-
-table.type3 tbody th {
-	border-top: none;
-	text-align: left;
-	text-transform: none;
-	padding: 0;
-	border: none;
-	font-size: 0.90em;
-	font-weight: normal;
-	width: 100%;
-}
-
-.rtl table.type3 tbody th {
-	text-align: right;
-}
-
-table.type3 td {
-	text-align: center;
-	padding: 1px;
-}
-
-th.name {
-	text-align: left;
-	width: auto;
-}
-
-.rtl th.name {
-	text-align: right;
-}
-
-td.name {
-	text-align: left;
-	font-weight: bold;
-}
-
-.rtl td.name {
-	text-align: right;
-}
-
-.entry {
-	text-align: left;
-	font-weight: normal;
-}
-
-.rtl .entry {
-	text-align: right;
-}
-
-.row1 { background-color: #F9F9F9; }
-.row2 { background-color: #DCEBFE; }
-.row3 { background-color: #DBDFE2; }
-.row4 { background-color: #E4E8EB; }
-.col1 { background-color: #DCEBFE; }
-.col2 { background-color: #F9F9F9; }
-
-.spacer {
-	background-color: #DBDFE2;
-	height: 1px;
-	line-height: 1px;
-}
-
-/* General form styles
-----------------------------------------*/
-fieldset {
-	margin: 15px 0;
-	padding: 10px;
-	border-top: 1px solid #D7D7D7;
-	border-right: 1px solid #CCCCCC;
-	border-bottom: 1px solid #CCCCCC;
-	border-left: 1px solid #D7D7D7;
-	background-color: #FFFFFF;
-	position: relative;
-}
-
-.rtl fieldset {
-	border-top: 1px solid #D7D7D7;
-	border-right: 1px solid #D7D7D7;
-	border-bottom: 1px solid #CCCCCC;
-	border-left: 1px solid #CCCCCC;
-}
-
-* html fieldset {
-	padding: 0 10px 5px 10px;
-}
-
-fieldset p {
-	font-size: 0.85em;
-}
-
-legend {
-	padding: 1px 0;
-	font-family: Tahoma,arial,Verdana,Sans-serif;
-	font-size: .9em;
-	font-weight: bold;
-	color: #115098;
-	margin-top: -.4em;
-	position: relative;
-	text-transform: none;
-	line-height: 1.2em;
-	top: 0;
-	vertical-align: middle;
-}
-
-/* Hide from macIE \*/
-legend { top: -1.2em; }
-/* end */
-
-* html legend {
-	margin: 0 0 -10px -7px;
-	line-height: 1em;
-	font-size: .85em;
-}
-
-/* Holly hack, .rtl comes after html */
-* html .rtl legend {
-	margin: 0;
-	margin-right: -7px;
-}
-
-input, textarea {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 0.90em;
-	font-weight: normal;
-	cursor: text;
-	vertical-align: middle;
-	padding: 2px;
-	color: #111111;
-	border-left: 1px solid #AFAEAA;
-	border-top: 1px solid #AFAEAA;
-	border-right: 1px solid #D5D5C8;
-	border-bottom: 1px solid #D5D5C8;
-	background-color: #E3DFD8;
-}
-
-.rtl input, .rtl textarea {
-	border-left: 1px solid #D5D5C8;
-	border-top: 1px solid #AFAEAA;
-	border-right: 1px solid #AFAEAA;
-	border-bottom: 1px solid #D5D5C8;
-}
-
-input:hover, textarea:hover {
-	border-left: 1px solid #AFAEAA;
-	border-top: 1px solid #AFAEAA;
-	border-right: 1px solid #AFAEAA;
-	border-bottom: 1px solid #AFAEAA;
-	background-color: #E9E9E2;
-}
-
-input.langvalue, textarea.langvalue {
-	width: 90%;
-}
-
-optgroup, select {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 0.85em;
-	font-weight: normal;
-	font-style: normal;
-	cursor: pointer;
-	vertical-align: middle;
-	width: auto;
-	color: #000;
-}
-
-optgroup {
-	font-size: 1.00em;
-	font-weight: bold;
-}
-
-optgroup.disabled-options {
-	display: none;
-	background-color: gray;
-}
-
-option {
-	padding: 0 1em 0 0;
-	color: #000;
-}
-
-option.disabled-option {
-	color: graytext;
-}
-
-.rtl option {
-	padding: 0 0 0 1em;
-}
-
-.sep {
-	font-weight: bold;
-}
-
-.username-coloured {
-	font-weight: bold;
-}
-
-textarea {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 0.85em;
-	width: 60%;
-	padding: 2px;
-}
-
-label {
-	cursor: pointer;
-	font-size: 0.85em;
-	padding: 0 5px 0 0;
-}
-
-.rtl label {
-	padding: 0 0 0 5px;
-}
-
-label input {
-	font-size: 1.00em;
-	vertical-align: middle;
-}
-
-label img {
-	vertical-align: middle;
-}
-
-fieldset.quick, p.quick {
-	margin: 0 0 5px;
-	padding: 5px 0 0; 
-	border: none;
-	background-color: transparent;
-	text-align: right;
-}
-
-.rtl fieldset.quick, .rtl p.quick {
-	text-align: left;
-}
-
-fieldset.quick legend {
-	display: none;
-}
-
-fieldset.tabulated {
-	background: none;
-	margin: 0;
-	padding: 0;
-	padding-top: 5px;
-	border: 0;
-}
-
-fieldset.tabulated legend {
-	display: none;
-}
-
-fieldset.nobg {
-	margin: 15px 0 0 0;
-	padding: 0;
-	border: none;
-	background-color: transparent;
-}
-
-fieldset.display-options {
-	margin: 15px 0 2px 0;
-	padding: 0 0 4px 0;
-	border: none;
-	background-color: transparent;
-	text-align: center;
-	font-size: 0.75em;
-}
-
-fieldset.display-options select, fieldset.display-options input, fieldset.display-options label {
-	font-size: 1.00em;
-	vertical-align: middle;
-}
-
-select option.disabled {
-	background-color: #bbb;
-	color: #fff;
-}
-
-/* Special case inputs */
-select#board_timezone, 
-select#full_folder_action {
-	width: 95%;
-}
-
-/* Definition list layout for forms
-	Other general def. list properties defined in prosilver_main.css
----------------------------------------- */
-dl {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 1.00em;
-}
-
-dt {
-	float: left;
-	width: auto;
-}
-
-.rtl dt {
-	float: right;
-}
-
-dd { color: #666666;}
-dd + dd { padding-top: 5px;}
-dt span { padding: 0 5px 0 0;}
-.rtl dt span { padding: 0 0 0 5px;}
-
-dt .explain { font-style: italic;}
-
-dt label {
-	font-size: 1.00em;
-	text-align: left;
-	font-weight: bold;
-	color: #4A5A73;
-}
-
-.rtl dt label {
-	text-align: right;
-}
-
-dd label {
-	font-size: 1.00em;
-	white-space: nowrap;
-	margin: 0 10px 0 0;
-	color: #4A5A73;
-}
-
-.rtl dd label {
-	margin: 0 0 0 10px;
-}
-
-html>body dd label input { vertical-align: text-bottom;}	/* Tweak for Moz to align checkboxes/radio buttons nicely */
-
-dd input {
-	font-size: 1.00em;
-	max-width: 100%;
-}
-
-dd select {
-	font-size: 100%;
-	width: auto;
-	max-width: 100%;
-}
-
-dd textarea {
-	font-size: 0.90em;
-	width: 90%;
-}
-
-dd select {
-	width: auto;
-	font-size: 1.00em;
-}
-
-fieldset dl {
-	margin-bottom: 10px;
-	font-size: 0.85em;
-}
-
-fieldset dt {
-	width: 45%;
-	text-align: left;
-	border: none;
-	border-right: 1px solid #CCCCCC;
-	padding-top: 3px;
-}
-
-.rtl fieldset dt {
-	text-align: right;
-	border: none;
-	border-left: 1px solid #CCCCCC;
-}
-
-fieldset dd {
-	margin: 0 0 0 45%;
-	padding: 0 0 0 5px;
-	border: none;
-	border-left: 1px solid #CCCCCC;
-	vertical-align: top;
-	font-size: 1.00em;
-}
-
-.rtl fieldset dd {
-	margin: 0 45% 0 0;
-	padding: 0 5px 0 0;
-	border: none;
-	border-right: 1px solid #CCCCCC;
-}
-
-dd.full, .rtl dd.full {
-	margin: 0;
-	border: 0;
-	padding: 0;
-	padding-top: 3px;
-	text-align: center;
-	width: 95%;
-}
-
-/* Hover highlights for form rows */
-fieldset dl:hover dt, fieldset dl:hover dd {
-	border-color: #666666;
-}
-
-fieldset dl:hover dt label {
-	color: #000000;
-}
-
-fieldset dl dd label:hover {
-	color: #BC2A4D;
-}
-
-input:focus, textarea:focus {
-	border: 1px solid #BC2A4D;
-	background-color: #E9E9E2;
-	color: #BC2A4D;
-}
-
-/* Submit button fieldset or paragraph
----------------------------------------- */
-fieldset.submit-buttons {
-	text-align: center;
-	border: none;
-	background-color: transparent;
-	margin: 0;
-	padding: 4px;
-	margin-top: -1px;
-}
-
-p.submit-buttons {
-	text-align: center;
-	margin: 0;
-	padding: 4px;
-	margin-top: 10px;
-}
-
-fieldset.submit-buttons input, p.submit-buttons input {
-	padding: 3px 2px;
-}
-
-fieldset.submit-buttons legend {
-	display: none;
-}
-
-/* Input field styles
----------------------------------------- */
-
-input.radio, input.permissions-checkbox {
-	width: auto !important;
-	background-color: transparent;
-	border: none;
-	cursor: default;
-}
-
-input.full,
-textarea.full {
-	width: 99%;
-}
-
-* html input.full, * html textarea.full { width: 95%;}
-input.medium { width: 50%;}
-input.narrow { width: 25%;}
-input.tiny { width: 10%;}
-input.autowidth { width: auto !important;}
-.box2 .inputbox { background-color: #E9E9E9;}
-
-/* Form button styles
----------------------------------------- */
-a.button1, input.button1, input.button3,
-a.button2, input.button2 {
-	width: auto !important;
-	padding: 1px 3px 0 3px;
-	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	color: #000;
-	font-size: 0.85em;
-	background: #EFEFEF url("../images/bg_button.gif") repeat-x top;
-	cursor: pointer;
-}
-
-a.button1, input.button1 {
-	font-weight: bold;
-	border: 1px solid #666666;
-}
-
-/* Alternative button */
-a.button2, input.button2 {
-	border: 1px solid #666666;
-}
-
-/* <a> button in the style of the form buttons */
-a.button1, a.button1:link, a.button1:visited, a.button1:active,
-a.button2, a.button2:link, a.button2:visited, a.button2:active {
-	text-decoration: none;
-	color: #000000;
-	padding: 4px 8px;
-}
-
-/* Hover states */
-a.button1:hover, input.button1:hover,
-a.button2:hover, input.button2:hover {
-	border: 1px solid #BC2A4D;
-	background: #EFEFEF url("../images/bg_button.gif") repeat bottom;
-	color: #BC2A4D;
-}
-
-input.disabled {
-	font-weight: normal;
-	color: #666666;
-}
-
-/* Pagination
----------------------------------------- */
-.pagination {
-	height: 1%; /* IE tweak (holly hack) */
-	width: auto;
-	text-align: right;
-	margin-top: 5px;
-	font-size: 0.85em;
-	padding-bottom: 2px;
-}
-
-.rtl .pagination {
-	text-align: left;
-}
-
-.pagination strong,
-.pagination b {
-	font-weight: normal;
-}
-
-.pagination span.page-sep {
-	display:none;
-}
-
-.pagination span strong {
-	padding: 0 2px;
-	margin: 0 2px;
-	font-weight: normal;
-	font-size: 0.85em;
-	color: #FFFFFF;
-	background: #4692BF;
-	border: 1px solid #4692BF;
-}
-
-.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active {
-	font-weight: normal;
-	font-size: 0.85em;
-	text-decoration: none;
-	color: #5C758C;
-	margin: 0 2px;
-	padding: 0 2px;
-	background: #ECEDEE;
-	border: 1px solid #B4BAC0;
-}
-
-.pagination span a:hover {
-	border-color: #368AD2;
-	background: #368AD2;
-	color: #FFFFFF;
-	text-decoration: none;
-}
-
-.pagination img {
-	vertical-align: middle;
-}
-
-
-/* Action Highlighting
----------------------------------------- */
-.successbox, .errorbox {
-	padding: 8px;
-	margin: 10px 0;
-	color: #FFFFFF;
-	text-align: center;
-}
-
-.success {
-	color: #228822;
-}
-
-.error {
-	color: #BC2A4D;
-}
-
-.successbox {
-	background-color: #228822;
-}
-
-.errorbox {
-	background-color: #BC2A4D;
-}
-
-* html .errorbox, * html .successbox { height: 1%; } /* Pixel shift fix for IE */
-
-.successbox h3, .errorbox h3 {
-	color: #FFFFFF;
-	margin: 0 0 0.5em;
-	font-size: 1.10em;
-	font-family: "Lucida Grande",Verdana,Helvetica,Arial,sans-serif;
-}
-
-.successbox p, .errorbox p {
-	color: #FFFFFF;
-	font-size: 0.85em;
-	margin-bottom: 0;
-}
-
-.errorbox a:link, .errorbox a:active, .errorbox a:visited,
-.successbox a:link, .successbox a:active, .successbox a:visited {
-	color: #DBD7D1;
-	text-decoration: underline;
-	font-weight: bold;
-}
-
-.errorbox a:hover, .successbox a:hover {
-	color: #FFFFFF;
-	text-decoration: none;
-	font-weight: bold;
-}
-
-.notice {
-	background-color: #62A5CC;
-}
-
-/* Special cases for the error page */
-#errorpage #page-header a {
-	font-weight: bold;
-	line-height: 6em;
-}
-
-#errorpage #content {
-	padding-top: 10px;
-}
-
-#errorpage #content h1 {
-	color: #DF075C;
-}
-
-#errorpage #content h2 {
-	margin-top: 20px;
-	margin-bottom: 5px;
-	border-bottom: 1px solid #CCCCCC;
-	padding-bottom: 5px;
-	color: #333333;
-}
-
-/* Tooltip for permission roles */
-.tooltip {
-	width: 200px;
-	color: #000;
-	text-align: center;
-	border: 1px solid #AAA;
-}
-
-.tooltip span.top {
-	background: #EFEFEF;
-	font-weight: bold;
-	padding: 2px;
-}
-
-.tooltip span.bottom {
-	padding: 5px;
-	color: #000000;
-	background: #FFFFFF;
-}
-
-/*
- Format Buttons for signature editor
-*/
-#format-buttons {
-	margin: 15px 0 2px 0;
-}
-
-#format-buttons input, #format-buttons select {
-	vertical-align: middle;
-}
-
-/* Nice method for clearing floated blocks without having to insert any extra markup
-	From http://www.positioniseverything.net/easyclearing.html 
-.clearfix:after, #tabs:after, .row:after, #content:after, fieldset dl:after, #page-body:after {
-	content: "."; 
-	display: block; 
-	height: 0; 
-	clear: both; 
-	visibility: hidden;
-}*/
-
-.clearfix, #tabs, .row, #content, fieldset dl, #page-body {
-	height: 1%;
-	overflow: hidden;
-}
-
-/* Syntax Highlighting
----------------------------------------- */
-.sourcenum {
-	color: gray;
-	font-family: Monaco, 'Courier New', monospace;
-	font-size: 1.25em;
-	font-weight: bold;
-	line-height: 1.20em;
-	text-align: right;
-	padding: 0;
-}
-
-.rtl .sourcenum {
-	text-align: left;
-}
-
-.source {
-	font-family: Monaco, 'Courier New', monospace;
-	font-size: 1.25em;
-	line-height: 1.20em;
-	padding: 0;
-}
-
-.syntaxbg {
-	color: #FFFFFF;
-}
-
-.syntaxcomment {
-	color: #FF8000;
-}
-
-.syntaxdefault {
-	color: #0000BB;
-}
-
-.syntaxhtml {
-	color: #000000;
-}
-
-.syntaxkeyword {
-	color: #007700;
-}
-
-.syntaxstring {
-	color: #DD0000;
-}
-
-/* Permission interface
----------------------------------------- */
-
-fieldset.permissions legend {
-	text-transform: none;
-}
-
-fieldset.permissions legend input{
-	height: 1.1em;
-}
-
-/* Permission sections */ 
-fieldset.permissions .permissions-simple {
-	text-align: left;
-	padding-top: 3px;
-}
-
-.rtl fieldset.permissions .permissions-simple {
-	text-align: right;
-}
-
-fieldset.permissions .permissions-advanced {
-	padding: 10px 0 0 5px;
-	vertical-align: top;
-	clear: right;
-}
-
-.rtl fieldset.permissions .permissions-advanced {
-	padding: 10px 5px 0 0;
-	clear: left;
-}
-
-fieldset.permissions .permissions-switch {
-	float: right;
-}
-
-.rtl fieldset.permissions .permissions-switch {
-	float: left;
-}
-
-fieldset.permissions .padding {
-}
-
-.permissions-switch {
-	margin-top: -6px;
-	font-size: .9em;
-}
-
-.permissions-switch a {
-	text-decoration: underline;
-}
-
-.permissions-reset {
-	padding-bottom: 10px;
-}
-
-.permissions-reset a {
-	font-size: .85em;
-}
-
-/* Tabbed menu */
-.permissions-category {
-	line-height: normal;
-	margin: 0 0 -1px 7px;
-	min-width: 570px;
-	font-size: 0.85em;
-}
-
-.rtl .permissions-category {
-	margin: 0 7px -1px 0;
-}
-
-.permissions-category ul {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-.permissions-category li {
-	display: inline;
-	margin: 0;
-	padding: 0;
-	font-size: 1em;
-	font-weight: bold;
-}
-
-.permissions-category a {
-	float: left;
-	background: url("../images/bg_tabs_alt1.gif") no-repeat 0% -35px;
-	margin: 0 1px 0 0;
-	padding: 0 0 0 6px;
-	text-decoration: none;
-	position: relative;
-}
-
-.rtl .permissions-category a {
-	float: right;
-}
-
-.permissions-category a span.tabbg {
-	float: left;
-	display: block;
-	background: url("../images/bg_tabs_alt2.gif") no-repeat 100% -35px;
-	padding: 7px 12px 6px 6px;
-	color: #536482;
-	white-space: nowrap;
-}
-
-.rtl .permissions-category a span.tabbg {
-	float: right;
-}
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-.permissions-category a span.tabbg, .rtl .permissions-category a span.tabbg { float: none;}
-/* End hack */
-
-.permissions-category a:hover span.tabbg {
-	color: #DD6900;
-}
-
-.permissions-category .activetab a {
-	background-position: 0 0;
-}
-
-.permissions-category .activetab a span.tabbg {
-	background-position: 100% 0;
-	padding-bottom: 7px;
-	color: #333333;
-}
-
-.permissions-category a:hover {
-	background-position: 0 -70px;
-}
-
-.permissions-category a:hover span.tabbg {
-	background-position: 100% -70px;
-}
-
-.permissions-category .activetab a:hover span.tabbg {
-	color: #333333;
-	background-position: 100% 0;
-}
-
-.permissions-category .activetab a:hover {
-	background-position: 0 0;
-}
-
-.permissions-category a span.colour {
-	border: 1px solid #536482;
-	display: block;
-	float: left;
-	width: 10px;
-	height: 10px;
-	margin: 0 5px 0 0;
-}
-
-/* Most browsers will have to live with a left aligned icon in RTL mode, as (currently) only Firefox 3.0 Alpha 3 renders it correctly without destroying it
-.rtl .permissions-category a span.colour {
-	float: right;
-	margin: 0 0 0 5px;
-}
-*/
-
-.permissions-category .activetab span.colour {
-	border-color: #333333;
-}
-
-.permissions-category a:hover span.colour {
-	border-color: #DD6900;
-}
-
-.permissions-category .activetab a:hover span.colour {
-	border-color: #333333;
-}
-
-/* Permission preset colours */
-.permissions-preset-yes span.colour,
-.yes {
-	background-color: #86F786;
-}
-
-.permissions-preset-custom span.colour {
-	background-color: #B2BBDD;
-}
-
-.permissions-preset-never span.colour {
-	background-color: #DD0000;
-}
-
-.permissions-preset-no span.colour,
-.never {
-	background-color: #EFB0B2;
-}
-
-/* Permission panel
----------------------------------------- */
-.permissions-panel {
-	float: left;
-	background-color: #CADCEB;
-	width: 100%;
-}
-
-.rtl .permissions-panel {
-	float: right;
-}
-
-.permissions-panel span.corners-top {
-	background-image: url("../images/corners_left2.gif");
-}
-
-.permissions-panel span.corners-top span {
-	background-image: url("../images/corners_right2.gif");
-}
-
-.permissions-panel span.corners-bottom {
-	background-image: url("../images/corners_left2.gif");
-}
-
-.permissions-panel span.corners-bottom span {
-	background-image: url("../images/corners_right2.gif");
-}
-
-.permissions-panel span.corners-top, .permissions-panel span.corners-bottom, 
-.permissions-panel span.corners-top span, .permissions-panel span.corners-bottom span {
-	font-size: 1px;
-	line-height: 1px;
-	display: block;
-	height: 5px;
-	background-repeat: no-repeat;
-}
-
-.permissions-panel span.corners-top {
-	background-image: url("../images/corners_left2.gif");
-	background-position: 0 0;
-	margin: 0 0;
-}
-
-.permissions-panel span.corners-top span {
-	background-image: url("../images/corners_right2.gif");
-	background-position: 100% 0;
-}
-
-.permissions-panel span.corners-bottom {
-	background-image: url("../images/corners_left2.gif");
-	background-position: 0 100%;
-	margin: 0 0;
-	clear: both;
-}
-
-.permissions-panel span.corners-bottom span {
-	background-image: url("../images/corners_right2.gif");
-	background-position: 100% 100%;
-}
-
-/* Permission table
----------------------------------------- */
-.permissions-panel .tablewrap {
-	margin: 0 10px;
-}
-
-.permissions-panel table {
-	width: 100%;
-}
-
-.permissions-panel th {
-	text-transform: none;
-}
-
-.permissions-panel th.value {
-	text-align: center;
-}
-
-.permissions-panel th.name {
-	text-align: left;
-	width: auto;
-	text-transform: none;
-}
-
-.rtl .permissions-panel th.name {
-	text-align: right;
-}
-
-.permissions-panel th.permissions-name {
-	border: none;
-	color: #536482;
-	font-weight: normal;
-}
-
-.permissions-panel th.permissions-name a.trace {
-	display: inline;
-}
-
-.permissions-panel th.row3 {
-	background-image: none;
-	background-color: #D1D7DC;
-	color: #536482;
-	border: none;
-}
-
-.permissions-panel th.row4 {
-	background-image: none;	
-	background-color: #E4E8EB;
-	color: #536482;
-	border: none;
-}
-
-.permissions-panel th a:link, .permissions-panel th a:hover, .permissions-panel th a:visited {
-	display: block;
-	color: #FFFFFF; 
-	text-decoration: underline; 
-}
-
-.permissions-panel td.permissions-yes label:hover {
-	background-color: #86F786;
-}
-
-.permissions-panel td.permissions-no label:hover {
-	background-color: #EFB0B2;
-}
-
-.permissions-panel td.permissions-never label:hover {
-	background-color: #DD0000;
-}
-
-.permissions-panel td {
-	padding: 0;
-	text-align: center;
-	width: 10%;
-}
-
-.permissions-panel td label {
-	display: block;
-	margin: 0;
-	padding: 0;
-}
-
-/* Classes for additional tasks
----------------------------------------- */
-
-.phpinfo {
-	overflow: auto;
-	width: 99%;
-	direction: ltr;
-}
-
-.phpinfo td, .phpinfo th, .phpinfo h2, .phpinfo h1 {
-	text-align: left;
-}
diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html
deleted file mode 100644
index a714386e51..0000000000
--- a/phpBB/adm/style/captcha_default_acp_demo.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<dl>
-	<dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
-	<dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd>
-</dl>
\ No newline at end of file
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html
deleted file mode 100644
index ff1500e7d0..0000000000
--- a/phpBB/adm/style/captcha_gd_acp.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_VC_SETTINGS}</h1>
-
-<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
-
-
-<form id="acp_captcha" method="post" action="{U_ACTION}">
-
-<fieldset>
-<legend>{L_GENERAL_OPTIONS}</legend>
-
-<dl>
-	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}:</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd>
-</dl>
-
-
-</fieldset>
-<fieldset>
-	<legend>{L_PREVIEW}</legend>
-<!-- IF PREVIEW -->
-	<div class="successbox">
-		<h3>{L_WARNING}</h3>
-		<p>{L_CAPTCHA_PREVIEW_MSG}</p>
-	</div>
-<!-- ENDIF -->
-{CAPTCHA_PREVIEW}
-</fieldset>
-
-<fieldset class="submit-buttons">
-	<legend>{L_SUBMIT}</legend>
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
-	<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" />
-	<input type="hidden" name="configure" value="1" />
-
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html
deleted file mode 100644
index f325c3727d..0000000000
--- a/phpBB/adm/style/captcha_recaptcha.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- IF S_RECAPTCHA_AVAILABLE -->
-	<dl>
-		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
-		// <![CDATA[
-		var RecaptchaOptions = {
-		   lang : {L_RECAPTCHA_LANG}
-		};
-		// ]]>
-		</script>
-
-	<noscript>
-  		<iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br/>
-  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
-	</noscript>
-	</dl>
-<!-- ELSE -->
-{L_RECAPTCHA_NOT_AVAILABLE}
-<!-- ENDIF -->
\ No newline at end of file
diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html
deleted file mode 100644
index 07751d1d03..0000000000
--- a/phpBB/adm/style/captcha_recaptcha_acp.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_VC_SETTINGS}</h1>
-
-<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
-
-
-<form id="acp_captcha" method="post" action="{U_ACTION}">
-
-<fieldset>
-<legend>{L_GENERAL_OPTIONS}</legend>
-
-<dl>
-	<dt><label for="recaptcha_pubkey">{L_RECAPTCHA_PUBLIC}:</label><br /><span>{L_RECAPTCHA_PUBLIC_EXPLAIN}</span></dt>
-	<dd><input id="recaptcha_pubkey" name="recaptcha_pubkey" value="{RECAPTCHA_PUBKEY}" size="50" type="text" /></dd>
-</dl>
-<dl>
-	<dt><label for="recaptcha_privkey">{L_RECAPTCHA_PRIVATE}:</label><br /><span>{L_RECAPTCHA_PRIVATE_EXPLAIN}</span></dt>
-	<dd><input id="recaptcha_privkey" name="recaptcha_privkey" value="{RECAPTCHA_PRIVKEY}" size="50" type="text" /></dd>
-</dl>
-
-
-</fieldset>
-<fieldset>
-	<legend>{L_PREVIEW}</legend>
-<!-- IF PREVIEW -->
-	<div class="successbox">
-		<h3>{L_WARNING}</h3>
-		<p>{L_CAPTCHA_PREVIEW_MSG}</p>
-	</div>
-<!-- ENDIF -->
-{CAPTCHA_PREVIEW}
-</fieldset>
-
-<fieldset class="submit-buttons">
-	<legend>{L_SUBMIT}</legend>
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
-	<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" />
-	<input type="hidden" name="configure" value="1" />
-
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
deleted file mode 100644
index c9e89980d8..0000000000
--- a/phpBB/adm/style/colour_swatch.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<title>{L_COLOUR_SWATCH}</title>
-
-<style type="text/css">
-/* <![CDATA[ */
-	body {
-		background-color: #404040;
-		color: #fff;
-	}
-
-	td {
-		border: solid 1px #333; 
-	}
-
-	.over { 
-		border-color: white; 
-	}
-
-	.out {
-		border-color: #333333; 
-	}
-
-	img {
-		border: 0;
-	}
-/* ]]> */
-</style>
-</head>
-
-<body>
-
-<script type="text/javascript">
-// <![CDATA[
-	var r = 0, g = 0, b = 0;
-
-	var numberList = new Array(6);
-	numberList[0] = '00';
-	numberList[1] = '33';
-	numberList[2] = '66';
-	numberList[3] = '99';
-	numberList[4] = 'CC';
-	numberList[5] = 'FF';
-
-	document.writeln('<table cellspacing="0" cellpadding="0" border="0">');
-
-	for (r = 0; r < 6; r++)
-	{
-		document.writeln('<tr>');
-
-		for (g = 0; g < 6; g++)
-		{
-			for (b = 0; b < 6; b++)
-			{
-				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td style="background-color: #' + color + ';" onmouseover="this.className=\'over\'" onmouseout="this.className=\'out\'">');
-				document.write('<a href="#" onclick="cell(\'' + color + '\'); return false;"><img src="{T_IMAGES_PATH}spacer.gif" width="15" height="12" alt="#' + color + '" title="#' + color + '" \/><\/a>');
-				document.writeln('<\/td>');
-			}
-		}
-		document.writeln('<\/tr>');
-	}
-	document.writeln('<\/table>');
-
-	function cell(color)
-	{
-		opener.document.forms["{OPENER}"].{NAME}.value = color;
-	}
-// ]]>
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/phpBB/adm/style/confirm_body.html b/phpBB/adm/style/confirm_body.html
deleted file mode 100644
index 2fbb1a60d7..0000000000
--- a/phpBB/adm/style/confirm_body.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
-
-<fieldset>
-	<h1>{MESSAGE_TITLE}</h1>
-	<p>{MESSAGE_TEXT}</p>
-
-	{S_HIDDEN_FIELDS}
-
-	<div style="text-align: center;">
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
-	</div>
-
-</fieldset>
-		
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/confirm_body_prune.html b/phpBB/adm/style/confirm_body_prune.html
deleted file mode 100644
index 9481386231..0000000000
--- a/phpBB/adm/style/confirm_body_prune.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
-
-<fieldset>
-	<h1>{MESSAGE_TITLE}</h1>
-	<p>{MESSAGE_TEXT}</p>
-
-	{S_HIDDEN_FIELDS}
-
-	<div style="text-align: center;">
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
-	</div>
-
-	<h2>{L_PRUNE_USERS_LIST}</h2>
-	<!-- IF S_DEACTIVATE --><p>{L_PRUNE_USERS_LIST_DEACTIVATE}</p><!-- ELSE --><p>{L_PRUNE_USERS_LIST_DELETE}</p><!-- ENDIF -->
-
-	<br />
-	<!-- BEGIN users -->
-	&raquo; <a href="{users.U_PROFILE}">{users.USERNAME}</a><!-- IF users.U_USER_ADMIN --> [<a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a>]<!-- ENDIF --><br />
-	<!-- END users -->
-
-	<br /><br />
-
-</fieldset>
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html
deleted file mode 100644
index 351397d3c7..0000000000
--- a/phpBB/adm/style/custom_profile_fields.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-<!-- BEGIN dropdown -->
-	<select name="{dropdown.FIELD_IDENT}" id="{dropdown.FIELD_IDENT}">
-		<!-- BEGIN options --><option value="{dropdown.options.OPTION_ID}"{dropdown.options.SELECTED}>{dropdown.options.VALUE}</option><!-- END options -->
-	</select>
-<!-- END dropdown -->
-
-<!-- BEGIN text -->
-	<textarea name="{text.FIELD_IDENT}" id="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}">{text.FIELD_VALUE}</textarea>
-<!-- END text -->
-
-<!-- BEGIN string -->
-	<input type="text" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
-<!-- END string -->
-
-<!-- BEGIN bool -->
-	<!-- IF bool.FIELD_LENGTH eq 1 -->
-		<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}</label> <!-- END options -->
-	<!-- ELSE -->
-		<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}" value="1"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> />
-	<!-- ENDIF -->
-<!-- END bool -->
-
-<!-- BEGIN int -->
-	<input type="text" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
-<!-- END int -->
-
-<!-- BEGIN date -->
-	<span>{L_DAY}:</span> <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select>
-	<span>{L_MONTH}:</span> <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select>
-	<span>{L_YEAR}:</span> <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select>
-<!-- END date -->
diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
deleted file mode 100644
index 93d0059609..0000000000
--- a/phpBB/adm/style/editor.js
+++ /dev/null
@@ -1,399 +0,0 @@
-/**
-* bbCode control by subBlue design [ www.subBlue.com ]
-* Includes unixsafe colour palette selector by SHS`
-*/
-
-// Startup variables
-var imageTag = false;
-var theSelection = false;
-
-// Check for Browser & Platform for PC & IE specific bits
-// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
-var clientPC = navigator.userAgent.toLowerCase(); // Get client info
-var clientVer = parseInt(navigator.appVersion); // Get browser version
-
-var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
-var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
-
-var baseHeight;
-window.onload = initInsertions;
-
-/**
-* Shows the help messages in the helpline window
-*/
-function helpline(help)
-{
-	document.forms[form_name].helpbox.value = help_line[help];
-}
-
-/**
-* Fix a bug involving the TextRange object. From
-* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/ 
-function initInsertions() 
-{
-	var doc;
-	if(document.forms[form_name])
-	{
-		doc = document;
-	}
-	else
-	{
-		doc = opener.document;
-	}
-
-	var textarea = doc.forms[form_name].elements[text_name];
-	if (is_ie && typeof(baseHeight) != 'number')
-	{
-		textarea.focus();
-		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
-		// document.body.focus();
-	}
-}
-
-/**
-* bbstyle
-*/
-function bbstyle(bbnumber)
-{
-	if (bbnumber != -1)
-	{
-		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	}
-	else
-	{
-		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();		
-	}
-}
-
-/**
-* Apply bbcodes
-*/
-function bbfontstyle(bbopen, bbclose)
-{
-	theSelection = false;
-		
-	var textarea = document.forms[form_name].elements[text_name];
-
-	textarea.focus();
-
-	if ((clientVer >= 4) && is_ie && is_win)
-	{
-		// Get text selection
-		theSelection = document.selection.createRange().text;
-
-		if (theSelection)
-		{
-			// Add tags around selection
-			document.selection.createRange().text = bbopen + theSelection + bbclose;
-			document.forms[form_name].elements[text_name].focus();
-			theSelection = '';
-			return;
-		}
-	}
-	else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0))
-	{
-		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);
-		document.forms[form_name].elements[text_name].focus();
-		theSelection = '';
-		return;
-	}
-	
-	//The new position for the cursor after adding the bbcode
-	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;		
-
-	// Open tag
-	insert_text(bbopen + bbclose);
-
-	// Center the cursor when we don't have a selection
-	// Gecko and proper browsers
-	if (!isNaN(textarea.selectionStart))
-	{
-		textarea.selectionStart = new_pos;
-		textarea.selectionEnd = new_pos;
-	}	
-	// IE
-	else if (document.selection)
-	{
-		var range = textarea.createTextRange(); 
-		range.move("character", new_pos); 
-		range.select();
-		storeCaret(textarea);
-	}
-
-	textarea.focus();
-	return;
-}
-
-/**
-* Insert text at position
-*/
-function insert_text(text, spaces, popup)
-{
-	var textarea;
-	
-	if (!popup)
-	{
-		textarea = document.forms[form_name].elements[text_name];
-	}
-	else
-	{
-		textarea = opener.document.forms[form_name].elements[text_name];
-	}
-
-	if (spaces)
-	{
-		text = ' ' + text + ' ';
-	}
-
-	if (!isNaN(textarea.selectionStart))
-	{
-		var sel_start = textarea.selectionStart;
-		var sel_end = textarea.selectionEnd;
-
-		mozWrap(textarea, text, '')
-		textarea.selectionStart = sel_start + text.length;
-		textarea.selectionEnd = sel_end + text.length;
-	}	
-	
-	else if (textarea.createTextRange && textarea.caretPos)
-	{
-		if (baseHeight != textarea.caretPos.boundingHeight) 
-		{
-			textarea.focus();
-			storeCaret(textarea);
-		}
-		var caret_pos = textarea.caretPos;
-		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-		
-	}
-	else
-	{
-		textarea.value = textarea.value + text;
-	}
-
-	if (!popup)
-	{
-		textarea.focus();
-	}
-
-}
-
-/**
-* Add inline attachment at position
-*/
-function attach_inline(index, filename)
-{
-	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
-	document.forms[form_name].elements[text_name].focus();
-}
-
-/**
-* Add quote text to message
-*/
-function addquote(post_id, username)
-{
-	var message_name = 'message_' + post_id;
-	var theSelection = '';
-	var divarea = false;
-
-	if (document.all)
-	{
-		divarea = document.all[message_name];
-	}
-	else
-	{
-		divarea = document.getElementById(message_name);
-	}
-
-	// Get text selection - not only the post content :(
-	if (window.getSelection)
-	{
-		theSelection = window.getSelection().toString();
-	}
-	else if (document.getSelection)
-	{
-		theSelection = document.getSelection();
-	}
-	else if (document.selection)
-	{
-		theSelection = document.selection.createRange().text;
-	}
-
-	if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
-	{
-		if (divarea.innerHTML)
-		{
-			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
-			theSelection = theSelection.replace(/<br\/>/ig, '\n');
-			theSelection = theSelection.replace(/&lt\;/ig, '<');
-			theSelection = theSelection.replace(/&gt\;/ig, '>');
-			theSelection = theSelection.replace(/&amp\;/ig, '&');			
-		}
-		else if (document.all)
-		{
-			theSelection = divarea.innerText;
-		}
-		else if (divarea.textContent)
-		{
-			theSelection = divarea.textContent;
-		}
-		else if (divarea.firstChild.nodeValue)
-		{
-			theSelection = divarea.firstChild.nodeValue;
-		}
-	}
-
-	if (theSelection)
-	{
-		insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
-	}
-
-	return;
-}
-
-/**
-* From http://www.massless.org/mozedit/
-*/
-function mozWrap(txtarea, open, close)
-{
-	var selLength = txtarea.textLength;
-	var selStart = txtarea.selectionStart;
-	var selEnd = txtarea.selectionEnd;
-	var scrollTop = txtarea.scrollTop;
-
-	if (selEnd == 1 || selEnd == 2) 
-	{
-		selEnd = selLength;
-	}
-
-	var s1 = (txtarea.value).substring(0,selStart);
-	var s2 = (txtarea.value).substring(selStart, selEnd)
-	var s3 = (txtarea.value).substring(selEnd, selLength);
-
-	txtarea.value = s1 + open + s2 + close + s3;
-	txtarea.selectionStart = selEnd + open.length + close.length;
-	txtarea.selectionEnd = txtarea.selectionStart;
-	txtarea.focus();
-	txtarea.scrollTop = scrollTop;
-
-	return;
-}
-
-/**
-* Insert at Caret position. Code from
-* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
-*/
-function storeCaret(textEl)
-{
-	if (textEl.createTextRange)
-	{
-		textEl.caretPos = document.selection.createRange().duplicate();
-	}
-}
-
-/**
-* Color pallette
-*/
-function colorPalette(dir, width, height)
-{
-	var r = 0, g = 0, b = 0;
-	var numberList = new Array(6);
-	var color = '';
-
-	numberList[0] = '00';
-	numberList[1] = '40';
-	numberList[2] = '80';
-	numberList[3] = 'BF';
-	numberList[4] = 'FF';
-
-	document.writeln('<table class="type2">');
-
-	for (r = 0; r < 5; r++)
-	{
-		if (dir == 'h')
-		{
-			document.writeln('<tr>');
-		}
-
-		for (g = 0; g < 5; g++)
-		{
-			if (dir == 'v')
-			{
-				document.writeln('<tr>');
-			}
-			
-			for (b = 0; b < 5; b++)
-			{
-				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td bgcolor="#' + color + '">');
-				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" onmouseover="helpline(\'s\');"  onmouseout="helpline(\'tip\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
-				document.writeln('</td>');
-			}
-
-			if (dir == 'v')
-			{
-				document.writeln('</tr>');
-			}
-		}
-
-		if (dir == 'h')
-		{
-			document.writeln('</tr>');
-		}
-	}
-	document.writeln('</table>');
-}
-
-
-/**
-* Caret Position object
-*/
-function caretPosition()
-{
-	var start = null;
-	var end = null;
-}
-
-
-/**
-* Get the caret position in an textarea
-*/
-function getCaretPosition(txtarea)
-{
-	var caretPos = new caretPosition();
-	
-	// simple Gecko/Opera way
-	if (txtarea.selectionStart || txtarea.selectionStart == 0)
-	{
-		caretPos.start = txtarea.selectionStart;
-		caretPos.end = txtarea.selectionEnd;
-	}
-	// dirty and slow IE way
-	else if (document.selection)
-	{
-		// get current selection
-		var range = document.selection.createRange();
-
-		// a new selection of the whole textarea
-		var range_all = document.body.createTextRange();
-		range_all.moveToElementText(txtarea);
-		
-		// calculate selection start point by moving beginning of range_all to beginning of range
-		var sel_start;
-		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
-		{
-			range_all.moveStart('character', 1);
-		}
-	
-		txtarea.sel_start = sel_start;
-	
-		// we ignore the end value for IE, this is already dirty enough and we don't need it
-		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;			
-	}
-
-	return caretPos;
-}
\ No newline at end of file
diff --git a/phpBB/adm/style/install/convert.html b/phpBB/adm/style/install/convert.html
deleted file mode 100644
index a9ff57da29..0000000000
--- a/phpBB/adm/style/install/convert.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!-- INCLUDE install/header.html -->
-
-<!-- IF S_NOT_INSTALLED -->
-
-	<h1>{TITLE}</h1>
-
-	<p>{BODY}</p>
-
-<!-- ELSE -->
-
-	<form id="install_convert" method="post" action="{U_ACTION}">
-
-	<h1>{TITLE}</h1>
-
-	<p>{BODY}</p>
-
-	<!-- IF S_ERROR_BOX -->
-	<div class="errorbox">
-		<h3>{ERROR_TITLE}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_LIST -->
-		<table cellspacing="1">
-			<caption>{L_AVAILABLE_CONVERTORS}</caption>
-			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-		<thead>
-		<tr>
-			<th>{L_SOFTWARE}</th>
-			<th>{L_VERSION}</th>
-			<th>{L_AUTHOR}</th>
-			<th>{L_OPTIONS}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- IF .convertors -->
-			<!-- BEGIN convertors -->
-			<tr>
-				<td>{convertors.SOFTWARE}</td>
-				<td>{convertors.VERSION}</td>
-				<td>{convertors.AUTHOR}</td>
-				<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
-			</tr>
-			<!-- END convertors -->
-		<!-- ELSE -->
-			<tr>
-				<td>{L_NO_CONVERTORS}</td>
-				<td>-</td>
-				<td>-</td>
-				<td>-</td>
-			</tr>
-		<!-- ENDIF -->
-		</tbody>
-		</table>
-	<!-- ENDIF -->
-
-	<!-- IF S_CONTINUE -->
-		</form>
-
-		<fieldset class="submit-buttons">
-			<form method="post" action="{U_NEW_ACTION}">
-				<input class="button1" type="submit" name="submit_new" value="{L_NEW}" />
-			</form>
-			<br />
-			<form method="post" action="{U_CONTINUE_ACTION}">
-				<input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}" />
-			</form>
-		</fieldset>
-
-		<form method="post" action="{U_ACTION}">
-	<!-- ENDIF -->
-
-	<!-- IF .checks -->
-		<fieldset>
-
-		<!-- BEGIN checks -->
-			<!-- IF checks.S_LEGEND -->
-				<!-- IF not checks.S_FIRST_ROW -->
-				</fieldset>
-
-				<fieldset>
-				<!-- ENDIF -->
-					<legend>{checks.LEGEND}</legend>
-					<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-			<!-- ELSE -->
-
-				<dl>
-					<dt><label>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-					<dd>{checks.RESULT}</dd>
-				</dl>
-			<!-- ENDIF -->
-		<!-- END checks -->
-
-		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF .options -->
-		<fieldset>
-
-		<!-- BEGIN options -->
-			<!-- IF options.S_LEGEND -->
-				<!-- IF not options.S_FIRST_ROW -->
-					</fieldset>
-
-					<fieldset>
-				<!-- ENDIF -->
-					<legend>{options.LEGEND}</legend>
-			<!-- ELSE -->
-
-				<dl>
-					<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-					<dd>{options.CONTENT}</dd>
-				</dl>
-
-			<!-- ENDIF -->
-		<!-- END options -->
-
-		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF L_SUBMIT -->
-		<!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF -->
-
-		<fieldset class="submit-buttons">
-			{S_HIDDEN}
-			<!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
-		</fieldset>
-	<!-- ENDIF -->
-
-	</form>
-<!-- ENDIF -->
-
-<!-- INCLUDE install/footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install/error.html b/phpBB/adm/style/install/error.html
deleted file mode 100644
index f6982650c8..0000000000
--- a/phpBB/adm/style/install/error.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- INCLUDE install/header.html -->
-
-<div class="errorbox">
-	<h3>{MESSAGE_TITLE}</h3>
-	<p>{MESSAGE_TEXT}</p>
-</div>
-
-<!-- INCLUDE install/footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install/footer.html b/phpBB/adm/style/install/footer.html
deleted file mode 100644
index 2ec3581ef4..0000000000
--- a/phpBB/adm/style/install/footer.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-					</div>
-				</div>
-			<span class="corners-bottom"><span></span></span>
-		</div>
-		</div>
-	</div>
-	
-	<!--
-		We request you retain the full copyright notice below including the link to www.phpbb.com.
-		This not only gives respect to the large amount of time given freely by the developers
-		but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
-		the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-		"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-		forums may be affected.
-	
-		The phpBB Group : 2006
-	// -->
-	
-	<div id="page-footer">
-		Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
-	</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/phpBB/adm/style/install/header.html b/phpBB/adm/style/install/header.html
deleted file mode 100644
index fbb6a7b409..0000000000
--- a/phpBB/adm/style/install/header.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<!-- IF META -->{META}<!-- ENDIF -->
-<title>{PAGE_TITLE}</title>
-
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-<script type="text/javascript">
-// <![CDATA[
-
-/**
-* Set display of page element
-* s[-1,0,1] = hide,toggle display,show
-*/
-function dE(n, s, type)
-{
-	if (!type)
-	{
-		type = 'block';
-	}
-
-	var e = document.getElementById(n);
-	if (!s)
-	{
-		s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
-	}
-	e.style.display = (s == 1) ? type : 'none';
-}
-
-// ]]>
-</script>
-
-</head>
-
-<body class="{S_CONTENT_DIRECTION}">
-<div id="wrap">
-	<div id="page-header">
-		<h1>{L_INSTALL_PANEL}</h1>
-		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
-		<!-- IF S_LANG_SELECT -->
-		<form method="post" action="">
-			<fieldset class="nobg">
-				<label for="language">{L_SELECT_LANG}:</label>
-				{S_LANG_SELECT}
-				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
-			</fieldset>
-		</form>
-		<!-- ENDIF -->
-	</div>
-	
-	<div id="page-body">
-		<div id="tabs">
-			<ul>
-			<!-- BEGIN t_block1 -->
-				<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
-			<!-- END t_block1 -->
-			</ul>
-		</div>
-
-		<div id="acp">
-		<div class="panel">
-			<span class="corners-top"><span></span></span>
-				<div id="content">
-					<div id="menu">
-						<ul>
-						<!-- BEGIN l_block1 -->
-							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
-						<!-- END l_block1 -->
-						<!-- BEGIN l_block2 -->
-							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>
-						<!-- END l_block2 -->
-						</ul>
-					</div>
-	
-					<div id="main" class="install-body">
diff --git a/phpBB/adm/style/install/install.html b/phpBB/adm/style/install/install.html
deleted file mode 100644
index a08b52eb7a..0000000000
--- a/phpBB/adm/style/install/install.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!-- INCLUDE install/header.html -->
-
-<!-- IF S_SUB eq 'intro' -->
-
-	<h1>{L_INSTALL_INTRO}</h1>
-	<p>{L_INSTALL_INTRO_BODY}</p>
-
-
-	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-	<fieldset class="submit-buttons">
-		<legend>{L_NEXT_STEP}</legend>
-		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_SUB eq 'requirements' -->
-	<h1>{L_REQUIREMENTS_TITLE}</h1>
-	<p>{L_REQUIREMENTS_EXPLAIN}</p>
-
-	<!-- INCLUDE install/snippet_checks.html -->
-
-	<!-- IF S_FAILED -->
-
-		<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-		<fieldset class="submit-buttons">
-			<legend>{L_INSTALL_TEST}</legend>
-			<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_INSTALL_TEST}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-
-		<form id="install_install" method="post" action="{U_ACTION_TEST}" onsubmit="submit.disabled = 'disabled';">
-
-		<fieldset class="submit-buttons" style="float: left;">
-			<legend>{L_INSTALL_TEST}</legend>
-			<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_INSTALL_TEST}" />
-		</fieldset>
-
-		</form>
-
-		<form id="install_start" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-		<fieldset class="submit-buttons" style="float: right;">
-			<legend>{L_INSTALL_START}</legend>
-			{S_HIDDEN}
-			<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_INSTALL_START}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_SUB eq 'database' -->
-
-	<!-- IF S_CONNECT_TEST -->
-		<fieldset>
-			<legend>{L_DB_CONNECTION}</legend>
-
-		<!-- IF S_SUCCESS -->
-			<dl>
-				<dt>{L_DB_TEST}:</dt>
-				<dd><strong style="color:green">{L_SUCCESSFUL_CONNECT}</strong></dd>
-			</dl>
-		<!-- ELSE -->
-			<dl>
-				<dt>{L_DB_TEST}:</dt>
-				<dd><strong style="color:red">{ERROR}</strong></dd>
-			</dl>
-		<!-- ENDIF -->
-		</fieldset>
-	<!-- ENDIF -->
-
-	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-	<!-- INCLUDE install/snippet_options.html -->
-
-	<fieldset class="submit-buttons">
-		<legend>{L_NEXT_STEP}</legend>
-		{S_HIDDEN}
-		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-<!-- ELSEIF S_SUB eq 'administrator' -->
-
-	<!-- INCLUDE install/snippet_checks.html -->
-
-	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-	<!-- INCLUDE install/snippet_options.html -->
-
-	<fieldset class="submit-buttons">
-		<legend>{L_NEXT_STEP}</legend>
-		{S_HIDDEN}
-		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_SUB eq 'config_file' -->
-
-	<!-- IF S_WRITTEN -->
-		<p>{L_CONFIG_FILE_WRITTEN}</p>
-
-		<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-		<fieldset class="submit-buttons">
-			<legend>{L_NEXT_STEP}</legend>
-			{S_HIDDEN}
-			<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-		<p>{L_CONFIG_FILE_UNABLE_WRITE}</p>
-
-		<h1>{L_DL_CONFIG}</h1>
-		<p>{L_DL_CONFIG_EXPLAIN}</p>
-
-		<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-		<fieldset class="submit-buttons">
-			<legend>{L_DL_CONFIG}</legend>
-			{S_HIDDEN}
-			<input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}" />&nbsp;<input class="button1" type="submit" id="dldone" name="dldone" value="{L_DONE}" />
-		</fieldset>
-
-		</form>
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_SUB eq 'advanced' -->
-
-	<p>{L_STAGE_ADVANCED_EXPLAIN}</p>
-
-	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-	<!-- INCLUDE install/snippet_options.html -->
-
-	<fieldset class="submit-buttons">
-		<legend>{L_NEXT_STEP}</legend>
-		{S_HIDDEN}
-		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_SUB eq 'create_table' -->
-
-	<p>{L_STAGE_CREATE_TABLE_EXPLAIN}</p>
-
-	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-	<fieldset class="submit-buttons">
-		<legend>{L_NEXT_STEP}</legend>
-		{S_HIDDEN}
-		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_SUB eq 'final' -->
-
-	<!-- INCLUDE install/snippet_checks.html -->
-
-	<h1>{L_INSTALL_CONGRATS}</h1>
-
-	<p>{L_BODY}</p>
-
-	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-	<fieldset class="submit-buttons">
-		<legend>{L_INSTALL_LOGIN}</legend>
-		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_INSTALL_LOGIN}" />
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
-
-
-<!-- INCLUDE install/footer.html -->
diff --git a/phpBB/adm/style/install/main.html b/phpBB/adm/style/install/main.html
deleted file mode 100644
index 64c1a58f37..0000000000
--- a/phpBB/adm/style/install/main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- INCLUDE install/header.html -->
-
-	<h1>{TITLE}</h1>
-	<p>{BODY}</p>
-
-<!-- INCLUDE install/footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install/snippet_checks.html b/phpBB/adm/style/install/snippet_checks.html
deleted file mode 100644
index 2b711bb77c..0000000000
--- a/phpBB/adm/style/install/snippet_checks.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- IF .checks -->
-	<fieldset>
-	<!-- BEGIN checks -->
-		<!-- IF checks.S_LEGEND -->
-			<!-- IF not checks.S_FIRST_ROW -->
-			</fieldset>
-
-			<fieldset>
-			<!-- ENDIF -->
-				<legend>{checks.LEGEND}</legend>
-				<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-		<!-- ELSE -->
-
-			<dl>
-				<dt>{checks.TITLE}:<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-				<dd>{checks.RESULT}</dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- END checks -->
-	</fieldset>
-<!-- ENDIF -->
diff --git a/phpBB/adm/style/install/snippet_options.html b/phpBB/adm/style/install/snippet_options.html
deleted file mode 100644
index a887a1da83..0000000000
--- a/phpBB/adm/style/install/snippet_options.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- IF .options -->
-	<fieldset>
-
-	<!-- BEGIN options -->
-		<!-- IF options.S_LEGEND -->
-			<!-- IF not options.S_FIRST_ROW -->
-				</fieldset>
-		
-				<fieldset>
-			<!-- ENDIF -->
-				<legend>{options.LEGEND}</legend>
-		<!-- ELSE -->
-
-			<dl>
-				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-				<dd>{options.CONTENT}</dd>
-			</dl>
-
-		<!-- ENDIF -->
-	<!-- END options -->
-
-	</fieldset>
-<!-- ENDIF -->
diff --git a/phpBB/adm/style/install/update.html b/phpBB/adm/style/install/update.html
deleted file mode 100644
index bf60207e46..0000000000
--- a/phpBB/adm/style/install/update.html
+++ /dev/null
@@ -1,374 +0,0 @@
-<!-- INCLUDE install/header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-	function popup(url, width, height, name)
-	{
-		if (!name)
-		{
-			name = '_popup';
-		}
-
-		window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
-		return false;
-	}
-
-	function diff_popup(url)
-	{
-		popup(url, 950, 600, '_diff');
-		return false;
-	}
-// ]]>
-</script>
-
-<!-- IF S_ERROR -->
-	<div class="errorbox" style="margin-top: 0;">
-		<h3>{L_NOTICE}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_IN_PROGRESS -->
-
-	<div class="successbox" style="margin-top: 0;">
-		<h3>{L_IN_PROGRESS}</h3>
-		<p>{L_IN_PROGRESS_EXPLAIN}</p>
-	</div>
-
-<!-- ELSEIF S_INTRO -->
-
-	<!-- IF S_WARNING -->
-	<div class="successbox" style="margin-top: 0;">
-		<h3>{L_NOTICE}</h3>
-		<p>{WARNING_MSG}</p>
-	</div>
-	<!-- ENDIF -->
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<h1>{L_UPDATE_INSTALLATION}</h1>
-	<p>{L_UPDATE_INSTALLATION_EXPLAIN}</p>
-
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
-
-<!-- IF S_VERSION_CHECK -->
-
-	<h1>{L_VERSION_CHECK}</h1>
-
-	<p>{L_VERSION_CHECK_EXPLAIN}</p>
-
-	<!-- IF S_UP_TO_DATE -->
-		<div class="successbox">
-			<p>{L_VERSION_UP_TO_DATE}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_VERSION_NOT_UP_TO_DATE}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend></legend>
-	<dl>
-		<dt><label>{L_CURRENT_VERSION}</label></dt>
-		<dd><strong>{CURRENT_VERSION}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_LATEST_VERSION}</label></dt>
-		<dd><strong>{LATEST_VERSION}</strong></dd>
-	</dl>
-	<!-- IF PACKAGE_VERSION and not S_UP_TO_DATE -->
-	<dl>
-		<dt><label>{L_PACKAGE_UPDATES_TO}</label></dt>
-		<dd><strong>{PACKAGE_VERSION}</strong></dd>
-	</dl>
-	<!-- ENDIF -->
-	</fieldset>
-
-	<!-- IF not S_UP_TO_DATE -->
-
-		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<p>{L_UPDATE_DATABASE_EXPLAIN}</p>
-			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-		<form id="install_update" method="post" action="{U_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<p>{L_CHECK_FILES_UP_TO_DATE}</p>
-			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
-		</fieldset>
-
-		</form>
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_DB_UPDATE -->
-
-	<!-- IF not S_DB_UPDATE_FINISHED -->
-
-		<h1>{L_PERFORM_DATABASE_UPDATE}</h1>
-
-		<p>
-			{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
-		</p>
-
-		<br /><br />
-
-		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<a href="{U_DB_UPDATE}" class="button1">{L_RUN_DATABASE_SCRIPT}</a>
-
-			<!-- input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" / -->
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-
-		<h1>{L_UPDATE_DB_SUCCESS}</h1>
-
-		<br /><br />
-
-		<form id="install_update" method="post" action="{U_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<p>{L_CHECK_FILES_EXPLAIN}</p>
-			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_FILE_CHECK -->
-
-	<!-- IF S_ALL_UP_TO_DATE -->
-
-		<div class="successbox">
-			<h3>{L_UPDATE_SUCCESS}</h3>
-			<p>{L_ALL_FILES_UP_TO_DATE}</p>
-		</div>
-
-	<!-- ELSE -->
-		<h1>{L_COLLECTED_INFORMATION}</h1>
-
-		<p>{L_COLLECTED_INFORMATION_EXPLAIN}</p>
-
-		<!-- IF S_NO_UPDATE_FILES -->
-			<div class="errorbox">
-				<h3>{L_NO_UPDATE_FILES}</h3>
-
-				<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
-
-				<strong>{NO_UPDATE_FILES}</strong>
-
-			</div>
-		<!-- ENDIF -->
-
-		<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
-
-		<!-- IF .up_to_date -->
-			<h2>{L_FILES_UP_TO_DATE}</h2>
-			<p>{L_FILES_UP_TO_DATE_EXPLAIN}</p>
-
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_up_to_date.gif" alt="{L_STATUS_UP_TO_DATE}" /></legend>
-			<!-- BEGIN up_to_date -->
-				<dl>
-					<dd class="full" style="text-align: left;"><strong>{up_to_date.FILENAME}</strong></dd>
-				</dl>
-			<!-- END up_to_date -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<!-- IF .new -->
-			<h2>{L_FILES_NEW}</h2>
-			<p>{L_FILES_NEW_EXPLAIN}</p>
-
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
-			<!-- BEGIN new -->
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br /><!-- ENDIF -->{new.FILE_PART}</strong>
-					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-				</dt>
-				<dd style="margin-left: 60%;">
-					<!-- IF not new.S_BINARY -->[ <a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>
-					<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-				</dd>
-				<!-- IF new.S_CUSTOM -->
-					<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-				<!-- ENDIF -->
-				</dl>
-			<!-- END new -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<!-- IF .not_modified -->
-			<h2>{L_FILES_NOT_MODIFIED}</h2>
-			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
-			<p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
-
-			<fieldset id="not_modified" style="display: none;">
-				<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
-			<!-- BEGIN not_modified -->
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong>
-						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-					</dt>
-					<dd style="margin-left: 60%;"><!-- IF not not_modified.S_BINARY -->[ <a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
-					<!-- IF not_modified.S_CUSTOM -->
-						<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-					<!-- ENDIF -->
-				</dl>
-			<!-- END not_modified -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<!-- IF .modified -->
-			<h2>{L_FILES_MODIFIED}</h2>
-			<p>{L_FILES_MODIFIED_EXPLAIN}</p>
-
-			<!-- BEGIN modified -->
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong>
-					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-				</dt>
-				<dd style="margin-left: 60%;">&nbsp;</dd>
-				<!-- IF modified.S_CUSTOM -->
-					<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-				<!-- ENDIF -->
-				</dl>
-				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
-					<dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[ <a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
-				</dl>
-				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-					<dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-				</dl>
-				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-					<dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-				</dl>
-			</fieldset>
-			<!-- END modified -->
-
-		<!-- ENDIF -->
-
-		<!-- IF .new_conflict -->
-			<h2>{L_FILES_NEW_CONFLICT}</h2>
-			<p>{L_FILES_NEW_CONFLICT_EXPLAIN}</p>
-
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_new_conflict.gif" alt="{L_STATUS_NEW_CONFLICT}" /></legend>
-			<!-- BEGIN new_conflict -->
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong>
-					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-				</dt>
-				<dd style="margin-left: 60%;">
-					<!-- IF not new_conflict.S_BINARY -->[ <a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>
-					<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-				</dd>
-				<!-- IF new_conflict.S_CUSTOM -->
-					<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-				<!-- ENDIF -->
-				</dl>
-			<!-- END new_conflict -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<!-- IF .conflict -->
-			<h2>{L_FILES_CONFLICT}</h2>
-			<p>{L_FILES_CONFLICT_EXPLAIN}</p>
-
-			<!-- BEGIN conflict -->
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong>
-						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}: {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
-					</dt>
-					<dd style="margin-left: 60%;">
-						<!-- IF not conflict.S_BINARY -->[ <a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a> ]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
-						<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-					</dd>
-					<!-- IF conflict.S_CUSTOM -->
-						<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-					<!-- ENDIF -->
-				</dl>
-				<!-- IF conflict.S_BINARY -->
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-						<dd style="margin-left: 60%;">&nbsp;</dd>
-					</dl>
-				<!-- ELSE -->
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
-						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
-						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-					</dl>
-				<!-- ENDIF -->
-			</fieldset>
-			<!-- END conflict -->
-
-		<!-- ENDIF -->
-
-		<br />
-
-		<fieldset class="quick">
-			<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
-		</fieldset>
-
-		<br />
-
-		<h1>{L_UPDATE_METHOD}</h1>
-
-		<p>{L_UPDATE_METHOD_EXPLAIN}</p>
-
-		<fieldset class="submit-buttons">
-			<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD_BUTTON}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_UPDATE_OPTIONS -->
-
-<!-- INCLUDE update_options.html -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE install/footer.html -->
diff --git a/phpBB/adm/style/install/update_diff.html b/phpBB/adm/style/install/update_diff.html
deleted file mode 100644
index efbe1d045c..0000000000
--- a/phpBB/adm/style/install/update_diff.html
+++ /dev/null
@@ -1,253 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<!-- IF META -->{META}<!-- ENDIF -->
-<title>{PAGE_TITLE}</title>
-
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-<script type="text/javascript">
-// <![CDATA[
-function resize_panel()
-{
-	var block = document.getElementById('codepanel');	
-	var height;
-	
-	if (window.innerHeight)
-	{
-		height = window.innerHeight - 150;
-		block.style.height = height + 'px';
-	}
-	else
-	{
-		//whatever IE needs to do this
-	}	
-}
-// ]]>
-</script>
-
-<style type="text/css">
-/* <![CDATA[ */
-
-#main {
-	font-size: 1em;
-	line-height: 0.7em;
-	margin: 0;
-	padding: 0;
-	width: 99%;
-}
-
-#diff_content {
-	padding: 30px 10px 10px;
-}
-
-<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
-div#codepanel {
-	overflow: auto;
-	width: 100%;
-	height: 350px;
-	display: inline-block;
-}
-<!-- ELSE -->
-div#codepanel {	
-	background-color: #eee;
-}
-<!-- ENDIF -->
-
-<!-- IF not S_DIFF_NEW_FILE -->
-/**
-* Unified Diff
-*/
-.file {
-	line-height: .7em;
-}
-
-.diff {
-	margin: 0;
-}
-
-.added {
-	background-color: #dfd;
-}
-
-.removed {
-	background-color: #fdd;
-}
-
-.info {
-	color: #888;
-}
-
-.context {
-	background-color: #eee;
-}
-
-/**
-* Inline Diff
-*/
-.ins {
-	background-color: #dfd;
-	text-decoration: underline;
-}
-
-.del {
-	background-color: #fdd;
-	text-decoration: line-through;
-}
-
-/**
-* Column Diff
-*/
-table.hrdiff {
-	margin: 0 0 8px 5px;
-	width: 100%;
-	overflow: hidden;
-	border-bottom: 1px solid #999;
-	table-layout: fixed;
-}
-
-table.hrdiff th {
-	text-align: left;
-	width: 50%;
-	color: #333;
-	font-family: Verdana,Helvetica,sans-serif;
-	font-size: 11px;
-	border-bottom: 1px solid #999;
-	background: transparent;
-}
-
-table.hrdiff thead th {
-	font-weight: bold;
-	font-size: 110%;
-	padding: 2px;
-}
-
-table.hrdiff tr:first-child th {
-	border-top: none;
-}
-
-table.hrdiff tbody th {
-	padding: 2em 1px 1px 1px;
-	font-size: 80%;
-	border-top: 1px solid #999;
-}
-
-table.hrdiff tbody td.old {
-	border-left: 1px solid #999;
-	border-right: 1px solid #999;	
-}
-table.hrdiff tbody td.new {
-	border-right: 1px solid #999;	
-}
-
-table.hrdiff td pre {
-	overflow: auto;
-	display: block;
-	width: 100%;
-	overflow: auto;
-	display: block;
-}
-
-table.hrdiff .unmodified {
-	background: #fff;
-}
-
-table.hrdiff .added {
-	background: #9f9;
-}
-
-table.hrdiff .added_empty {
-	background: #cfc;
-}
-
-table.hrdiff .modified {
-	background: #fd9;
-}
-
-table.hrdiff .removed {
-	background: #f99;
-}
-
-table.hrdiff .removed_empty {
-	background: #fcc;
-}
-
-table.hrdiff caption {
-	caption-side: top;
-	text-align: left;
-	margin: 0 0 8px 5px;
-	font-size: 90%;
-	font-weight: bold;
-	padding: 5px;
-}
-
-table.hrdiff caption span {
-	height: 10px;
-	width: 10px;
-	line-height: 10px;
-	letter-spacing: 10px;
-	border: 1px solid #000;
-	margin-left: 0.5em;
-	vertical-align: baseline;
-}
-
-<!-- ENDIF -->
-
-/* ]]> */
-</style>
-
-</head>
-
-
-<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
-<body onresize="resize_panel();" onload="resize_panel();">
-<!-- ELSE -->
-<body>
-<!-- ENDIF -->
-
-<div id="wrap">
-	<div id="page-header">
-<!-- IF S_DIFF_NEW_FILE -->
-
-		<h1>{L_VIEWING_FILE_CONTENTS}</h1>
-<!-- ELSE -->
-		<h1>{L_VIEWING_FILE_DIFF}</h1>
-<!-- ENDIF -->
-<!-- IF not S_DIFF_NEW_FILE -->
-		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
-		<form method="post">
-		<fieldset class="quick">
-			<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
-			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
-
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
-		</fieldset>
-		</form>
-<!-- ENDIF -->
-	</div>
-	
-	<div id="page-body">
-		<div id="acp">
-		<div class="panel" id="codepanel">
-			<span class="corners-top"><span></span></span>
-				<div id="diff_content">
-					<div id="main">
-
-<!-- IF S_DIFF_CONFLICT_FILE -->
-		<div style="float: {S_CONTENT_FLOW_END};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
-<!-- ENDIF -->
-						{DIFF_CONTENT}
-					</div>
-				</div>
-			<span class="corners-bottom"><span></span></span>
-		</div>
-		</div>
-	</div>
-	
-
-<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/message_body.html b/phpBB/adm/style/message_body.html
deleted file mode 100644
index 5d907e911c..0000000000
--- a/phpBB/adm/style/message_body.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div <!-- IF S_USER_NOTICE -->class="successbox"<!-- ELSE -->class="errorbox"<!-- ENDIF -->>
-	<h3>{MESSAGE_TITLE}</h3>
-	<p>{MESSAGE_TEXT}</p>
-</div>
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
deleted file mode 100644
index d5316aae08..0000000000
--- a/phpBB/adm/style/overall_footer.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
-					</div>
-				</div>
-			<span class="corners-bottom"><span></span></span>
-		</div>
-		</div>
-	</div>
-	
-	<!--
-		We request you retain the full copyright notice below including the link to www.phpbb.com.
-		This not only gives respect to the large amount of time given freely by the developers
-		but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
-		the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-		"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-		forums may be affected.
-	
-		The phpBB Group : 2006
-	// -->
-	
-	<div id="page-footer">
-		<!-- IF S_COPYRIGHT_HTML -->
-			Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
-			<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
-		<!-- ENDIF -->
-
-		<!-- IF DEBUG_OUTPUT -->
-			<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->
-			{DEBUG_OUTPUT}
-		<!-- ENDIF -->
-	</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
deleted file mode 100644
index 93d72d5205..0000000000
--- a/phpBB/adm/style/overall_header.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<!-- IF META -->{META}<!-- ENDIF -->
-<title>{PAGE_TITLE}</title>
-
-<link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-<script type="text/javascript">
-// <![CDATA[
-var jump_page = '{LA_JUMP_PAGE}:';
-var on_page = '{ON_PAGE}';
-var per_page = '{PER_PAGE}';
-var base_url = '{A_BASE_URL}';
-
-var menu_state = 'shown';
-
-
-/**
-* Jump to page
-*/
-function jumpto()
-{
-	var page = prompt(jump_page, on_page);
-
-	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
-	{
-		if (base_url.indexOf('?') == -1)
-		{
-			document.location.href = base_url + '?start=' + ((page - 1) * per_page);
-		}
-		else
-		{
-			document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
-		}
-	}
-}
-
-/**
-* Set display of page element
-* s[-1,0,1] = hide,toggle display,show
-*/
-function dE(n, s, type)
-{
-	if (!type)
-	{
-		type = 'block';
-	}
-
-	var e = document.getElementById(n);
-	if (!s)
-	{
-		s = (e.style.display == '') ? -1 : 1;
-	}
-	e.style.display = (s == 1) ? type : 'none';
-}
-
-/**
-* Mark/unmark checkboxes
-* id = ID of parent container, name = name prefix, state = state [true/false]
-*/
-function marklist(id, name, state)
-{
-	var parent = document.getElementById(id);
-	if (!parent)
-	{
-		eval('parent = document.' + id);
-	}
-
-	if (!parent)
-	{
-		return;
-	}
-
-	var rb = parent.getElementsByTagName('input');
-
-	for (var r = 0; r < rb.length; r++)
-	{
-		if (rb[r].name.substr(0, name.length) == name)
-		{
-			rb[r].checked = state;
-		}
-	}
-}
-
-/**
-* Find a member
-*/
-function find_username(url)
-{
-	popup(url, 760, 570, '_usersearch');
-	return false;
-}
-
-/**
-* Window popup
-*/
-function popup(url, width, height, name)
-{
-	if (!name)
-	{
-		name = '_popup';
-	}
-
-	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
-	return false;
-}
-
-/**
-* Hiding/Showing the side menu
-*/
-function switch_menu()
-{
-	var menu = document.getElementById('menu');
-	var main = document.getElementById('main');
-	var toggle = document.getElementById('toggle');
-	var handle = document.getElementById('toggle-handle');
-
-	switch (menu_state)
-	{
-		// hide
-		case 'shown':
-			main.style.width = '93%';
-			menu_state = 'hidden';
-			menu.style.display = 'none';
-			toggle.style.width = '20px';
-			handle.style.backgroundImage = 'url(images/toggle.gif)';
-			handle.style.backgroundRepeat = 'no-repeat';
-
-			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-				handle.style.backgroundPosition = '0% 50%';
-				toggle.style.left = '96%';
-			<!-- ELSE -->
-				handle.style.backgroundPosition = '100% 50%';
-				toggle.style.left = '0';
-			<!-- ENDIF -->
-		break;
-
-		// show
-		case 'hidden':
-			main.style.width = '76%';
-			menu_state = 'shown';
-			menu.style.display = 'block';
-			toggle.style.width = '5%';
-			handle.style.backgroundImage = 'url(images/toggle.gif)';
-			handle.style.backgroundRepeat = 'no-repeat';
-
-			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-				handle.style.backgroundPosition = '100% 50%';
-				toggle.style.left = '75%';
-			<!-- ELSE -->
-				handle.style.backgroundPosition = '0% 50%';
-				toggle.style.left = '15%';
-			<!-- ENDIF -->
-		break;
-	}
-}
-
-// ]]>
-</script>
-</head>
-
-<body class="{S_CONTENT_DIRECTION}">
-
-<div id="wrap">
-	<div id="page-header">
-		<h1>{L_ADMIN_PANEL}</h1>
-		<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
-		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
-	</div>
-
-	<div id="page-body">
-		<div id="tabs">
-			<ul>
-			<!-- BEGIN t_block1 -->
-				<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
-			<!-- END t_block1 -->
-			</ul>
-		</div>
-
-		<div id="acp">
-		<div class="panel">
-			<span class="corners-top"><span></span></span>
-				<div id="content">
-					<!-- IF not S_USER_NOTICE -->
-					<div id="toggle">
-						<a id="toggle-handle" accesskey="m" title="{L_MENU_TOGGLE}" onclick="switch_menu(); return false;" href="#"></a></div>
-					<!-- ENDIF -->
-					<div id="menu">
-						<p><!-- IF S_USER_LOGGED_IN --> {L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;]<!-- ENDIF --><!-- IF S_USER_ADMIN -->[&nbsp;<a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a>&nbsp;]<!-- ENDIF --></p>
-						<!-- IF S_USER_ADMIN -->
-						<ul>
-						<!-- BEGIN l_block1 -->
-							<!-- IF l_block1.S_SELECTED -->
-
-						<!-- BEGIN l_block2 -->
-							<!-- IF .l_block1.l_block2.l_block3 -->
-							<li class="header">{l_block1.l_block2.L_TITLE}</li>
-							<!-- ENDIF -->
-
-							<!-- BEGIN l_block3 -->
-								<li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li>
-							<!-- END l_block3 -->
-						<!-- END l_block2 -->
-
-							<!-- ENDIF -->
-						<!-- END l_block1 -->
-						</ul>
-						<!-- ENDIF -->
-					</div>
-
-					<div id="main">
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
deleted file mode 100644
index fb4d3ef143..0000000000
--- a/phpBB/adm/style/permission_mask.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-<script type="text/javascript">
-// <![CDATA[
-	var active_pmask = '0';
-	var active_fmask = '0';
-	var active_cat = '0';
-
-	var id = '000';
-
-	var role_options = new Array();
-
-	<!-- IF S_ROLE_JS_ARRAY -->
-		{S_ROLE_JS_ARRAY}
-	<!-- ENDIF -->
-// ]]>
-</script>
-<script type="text/javascript" src="style/permissions.js"></script>
-
-<!-- BEGIN p_mask -->
-<div class="clearfix"></div>
-<h3>{p_mask.NAME}<!-- IF p_mask.S_LOCAL --> <span class="small"> [{p_mask.L_ACL_TYPE}]</span><!-- ENDIF --></h3>
-
-<!-- BEGIN f_mask -->
-<div class="clearfix"></div>
-<fieldset class="permissions" id="perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
-	<legend id="legend{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
-		<!-- IF not p_mask.S_VIEW -->
-			<input type="checkbox" style="display: none;" class="permissions-checkbox" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" id="checkbox{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" value="1" onclick="toggle_opacity('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" /> 
-		<!-- ELSE -->
-		<!-- ENDIF -->
-		<!-- IF p_mask.f_mask.PADDING --><span class="padding">{p_mask.f_mask.PADDING}{p_mask.f_mask.PADDING}</span><!-- ENDIF -->{p_mask.f_mask.NAME}
-	</legend>
-	<!-- IF not p_mask.S_VIEW -->
-		<div class="permissions-switch">
-			<div class="permissions-reset">
-				<a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_YES}</a> &middot; <a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_NO}</a> &middot; <a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_NEVER}</a>
-			</div>
-			<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0', true); return false;">{L_ADVANCED_PERMISSIONS}</a><!-- IF not p_mask.S_VIEW and p_mask.f_mask.S_CUSTOM --> *<!-- ENDIF -->
-		</div>
-		<dl class="permissions-simple">
-			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}:</label></dt>
-			<!-- IF p_mask.f_mask.S_ROLE_OPTIONS -->
-				<dd style="margin-left: 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd>
-			<!-- ELSE -->
-				<dd>{L_NO_ROLE_AVAILABLE}</dd>
-			<!-- ENDIF -->
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- BEGIN category -->
-		<!-- IF p_mask.f_mask.category.S_FIRST_ROW -->
-			<!-- IF not p_mask.S_VIEW -->
-				<div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" style="display: none;">
-			<!-- ELSE -->
-				<div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
-			<!-- ENDIF -->
-
-			<div class="permissions-category">
-				<ul>
-		<!-- ENDIF -->
- 		
-		<!-- IF p_mask.f_mask.category.S_YES -->
-			<li class="permissions-preset-yes<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
-		<!-- ELSEIF p_mask.f_mask.category.S_NEVER -->
-			<li class="permissions-preset-never<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
-		<!-- ELSEIF p_mask.f_mask.category.S_NO -->
-			<li class="permissions-preset-no<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
-		<!-- ELSE -->
-			<li class="permissions-preset-custom<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
-		<!-- ENDIF -->
-		<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '{p_mask.f_mask.category.S_ROW_COUNT}', false<!-- IF p_mask.S_VIEW -->, true<!-- ENDIF -->); return false;"><span class="tabbg"><span class="colour"></span>{p_mask.f_mask.category.CAT_NAME}</span></a></li>
-	<!-- END category -->
-				</ul>
-			</div>
-
-	<!-- BEGIN category -->
-		<div class="permissions-panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
-			<span class="corners-top"><span></span></span>
-			<div class="tablewrap">
-				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1">
-				<colgroup>
-					<col class="permissions-name" />
-					<col class="permissions-yes" />
-					<col class="permissions-no" />
-					<!-- IF not p_mask.S_VIEW -->
-						<col class="permissions-never" />
-					<!-- ENDIF -->
-				</colgroup>
-				<thead>
-				<tr>
-					<th class="name" scope="col"><strong>{L_ACL_SETTING}</strong></th>
-				<!-- IF p_mask.S_VIEW -->
-					<th class="value" scope="col">{L_ACL_YES}</th>
-					<th class="value" scope="col">{L_ACL_NEVER}</th>
-				<!-- ELSE -->
-					<th class="value permissions-yes" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
-					<th class="value permissions-no" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
-					<th class="value permissions-never" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
-				<!-- ENDIF -->
-				</tr>
-				</thead>
-				<tbody>
-				<!-- BEGIN mask -->
-					<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-					<th class="permissions-name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="{p_mask.f_mask.category.mask.U_TRACE}" class="trace" onclick="popup(this.href, 750, 515, '_trace'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
-					<!-- IF p_mask.S_VIEW -->
-						<td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ENDIF -->>&nbsp;</td>
-						<td<!-- IF p_mask.f_mask.category.mask.S_NEVER --> class="never"<!-- ENDIF -->></td>
-					<!-- ELSE -->
-						<td class="permissions-yes"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
-						<td class="permissions-no"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
-						<td class="permissions-never"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
-					<!-- ENDIF -->
-				</tr>
-				<!-- END mask -->
-				</tbody>
-				</table>
-			</div>
-			
-			<!-- IF not p_mask.S_VIEW -->
-			<fieldset class="quick" style="margin-right: 11px;">
-				<p class="small">{L_APPLY_PERMISSIONS_EXPLAIN}</p>
-				<input class="button1" type="submit" name="psubmit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" value="{L_APPLY_PERMISSIONS}" />
-				<!-- IF .p_mask.f_mask gt 1 or .p_mask gt 1 -->
-					<p class="small"><a href="#" onclick="reset_opacity(0, '{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="reset_opacity(1, '{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_UNMARK_ALL}</a></p>
-				<!-- ENDIF -->
-			</fieldset>
-		
-			<!-- ENDIF -->
-
-			<span class="corners-bottom"><span></span></span>
-		</div>
-	<!-- END category -->
-			<div class="clearfix"></div>
-	</div>
-</fieldset>
-<!-- END f_mask -->
-
-<!-- END p_mask -->
diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html
deleted file mode 100644
index e88c5fd2ba..0000000000
--- a/phpBB/adm/style/permission_roles_mask.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-<!-- BEGIN role_mask -->
-
-	<table cellspacing="1">
-		<caption><!-- IF role_mask.FORUM_ID -->{L_FORUM}: <!-- ENDIF -->{role_mask.NAME}</caption>
-	<tbody>
-	<tr>
-		<th>{L_USERS}</th>
-	</tr>
-	<tr>
-		<td class="row1">
-			<!-- BEGIN users -->
-				<a href="{role_mask.users.U_PROFILE}">{role_mask.users.USERNAME}</a><!-- IF not role_mask.users.S_LAST_ROW --> :: <!-- ENDIF -->
-			<!-- BEGINELSE -->
-				{L_USERS_NOT_ASSIGNED}
-			<!-- END users -->
-		</td>
-	</tr>
-	<tr>
-		<th>{L_GROUPS}</th>
-	</tr>
-	<tr>
-		<td class="row2">
-			<!-- BEGIN groups -->
-				<a href="{role_mask.groups.U_PROFILE}">{role_mask.groups.GROUP_NAME}</a><!-- IF not role_mask.groups.S_LAST_ROW --> :: <!-- ENDIF -->
-			<!-- BEGINELSE -->
-				{L_GROUPS_NOT_ASSIGNED}
-			<!-- END users -->
-		</td>
-	</tr>
-	</tbody>
-	</table>
-
-<!-- BEGINELSE -->
-	
-	<p>{L_ROLE_NOT_ASSIGNED}</p>
-
-<!-- END role_mask -->
\ No newline at end of file
diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html
deleted file mode 100644
index 186bb28b67..0000000000
--- a/phpBB/adm/style/permission_trace.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<div style="background-color: #fff; padding: 10px; margin-top: 10px;" class="permissions">
-
-	<!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a><!-- ENDIF -->
-
-	<h3>{L_TRACE_FOR}: {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3>
-
-	<br />
-
-	<table cellspacing="1" class="type1">
-	<thead>
-	<tr>
-		<th>{L_TRACE_WHO}</th>
-		<th style="width: 50px;">{L_ACL_SETTING}</th>
-		<th style="width: 50px;">{L_TRACE_TOTAL}</th>
-		<th>{L_INFORMATION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN trace -->
-		<!-- IF trace.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-		<td style="white-space: nowrap;"><strong>{trace.WHO}</strong></td>
-
-		<!-- IF trace.S_SETTING_NEVER -->
-			<td class="never">{L_ACL_NEVER}</td>
-		<!-- ELSEIF trace.S_SETTING_YES -->
-			<td class="yes">{L_ACL_YES}</td>
-		<!-- ELSE -->
-			<td class="no">{L_ACL_NO}</td>
-		<!-- ENDIF -->
-
-		<!-- IF trace.S_TOTAL_NEVER -->
-			<td class="never">{L_ACL_NEVER}</td>
-		<!-- ELSEIF trace.S_TOTAL_YES -->
-			<td class="yes">{L_ACL_YES}</td>
-		<!-- ELSE -->
-			<td class="no">{L_ACL_NO}</td>
-		<!-- ENDIF -->
-
-		<td>{trace.INFORMATION}</td>
-	</tr>
-	<!-- END trace -->
-	<tr class="row2">
-		<td style="white-space: nowrap;"><strong>{L_TRACE_RESULT}</strong></td>
-		<td colspan="2" style="text-align: center;" class="<!-- IF S_RESULT_NEVER -->never<!-- ELSEIF S_RESULT_YES -->yes<!-- ELSE -->no<!-- ENDIF -->">
-		<!-- IF S_RESULT_NEVER -->{L_ACL_NEVER}<!-- ELSEIF S_RESULT_YES -->{L_ACL_YES}<!-- ELSE -->{L_ACL_NO}<!-- ENDIF -->
-		</td>
-		<td>{L_RESULTING_PERMISSION}</td>
-	</tr>
-	</tbody>
-	</table>
-
-	<br />
-
-</div>
-
-<!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/adm/style/permissions.js b/phpBB/adm/style/permissions.js
deleted file mode 100644
index adc8995c23..0000000000
--- a/phpBB/adm/style/permissions.js
+++ /dev/null
@@ -1,359 +0,0 @@
-/**
-* Hide and show all checkboxes
-* status = true (show boxes), false (hide boxes)
-*/
-function display_checkboxes(status) 
-{
-	var form = document.getElementById('set-permissions');
-	var cb = document.getElementsByTagName('input');
-	var display;
-
-	//show
-	if (status)
-	{
-		display = 'inline';
-	}
-	//hide
-	else
-	{
-		display = 'none';
-	}
-	
-	for (var i = 0; i < cb.length; i++ )
-	{
-		if (cb[i].className == 'permissions-checkbox')
-		{
-			cb[i].style.display = display;
-		}
-		
-	}	
-	
-}
-
-
-/**
-* Change opacity of element
-* e = element
-* value = 0 (hidden) till 10 (fully visible)
-*/
-function set_opacity(e, value) {
-	e.style.opacity = value/10;
-	
-	//IE opacity currently turned off, because of its astronomical stupidity
-	//e.style.filter = 'alpha(opacity=' + value*10 + ')';
-}
-
-/**
-* Reset the opacity and checkboxes
-* block_id = id of the element that needs to be toggled
-*/
-function toggle_opacity(block_id) {
-	var cb = document.getElementById('checkbox' + block_id);
-	var fs = document.getElementById('perm' + block_id);
-	
-	if (cb.checked) 
-	{
-		set_opacity(fs, 5);
-	} 
-	else 
-	{
-		set_opacity(fs, 10);
-	}
-}
-
-/**
-* Reset the opacity and checkboxes
-* value = 0 (checked) and 1 (unchecked)
-* except_id = id of the element not to hide
-*/
-function reset_opacity(status, except_id) {
-	var perm = document.getElementById('set-permissions');
-	var fs = perm.getElementsByTagName('fieldset');
-	var opacity = 5;
-
-	if (status)
-	{
-		opacity = 10;	
-	}
-	
-	for (var i = 0; i < fs.length; i++ )
-	{
-		if (fs[i].className != 'quick')
-		{
-			set_opacity(fs[i], opacity);
-		}
-	}
-
-	if (typeof(except_id) != 'undefined')
-	{
-		set_opacity(document.getElementById('perm' + except_id), 10);
-	}
-
-	//reset checkboxes too
-	marklist('set-permissions', 'inherit', !status);
-}
-
-
-/**
-* Check whether we have a full radiobutton row of true
-* index = offset for the row of inputs (0 == first row, 1 == second, 2 == third),
-* rb = array of radiobuttons
-*/
-function get_radio_status(index, rb) 
-{
-	for (var i = index; i < rb.length; i = i + 3 )
-	{
-		if (rb[i].checked != true)
-		{
-			if (i > index)
-			{
-				//at least one is true, but not all (custom)
-				return 2;
-			}
-			//first one is not true
-			return 0;
-		}
-	}
-
-	// all radiobuttons true
-	return 1;
-}
-
-/**
-* Set tab colours
-* id = panel the tab needs to be set for, 
-* init = initialising on open, 
-* quick = If no calculation needed, this contains the colour
-*/
-function set_colours(id, init, quick)
-{
-	var table = document.getElementById('table' + id);
-	var tab = document.getElementById('tab' + id);
-
-	if (typeof(quick) != 'undefined') 
-	{
-		tab.className = 'permissions-preset-' + quick + ' activetab';
-		return;
-	}
-
-	var rb = table.getElementsByTagName('input');
-	var colour = 'custom';
-
-	var status = get_radio_status(0, rb);
-
-	if (status == 1)
-	{
-		colour = 'yes';
-	}
-	else if (status == 0) 
-	{
-		// We move on to No
-		status = get_radio_status(1, rb);
-
-		if (status == 1)
-		{
-			colour = 'no';
-		}
-		else if (status == 0) 
-		{
-			// We move on to Never
-			status = get_radio_status(2, rb);
-
-			if (status == 1)
-			{
-				colour = 'never';
-			}
-		}
-	}
-
-	if (init)
-	{
-		tab.className = 'permissions-preset-' + colour;
-	}
-	else
-	{
-		tab.className = 'permissions-preset-' + colour + ' activetab';
-	}
-}
-
-/**
-* Initialise advanced tab colours on first load
-* block_id = block that is opened
-*/
-function init_colours(block_id)
-{	
-	var block = document.getElementById('advanced' + block_id);
-	var panels = block.getElementsByTagName('div');
-	var tab = document.getElementById('tab' + id);
-
-	for (var i = 0; i < panels.length; i++)
-	{
-		if(panels[i].className == 'permissions-panel')
-		{
-			set_colours(panels[i].id.replace(/options/, ''), true);
-		}
-	}
-
-	tab.className = tab.className + ' activetab';
-}
-
-/**
-* Show/hide option panels
-* value = suffix for ID to show
-* adv = we are opening advanced permissions
-* view = called from view permissions
-*/
-function swap_options(pmask, fmask, cat, adv, view)
-{
-	id = pmask + fmask + cat;
-	active_option = active_pmask + active_fmask + active_cat;
-
-	var	old_tab = document.getElementById('tab' + active_option);	
-	var new_tab = document.getElementById('tab' + id);
-	var adv_block = document.getElementById('advanced' + pmask + fmask);
-
-	if (adv_block.style.display == 'block' && adv == true)
-	{
-		dE('advanced' + pmask + fmask, -1);
-		reset_opacity(1);
-		display_checkboxes(false);
-		return;
-	}
-
-	// no need to set anything if we are clicking on the same tab again
-	if (new_tab == old_tab && !adv)
-	{
-		return;
-	}
-
-	// init colours
-	if (adv && (pmask + fmask) != (active_pmask + active_fmask))
-	{
-		init_colours(pmask + fmask);
-		display_checkboxes(true);
-		reset_opacity(1);
-	} 
-	else if (adv) 
-	{
-		//Checkbox might have been clicked, but we need full visibility
-		display_checkboxes(true);
-		reset_opacity(1);
-	}
-
-	// set active tab
-	old_tab.className = old_tab.className.replace(/\ activetab/g, '');
-	new_tab.className = new_tab.className + ' activetab';
-
-	if (id == active_option && adv != true)
-	{
-		return;
-	}
-
-	dE('options' + active_option, -1);
-	
-	//hiding and showing the checkbox
-	if (document.getElementById('checkbox' + active_pmask + active_fmask))
-	{
-		dE('checkbox' + pmask + fmask, -1);	
-		
-		if ((pmask + fmask) != (active_pmask + active_fmask))
-		{
-			document.getElementById('checkbox' + active_pmask + active_fmask).style.display = 'inline';
-		}
-	}
-
-	if (!view)
-	{
-		dE('advanced' + active_pmask + active_fmask, -1);
-	}
-
-	if (!view)
-	{
-		dE('advanced' + pmask + fmask, 1);
-	}
-	dE('options' + id, 1);
-
-	active_pmask = pmask;
-	active_fmask = fmask;
-	active_cat = cat;
-}
-
-/**
-* Mark all radio buttons in one panel
-* id = table ID container, s = status ['y'/'u'/'n']
-*/
-function mark_options(id, s)
-{
-	var t = document.getElementById(id);
-
-	if (!t)
-	{
-		return;
-	}
-
-	var rb = t.getElementsByTagName('input');
-
-	for (var r = 0; r < rb.length; r++)
-	{
-		if (rb[r].id.substr(rb[r].id.length-1) == s)
-		{
-			rb[r].checked = true;
-		}
-	}
-}
-
-function mark_one_option(id, field_name, s)
-{
-	var t = document.getElementById(id);
-
-	if (!t)
-	{
-		return;
-	}
-
-	var rb = t.getElementsByTagName('input');
-
-	for (var r = 0; r < rb.length; r++)
-	{
-		if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) == field_name && rb[r].id.substr(rb[r].id.length-1) == s)
-		{
-			rb[r].checked = true;
-		}
-	}
-}
-
-/**
-* Reset role dropdown field to Select role... if an option gets changed
-*/
-function reset_role(id)
-{
-	var t = document.getElementById(id);
-
-	if (!t)
-	{
-		return;
-	}
-
-	t.options[0].selected = true;
-}
-
-/**
-* Load role and set options accordingly
-*/
-function set_role_settings(role_id, target_id)
-{
-	settings = role_options[role_id];
-
-	if (!settings)
-	{
-		return;
-	}
-
-	// Mark all options to no (unset) first...
-	mark_options(target_id, 'u');
-
-	for (var r in settings)
-	{
-		mark_one_option(target_id, r, (settings[r] == 1) ? 'y' : 'n');
-	}
-}
diff --git a/phpBB/adm/style/progress_bar.html b/phpBB/adm/style/progress_bar.html
deleted file mode 100644
index 00e1e5e885..0000000000
--- a/phpBB/adm/style/progress_bar.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-	/**
-	* Close previously opened popup
-	*/
-	function close_popup()
-	{
-		if (opener != null)
-		{
-			if (opener.close_waitscreen != null)
-			{
-				if (opener.close_waitscreen == 1)
-				{
-					opener.close_waitscreen = 0;
-					self.close();
-					return 0;
-				}
-			}
-		}
-		setTimeout("close_popup()", 1000);
-		return 0;
-	}
-// ]]>
-</script>
-
-<div class="successbox">
-	<h3>{L_PROGRESS}</h3>
-	<img src="images/progress_bar.gif" alt="{L_PROGRESS}" />
-	<p>{L_PROGRESS_EXPLAIN}</p>
-</div>
-
-<script type="text/javascript">
-// <![CDATA[
-	close_popup();
-// ]]>
-</script>
-
-<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/simple_body.html b/phpBB/adm/style/simple_body.html
deleted file mode 100644
index 0b1e11b9a2..0000000000
--- a/phpBB/adm/style/simple_body.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<div class="successbox">
-	<h3>{MESSAGE_TITLE}</h3>
-	<p>{MESSAGE_TEXT}</p>
-</div>
-
-<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
deleted file mode 100644
index 65cf724c2f..0000000000
--- a/phpBB/adm/style/simple_footer.html
+++ /dev/null
@@ -1,31 +0,0 @@
-		<div style="text-align: {S_CONTENT_FLOW_END};"><a href="#" onclick="self.close(); return false;">{L_CLOSE_WINDOW}</a></div>
-	<br /><br />
-</div>
-
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-// -->
-
-<div id="page-footer">
-
-	<!-- IF S_COPYRIGHT_HTML -->
-		<br />Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
-		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
-	<!-- ENDIF -->
-
-	<!-- IF DEBUG_OUTPUT -->
-		<!-- IF S_COPYRIGHT_HTML --><br /><br /><!-- ENDIF -->
-		{DEBUG_OUTPUT}
-	<!-- ENDIF -->
-
-</div>
-
-</body>
-</html>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
deleted file mode 100644
index e7d34c7ff4..0000000000
--- a/phpBB/adm/style/simple_header.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<!-- IF META -->{META}<!-- ENDIF -->
-<title>{PAGE_TITLE}</title>
-
-<link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-<script type="text/javascript">
-// <![CDATA[
-var jump_page = '{LA_JUMP_PAGE}:';
-var on_page = '{ON_PAGE}';
-var per_page = '{PER_PAGE}';
-var base_url = '{A_BASE_URL}';
-
-/**
-* Window popup
-*/
-function popup(url, width, height, name)
-{
-	if (!name)
-	{
-		name = '_popup';
-	}
-
-	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
-	return false;
-}
-
-/**
-* Jump to page
-*/
-function jumpto()
-{
-	var page = prompt(jump_page, on_page);
-
-	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
-	{
-		if (base_url.indexOf('?') == -1)
-		{
-			document.location.href = base_url + '?start=' + ((page - 1) * per_page);
-		}
-		else
-		{
-			document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
-		}
-	}
-}
-
-/**
-* Set display of page element
-* s[-1,0,1] = hide,toggle display,show
-*/
-function dE(n, s, type)
-{
-	if (!type)
-	{
-		type = 'block';
-	}
-
-	var e = document.getElementById(n);
-	if (!s)
-	{
-		s = (e.style.display == '') ? -1 : 1;
-	}
-	e.style.display = (s == 1) ? type : 'none';
-}
-
-/**
-* Mark/unmark checkboxes
-* id = ID of parent container, name = name prefix, state = state [true/false]
-*/
-function marklist(id, name, state)
-{
-	var parent = document.getElementById(id);
-	if (!parent)
-	{
-		return;
-	}
-
-	var rb = parent.getElementsByTagName('input');
-
-	for (var r = 0; r < rb.length; r++)
-	{
-		if (rb[r].name.substr(0, name.length) == name)
-		{
-			rb[r].checked = state;
-		}
-	}
-}
-
-/**
-* Find a member
-*/
-function find_username(url)
-{
-	popup(url, 760, 570, '_usersearch');
-	return false;
-}
-
-// ]]>
-</script>
-</head>
-
-<body class="{S_CONTENT_DIRECTION}">
-
-<div id="page-body" class="simple-page-body">
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
deleted file mode 100644
index 20610b52fe..0000000000
--- a/phpBB/adm/style/tooltip.js
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
-javascript for Bubble Tooltips by Alessandro Fulciniti
-- http://pro.html.it - http://web-graphics.com 
-obtained from: http://web-graphics.com/mtarchive/001717.php
-
-phpBB Development Team:
-	- modified to adhere to our coding guidelines
-	- integration into our design
-	- added ability to perform tooltips on select elements
-	- further adjustements
-*/
-
-var head_text, tooltip_mode;
-
-/**
-* Enable tooltip replacements for links
-*/
-function enable_tooltips_link(id, headline, sub_id)
-{
-	var links, i, hold;
-	
-	head_text = headline;
-
-	if (!document.getElementById || !document.getElementsByTagName)
-	{
-		return;
-	}
-
-	hold = document.createElement('span');
-	hold.id = '_tooltip_container';
-	hold.setAttribute('id', '_tooltip_container');
-	hold.style.position = 'absolute';
-
-	document.getElementsByTagName('body')[0].appendChild(hold);
-
-	if (id == null)
-	{
-		links = document.getElementsByTagName('a');
-	}
-	else
-	{
-		links = document.getElementById(id).getElementsByTagName('a');
-	}
-
-	for (i = 0; i < links.length; i++)
-	{
-		if (sub_id)
-		{
-			if (links[i].id.substr(0, sub_id.length) == sub_id)
-			{
-				prepare(links[i]);
-			}
-		}
-		else
-		{
-			prepare(links[i]);
-		}
-	}
-
-	tooltip_mode = 'link';
-}
-
-/**
-* Enable tooltip replacements for selects
-*/
-function enable_tooltips_select(id, headline, sub_id)
-{
-	var links, i, hold;
-	
-	head_text = headline;
-
-	if (!document.getElementById || !document.getElementsByTagName)
-	{
-		return;
-	}
-
-	hold = document.createElement('span');
-	hold.id = '_tooltip_container';
-	hold.setAttribute('id', '_tooltip_container');
-	hold.style.position = 'absolute';
-
-	document.getElementsByTagName('body')[0].appendChild(hold);
-
-	if (id == null)
-	{
-		links = document.getElementsByTagName('option');
-	}
-	else
-	{
-		links = document.getElementById(id).getElementsByTagName('option');
-	}
-
-	for (i = 0; i < links.length; i++)
-	{
-		if (sub_id)
-		{
-			if (links[i].parentNode.id.substr(0, sub_id.length) == sub_id)
-			{
-				prepare(links[i]);
-			}
-		}
-		else
-		{
-			prepare(links[i]);
-		}
-	}
-
-	tooltip_mode = 'select';
-}
-
-/**
-* Prepare elements to replace
-*/
-function prepare(element)
-{
-	var tooltip, text, desc, title;
-
-	text = element.getAttribute('title');
-
-	if (text == null || text.length == 0)
-	{
-		return;
-	}
-
-	element.removeAttribute('title');
-	tooltip = create_element('span', 'tooltip');
-
-	title = create_element('span', 'top');
-	title.appendChild(document.createTextNode(head_text));
-	tooltip.appendChild(title);
-
-	desc = create_element('span', 'bottom');
-	desc.innerHTML = text;
-	tooltip.appendChild(desc);
-
-	set_opacity(tooltip);
-
-	element.tooltip = tooltip;
-	element.onmouseover = show_tooltip;
-	element.onmouseout = hide_tooltip;
-
-	if (tooltip_mode == 'link')
-	{
-		element.onmousemove = locate;
-	}
-}
-
-/**
-* Show tooltip
-*/
-function show_tooltip(e)
-{
-	document.getElementById('_tooltip_container').appendChild(this.tooltip);
-	locate(this);
-}
-
-/**
-* Hide tooltip
-*/
-function hide_tooltip(e)
-{
-	var d = document.getElementById('_tooltip_container');
-	if (d.childNodes.length > 0)
-	{
-		d.removeChild(d.firstChild);
-	}
-}
-
-/**
-* Set opacity on tooltip element
-*/
-function set_opacity(element)
-{
-	element.style.filter = 'alpha(opacity:95)';
-	element.style.KHTMLOpacity = '0.95';
-	element.style.MozOpacity = '0.95';
-	element.style.opacity = '0.95';
-}
-
-/**
-* Create new element
-*/
-function create_element(tag, c)
-{
-	var x = document.createElement(tag);
-	x.className = c;
-	x.style.display = 'block';
-	return x;
-}
-
-/**
-* Correct positioning of tooltip container
-*/
-function locate(e)
-{
-	var posx = 0;
-	var posy = 0;
-
-	e = e.parentNode;
-
-	if (e.offsetParent)
-	{
-		for (var posx = 0, posy = 0; e.offsetParent; e = e.offsetParent)
-		{
-			posx += e.offsetLeft;
-			posy += e.offsetTop;
-		}
-	}
-	else
-	{
-		posx = e.offsetLeft;
-		posy = e.offsetTop;
-	}
-
-	if (tooltip_mode == 'link')
-	{
-		document.getElementById('_tooltip_container').style.top=(posy+20) + 'px';
-		document.getElementById('_tooltip_container').style.left=(posx-20) + 'px';
-	}
-	else
-	{
-		document.getElementById('_tooltip_container').style.top=(posy+30) + 'px';
-		document.getElementById('_tooltip_container').style.left=(posx-205) + 'px';
-	}
-
-/*
-	if (e == null)
-	{
-		e = window.event;
-	}
-
-	if (e.pageX || e.pageY)
-	{
-		posx = e.pageX;
-		posy = e.pageY;
-	}
-	else if (e.clientX || e.clientY)
-	{
-		if (document.documentElement.scrollTop)
-		{
-			posx = e.clientX+document.documentElement.scrollLeft;
-			posy = e.clientY+document.documentElement.scrollTop;
-		}
-		else
-		{
-			posx = e.clientX+document.body.scrollLeft;
-			posy = e.clientY+document.body.scrollTop;
-		}
-	}
-*/
-}
diff --git a/phpBB/adm/style/update_options.html b/phpBB/adm/style/update_options.html
deleted file mode 100644
index e3ef01582c..0000000000
--- a/phpBB/adm/style/update_options.html
+++ /dev/null
@@ -1,123 +0,0 @@
-
-<!-- IF S_DOWNLOAD_FILES -->
-
-	<h1>{L_DOWNLOAD_UPDATE_METHOD}</h1>
-
-	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
-	<dl>
-		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
-		<dd>{RADIO_BUTTONS}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}{S_FORM_TOKEN}
-		<!-- IF S_CHECK_AGAIN --><input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<!-- ENDIF -->
-		<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
-	</fieldset>
-
-	</form>
-
-	<br /><br />
-
-	<p>{L_MAPPING_FILE_STRUCTURE}</p>
-
-	<table cellspacing="1">
-		<col class="row1" /><col class="row2" /><col class="row1" />
-	<thead>
-	<tr>
-		<th style="width: 49%">{L_ARCHIVE_FILE}</th>
-		<th style="width: 2%">&nbsp;</th>
-		<th style="width: 49%">{L_DESTINATION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN location -->
-	<tr>
-		<td>{location.SOURCE}</td>
-		<td><strong>&raquo;</strong></td>
-		<td>{location.DESTINATION}</td>
-	</tr>
-	<!-- END location -->
-	</tbody>
-	</table>
-
-<!-- ELSEIF S_FTP_UPLOAD -->
-
-	<h1>{L_SELECT_FTP_SETTINGS}</h1>
-
-	<form id="update_options" method="post" action="{U_ACTION}">
-
-	<!-- IF S_CONNECTION_SUCCESS -->
-		<div class="successbox">
-			<p>{L_CONNECTION_SUCCESS}</p>
-		</div>
-	<!-- ELSEIF S_CONNECTION_FAILED -->
-		<div class="successbox">
-			<p>{L_TRY_DOWNLOAD_METHOD}</p>
-
-			<fieldset class="quick">
-				<input class="button1" type="submit" name="download" value="{L_TRY_DOWNLOAD_METHOD_BUTTON}" />
-			</fieldset>
-		</div>
-
-		<div class="errorbox">
-			<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_FTP_SETTINGS}</legend>
-	<dl>
-		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
-		<dd><strong>{UPLOAD_METHOD}</strong></dd>
-	</dl>
-	<!-- BEGIN data -->
-	<dl>
-		<dt><label for="{data.DATA}">{data.NAME}:</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="submit-buttons">
-		{S_HIDDEN_FIELDS}{S_FORM_TOKEN}
-		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
-		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
-		<input class="button1" type="submit" name="update" value="{L_UPDATE_FILES}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_UPLOAD_SUCCESS -->
-
-	<form id="update_options" method="post" action="{U_FINAL_ACTION}">
-
-	<h1>{L_UPDATE_SUCCESS}</h1>
-	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
-
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="clean_up" value="{L_CONTINUE_UPDATE}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_UPDATE_OPTIONS -->
-
-	<form id="update_options" method="post" action="{U_INITIAL_ACTION}">
-
-	<p>{L_UPDATE_METHOD_EXPLAIN}</p>
-
-	<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}{S_FORM_TOKEN}
-	<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD_BUTTON}" />
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
\ No newline at end of file
diff --git a/phpBB/adm/style/viewsource.html b/phpBB/adm/style/viewsource.html
deleted file mode 100644
index f127c9626f..0000000000
--- a/phpBB/adm/style/viewsource.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-<div id="acp" style="padding: 0;">
-<div class="panel" style="padding: 10px;">
-<div style="overflow: auto;">
-	<h1>{FILENAME}</h1>
-
-	<table class="type2">
-	<tbody>
-	<!-- BEGIN source -->
-		<tr valign="top">
-			<td class="sourcenum">{source.LINENUM}&nbsp;&nbsp;</td>
-			<td class="source">{source.LINE}</td>
-		</tr>
-	<!-- END source -->
-	</tbody>
-	</table>
-
-</div>
-</div>
-</div>
-<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
-- 
cgit v1.2.1


From 2e17e448deed073f8614bb555a8ef20c57291c2a Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 4 Oct 2009 18:14:59 +0000
Subject: Copy 3.0.x branch to trunk

git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_attachments.html          |  376 ++++++
 phpBB/adm/style/acp_ban.html                  |  124 ++
 phpBB/adm/style/acp_bbcodes.html              |  124 ++
 phpBB/adm/style/acp_board.html                |   49 +
 phpBB/adm/style/acp_bots.html                 |  102 ++
 phpBB/adm/style/acp_captcha.html              |   67 +
 phpBB/adm/style/acp_database.html             |   98 ++
 phpBB/adm/style/acp_disallow.html             |   45 +
 phpBB/adm/style/acp_email.html                |   54 +
 phpBB/adm/style/acp_forums.html               |  505 ++++++++
 phpBB/adm/style/acp_forums_copy_perm.html     |   22 +
 phpBB/adm/style/acp_groups.html               |  358 ++++++
 phpBB/adm/style/acp_icons.html                |  268 ++++
 phpBB/adm/style/acp_inactive.html             |   77 ++
 phpBB/adm/style/acp_jabber.html               |   65 +
 phpBB/adm/style/acp_language.html             |  255 ++++
 phpBB/adm/style/acp_logs.html                 |   93 ++
 phpBB/adm/style/acp_main.html                 |  249 ++++
 phpBB/adm/style/acp_modules.html              |  212 ++++
 phpBB/adm/style/acp_permission_roles.html     |  202 +++
 phpBB/adm/style/acp_permissions.html          |  357 ++++++
 phpBB/adm/style/acp_php_info.html             |   13 +
 phpBB/adm/style/acp_profile.html              |  236 ++++
 phpBB/adm/style/acp_prune_forums.html         |  108 ++
 phpBB/adm/style/acp_prune_users.html          |   59 +
 phpBB/adm/style/acp_ranks.html                |   98 ++
 phpBB/adm/style/acp_reasons.html              |  127 ++
 phpBB/adm/style/acp_search.html               |  157 +++
 phpBB/adm/style/acp_send_statistics.html      |   71 ++
 phpBB/adm/style/acp_styles.html               |  521 ++++++++
 phpBB/adm/style/acp_update.html               |   46 +
 phpBB/adm/style/acp_users.html                |  234 ++++
 phpBB/adm/style/acp_users_avatar.html         |   78 ++
 phpBB/adm/style/acp_users_feedback.html       |   76 ++
 phpBB/adm/style/acp_users_overview.html       |  144 +++
 phpBB/adm/style/acp_users_prefs.html          |  158 +++
 phpBB/adm/style/acp_users_profile.html        |   66 +
 phpBB/adm/style/acp_users_signature.html      |  117 ++
 phpBB/adm/style/acp_users_warnings.html       |   36 +
 phpBB/adm/style/acp_words.html                |   77 ++
 phpBB/adm/style/admin.css                     | 1655 +++++++++++++++++++++++++
 phpBB/adm/style/captcha_default_acp_demo.html |    4 +
 phpBB/adm/style/captcha_gd_acp.html           |   74 ++
 phpBB/adm/style/captcha_qa_acp.html           |   92 ++
 phpBB/adm/style/captcha_qa_acp_demo.html      |    7 +
 phpBB/adm/style/captcha_recaptcha.html        |   33 +
 phpBB/adm/style/captcha_recaptcha_acp.html    |   50 +
 phpBB/adm/style/colour_swatch.html            |   78 ++
 phpBB/adm/style/confirm_body.html             |   20 +
 phpBB/adm/style/confirm_body_prune.html       |   30 +
 phpBB/adm/style/custom_profile_fields.html    |   32 +
 phpBB/adm/style/editor.js                     |  398 ++++++
 phpBB/adm/style/install_convert.html          |  134 ++
 phpBB/adm/style/install_error.html            |    8 +
 phpBB/adm/style/install_footer.html           |   27 +
 phpBB/adm/style/install_header.html           |   81 ++
 phpBB/adm/style/install_install.html          |   77 ++
 phpBB/adm/style/install_main.html             |    6 +
 phpBB/adm/style/install_update.html           |  475 +++++++
 phpBB/adm/style/install_update_diff.html      |  262 ++++
 phpBB/adm/style/message_body.html             |    8 +
 phpBB/adm/style/overall_footer.html           |   35 +
 phpBB/adm/style/overall_header.html           |  221 ++++
 phpBB/adm/style/permission_forum_copy.html    |   40 +
 phpBB/adm/style/permission_mask.html          |  139 +++
 phpBB/adm/style/permission_roles_mask.html    |   38 +
 phpBB/adm/style/permission_trace.html         |   58 +
 phpBB/adm/style/permissions.js                |  359 ++++++
 phpBB/adm/style/progress_bar.html             |   40 +
 phpBB/adm/style/simple_body.html              |    8 +
 phpBB/adm/style/simple_footer.html            |   31 +
 phpBB/adm/style/simple_header.html            |  112 ++
 phpBB/adm/style/tooltip.js                    |  251 ++++
 phpBB/adm/style/viewsource.html               |   21 +
 74 files changed, 11028 insertions(+)
 create mode 100644 phpBB/adm/style/acp_attachments.html
 create mode 100644 phpBB/adm/style/acp_ban.html
 create mode 100644 phpBB/adm/style/acp_bbcodes.html
 create mode 100644 phpBB/adm/style/acp_board.html
 create mode 100644 phpBB/adm/style/acp_bots.html
 create mode 100644 phpBB/adm/style/acp_captcha.html
 create mode 100644 phpBB/adm/style/acp_database.html
 create mode 100644 phpBB/adm/style/acp_disallow.html
 create mode 100644 phpBB/adm/style/acp_email.html
 create mode 100644 phpBB/adm/style/acp_forums.html
 create mode 100644 phpBB/adm/style/acp_forums_copy_perm.html
 create mode 100644 phpBB/adm/style/acp_groups.html
 create mode 100644 phpBB/adm/style/acp_icons.html
 create mode 100644 phpBB/adm/style/acp_inactive.html
 create mode 100644 phpBB/adm/style/acp_jabber.html
 create mode 100644 phpBB/adm/style/acp_language.html
 create mode 100644 phpBB/adm/style/acp_logs.html
 create mode 100644 phpBB/adm/style/acp_main.html
 create mode 100644 phpBB/adm/style/acp_modules.html
 create mode 100644 phpBB/adm/style/acp_permission_roles.html
 create mode 100644 phpBB/adm/style/acp_permissions.html
 create mode 100644 phpBB/adm/style/acp_php_info.html
 create mode 100644 phpBB/adm/style/acp_profile.html
 create mode 100644 phpBB/adm/style/acp_prune_forums.html
 create mode 100644 phpBB/adm/style/acp_prune_users.html
 create mode 100644 phpBB/adm/style/acp_ranks.html
 create mode 100644 phpBB/adm/style/acp_reasons.html
 create mode 100644 phpBB/adm/style/acp_search.html
 create mode 100644 phpBB/adm/style/acp_send_statistics.html
 create mode 100644 phpBB/adm/style/acp_styles.html
 create mode 100644 phpBB/adm/style/acp_update.html
 create mode 100644 phpBB/adm/style/acp_users.html
 create mode 100644 phpBB/adm/style/acp_users_avatar.html
 create mode 100644 phpBB/adm/style/acp_users_feedback.html
 create mode 100644 phpBB/adm/style/acp_users_overview.html
 create mode 100644 phpBB/adm/style/acp_users_prefs.html
 create mode 100644 phpBB/adm/style/acp_users_profile.html
 create mode 100644 phpBB/adm/style/acp_users_signature.html
 create mode 100644 phpBB/adm/style/acp_users_warnings.html
 create mode 100644 phpBB/adm/style/acp_words.html
 create mode 100644 phpBB/adm/style/admin.css
 create mode 100644 phpBB/adm/style/captcha_default_acp_demo.html
 create mode 100644 phpBB/adm/style/captcha_gd_acp.html
 create mode 100644 phpBB/adm/style/captcha_qa_acp.html
 create mode 100644 phpBB/adm/style/captcha_qa_acp_demo.html
 create mode 100644 phpBB/adm/style/captcha_recaptcha.html
 create mode 100644 phpBB/adm/style/captcha_recaptcha_acp.html
 create mode 100644 phpBB/adm/style/colour_swatch.html
 create mode 100644 phpBB/adm/style/confirm_body.html
 create mode 100644 phpBB/adm/style/confirm_body_prune.html
 create mode 100644 phpBB/adm/style/custom_profile_fields.html
 create mode 100644 phpBB/adm/style/editor.js
 create mode 100644 phpBB/adm/style/install_convert.html
 create mode 100644 phpBB/adm/style/install_error.html
 create mode 100644 phpBB/adm/style/install_footer.html
 create mode 100644 phpBB/adm/style/install_header.html
 create mode 100644 phpBB/adm/style/install_install.html
 create mode 100644 phpBB/adm/style/install_main.html
 create mode 100644 phpBB/adm/style/install_update.html
 create mode 100644 phpBB/adm/style/install_update_diff.html
 create mode 100644 phpBB/adm/style/message_body.html
 create mode 100644 phpBB/adm/style/overall_footer.html
 create mode 100644 phpBB/adm/style/overall_header.html
 create mode 100644 phpBB/adm/style/permission_forum_copy.html
 create mode 100644 phpBB/adm/style/permission_mask.html
 create mode 100644 phpBB/adm/style/permission_roles_mask.html
 create mode 100644 phpBB/adm/style/permission_trace.html
 create mode 100644 phpBB/adm/style/permissions.js
 create mode 100644 phpBB/adm/style/progress_bar.html
 create mode 100644 phpBB/adm/style/simple_body.html
 create mode 100644 phpBB/adm/style/simple_footer.html
 create mode 100644 phpBB/adm/style/simple_header.html
 create mode 100644 phpBB/adm/style/tooltip.js
 create mode 100644 phpBB/adm/style/viewsource.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
new file mode 100644
index 0000000000..9573c34248
--- /dev/null
+++ b/phpBB/adm/style/acp_attachments.html
@@ -0,0 +1,376 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF U_BACK -->
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+<!-- ENDIF -->
+
+<h1>{L_TITLE}</h1>
+
+<p>{L_TITLE_EXPLAIN}</p>
+
+<!-- IF S_WARNING -->
+	<div class="errorbox">
+		<h3>{L_WARNING}</h3>
+		<p>{WARNING_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
+<!-- IF S_NOTIFY -->
+	<div class="successbox">
+		<h3>{L_NOTIFY}</h3>
+		<p>{NOTIFY_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
+<!-- IF S_UPLOADING_FILES -->
+	<h2>{L_UPLOADING_FILES}</h2>
+
+	<!-- BEGIN upload -->
+		:: {upload.FILE_INFO}<br />
+		<!-- IF upload.S_DENIED --><span class="error">{upload.DENIED}</span><!-- ELSEIF upload.ERROR_MSG --><span class="error">{upload.ERROR_MSG}</span><!-- ELSE --><span class="success">{L_SUCCESSFULLY_UPLOADED}</span><!-- ENDIF -->
+		<br /><br />
+	<!-- END upload -->
+
+<!-- ENDIF -->
+
+<!-- IF S_ATTACHMENT_SETTINGS -->
+
+	<!-- IF not S_THUMBNAIL_SUPPORT -->
+		<div class="errorbox">
+			<p>{L_NO_THUMBNAIL_SUPPORT}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="attachsettings" method="post" action="{U_ACTION}">
+	<!-- BEGIN options -->
+		<!-- IF options.S_LEGEND -->
+			<!-- IF not options.S_FIRST_ROW -->
+				</fieldset>
+			<!-- ENDIF -->
+			<fieldset>
+				<legend>{options.LEGEND}</legend>
+		<!-- ELSE -->
+
+			<dl>
+				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dd>{options.CONTENT}</dd>
+			</dl>
+
+		<!-- ENDIF -->
+	<!-- END options -->
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</fieldset>
+
+	<!-- IF not S_SECURE_DOWNLOADS -->
+		<div class="errorbox">
+			<p>{L_SECURE_DOWNLOAD_NOTICE}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_SECURE_TITLE}</legend>
+		<p>{L_DOWNLOAD_ADD_IPS_EXPLAIN}</p>
+	<dl>
+		<dt><label for="ip_hostname">{L_IP_HOSTNAME}:</label></dt>
+		<dd><textarea id="ip_hostname" cols="40" rows="3" name="ips"></textarea></dd>
+	</dl>
+	<dl>
+		<dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
+		<dd><label><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES}</label>
+			<label><input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
+	</dl>
+
+	<p class="quick">
+		<input class="button1" type="submit" id="securesubmit" name="securesubmit" value="{L_SUBMIT}" />
+	</p>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_REMOVE_IPS}</legend>
+	<!-- IF S_DEFINED_IPS -->
+			<p>{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}</p>
+		<dl>
+			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}:</label></dt>
+			<dd><select name="unip[]" id="remove_ip_hostname" multiple="multiple" size="10">{DEFINED_IPS}</select></dd>
+		</dl>
+
+		<p class="quick">
+			<input class="button1" type="submit" id="unsecuresubmit" name="unsecuresubmit" value="{L_SUBMIT}" />
+		</p>
+		</fieldset>
+
+	<!-- ELSE -->
+		<p>{L_NO_IPS_DEFINED}</p>
+	<!-- ENDIF -->
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_EXTENSION_GROUPS -->
+
+	<!-- IF S_EDIT_GROUP -->
+		<script type="text/javascript" defer="defer">
+		// <![CDATA[
+			function update_image(newimage)
+			{
+				if (newimage == 'no_image')
+				{
+					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}images/spacer.gif";
+				}
+				else
+				{
+					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
+				}
+			}
+
+			function show_extensions(elem)
+			{
+				var str = '';
+
+				for (i = 0; i < elem.length; i++)
+				{
+					var element = elem.options[i];
+					if (element.selected)
+					{
+						if (str)
+						{
+							str = str + ', ';
+						}
+
+						str = str + element.innerHTML;
+					}
+				}
+
+				if (document.all)
+				{
+					document.all.ext.innerText = str;
+				}
+				else if (document.getElementById('ext').textContent)
+				{
+					document.getElementById('ext').textContent = str;
+				}
+				else if (document.getElementById('ext').firstChild.nodeValue)
+				{
+					document.getElementById('ext').firstChild.nodeValue = str;
+				}
+			}
+
+		// ]]>
+		</script>
+
+		<form id="extgroups" method="post" action="{U_ACTION}">
+		<fieldset>
+			<input type="hidden" name="action" value="{ACTION}" />
+			<input type="hidden" name="g" value="{GROUP_ID}" />
+
+			<legend>{L_LEGEND}</legend>
+		<dl>
+			<dt><label for="group_name">{L_GROUP_NAME}:</label></dt>
+			<dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="category">{L_SPECIAL_CATEGORY}:</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
+			<dd>{S_CATEGORY_SELECT}</dd>
+		</dl>
+		<dl>
+			<dt><label for="allowed">{L_ALLOWED}:</label></dt>
+			<dd><input type="checkbox" class="radio" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		<dl>
+			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt>
+			<dd><input type="checkbox" class="radio" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		<dl>
+			<dt><label for="upload_icon">{L_UPLOAD_ICON}:</label></dt>
+			<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">
+					<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}
+			</select></dd>
+			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
+		</dl>
+		<dl>
+			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt>
+			<dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}:</label></dt>
+			<dd><div id="ext">{ASSIGNED_EXTENSIONS}</div> <span>[<a href="{U_EXTENSIONS}">{L_GO_TO_EXTENSIONS}</a> ]</span></dd>
+			<dd><select name="extensions[]" id="assigned_extensions" class="narrow" onchange="show_extensions(this);" multiple="multiple" size="8">{S_EXTENSION_OPTIONS}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label>
+				<label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
+			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
+		</dl>
+
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		</p>
+		{S_FORM_TOKEN}
+		</fieldset>
+
+		</form>
+	<!-- ELSE -->
+
+		<form id="extgroups" method="post" action="{U_ACTION}">
+		<fieldset class="tabulated">
+		<legend>{L_TITLE}</legend>
+
+		<table cellspacing="1">
+			<col class="row1" /><col class="row1" /><col class="row2" />
+		<thead>
+		<tr>
+			<th>{L_EXTENSION_GROUP}</th>
+			<th>{L_SPECIAL_CATEGORY}</th>
+			<th>{L_OPTIONS}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN groups -->
+			<!-- IF groups.S_ADD_SPACER and not groups.S_FIRST_ROW -->
+			<tr>
+				<td class="spacer" colspan="3">&nbsp;</td>
+			</tr>
+			<!-- ENDIF -->
+			<tr>
+				<td><strong>{groups.GROUP_NAME}</strong>
+					<!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM}</span>
+					<!-- ELSEIF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br /><span>&raquo; {L_ONLY_ALLOWED_IN_PM}</span>
+					<!-- ELSEIF not groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM_POST}</span>
+					<!-- ELSE --><br /><span>&raquo; {L_ALLOWED_IN_PM_POST}</span><!-- ENDIF -->
+				</td>
+				<td>{groups.CATEGORY}</td>
+				<td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{groups.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
+			</tr>
+		<!-- END groups -->
+		</tbody>
+		</table>
+		<p class="quick">
+				{L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" />
+				<input class="button2" name="add" type="submit" value="{L_SUBMIT}" />
+		</p>
+		{S_FORM_TOKEN}
+		</fieldset>
+		</form>
+
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_EXTENSIONS -->
+
+	<form id="add_ext" method="post" action="{U_ACTION}">
+	<fieldset>
+		<legend>{L_ADD_EXTENSION}</legend>
+	<dl>
+		<dt><label for="add_extension">{L_EXTENSION}</label></dt>
+		<dd><input type="text" id="add_extension" size="20" maxlength="100" name="add_extension" value="{ADD_EXTENSION}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="extension_group">{L_EXTENSION_GROUP}</label></dt>
+		<dd>{GROUP_SELECT_OPTIONS}</dd>
+	</dl>
+
+	<p class="quick">
+		<input type="submit" id="add_extension_check" name="add_extension_check" class="button2" value="{L_SUBMIT}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+	<br />
+
+	<form id="change_ext" method="post" action="{U_ACTION}">
+
+	<fieldset class="tabulated">
+	<legend>{L_TITLE}</legend>
+
+	<table cellspacing="1">
+		<col class="row1" /><col class="row1" /><col class="row2" />
+	<thead>
+	<tr>
+		<th>{L_EXTENSION}</th>
+		<th>{L_EXTENSION_GROUP}</th>
+		<th>{L_DELETE}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN extensions -->
+		<!-- IF extensions.S_SPACER -->
+		<tr>
+			<td class="spacer" colspan="3">&nbsp;</td>
+		</tr>
+		<!-- ENDIF -->
+		<tr>
+			<td><strong>{extensions.EXTENSION}</strong></td>
+			<td>{extensions.GROUP_OPTIONS}</td>
+			<td><input type="checkbox" class="radio" name="extension_id_list[]" value="{extensions.EXTENSION_ID}" /><input type="hidden" name="extension_change_list[]" value="{extensions.EXTENSION_ID}" /></td>
+		</tr>
+	<!-- END extensions -->
+	</tbody>
+	</table>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_ORPHAN -->
+
+	<form id="orphan" method="post" action="{U_ACTION}">
+
+	<fieldset class="tabulated">
+	<legend>{L_TITLE}</legend>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_FILENAME}</th>
+		<th>{L_FILEDATE}</th>
+		<th>{L_FILESIZE}</th>
+		<th>{L_ATTACH_POST_ID}</th>
+		<th>{L_ATTACH_TO_POST}</th>
+		<th>{L_DELETE}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN orphan -->
+		<!-- IF orphan.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
+			<td>{orphan.FILETIME}</td>
+			<td>{orphan.FILESIZE}</td>
+			<td><strong>{L_ATTACH_ID}: </strong><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
+			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
+			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
+		</tr>
+	<!-- END orphan -->
+	<tr class="row4">
+		<td colspan="4">&nbsp;</td>
+		<td class="small"><a href="#" onclick="marklist('orphan', 'add', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'add', false); return false;">{L_UNMARK_ALL}</a></td>
+		<td class="small"><a href="#" onclick="marklist('orphan', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'delete', false); return false;">{L_UNMARK_ALL}</a></td>
+	</tr>
+	</tbody>
+	</table>
+
+	<br />
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
new file mode 100644
index 0000000000..bc326345b0
--- /dev/null
+++ b/phpBB/adm/style/acp_ban.html
@@ -0,0 +1,124 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<p>{L_ACP_BAN_EXPLAIN}</p>
+
+<h1>{L_TITLE}</h1>
+
+<p>{L_EXPLAIN}</p>
+
+<script type="text/javascript">
+// <![CDATA[
+
+	var ban_length = new Array();
+		ban_length[-1] = '';
+	<!-- BEGIN ban_length -->
+		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
+	<!-- END ban_length -->
+
+	var ban_reason = new Array();
+		ban_reason[-1] = '';
+	<!-- BEGIN ban_reason -->
+		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
+	<!-- END ban_reason -->
+
+	var ban_give_reason = new Array();
+		ban_give_reason[-1] = '';
+	<!-- BEGIN ban_give_reason -->
+		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
+	<!-- END ban_give_reason -->
+
+	function display_details(option)
+	{
+		document.getElementById('acp_unban').unbangivereason.value = ban_give_reason[option];
+		document.getElementById('acp_unban').unbanreason.value = ban_reason[option];
+		document.getElementById('acp_unban').unbanlength.value = ban_length[option];
+	}
+
+// ]]>
+</script>
+
+<form id="acp_ban" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_TITLE}</legend>
+<dl>
+	<dt><label for="ban">{L_BAN_CELL}:</label></dt>
+	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
+	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
+</dl>
+<dl>
+	<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
+	<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>
+	<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>
+</dl>
+<dl>
+	<dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES}</label>
+		<label><input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
+</dl>
+<dl>
+	<dt><label for="banreason">{L_BAN_REASON}:</label></dt>
+	<dd><input name="banreason" type="text" class="text medium" maxlength="255" id="banreason" /></dd>
+</dl>
+<dl>
+	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt>
+	<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>
+</dl>
+
+<p class="submit-buttons">
+	<input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />&nbsp;
+	<input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
+</p>
+{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<br /><br />
+
+<h1>{L_UNBAN_TITLE}</h1>
+
+<p>{L_UNBAN_EXPLAIN}</p>
+
+<form id="acp_unban" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_UNBAN_TITLE}</legend>
+
+<!-- IF S_BANNED_OPTIONS -->
+	<dl>
+		<dt><label for="unban">{L_BAN_CELL}:</label></dt>
+		<dd><select id="unban" name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
+		<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbanlength" id="unbanlength" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
+		<dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbanreason" id="unbanreason" rows="5" cols="80">&nbsp;</textarea></dd>
+	</dl>
+	<dl>
+		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
+		<dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbangivereason" id="unbangivereason" rows="5" cols="80">&nbsp;</textarea></dd>
+	</dl>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="unbansubmit" name="unbansubmit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="unbanreset" name="unbanreset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+
+<!-- ELSE -->
+
+	<p>{L_NO_BAN_CELL}</p>
+	{S_FORM_TOKEN}
+</fieldset>
+
+<!-- ENDIF -->
+
+</form>
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
new file mode 100644
index 0000000000..c81c198fd5
--- /dev/null
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -0,0 +1,124 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT_BBCODE -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_ACP_BBCODES}</h1>
+
+	<p>{L_ACP_BBCODES_EXPLAIN}</p>
+
+	<form id="acp_bbcodes" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_BBCODE_USAGE}</legend>
+		<p>{L_BBCODE_USAGE_EXPLAIN}</p>
+	<dl>
+		<dt><label for="bbcode_match">{L_EXAMPLES}</label><br /><br /><span>{L_BBCODE_USAGE_EXAMPLE}</span></dt>
+		<dd><textarea id="bbcode_match" name="bbcode_match" cols="60" rows="5">{BBCODE_MATCH}</textarea></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_HTML_REPLACEMENT}</legend>
+		<p>{L_HTML_REPLACEMENT_EXPLAIN}</p>
+	<dl>
+		<dt><label for="bbcode_tpl">{L_EXAMPLES}</label><br /><br /><span>{L_HTML_REPLACEMENT_EXAMPLE}</span></dt>
+		<dd><textarea id="bbcode_tpl" name="bbcode_tpl" cols="60" rows="8">{BBCODE_TPL}</textarea></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_BBCODE_HELPLINE}</legend>
+		<p>{L_BBCODE_HELPLINE_EXPLAIN}</p>
+	<dl>
+		<dt><label for="bbcode_helpline">{L_BBCODE_HELPLINE_TEXT}</label></dt>
+		<dd><input type="text" id="bbcode_helpline" name="bbcode_helpline" size="60" maxlength="255" value="{BBCODE_HELPLINE}" /></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_SETTINGS}</legend>
+	<dl>
+		<dt><label for="display_on_posting">{L_DISPLAY_ON_POSTING}</label></dt>
+		<dd><input type="checkbox" class="radio" name="display_on_posting" id="display_on_posting" value="1"<!-- IF DISPLAY_ON_POSTING --> checked="checked"<!-- ENDIF --> /></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	
+	<br />
+
+	<table cellspacing="1" id="down">
+	<thead>
+	<tr>
+		<th colspan="2">{L_TOKENS}</th>
+	</tr>
+	<tr>
+		<td class="row3" colspan="2">{L_TOKENS_EXPLAIN}</td>
+	</tr>
+	<tr>
+		<th>{L_TOKEN}</th>
+		<th>{L_TOKEN_DEFINITION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN token -->
+		<tr valign="top">
+			<td class="row1">{token.TOKEN}</td>
+			<td class="row2">{token.EXPLAIN}</td>
+		</tr>
+	<!-- END token -->
+	</tbody>
+	</table>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_ACP_BBCODES}</h1>
+
+	<p>{L_ACP_BBCODES_EXPLAIN}</p>
+	
+	<form id="acp_bbcodes" method="post" action="{U_ACTION}">
+	<fieldset class="tabulated">
+	<legend>{L_ACP_BBCODES}</legend>
+
+	<table cellspacing="1" id="down">
+	<thead>
+	<tr>
+		<th>{L_BBCODE_TAG}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN bbcodes -->
+		<!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td>
+			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}">{ICON_DELETE}</a></td>
+		</tr>
+	<!-- BEGINELSE -->
+		<tr class="row3">
+			<td colspan="2">{L_ACP_NO_ITEMS}</td>
+		</tr>
+	<!-- END bbcodes -->
+	</tbody>
+	</table>
+
+	<p class="quick">
+		<input class="button2" name="submit" type="submit" value="{L_ADD_BBCODE}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
new file mode 100644
index 0000000000..bb16204801
--- /dev/null
+++ b/phpBB/adm/style/acp_board.html
@@ -0,0 +1,49 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_TITLE}</h1>
+
+<p>{L_TITLE_EXPLAIN}</p>
+
+<!-- IF S_ERROR -->
+	<div class="errorbox">
+		<h3>{L_WARNING}</h3>
+		<p>{ERROR_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
+<form id="acp_board" method="post" action="{U_ACTION}">
+
+<!-- BEGIN options -->
+	<!-- IF options.S_LEGEND -->
+		<!-- IF not options.S_FIRST_ROW -->
+			</fieldset>
+		<!-- ENDIF -->
+		<fieldset>
+			<legend>{options.LEGEND}</legend>
+	<!-- ELSE -->
+
+		<dl>
+			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dd>{options.CONTENT}</dd>
+		</dl>
+
+	<!-- ENDIF -->
+<!-- END options -->
+
+<!-- IF S_AUTH -->
+	<!-- BEGIN auth_tpl -->
+		{auth_tpl.TPL}
+	<!-- END auth_tpl -->
+<!-- ENDIF -->
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
new file mode 100644
index 0000000000..7783356574
--- /dev/null
+++ b/phpBB/adm/style/acp_bots.html
@@ -0,0 +1,102 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT_BOT -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_BOT_EDIT_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="acp_bots" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_TITLE}</legend>
+	<dl>
+		<dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>
+		<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" maxlength="255" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
+		<dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_lang">{L_BOT_LANG}:</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>
+		<dd><select id="bot_lang" name="bot_lang">{S_LANG_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_active">{L_BOT_ACTIVE}:</label></dt>
+		<dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
+		<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt>
+		<dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" maxlength="255" /></dd>
+	</dl>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_BOTS}</h1>
+
+	<p>{L_BOTS_EXPLAIN}</p>
+
+	<form id="acp_bots" method="post" action="{U_ACTION}">
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_BOT_NAME}</th>
+		<th>{L_BOT_LAST_VISIT}</th>
+		<th colspan="3">{L_OPTIONS}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN bots -->
+		<!-- IF bots.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td style="width: 50%;">{bots.BOT_NAME}</td>
+			<td style="width: 15%; white-space: nowrap;" align="center">&nbsp;{bots.LAST_VISIT}&nbsp;</td>
+			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
+			<td style="text-align: center;">&nbsp;<a href="{bots.U_EDIT}">{L_EDIT}</a>&nbsp;</td>
+			<td style="text-align: center;">&nbsp;<a href="{bots.U_DELETE}">{L_DELETE}</a>&nbsp;</td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{bots.BOT_ID}" /></td>
+		</tr>
+	<!-- END bots -->
+	</tbody>
+	</table>
+
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+		<input class="button2" name="add" type="submit" value="{L_BOT_ADD}" />
+	</fieldset>
+
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+		<select name="action">{S_BOT_OPTIONS}</select>
+		<input class="button2" name="submit" type="submit" value="{L_SUBMIT}" />
+		<p class="small"><a href="#" onclick="marklist('acp_bots', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('acp_bots', 'mark', false);">{L_UNMARK_ALL}</a></p>
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
new file mode 100644
index 0000000000..d31527b64d
--- /dev/null
+++ b/phpBB/adm/style/acp_captcha.html
@@ -0,0 +1,67 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_VC_SETTINGS}</h1>
+
+<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
+
+
+<form id="acp_captcha" method="post" action="{U_ACTION}">
+
+<fieldset>
+<legend>{L_GENERAL_OPTIONS}</legend>
+
+<dl>
+	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}:</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+</dl>
+<dl>
+	<dt><label for="max_reg_attempts">{L_REG_LIMIT}:</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
+	<dd><input id="max_reg_attempts" type="text" size="4" maxlength="4" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
+</dl>
+<dl>
+	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+</dl>
+<dl>
+	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}:</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"<!-- IF CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+</dl>
+</fieldset>
+
+<fieldset>
+<legend>{L_AVAILABLE_CAPTCHAS}</legend>
+<dl>
+	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}:</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
+	<dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd>
+</dl>
+ <!-- IF S_CAPTCHA_HAS_CONFIG -->
+<dl>
+	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}:</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
+	<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd>
+</dl>
+<!-- ENDIF -->
+</fieldset>
+
+<!-- IF CAPTCHA_PREVIEW_TPL -->
+<fieldset>
+	<legend>{L_PREVIEW}</legend>
+<!-- INCLUDE {CAPTCHA_PREVIEW_TPL} -->
+</fieldset>
+<!-- ENDIF -->
+
+<fieldset>
+	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="main_submit" name="main_submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="form_reset" name="reset" value="{L_RESET}" />&nbsp;
+	</p>
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html
new file mode 100644
index 0000000000..de02ac6dbe
--- /dev/null
+++ b/phpBB/adm/style/acp_database.html
@@ -0,0 +1,98 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF MODE eq 'restore' -->
+	<h1>{L_ACP_RESTORE}</h1>
+
+	<p>{L_ACP_RESTORE_EXPLAIN}</p>
+
+	<!-- IF .files -->
+	<form id="acp_backup" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_RESTORE_OPTIONS}</legend>
+	<dl>
+		<dt><label for="file">{L_SELECT_FILE}:</label></dt>
+		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
+	</dl>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" />&nbsp;
+		<input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" />&nbsp;
+		<input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_ACP_NO_ITEMS}</p>
+		</div>
+	<!-- ENDIF -->
+
+<!-- ELSE -->
+	<h1>{L_ACP_BACKUP}</h1>
+
+	<p>{L_ACP_BACKUP_EXPLAIN}</p>
+
+	<script type="text/javascript">
+	// <![CDATA[
+
+		function selector(bool)
+		{
+			var table = document.getElementById('table');
+
+			for (var i = 0; i < table.options.length; i++)
+			{
+				table.options[i].selected = bool;
+			}
+		}
+
+	// ]]>
+	</script>
+
+	<form id="acp_backup" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_BACKUP_OPTIONS}</legend>
+	<dl>
+		<dt><label for="type">{L_BACKUP_TYPE}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>
+			<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>
+			<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>
+	</dl>
+	<dl>
+		<dt><label for="method">{L_FILE_TYPE}:</label></dt>
+		<dd><!-- BEGIN methods -->
+		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>
+		<!-- END methods --></dd>
+	</dl>
+	<dl>
+		<dt><label for="where">{L_ACTION}:</label></dt>
+		<dd>
+			<label><input id="where" type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>
+			<label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label>
+		</dd>
+	</dl>
+	<dl>
+		<dt><label for="table">{L_TABLE_SELECT}:</label></dt>
+		<dd><select id="table" name="table[]" size="10" multiple="multiple">
+		<!-- BEGIN tables -->
+			<option value="{tables.TABLE}">{tables.TABLE}</option>
+		<!-- END tables -->
+		</select></dd>
+		<dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd>
+	</dl>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html
new file mode 100644
index 0000000000..b68d3ab3c0
--- /dev/null
+++ b/phpBB/adm/style/acp_disallow.html
@@ -0,0 +1,45 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_DISALLOW_USERNAMES}</h1>
+
+<p>{L_ACP_DISALLOW_EXPLAIN}</p>
+
+<form id="acp_disallow" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_ADD_DISALLOW_TITLE}</legend>
+<dl>
+	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
+	<dd><input id="user" type="text" class="text medium" maxlength="255" name="disallowed_user" /></dd>
+</dl>
+
+<p class="quick">
+	<input class="button1" type="submit" name="disallow" value="{L_SUBMIT}" />
+</p>
+</fieldset>
+
+<h1>{L_DELETE_DISALLOW_TITLE}</h1>
+
+<p>{L_DELETE_DISALLOW_EXPLAIN}</p>
+
+<fieldset>
+	<legend>{L_DELETE_DISALLOW_TITLE}</legend>
+<!-- IF S_DISALLOWED_NAMES -->
+	<dl>
+		<dt><label for="disallowed">{L_USERNAME}:</label></dt>
+		<dd><select name="disallowed_id" id="disallowed">{S_DISALLOWED_NAMES}</select></dd>
+	</dl>
+
+	<p class="quick">
+		<input class="button1" type="submit" name="allow" value="{L_SUBMIT}" />
+	</p>
+<!-- ELSE -->
+	<p>{L_NO_DISALLOWED}</p>
+<!-- ENDIF -->
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html
new file mode 100644
index 0000000000..885809ffe2
--- /dev/null
+++ b/phpBB/adm/style/acp_email.html
@@ -0,0 +1,54 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_MASS_EMAIL}</h1>
+
+<p>{L_ACP_MASS_EMAIL_EXPLAIN}</p>
+
+<!-- IF S_WARNING -->
+	<div class="errorbox">
+		<h3>{L_WARNING}</h3>
+		<p>{WARNING_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
+<form id="acp_email" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_COMPOSE}</legend>
+<dl>
+	<dt><label for="group">{L_SEND_TO_GROUP}:</label></dt>
+	<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
+</dl>
+<dl>
+	<dt><label for="usernames">{L_SEND_TO_USERS}:</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
+	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
+	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+</dl>
+<dl>
+	<dt><label for="subject">{L_SUBJECT}:</label></dt>
+	<dd><input name="subject" type="text" id="subject" value="{SUBJECT}" /></dd>
+</dl>
+<dl>
+	<dt><label for="message">{L_MASS_MESSAGE}:</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt>
+	<dd><textarea id="message" name="message" rows="10" cols="60">{MESSAGE}</textarea></dd>
+</dl>
+<dl>
+	<dt><label for="priority">{L_MAIL_PRIORITY}:</label></dt>
+	<dd><select id="priority" name="mail_priority_flag">{S_PRIORITY_OPTIONS}</select></dd>
+</dl>
+<dl>
+	<dt><label for="send">{L_SEND_IMMEDIATELY}:</label></dt>
+	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>
+</dl>
+
+<p class="submit-buttons">
+	<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_EMAIL}" />&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+</p>
+{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
new file mode 100644
index 0000000000..937a288cb2
--- /dev/null
+++ b/phpBB/adm/style/acp_forums.html
@@ -0,0 +1,505 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT_FORUM -->
+
+	<script type="text/javascript">
+	// <![CDATA[
+		/**
+		* Handle displaying/hiding several options based on the forum type
+		*/
+		function display_options(value)
+		{
+			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
+				if (value == {FORUM_POST})
+				{
+					dE('type_actions', -1);
+				}
+				else
+				{
+					dE('type_actions', 1);
+				}
+			<!-- ENDIF -->
+
+			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
+				if (value == {FORUM_LINK})
+				{
+					dE('cat_to_link_actions', 1);
+				}
+				else
+				{
+					dE('cat_to_link_actions', -1);
+				}
+			<!-- ENDIF -->
+
+			if (value == {FORUM_POST})
+			{
+				dE('forum_post_options', 1);
+				dE('forum_link_options', -1);
+				dE('forum_rules_options', 1);
+				dE('forum_cat_options', -1);
+			}
+			else if (value == {FORUM_LINK})
+			{
+				dE('forum_post_options', -1);
+				dE('forum_link_options', 1);
+				dE('forum_rules_options', -1);
+				dE('forum_cat_options', -1);
+			}
+			else if (value == {FORUM_CAT})
+			{
+				dE('forum_post_options', -1);
+				dE('forum_link_options', -1);
+				dE('forum_rules_options', 1);
+				dE('forum_cat_options', 1);
+			}
+		}
+
+		/**
+		* Init the wanted display functionality if javascript is enabled.
+		* If javascript is not available, the user is still able to properly administrate.
+		*/
+		onload = function()
+		{
+			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
+				<!-- IF S_FORUM_POST -->
+					dE('type_actions', -1);
+				<!-- ENDIF -->
+			<!-- ENDIF -->
+
+			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
+				<!-- IF S_FORUM_CAT -->
+					dE('cat_to_link_actions', -1);
+				<!-- ENDIF -->
+			<!-- ENDIF -->
+
+			<!-- IF not S_FORUM_POST -->
+				dE('forum_post_options', -1);
+			<!-- ENDIF -->
+
+			<!-- IF not S_FORUM_CAT -->
+				dE('forum_cat_options', -1);
+			<!-- ENDIF -->
+
+			<!-- IF not S_FORUM_LINK -->
+				dE('forum_link_options', -1);
+			<!-- ENDIF -->
+
+			<!-- IF S_FORUM_LINK -->
+			dE('forum_rules_options', -1);
+			<!-- ENDIF -->
+		}
+
+	// ]]>
+	</script>
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE} <!-- IF FORUM_NAME -->:: {FORUM_NAME}<!-- ENDIF --></h1>
+
+	<p>{L_FORUM_EDIT_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="forumedit" method="post" action="{U_EDIT_ACTION}">
+
+	<fieldset>
+		<legend>{L_FORUM_SETTINGS}</legend>
+	<dl>
+		<dt><label for="forum_type">{L_FORUM_TYPE}:</label></dt>
+		<dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd>
+	</dl>
+	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
+	<div id="type_actions">
+		<dl>
+			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt>
+			<dd><label><input type="radio" class="radio" name="type_action" value="delete"<!-- IF not S_MOVE_FORUM_OPTIONS --> checked="checked" id="type_action"<!-- ENDIF --> /> {L_DELETE_ALL_POSTS}</label></dd>
+			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><label><input type="radio" class="radio" name="type_action" id="type_action" value="move" checked="checked" /> {L_MOVE_POSTS_TO}</label> <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
+		</dl>
+	</div>
+	<!-- ENDIF -->
+	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
+	<div id="cat_to_link_actions">
+		<dl>
+			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}:</label></dt>
+			<!-- IF S_FORUMS_LIST -->
+				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
+			<!-- ELSE -->
+				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
+			<!-- ENDIF -->
+		</dl>
+	</div>
+	<!-- ENDIF -->
+	<dl>
+		<dt><label for="parent">{L_FORUM_PARENT}:</label></dt>
+		<dd><select id="parent" name="forum_parent_id"><option value="0"<!-- IF not S_FORUM_PARENT_ID --> selected="selected"<!-- ENDIF -->>{L_NO_PARENT}</option>{S_PARENT_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="forum_name">{L_FORUM_NAME}:</label></dt>
+		<dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="forum_desc">{L_FORUM_DESC}:</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
+		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd>
+		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
+	</dl>
+	<dl>
+		<dt><label for="forum_image">{L_FORUM_IMAGE}:</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>
+		<dd><input class="text medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255" /></dd>
+		<!-- IF FORUM_IMAGE_SRC -->
+			<dd><img src="{FORUM_IMAGE_SRC}" alt="{L_FORUM_IMAGE}" /></dd>
+		<!-- ENDIF -->
+	</dl>
+	<dl>
+		<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
+		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
+		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
+	</dl>
+	<!-- IF S_FORUM_PASSWORD_SET -->
+	<dl>
+		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}:</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt>
+		<dd><input id="forum_password_unset" name="forum_password_unset" type="checkbox" /></dd>
+	</dl>
+	<!-- ENDIF -->
+	<dl>
+		<dt><label for="forum_style">{L_FORUM_STYLE}:</label></dt>
+		<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>
+	</dl>
+	<!-- IF S_CAN_COPY_PERMISSIONS -->
+		<dl>
+			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+			<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
+		</dl>
+	<!-- ENDIF -->
+	</fieldset>
+
+	<div id="forum_cat_options">
+		<fieldset>
+			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
+		<dl>
+			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}:</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		</fieldset>
+	</div>
+
+	<div id="forum_post_options">
+		<fieldset>
+			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
+		<dl>
+			<dt><label for="forum_status">{L_FORUM_STATUS}:</label></dt>
+			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}:</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_subforum_list" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}:</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="enable_quick_reply">{L_ENABLE_QUICK_REPLY}:</label><br /><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_quick_reply" value="1"<!-- IF S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_quick_reply" value="0"<!-- IF not S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt>
+			<dd><label><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
+			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
+		</dl>
+		</fieldset>
+
+		<fieldset>
+			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
+		<dl>
+			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}:</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
+			<dd><input type="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" /> {L_DAYS}</dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}:</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
+			<dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" /> {L_DAYS}</dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}:</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
+			<dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" /> {L_DAYS}</dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
+			<dd><label><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt>
+			<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		</fieldset>
+	</div>
+
+	<div id="forum_link_options">
+		<fieldset>
+			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
+		<dl>
+			<dt><label for="link_display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="forum_link">{L_FORUM_LINK}:</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>
+			<dd><input class="text medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}:</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		</fieldset>
+	</div>
+
+	<div id="forum_rules_options">
+		<fieldset>
+			<legend>{L_FORUM_RULES}</legend>
+		<dl>
+			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}:</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
+			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
+		</dl>
+	<!-- IF FORUM_RULES_PREVIEW -->
+		<dl>
+			<dt><label>{L_FORUM_RULES_PREVIEW}:</label></dt>
+			<dd>{FORUM_RULES_PREVIEW}</dd>
+		</dl>
+	<!-- ENDIF -->
+		<dl>
+			<dt><label for="forum_rules">{L_FORUM_RULES}:</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
+			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd>
+			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
+				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
+				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
+		</dl>
+		</fieldset>
+	</div>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_DELETE_FORUM -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_FORUM_DELETE}</h1>
+
+	<p>{L_FORUM_DELETE_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="acp_forum" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_FORUM_DELETE}</legend>
+	<dl>
+		<dt><label>{L_FORUM_NAME}:</label></dt>
+		<dd><strong>{FORUM_NAME}</strong></dd>
+	</dl>
+	<!-- IF S_FORUM_POST -->
+		<dl>
+			<dt><label for="delete_action">{L_ACTION}:</label></dt>
+			<dd><label><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</label></dd>
+			<!-- IF S_MOVE_FORUM_OPTIONS -->
+				<dd><label><input type="radio" class="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO}</label> <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd>
+			<!-- ENDIF -->
+		</dl>
+	<!-- ENDIF -->
+	<!-- IF S_HAS_SUBFORUMS -->
+		<dl>
+			<dt><label for="sub_delete_action">{L_ACTION}:</label></dt>
+			<dd><label><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
+			<!-- IF S_FORUMS_LIST -->
+				<dd><label><input type="radio" class="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
+			<!-- ENDIF -->
+		</dl>
+	<!-- ENDIF -->
+
+	<p class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_CONTINUE_SYNC -->
+
+	<script type="text/javascript">
+	// <![CDATA[
+		var close_waitscreen = 0;
+		// no scrollbars...
+		popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
+	// ]]>
+	</script>
+
+	<h1>{L_FORUM_ADMIN}</h1>
+
+	<p>{L_FORUM_ADMIN_EXPLAIN}</p>
+
+	<p>{L_PROGRESS_EXPLAIN}</p>
+
+<!-- ELSE -->
+
+	<script type="text/javascript">
+	// <![CDATA[
+		/**
+		* Popup search progress bar
+		*/
+		function popup_progress_bar()
+		{
+			var close_waitscreen = 0;
+			// no scrollbars...
+			popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
+		}
+	// ]]>
+	</script>
+
+	<h1>{L_FORUM_ADMIN}</h1>
+
+	<p>{L_FORUM_ADMIN_EXPLAIN}</p>
+
+	<!-- IF ERROR_MSG -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<!-- IF S_RESYNCED -->
+		<script type="text/javascript">
+		// <![CDATA[
+			var close_waitscreen = 1;
+		// ]]>
+		</script>
+
+		<div class="successbox">
+			<h3>{L_NOTIFY}</h3>
+			<p>{L_FORUM_RESYNCED}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF --->]<!-- ENDIF --></strong></p>
+
+	<!-- IF .forums -->
+		<table cellspacing="1">
+			<col class="row1" /><col class="row1" /><col class="row2" />
+		<tbody>
+		<!-- BEGIN forums -->
+			<tr>
+				<td style="width: 5%; text-align: center;">{forums.FOLDER_IMAGE}</td>
+				<td>
+					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
+					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>
+					<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
+					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}: <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
+				</td>
+				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
+					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
+						{ICON_MOVE_UP_DISABLED}
+						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
+						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
+						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ELSE -->
+						{ICON_MOVE_UP_DISABLED}
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ENDIF -->
+					<a href="{forums.U_EDIT}">{ICON_EDIT}</a>
+					<!-- IF not forums.S_FORUM_LINK -->
+						<a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a>
+					<!-- ELSE -->
+						{ICON_SYNC_DISABLED}
+					<!-- ENDIF -->
+					<a href="{forums.U_DELETE}">{ICON_DELETE}</a>
+				</td>
+			</tr>
+		<!-- END forums -->
+		</tbody>
+		</table>
+	<!-- ENDIF -->
+
+	<form id="fselect" method="post" action="{U_SEL_ACTION}">
+
+	<fieldset class="quick">
+		{L_SELECT_FORUM}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
+
+		<input class="button2" type="submit" value="{L_GO}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+	<form id="forums" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick">
+		<input type="hidden" name="action" value="add" />
+
+		<input type="text" name="forum_name" value="" maxlength="255" />
+		<input class="button2" name="addforum" type="submit" value="{L_CREATE_FORUM}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html
new file mode 100644
index 0000000000..acec3c1967
--- /dev/null
+++ b/phpBB/adm/style/acp_forums_copy_perm.html
@@ -0,0 +1,22 @@
+<!-- INCLUDE overall_header.html -->
+
+<h1>{L_COPY_PERMISSIONS}</h1>
+
+<p>{L_COPY_PERMISSIONS_EXPLAIN}</p>
+<p>{L_ACL_LINK}</p>
+
+<form id="confirm" method="post" action="{S_COPY_ACTION}">
+
+<fieldset>
+	<dl>
+		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+		<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
+	</dl>
+	<div style="text-align: center;">{S_FORM_TOKEN}{S_HIDDEN_FIELDS}
+		<input type="submit" name="update" value="{L_CONTINUE}" class="button2" />&nbsp;
+	</div>
+</fieldset>
+
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
new file mode 100644
index 0000000000..a513e69a8a
--- /dev/null
+++ b/phpBB/adm/style/acp_groups.html
@@ -0,0 +1,358 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_ACP_GROUPS_MANAGE}</h1>
+
+	<p>{L_GROUP_EDIT_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
+
+	<fieldset>
+		<legend>{L_GROUP_DETAILS}</legend>
+	<dl>
+		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt>
+		<dd><!-- IF S_SPECIAL_GROUP --><strong>{GROUP_NAME}</strong><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt>
+		<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd>
+		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
+	</dl>
+	<!-- IF not S_SPECIAL_GROUP -->
+		<dl>
+			<dt><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
+			<dd>
+				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>
+				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>
+				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label>
+				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label>
+			</dd>
+		</dl>
+	<!-- ELSE -->
+		<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" />
+	<!-- ENDIF -->
+
+	<!-- IF S_ADD_GROUP and S_GROUP_PERM -->
+		<dl>
+			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+			<dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd>
+		</dl>
+	<!-- ENDIF -->
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_GROUP_OPTIONS_SAVE}</legend>
+	<!-- IF S_USER_FOUNDER -->
+	<dl>
+		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}:</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>
+		<dd><input name="group_founder_manage" type="checkbox" value="1" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE} /></dd>
+	</dl>
+	<!-- ENDIF -->
+	<dl>
+		<dt><label for="group_skip_auth">{L_GROUP_SKIP_AUTH}:</label><br /><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt>
+		<dd><input name="group_skip_auth" type="checkbox" value="1" class="radio" id="group_skip_auth"{GROUP_SKIP_AUTH} /></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt>
+		<dd><input name="group_legend" type="checkbox" value="1" class="radio" id="group_legend"{GROUP_LEGEND} /></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</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>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
+	<dl>
+		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
+		<dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}:</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
+		<dd><input name="group_max_recipients" type="text" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
+		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /><!-- IF GROUP_COLOUR -->&nbsp;<span style="background-color: #{GROUP_COLOUR}">&nbsp; &nbsp;</span><!-- ENDIF -->&nbsp;&nbsp;<span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
+		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_GROUP_AVATAR}</legend>
+	<dl>
+		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+		<dd>{AVATAR_IMAGE}</dd>
+		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
+	</dl>
+	<!-- IF not S_IN_AVATAR_GALLERY -->
+		<!-- IF S_CAN_UPLOAD -->
+			<dl>
+				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+				<dd><input type="file" id="uploadfile" name="uploadfile" /></dd>
+			</dl>
+			<dl>
+				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
+			</dl>
+		<!-- ENDIF -->
+		<dl>
+			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+			<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+			<dd><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>px</span></dd>
+		</dl>
+		<!-- IF S_DISPLAY_GALLERY -->
+			<dl>
+				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
+				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
+			</dl>
+		<!-- ENDIF -->
+	<!-- ELSE -->
+		</fieldset>
+
+		<fieldset>
+			<legend>{L_AVATAR_GALLERY}</legend>
+		<dl>
+			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
+			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
+		</dl>
+		<dl>
+			<table cellspacing="1">
+			<!-- BEGIN avatar_row -->
+			<tr>
+				<!-- BEGIN avatar_column -->
+					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
+				<!-- END avatar_column -->
+			</tr>
+			<tr>
+				<!-- BEGIN avatar_option_column -->
+					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
+				<!-- END avatar_option_column -->
+			</tr>
+			<!-- END avatar_row -->
+			</table>
+		</dl>
+		</fieldset>
+
+		<fieldset class="quick" style="margin-top: -15px;">
+			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+		</fieldset>
+
+	<!-- ENDIF -->
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_LIST -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_GROUP_MEMBERS} :: {GROUP_NAME}</h1>
+
+	<p>{L_GROUP_MEMBERS_EXPLAIN}</p>
+
+	<form id="list" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick">
+		<a href="{U_DEFAULT_ALL}">&raquo; {L_MAKE_DEFAULT_FOR_ALL}</a>
+	</fieldset>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_USERNAME}</th>
+		<th>{L_GROUP_DEFAULT}</th>
+		<th>{L_JOINED}</th>
+		<th>{L_POSTS}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<tr>
+		<td class="row3" colspan="5"><strong>{L_GROUP_LEAD}</strong></td>
+	</tr>
+	<!-- BEGIN leader -->
+		<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td><!-- IF leader.USERNAME_COLOUR --><a href="{leader.U_USER_EDIT}" style="color: #{leader.USERNAME_COLOUR};" class="username-coloured">{leader.USERNAME}</a><!-- ELSE --><a href="{leader.U_USER_EDIT}">{leader.USERNAME}</a><!-- ENDIF --></td>
+			<td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
+			<td style="text-align: center;">{leader.JOINED}</td>
+			<td style="text-align: center;">{leader.USER_POSTS}</td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{leader.USER_ID}" /></td>
+		</tr>
+	<!-- BEGINELSE -->
+		<tr>
+			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MODS}</td>
+		</tr>
+	<!-- END leader -->
+	<tr>
+		<td class="row3" colspan="5"><strong>{L_GROUP_APPROVED}</strong></td>
+	</tr>
+	<!-- BEGIN member -->
+		<!-- IF member.S_PENDING -->
+		<tr>
+			<td class="row3" colspan="5"><strong>{L_GROUP_PENDING}</strong></td>
+		</tr>
+		<!-- ELSE -->
+			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td><!-- IF member.USERNAME_COLOUR --><a href="{member.U_USER_EDIT}" style="color: #{member.USERNAME_COLOUR};" class="username-coloured">{member.USERNAME}</a><!-- ELSE --><a href="{member.U_USER_EDIT}">{member.USERNAME}</a><!-- ENDIF --></td>
+			<td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
+			<td style="text-align: center;">{member.JOINED}</td>
+			<td style="text-align: center;">{member.USER_POSTS}</td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{member.USER_ID}" /></td>
+		</tr>
+		<!-- ENDIF -->
+	<!-- BEGINELSE -->
+		<tr>
+			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td>
+		</tr>
+	<!-- END member -->
+	</tbody>
+	</table>
+	<!-- IF PAGINATION -->
+	<div class="pagination">
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	</div>
+	<!-- ENDIF -->
+
+	<fieldset class="quick">
+		<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
+		<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
+		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
+	</fieldset>
+
+	<h1>{L_ADD_USERS}</h1>
+
+	<p>{L_ADD_USERS_EXPLAIN}</p>
+
+	<fieldset>
+		<legend>{L_ADD_USERS}</legend>
+	<dl>
+		<dt><label for="leader">{L_USER_GROUP_LEADER}:</label></dt>
+		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>
+			<label><input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked" /> {L_NO}</label></dd>
+	</dl>
+	<dl>
+		<dt><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
+		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>
+			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>
+	</dl>
+	<dl>
+		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
+		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
+		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	</dl>
+
+	<p class="quick">
+		<input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_ACP_GROUPS_MANAGE}</h1>
+
+	<p>{L_ACP_GROUPS_MANAGE_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<h1>{L_USER_DEF_GROUPS}</h1>
+
+	<p>{L_USER_DEF_GROUPS_EXPLAIN}</p>
+
+	<form id="acp_groups" method="post" action="{U_ACTION}">
+
+	<table cellspacing="1">
+		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+	<thead>
+	<tr>
+		<th style="width: 50%">{L_GROUP}</th>
+		<th>{L_TOTAL_MEMBERS}</th>
+		<th colspan="2">{L_OPTIONS}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN groups -->
+		<!-- IF groups.S_SPECIAL -->
+		<!-- IF groups.S_FIRST_ROW -->
+			<tr>
+				<td colspan="5" class="row3">{L_NO_GROUPS_CREATED}</td>
+			</tr>
+		<!-- ENDIF -->
+	</tbody>
+	</table>
+
+	<fieldset class="quick">
+		<!-- IF S_GROUP_ADD -->
+			{L_CREATE_GROUP}: <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+			<input type="hidden" name="add" value="1" />
+		<!-- ENDIF -->
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+	<h1>{L_SPECIAL_GROUPS}</h1>
+
+	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>
+
+	<table cellspacing="1">
+		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+	<thead>
+	<tr>
+		<th style="width: 50%">{L_GROUP}</th>
+		<th>{L_TOTAL_MEMBERS}</th>
+		<th colspan="2">{L_OPTIONS}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+		<!-- ELSE -->
+		<tr>
+			<td><strong>{groups.GROUP_NAME}</strong></td>
+			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
+			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
+			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
+			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
+		</tr>
+		<!-- ENDIF -->
+	<!-- END groups -->
+	</tbody>
+	</table>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
new file mode 100644
index 0000000000..10166fec35
--- /dev/null
+++ b/phpBB/adm/style/acp_icons.html
@@ -0,0 +1,268 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT -->
+
+	<script type="text/javascript" defer="defer">
+	// <![CDATA[
+	<!-- IF S_ADD_CODE -->
+	
+			var smiley = Array();
+			<!-- BEGIN smile -->
+				smiley['{smile.SMILEY_URL}'] = Array();
+				smiley['{smile.SMILEY_URL}']['code'] = '{smile.CODE}';
+				smiley['{smile.SMILEY_URL}']['emotion'] = '{smile.EMOTION}';
+				smiley['{smile.SMILEY_URL}']['width'] = {smile.WIDTH};
+				smiley['{smile.SMILEY_URL}']['height'] = {smile.HEIGHT};
+				smiley['{smile.SMILEY_URL}']['order'] = {smile.ORDER};
+			<!-- END smile -->
+
+			function update_image(newimage)
+			{
+				var use_element = smiley[newimage];
+
+				document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage);
+				document.getElementById('add_code').value = use_element['code'];
+				document.getElementById('add_emotion').value = use_element['emotion'];
+				document.getElementById('add_width').value = use_element['width'];
+				document.getElementById('add_height').value = use_element['height'];
+
+				element = document.getElementById('add_order');
+				for (var i = 0; i < element.length; i++)
+				{
+					if (element.options[i].value == use_element['order'])
+					{
+						document.getElementById('add_order').options.selectedIndex = i;
+					}
+				}
+			}
+		
+	<!-- ENDIF -->
+
+	
+	function toggle_select(icon, display, select)
+	{
+		var disp = document.getElementById('order_disp_' + select);
+		var nodisp = document.getElementById('order_no_disp_' + select);
+		disp.disabled = !display;
+		nodisp.disabled = display;
+		if (display)
+		{
+			document.getElementById('order_' + select).selectedIndex = 0;
+			nodisp.className = 'disabled-options';
+			disp.className = '';
+		}
+		else
+		{
+			document.getElementById('order_' + select).selectedIndex = {S_ORDER_LIST_DISPLAY_COUNT};
+			disp.className = 'disabled-options';
+			nodisp.className = '';
+		}
+	}
+	// ]]>
+	</script>
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<form id="acp_icons" method="post" action="{U_ACTION}">
+
+	<fieldset class="tabulated">
+	<legend>{L_TITLE}</legend>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th colspan="{COLSPAN}">{L_CONFIG}</th>
+	</tr>
+	<!-- IF .items or S_ADD_CODE -->
+	<tr class="row3">
+		<td>{L_URL}</td>
+		<td>{L_LOCATION}</td>
+	<!-- IF S_SMILIES -->
+		<td>{L_SMILIES_CODE}</td>
+		<td>{L_SMILIES_EMOTION}</td>
+	<!-- ENDIF -->
+		<td>{L_WIDTH}</td>
+		<td>{L_HEIGHT}</td>
+		<td>{L_DISPLAY_ON_POSTING}</td>
+	<!-- IF ID or S_ADD -->
+		<td>{L_ORDER}</td>
+	<!-- ENDIF -->
+	<!-- IF S_ADD -->
+		<td>{L_ADD}</td>
+	<!-- ENDIF -->
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN items -->
+		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+	
+		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
+		<td style="vertical-align: top;">[{items.IMG}]</td>
+		<!-- IF S_SMILIES -->
+			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
+			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
+		<!-- ENDIF -->
+		<td><input class="text post" type="text" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
+		<td><input class="text post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
+		<td>
+			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>
+			<!-- IF items.S_ID -->
+				<input type="hidden" name="id[{items.IMG}]" value="{items.ID}" />
+			<!-- ENDIF -->
+		</td>
+		<!-- IF ID or S_ADD -->
+			<td><select id="order_{items.S_ROW_COUNT}" name="order[{items.IMG}]">
+				<optgroup id="order_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING}" <!-- IF not items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_DISPLAY}</optgroup>
+				<optgroup id="order_no_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING_NO}" <!-- IF  items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_UNDISPLAY}</optgroup>
+			</select></td>
+		<!-- ENDIF -->	
+		<!-- IF S_ADD -->
+			<td><input type="checkbox" class="radio" name="add_img[{items.IMG}]" value="1" /></td>
+		<!-- ENDIF -->
+		</tr>
+	<!-- END items -->
+	<!-- IF S_ADD_CODE -->
+	<tr>
+		<th colspan="{COLSPAN}">{L_ADD_SMILEY_CODE}</th>
+	</tr>
+	<tr class="row1">
+		<td style="text-align: center;"><select name="add_image" id="add_image" onchange="update_image(this.options[selectedIndex].value);">{S_IMG_OPTIONS}</select></td>
+		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>
+		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>
+		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td>
+		<td><input class="text post" type="text" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
+		<td><input class="text post" type="text" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
+		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>
+ 		<td><select id="add_order" name="add_order">
+				<optgroup id="order_disp[add]" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>
+				<optgroup id="order_no_disp[add]" label="{L_DISPLAY_POSTING_NO}" disabled="disabled" class="disabled-options" >{S_ADD_ORDER_LIST_UNDISPLAY}</optgroup>
+		</select></td>
+		<td><input type="checkbox" class="radio" name="add_additional_code" value="1" /></td>
+	</tr>
+	<!-- ENDIF -->
+	<!-- ELSE -->
+	<tr class="row3">
+		<td colspan="{COLSPAN}">{L_NO_ICONS}</td>
+	</tr>
+	<!-- ENDIF -->
+	</tbody>
+	</table>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_CHOOSE_PAK -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<form id="acp_icons" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_IMPORT}</legend>
+	
+	<!-- IF not S_PAK_OPTIONS -->
+		<p>{L_NO_PAK_OPTIONS}</p>
+
+	<!-- ELSE -->
+		<dl>
+			<dt><label for="pak">{L_SELECT_PACKAGE}</label></dt>
+			<dd><select id="pak" name="pak">{S_PAK_OPTIONS}</select></dd>
+		</dl>
+			<dt><label for="current">{L_CURRENT}</label><br /><span>{L_CURRENT_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" id="current" name="current" value="keep" checked="checked" /> {L_KEEP_ALL}</label>
+				<label><input type="radio" class="radio" name="current" value="replace" /> {L_REPLACE_MATCHES}</label>
+				<label><input type="radio" class="radio" name="current" value="delete" /> {L_DELETE_ALL}</label></dd>
+		</dl>
+
+	<p class="quick">
+		<input class="button1" type="submit" id="import" name="import" value="{L_IMPORT_SUBMIT}" />
+	</p>
+	<!-- ENDIF -->
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<!-- IF NOTICE -->
+		<div class="successbox">
+			<h3>{L_NOTIFY}</h3>
+			<p>{NOTICE}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="acp_icons" method="post" action="{U_ACTION}">
+
+	<div style="text-align: right;"><a href="{U_IMPORT}">{L_IMPORT}</a> | <a href="{U_EXPORT}">{L_EXPORT}</a></div>
+
+	<fieldset class="tabulated">
+
+	<legend>{L_TITLE}</legend>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_TITLE}</th>
+		<!-- IF S_SMILIES -->
+		<th>{L_CODE}</th>
+		<th>{L_EMOTION}</th>
+		<!-- ENDIF -->
+		<th>{L_OPTIONS}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN items -->
+		<!-- IF items.S_SPACER -->
+			<tr>
+				<td class="row3" colspan="{COLSPAN}" style="text-align: center;">{L_NOT_DISPLAYED}</td>
+			</tr>
+		<!-- ENDIF -->
+		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td style="width: 85%; text-align: center;"><img src="{items.IMG_SRC}" width="{items.WIDTH}" height="{items.HEIGHT}" alt="{items.ALT_TEXT}" title="{items.ALT_TEXT}" /></td>
+			<!-- IF S_SMILIES -->
+				<td style="text-align: center;">{items.CODE}</td>
+				<td style="text-align: center;">{items.EMOTION}</td>
+			<!-- ENDIF -->
+			<td style="text-align: right; white-space: nowrap;">
+				<!-- IF items.S_FIRST_ROW and not PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
+				<!-- IF items.S_LAST_ROW and not NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
+				&nbsp;<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}">{ICON_DELETE}</a>
+			</td>
+		</tr>
+	<!-- BEGINELSE -->
+		<tr class="row3">
+			<td colspan="{COLSPAN}">{L_ACP_NO_ITEMS}</td>
+		</tr>
+	<!-- END items -->
+	</tbody>
+	</table>
+	<div>{PAGINATION}</div>
+	<p class="quick">
+		<input class="button2" name="add" type="submit" value="{L_ICON_ADD}" />&nbsp; &nbsp;<input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
new file mode 100644
index 0000000000..3b20043dd9
--- /dev/null
+++ b/phpBB/adm/style/acp_inactive.html
@@ -0,0 +1,77 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h2>{L_INACTIVE_USERS}</h2>
+
+<p>{L_INACTIVE_USERS_EXPLAIN}</p>
+
+<form id="inactive" method="post" action="{U_ACTION}">
+
+<div class="clearfix"></div>
+
+<!-- IF PAGINATION -->
+<div class="pagination">
+	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+</div>
+<!-- ENDIF -->
+
+<table cellspacing="1">
+<thead>
+<tr>
+	<th>{L_USERNAME}</th>
+	<th>{L_JOINED}</th>
+	<th>{L_INACTIVE_DATE}</th>
+	<th>{L_LAST_VISIT}</th>
+	<th>{L_INACTIVE_REASON}</th>
+	<th>{L_MARK}</th>
+</tr>
+</thead>
+<tbody>
+<!-- BEGIN inactive -->
+	<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+		<td style="vertical-align: top;">
+			{inactive.USERNAME_FULL}
+			<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
+		</td>
+		<td style="vertical-align: top;">{inactive.JOINED}</td>
+		<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
+		<td style="vertical-align: top;">{inactive.LAST_VISIT}</td>
+		<td style="vertical-align: top;">
+			{inactive.REASON}
+			<!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
+		</td>
+		<td>&nbsp;<input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" />&nbsp;</td>
+	</tr>
+<!-- BEGINELSE -->
+	<tr>
+		<td colspan="6" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
+	</tr>
+<!-- END inactive -->
+</tbody>
+</table>
+
+<fieldset class="display-options">
+	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF PAGINATION -->&nbsp;Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
+	<input class="button2" type="submit" value="{L_GO}" name="sort" />
+</fieldset>
+
+<hr />
+
+<!-- IF PAGINATION -->
+	<div class="pagination">
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	</div>
+<!-- ENDIF -->
+
+<fieldset class="quick">
+	<select name="action">{S_INACTIVE_OPTIONS}</select>
+	<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+	<p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
+	{S_FORM_TOKEN}
+</fieldset>
+
+</form>
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html
new file mode 100644
index 0000000000..2cc715493a
--- /dev/null
+++ b/phpBB/adm/style/acp_jabber.html
@@ -0,0 +1,65 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_JABBER_SETTINGS}</h1>
+
+<p>{L_ACP_JABBER_SETTINGS_EXPLAIN}</p>
+
+<!-- IF S_WARNING -->
+	<div class="errorbox">
+		<h3>{L_WARNING}</h3>
+		<p>{WARNING_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
+<form id="acp_jabber" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_ACP_JABBER_SETTINGS}</legend>
+<!-- IF S_GTALK_NOTE -->
+	<p>{L_JAB_GTALK_NOTE}</p>
+<!-- ENDIF -->
+<dl>
+	<dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+</dl>
+<dl>
+	<dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd>
+</dl>
+<dl>
+	<dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
+</dl>
+<dl>
+	<dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd>
+</dl>
+<dl>
+	<dt><label for="jab_password">{L_JAB_PASSWORD}:</label></dt>
+	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
+</dl>
+<!-- IF S_CAN_USE_SSL -->
+<dl>
+	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}:</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+</dl>
+<!-- ENDIF -->
+<dl>
+	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" /></dd>
+</dl>
+
+</fieldset>
+
+<fieldset class="submit-buttons">
+	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
new file mode 100644
index 0000000000..95ac1d5852
--- /dev/null
+++ b/phpBB/adm/style/acp_language.html
@@ -0,0 +1,255 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="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}:</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 -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_LANGUAGE_PACK_DETAILS}</h1>
+
+	<form id="details" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{LANG_LOCAL_NAME}</legend>
+	<dl>
+		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}:</label></dt>
+		<dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}:</label></dt>
+		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255" /></dd>
+	</dl>
+	<dl>
+		<dt><label>{L_LANG_ISO_CODE}:</label></dt>
+		<dd><strong>{LANG_ISO}</strong></dd>
+	</dl>
+	<dl>
+		<dt><label for="lang_author">{L_LANG_AUTHOR}:</label></dt>
+		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255" /></dd>
+	</dl>
+
+	<p class="quick" style="margin-top: -15px;">
+		<input type="submit" name="update_details" class="button2" value="{L_SUBMIT}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+	<br /><br />
+
+	<!-- 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 cellspacing="1">
+		<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 name="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>
+	<!-- 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 cellspacing="1">
+	<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}:&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>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_UPLOAD_SETTINGS}</legend>
+	<dl>
+		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
+		<dd><strong>{NAME}</strong></dd>
+	</dl>
+	<!-- BEGIN data -->
+	<dl>
+		<dt><label for="{data.DATA}">{data.NAME}:</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>
+
+	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_LANGUAGE_PACK_NAME}</th>
+		<th>{L_LANGUAGE_PACK_LOCALNAME}</th>
+		<th>{L_LANGUAGE_PACK_ISO}</th>
+		<th>{L_LANGUAGE_PACK_USED_BY}</th>
+		<th>{L_OPTIONS}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<tr>
+		<td class="row3" colspan="5"><strong>{L_INSTALLED_LANGUAGE_PACKS}</strong></td>
+	</tr>
+	<!-- BEGIN lang -->
+		<!-- IF lang.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<td><a href="{lang.U_DETAILS}">{lang.ENGLISH_NAME}</a> {lang.TAG}</td>
+		<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>
+	</tr>
+	<!-- END lang -->
+	<!-- IF .notinst -->
+	<tr>
+		<td class="row3" colspan="5"><strong>{L_UNINSTALLED_LANGUAGE_PACKS}</strong></td>
+	</tr>
+	<!-- ENDIF -->
+	<!-- BEGIN notinst -->
+		<!-- IF notinst.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<td>{notinst.NAME}</td>
+		<td>{notinst.LOCAL_NAME}</td>
+		<td style="text-align: center;"><strong>{notinst.ISO}</strong></td>
+		<td colspan="2" style="text-align: center;"><a href="{notinst.U_INSTALL}">{L_INSTALL}</a></td>
+	</tr>
+	<!-- END notinst -->
+	</tbody>
+	</table>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
new file mode 100644
index 0000000000..f2fa5dbc26
--- /dev/null
+++ b/phpBB/adm/style/acp_logs.html
@@ -0,0 +1,93 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_TITLE}</h1>
+
+<p>{L_EXPLAIN}</p>
+
+<form id="list" method="post" action="{U_ACTION}">
+
+<fieldset class="display-options" style="float: left">
+	{L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
+</fieldset>
+
+<!-- IF PAGINATION -->
+<div class="pagination" style="float: right; margin: 15px 0 2px 0">
+	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+</div>
+<!-- ENDIF -->
+
+<div class="clearfix">&nbsp;</div>
+<div><br style="clear: both;" /></div>
+
+<!-- IF .log -->
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_USERNAME}</th>
+		<th>{L_IP}</th>
+		<th>{L_TIME}</th>
+		<th>{L_ACTION}</th>
+		<!-- IF S_CLEARLOGS -->
+			<th>{L_MARK}</th>
+		<!-- ENDIF -->
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN log -->
+		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td>
+				{log.USERNAME}
+				<!-- IF log.REPORTEE_USERNAME -->
+				<br />&raquo; {log.REPORTEE_USERNAME}
+				<!-- ENDIF -->
+			</td>
+			<td style="text-align: center;">{log.IP}</td>
+			<td style="text-align: center;">{log.DATE}</td>
+			<td>{log.ACTION}<!-- IF log.DATA --><br /><span>{log.DATA}</span><!-- ENDIF --></td>
+			<!-- IF S_CLEARLOGS -->
+				<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
+			<!-- ENDIF -->
+		</tr>
+	<!-- END log -->
+	</tbody>
+	</table>
+
+<!-- IF PAGINATION -->
+	<div class="pagination">
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	</div>
+<!-- ENDIF -->
+
+<!-- ELSE -->
+	<div class="errorbox">
+		<p>{L_NO_ENTRIES}</p>
+	</div>
+<!-- ENDIF -->
+
+<fieldset class="display-options">
+	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
+	<input class="button2" type="submit" value="{L_GO}" name="sort" />
+	{S_FORM_TOKEN}
+</fieldset>
+<hr />
+
+<!-- IF S_SHOW_FORUMS -->
+	<fieldset class="quick">
+		{L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
+		<input class="button2" type="submit" value="{L_GO}" />
+	</fieldset>
+<!-- ENDIF -->
+
+<!-- IF .log and S_CLEARLOGS -->
+	<fieldset class="quick">
+		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
+		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /><br />
+		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
+	</fieldset>
+<!-- ENDIF -->
+
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
new file mode 100644
index 0000000000..46d65df7a2
--- /dev/null
+++ b/phpBB/adm/style/acp_main.html
@@ -0,0 +1,249 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_RESTORE_PERMISSIONS -->
+
+	<h1>{L_PERMISSIONS_TRANSFERRED}</h1>
+
+	<p>{L_PERMISSIONS_TRANSFERRED_EXPLAIN}</p>
+
+<!-- ELSE -->
+
+	<h1>{L_WELCOME_PHPBB}</h1>
+
+	<p>{L_ADMIN_INTRO}</p>
+
+	<!-- IF S_VERSIONCHECK_FAIL -->
+		<div class="errorbox notice">
+			<p>{L_VERSIONCHECK_FAIL}</p>
+			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
+		</div>
+	<!-- ELSEIF not S_VERSION_UP_TO_DATE -->
+		<div class="errorbox">
+			<p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p>
+			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
+		</div>
+	<!-- ENDIF -->
+
+
+	<!-- IF S_REMOVE_INSTALL -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{L_REMOVE_INSTALL}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<!-- IF S_WRITABLE_CONFIG -->
+		<div class="errorbox notice">
+			<p>{L_WRITABLE_CONFIG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<table cellspacing="1">
+		<caption>{L_FORUM_STATS}</caption>
+		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+	<thead>
+	<tr>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<tr>
+		<td>{L_NUMBER_POSTS}: </td>
+		<td><strong>{TOTAL_POSTS}</strong></td>
+		<td>{L_POSTS_PER_DAY}: </td>
+		<td><strong>{POSTS_PER_DAY}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_TOPICS}: </td>
+		<td><strong>{TOTAL_TOPICS}</strong></td>
+		<td>{L_TOPICS_PER_DAY}: </td>
+		<td><strong>{TOPICS_PER_DAY}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_USERS}: </td>
+		<td><strong>{TOTAL_USERS}</strong></td>
+		<td>{L_USERS_PER_DAY}: </td>
+		<td><strong>{USERS_PER_DAY}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_FILES}: </td>
+		<td><strong>{TOTAL_FILES}</strong></td>
+		<td>{L_FILES_PER_DAY}: </td>
+		<td><strong>{FILES_PER_DAY}</strong></td>
+	</tr>
+
+
+	<tr>
+		<td>{L_BOARD_STARTED}: </td>
+		<td><strong>{START_DATE}</strong></td>
+		<td>{L_AVATAR_DIR_SIZE}: </td>
+		<td><strong>{AVATAR_DIR_SIZE}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_DATABASE_SIZE}: </td>
+		<td><strong>{DBSIZE}</strong></td>
+		<td>{L_UPLOAD_DIR_SIZE}: </td>
+		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_DATABASE_SERVER_INFO}: </td>
+		<td><strong>{DATABASE_INFO}</strong></td>
+		<td>{L_GZIP_COMPRESSION}: </td>
+		<td><strong>{GZIP_COMPRESSION}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_BOARD_VERSION}: </td>
+		<td>
+			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+		</td>
+	<!-- IF S_TOTAL_ORPHAN -->
+		<td>{L_NUMBER_ORPHAN}: </td>
+		<td><strong>{TOTAL_ORPHAN}</strong></td>
+	<!-- ELSE -->
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	<!-- ENDIF -->
+	</tr>
+	</tbody>
+	</table>
+
+	<!-- IF S_ACTION_OPTIONS -->
+		<fieldset>
+			<legend>{L_STATISTIC_RESYNC_OPTIONS}</legend>
+
+			<form id="action_online_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_online">{L_RESET_ONLINE}</label><br /><span>&nbsp;</span></dt>
+					<dd><input type="hidden" name="action" value="online" /><input class="button2" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<form id="action_date_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_date">{L_RESET_DATE}</label><br /><span>&nbsp;</span></dt>
+					<dd><input type="hidden" name="action" value="date" /><input class="button2" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<form id="action_stats_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_STATS_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<form id="action_user_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<form id="action_db_track_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="db_track" /><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<!-- IF S_FOUNDER -->
+			<form id="action_purge_sessions_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_purge_sessions">{L_PURGE_SESSIONS}</label><br /><span>{L_PURGE_SESSIONS_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="purge_sessions" /><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+			<form id="action_purge_cache_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+			<!-- ENDIF -->
+  		</fieldset>
+	<!-- ENDIF -->
+
+	<!-- IF .log -->
+		<h2>{L_ADMIN_LOG}</h2>
+
+		<p>{L_ADMIN_LOG_INDEX_EXPLAIN}</p>
+
+		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
+
+		<table cellspacing="1">
+		<thead>
+		<tr>
+			<th>{L_USERNAME}</th>
+			<th>{L_IP}</th>
+			<th>{L_TIME}</th>
+			<th>{L_ACTION}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN log -->
+			<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+				<td>{log.USERNAME}</td>
+				<td style="text-align: center;">{log.IP}</td>
+				<td style="text-align: center;">{log.DATE}</td>
+				<td>{log.ACTION}</td>
+			</tr>
+		<!-- END log -->
+		</tbody>
+		</table>
+
+		<br />
+
+	<!-- ENDIF -->
+
+	<!-- IF S_INACTIVE_USERS -->
+		<h2>{L_INACTIVE_USERS}</h2>
+
+		<p>{L_INACTIVE_USERS_EXPLAIN_INDEX}</p>
+
+		<div style="text-align: right;"><a href="{U_INACTIVE_USERS}">&raquo; {L_VIEW_INACTIVE_USERS}</a></div>
+
+		<table cellspacing="1">
+		<thead>
+		<tr>
+			<th>{L_USERNAME}</th>
+			<th>{L_JOINED}</th>
+			<th>{L_INACTIVE_DATE}</th>
+			<th>{L_LAST_VISIT}</th>
+			<th>{L_INACTIVE_REASON}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN inactive -->
+			<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+				<td style="vertical-align: top;">
+					{inactive.USERNAME_FULL}
+					<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
+				</td>
+				<td style="vertical-align: top;">{inactive.JOINED}</td>
+				<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
+				<td style="vertical-align: top;">{inactive.LAST_VISIT}</td>
+				<td style="vertical-align: top;">
+					{inactive.REASON}
+					<!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
+				</td>
+			</tr>
+		<!-- BEGINELSE -->
+			<tr>
+				<td colspan="5" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
+			</tr>
+		<!-- END inactive -->
+		</tbody>
+		</table>
+
+	<!-- ENDIF -->
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
new file mode 100644
index 0000000000..5396e78557
--- /dev/null
+++ b/phpBB/adm/style/acp_modules.html
@@ -0,0 +1,212 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT_MODULE -->
+
+	<script type="text/javascript">
+	// <![CDATA[
+		function display_options(value)
+		{
+			if (value == 'category')
+			{
+				dE('modoptions', -1);
+			}
+			else
+			{
+				dE('modoptions', 1);
+			}
+		}
+
+		function display_modes(value)
+		{
+			// Find the old select tag
+			var item = document.getElementById('module_mode');
+
+			// Create the new select tag
+			var new_node = document.createElement('select');
+			new_node.setAttribute('id', 'module_mode');
+			new_node.setAttribute('name', 'module_mode');
+
+			// Substitute it for the old one
+			item.parentNode.replaceChild(new_node, item);
+
+			// Reset the variable
+			item = document.getElementById('module_mode');
+
+			var j = 0;
+<!-- BEGIN m_names -->
+		
+			if (value == '{m_names.A_NAME}')
+			{
+	<!-- BEGIN modes -->
+				item.options[j] = new Option('{m_names.modes.A_VALUE}');
+				item.options[j].value = '{m_names.modes.A_OPTION}';
+				j++;
+	<!-- END modes -->
+			}
+<!-- END m_names -->
+
+			// select first item
+			item.options[0].selected = true;
+		}
+
+	// ]]>
+	</script>
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE} :: {MODULENAME}</h1>
+
+	<p>{L_EDIT_MODULE_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="moduleedit" method="post" action="{U_EDIT_ACTION}">
+
+	<fieldset>
+		<legend>{L_GENERAL_OPTIONS}</legend>
+	<dl>
+		<dt><label for="module_langname">{L_MODULE_LANGNAME}:</label><br />
+		<span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt>
+		<dd><input name="module_langname" type="text" class="text medium" id="module_langname" value="{MODULE_LANGNAME}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="module_type">{L_MODULE_TYPE}:</label></dt>
+		<dd><select name="module_type" id="module_type" onchange="display_options(this.value);"><option value="category"<!-- IF S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_CATEGORY}</option><option value="module"<!-- IF not S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_MODULE}</option></select></dd>
+	</dl>
+	<dl>
+		<dt><label for="parent_id">{L_PARENT}:</label></dt>
+		<dd><select name="module_parent_id" id="parent_id">{S_CAT_OPTIONS}</select></dd>
+	</dl>
+	<hr />
+	<dl>
+		<dt><label for="module_enabled">{L_MODULE_ENABLED}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<div id="modoptions"<!-- IF S_IS_CAT --> style="display: none;"<!-- ENDIF -->>
+		<dl>
+			<dt><label for="module_display">{L_MODULE_DISPLAYED}:</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="module_basename">{L_CHOOSE_MODULE}:</label><br />
+			<span>{L_CHOOSE_MODULE_EXPLAIN}</span></dt>
+			<dd><select name="module_basename" id="module_basename" onchange="display_modes(this.value);">{S_MODULE_NAMES}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="module_mode">{L_CHOOSE_MODE}:</label><br />
+			<span>{L_CHOOSE_MODE_EXPLAIN}</span></dt>
+			<dd><select name="module_mode" id="module_mode">{S_MODULE_MODES}</select></dd>
+		</dl>
+	</div>
+
+	<p class="submit-buttons">
+		<input type="hidden" name="action" value="{ACTION}" />
+		<input type="hidden" name="m" value="{MODULE_ID}" />
+		
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_ACP_MODULE_MANAGEMENT}</h1>
+
+	<p>{L_ACP_MODULE_MANAGEMENT_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<table cellspacing="1">
+	<tbody>
+	<tr>
+		<td class="row3">{NAVIGATION}<!-- IF S_NO_MODULES --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a> | <!-- IF MODULE_ENABLED --><a href="{U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->]<!-- ENDIF --></td>
+	</tr>
+	</tbody>
+	</table>
+
+	<!-- IF .modules -->
+		<table cellspacing="1">
+			<col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" />
+		<tbody>
+		<!-- BEGIN modules -->
+			<tr>
+				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
+				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
+				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
+				<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;">
+					<!-- IF modules.S_FIRST_ROW && not modules.S_LAST_ROW -->
+						{ICON_MOVE_UP_DISABLED}
+						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF not modules.S_FIRST_ROW && not modules.S_LAST_ROW-->
+						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
+						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
+					<!-- ELSEIF modules.S_LAST_ROW && not modules.S_FIRST_ROW -->
+						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ELSE -->
+						{ICON_MOVE_UP_DISABLED}
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ENDIF -->
+					<a href="{modules.U_EDIT}">{ICON_EDIT}</a> 
+					<a href="{modules.U_DELETE}">{ICON_DELETE}</a>
+				</td>
+			</tr>
+		<!-- END modules -->
+		</tbody>
+		</table>
+	<!-- ENDIF -->
+
+	<div class="clearfix">&nbsp;</div>
+
+	<form id="quick" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+		<input type="hidden" name="action" value="quickadd" />
+
+		<select name="quick_install">{S_INSTALL_OPTIONS}</select>
+		<input class="button2" name="quickadd" type="submit" value="{L_ADD_MODULE}" />
+	</fieldset>
+	
+	</form>
+
+	<form id="module" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+		<input type="hidden" name="action" value="add" />
+		<input type="hidden" name="module_parent_id" value="{PARENT_ID}" />
+
+		<input type="text" name="module_langname" maxlength="255" /> 
+		<input class="button2" name="addmodule" type="submit" value="{L_CREATE_MODULE}" />
+	</fieldset>
+
+	</form>
+
+	<div class="clearfix">&nbsp;</div><br style="clear: both;" />
+	
+	<form id="mselect" method="post" action="{U_SEL_ACTION}">
+	<fieldset class="quick">
+		{L_SELECT_MODULE}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select> 
+
+		<input class="button2" type="submit" value="{L_GO}" />
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
new file mode 100644
index 0000000000..220e7dafbe
--- /dev/null
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -0,0 +1,202 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT -->
+
+	<script type="text/javascript">
+	// <![CDATA[
+		var active_pmask = '0';
+		var active_fmask = '0';
+		var active_cat = '0';
+
+		var id = '000';
+
+		var role_options = new Array();
+
+		<!-- IF S_ROLE_JS_ARRAY -->
+			{S_ROLE_JS_ARRAY}
+		<!-- ENDIF -->
+	// ]]>
+	</script>
+
+	<script type="text/javascript" src="style/permissions.js"></script>
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<br />
+	<a href="#acl">&raquo; {L_SET_ROLE_PERMISSIONS}</a>
+
+	<form id="acp_roles" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_ROLE_DETAILS}</legend>
+	<dl>
+		<dt><label for="role_name">{L_ROLE_NAME}:</label></dt>
+		<dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" maxlength="255" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>
+		<dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd>
+	</dl>
+
+	<p class="quick">
+		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+
+	<!-- IF S_DISPLAY_ROLE_MASK -->
+
+		<h1>{L_ROLE_ASSIGNED_TO}</h1>
+
+		<!-- INCLUDE permission_roles_mask.html -->
+
+	<!-- ENDIF -->
+
+	<p>
+
+	<a name="acl"></a>
+
+	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
+	<br /><br />
+
+	</p>
+
+	<h1>{L_ACL_TYPE}</h1>
+
+	<fieldset class="perm nolegend">
+
+		<div id="advanced00">
+			<div class="permissions-category">
+				<ul>
+				<!-- BEGIN auth -->
+					<!-- IF auth.S_YES -->
+						<li class="permissions-preset-yes<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+					<!-- ELSEIF auth.S_NEVER -->
+						<li class="permissions-preset-never<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+					<!-- ELSEIF auth.S_NO -->
+						<li class="permissions-preset-no<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+					<!-- ELSE -->
+						<li class="permissions-preset-custom<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+					<!-- ENDIF -->
+						<a href="#" onclick="swap_options('0','0','{auth.S_ROW_COUNT}'); return false;"><span class="tabbg"><span class="colour"></span>{auth.CAT_NAME}</span></a></li>	
+				<!-- END auth -->
+				</ul>
+			</div>
+			<!-- BEGIN auth -->
+			<div class="permissions-panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
+				<span class="corners-top"><span></span></span>
+				<div class="tablewrap">
+					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1">
+					<colgroup>
+						<col class="permissions-name" />
+						<col class="permissions-yes" />
+						<col class="permissions-no" />
+						<col class="permissions-never" />
+					</colgroup>
+					<thead>
+					<tr>
+						<th class="name" scope="col"><strong>{L_ACL_SETTING}</strong></th>
+						<th class="value permissions-yes" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'y'); set_colours('00{auth.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
+						<th class="value permissions-no" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'u'); set_colours('00{auth.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
+						<th class="value permissions-never" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'n'); set_colours('00{auth.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
+					</tr>
+					</thead>
+					<tbody>
+					<!-- BEGIN mask -->
+						<!-- IF auth.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
+						<th class="permissions-name<!-- IF auth.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->">{auth.mask.PERMISSION}</th>
+							
+						<td class="permissions-yes"><label for="setting_{auth.mask.FIELD_NAME}_y"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_y" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
+						<td class="permissions-no"><label for="setting_{auth.mask.FIELD_NAME}_u"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_u" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
+						<td class="permissions-never"><label for="setting_{auth.mask.FIELD_NAME}_n"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_n" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
+					</tr>
+					<!-- END mask -->
+					</tbody>
+					</table>
+				</div>
+				<span class="corners-bottom"><span></span></span>
+			</div>
+			<!-- END auth -->
+		</div>
+
+	</fieldset>
+
+	<fieldset class="quick">
+		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
+	<br />
+
+<!-- ELSE -->
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<form id="acp_roles" method="post" action="{U_ACTION}">
+
+	<table cellspacing="1">
+		<col class="col2" /><col class="col2" /><col class="col1" /><col class="col2" /><col class="col2" />
+	<thead>
+	<tr>
+		<th>{L_ROLE_NAME}</th>
+		<th colspan="2">{L_OPTIONS}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN roles -->
+	<tr>
+		<td style="vertical-align: top;"><strong>{roles.ROLE_NAME}</strong>
+			<!-- IF roles.ROLE_DESCRIPTION --><br /><span>{roles.ROLE_DESCRIPTION}</span><!-- ENDIF -->
+		</td>
+		<td style="width: 30%; text-align: center; vertical-align: top; white-space: nowrap;"><!-- IF roles.U_DISPLAY_ITEMS --><a href="{roles.U_DISPLAY_ITEMS}">{L_VIEW_ASSIGNED_ITEMS}</a><!-- ELSE -->{L_VIEW_ASSIGNED_ITEMS}<!-- ENDIF --></td>
+		<td style="width: 80px; text-align: right; vertical-align: top; white-space: nowrap;">
+			<!-- IF roles.S_FIRST_ROW && not roles.S_LAST_ROW -->
+				{ICON_MOVE_UP_DISABLED}
+				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+			<!-- ELSEIF not roles.S_FIRST_ROW && not roles.S_LAST_ROW-->
+				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
+				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
+			<!-- ELSEIF roles.S_LAST_ROW && not roles.S_FIRST_ROW -->
+				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
+				{ICON_MOVE_DOWN_DISABLED}
+			<!-- ELSE -->
+				{ICON_MOVE_UP_DISABLED}
+				{ICON_MOVE_DOWN_DISABLED}
+			<!-- ENDIF -->	
+			<a href="{roles.U_EDIT}" title="{L_EDIT_ROLE}">{ICON_EDIT}</a> 
+			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}">{ICON_DELETE}</a>
+		</td>
+	</tr>
+	<!-- END roles -->
+	</tbody>
+	</table>
+
+	<fieldset class="quick">
+		{L_CREATE_ROLE}: <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+	<!-- IF S_DISPLAY_ROLE_MASK -->
+
+		<a name="assigned_to"></a>
+
+		<h1>{L_ROLE_ASSIGNED_TO}</h1>
+
+		<!-- INCLUDE permission_roles_mask.html -->
+
+	<!-- ENDIF -->
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
new file mode 100644
index 0000000000..63583093b0
--- /dev/null
+++ b/phpBB/adm/style/acp_permissions.html
@@ -0,0 +1,357 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_INTRO -->
+
+	<h1>{L_ACP_PERMISSIONS}</h1>
+
+	{L_ACP_PERMISSIONS_EXPLAIN}
+
+<!-- ENDIF -->
+
+<!-- IF S_SELECT_VICTIM -->
+
+	<!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a><!-- ENDIF -->
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<!-- IF S_FORUM_NAMES -->
+		<p><strong>{L_FORUMS}:</strong> {FORUM_NAMES}</p>
+	<!-- ENDIF -->
+
+	<!-- IF S_SELECT_FORUM -->
+
+		<form id="select_victim" method="post" action="{U_ACTION}">
+
+		<fieldset>
+			<legend>{L_LOOK_UP_FORUM}</legend>
+			<!-- IF S_FORUM_MULTIPLE --><p>{L_LOOK_UP_FORUMS_EXPLAIN}</p><!-- ENDIF -->
+		<dl>
+			<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
+			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
+			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
+		</dl>
+
+		<p class="quick">
+			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
+			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+		</p>
+
+		</fieldset>
+		</form>
+
+		<!-- IF S_FORUM_MULTIPLE -->
+
+			<form id="select_subforum" method="post" action="{U_ACTION}">
+
+			<fieldset>
+				<legend>{L_LOOK_UP_FORUM}</legend>
+				<p>{L_SELECT_FORUM_SUBFORUM_EXPLAIN}</p>
+			<dl>
+				<dt><label for="sforum">{L_LOOK_UP_FORUM}:</label></dt>
+				<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>
+			</dl>
+
+			<p class="quick">
+				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
+				<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+			</p>
+
+			</fieldset>
+			</form>
+
+		<!-- ENDIF -->
+
+	<!-- ELSEIF S_SELECT_USER and S_CAN_SELECT_USER -->
+
+		<form id="select_victim" method="post" action="{U_ACTION}">
+
+		<fieldset>
+			<legend>{L_LOOK_UP_USER}</legend>
+		<dl>
+			<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
+			<dd><input class="text medium" type="text" id="username" name="username[]" /></dd>
+			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+			<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+		</dl>
+
+		<p class="quick">
+			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
+			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+		</p>
+		</fieldset>
+		</form>
+
+	<!-- ELSEIF S_SELECT_GROUP and S_CAN_SELECT_GROUP -->
+
+		<form id="select_victim" method="post" action="{U_ACTION}">
+
+		<fieldset>
+			<legend>{L_LOOK_UP_GROUP}</legend>
+		<dl>
+			<dt><label for="group">{L_LOOK_UP_GROUP}:</label></dt>
+			<dd><select name="group_id[]" id="group">{S_GROUP_OPTIONS}</select></dd>
+		</dl>
+
+		<p class="quick">
+			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
+			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+		</p>
+
+		</fieldset>
+		</form>
+
+		<!-- ELSEIF S_SELECT_USERGROUP -->
+
+		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
+
+		<!-- IF S_CAN_SELECT_USER -->
+
+			<h1>{L_USERS}</h1>
+
+			<form id="users" method="post" action="{U_ACTION}">
+
+			<fieldset>
+				<legend>{L_MANAGE_USERS}</legend>
+			<dl>
+				<dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd>
+				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_users" value="1" /> {L_ALL_USERS}</label></dd><!-- ENDIF -->
+			</dl>
+			</fieldset>
+
+			<fieldset class="quick">
+				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
+				<input type="submit" class="button2" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;" /> &nbsp; <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;" />
+			</fieldset>
+			</form>
+
+			<form id="add_user" method="post" action="{U_ACTION}">
+
+			<fieldset>
+				<legend>{L_ADD_USERS}</legend>
+				<p>{L_USERNAMES_EXPLAIN}</p>
+			<dl>
+				<dd class="full"><textarea id="username" name="usernames" rows="5" cols="5" style="width: 100%; height: 60px;"></textarea></dd>
+				<dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+			</dl>
+			</fieldset>
+
+			<fieldset class="quick">
+				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
+				<input class="button1" type="submit" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
+			</fieldset>
+			</form>
+
+		<!-- ENDIF -->
+
+		</div>
+
+		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
+
+		<!-- IF S_CAN_SELECT_GROUP -->
+
+			<h1>{L_USERGROUPS}</h1>
+
+			<form id="groups" method="post" action="{U_ACTION}">
+
+			<fieldset>
+				<legend>{L_MANAGE_GROUPS}</legend>
+			<dl>
+				<dd class="full"><select style="width: 100%;" name="group_id[]" multiple="multiple" size="5">{S_DEFINED_GROUP_OPTIONS}</select></dd>
+				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_groups" value="1" /> {L_ALL_GROUPS}</label></dd><!-- ENDIF -->
+			</dl>
+			</fieldset>
+
+			<fieldset class="quick">
+				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
+				<input class="button2" type="submit" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;" /> &nbsp; <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;" />
+			</fieldset>
+			</form>
+
+			<form id="add_groups" method="post" action="{U_ACTION}">
+
+			<fieldset>
+				<legend>{L_ADD_GROUPS}</legend>
+			<dl>
+				<dd class="full"><select name="group_id[]" style="width: 100%; height: 107px;" multiple="multiple">{S_ADD_GROUP_OPTIONS}</select></dd>
+			</dl>
+			</fieldset>
+
+			<fieldset class="quick">
+				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
+				<input type="submit" class="button1" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
+			</fieldset>
+			</form>
+
+		<!-- ENDIF -->
+
+		</div>
+
+	<!-- ELSEIF S_SELECT_USERGROUP_VIEW -->
+
+		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
+
+			<h1>{L_USERS}</h1>
+
+			<form id="users" method="post" action="{U_ACTION}">
+
+			<fieldset>
+				<legend>{L_MANAGE_USERS}</legend>
+			<dl>
+				<dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd>
+			</dl>
+			</fieldset>
+
+			<fieldset class="quick">
+				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
+				<input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" />
+			</fieldset>
+			</form>
+
+			<form id="add_user" method="post" action="{U_ACTION}">
+
+			<fieldset>
+				<legend>{L_LOOK_UP_USER}</legend>
+			<dl>
+				<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
+				<dd><input type="text" id="username" name="username[]" /></dd>
+				<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+				<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+			</dl>
+			</fieldset>
+
+			<fieldset class="quick">
+				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
+				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" />
+			</fieldset>
+			</form>
+
+		</div>
+
+		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
+
+			<h1>{L_USERGROUPS}</h1>
+
+			<form id="groups" method="post" action="{U_ACTION}">
+
+			<fieldset>
+				<legend>{L_MANAGE_GROUPS}</legend>
+			<dl>
+				<dd class="full"><select style="width: 100%;" name="group_id[]" multiple="multiple" size="5">{S_DEFINED_GROUP_OPTIONS}</select></dd>
+			</dl>
+			</fieldset>
+
+			<fieldset class="quick">
+				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
+				<input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" />
+			</fieldset>
+			</form>
+
+			<form id="group" method="post" action="{U_ACTION}">
+
+			<fieldset>
+				<legend>{L_LOOK_UP_GROUP}</legend>
+			<dl>
+				<dt><label for="group_select">{L_LOOK_UP_GROUP}:</label></dt>
+				<dd><select name="group_id[]" id="group_select">{S_ADD_GROUP_OPTIONS}</select></dd>
+				<dd>&nbsp;</dd>
+			</dl>
+			</fieldset>
+
+			<fieldset class="quick">
+				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
+				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" />
+			</fieldset>
+			</form>
+
+		</div>
+
+	<!-- ENDIF -->
+
+<!-- ENDIF -->
+
+<!-- IF S_VIEWING_PERMISSIONS -->
+
+	<h1>{L_ACL_VIEW}</h1>
+
+	<p>{L_ACL_VIEW_EXPLAIN}</p>
+
+	<fieldset class="quick">
+		<strong>&raquo; {L_PERMISSION_TYPE}</strong>
+	</fieldset>
+
+	<!-- INCLUDE permission_mask.html -->
+
+<!-- ENDIF -->
+
+<!-- IF S_SETTING_PERMISSIONS -->
+
+	<h1>{L_ACL_SET}</h1>
+
+	<p>{L_ACL_SET_EXPLAIN}</p>
+
+	<br />
+
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+		<strong>&raquo; {L_PERMISSION_TYPE}</strong>
+	</fieldset>
+
+	<!-- IF S_PERMISSION_DROPDOWN -->
+		<form id="pselect" method="post" action="{U_ACTION}">
+
+		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
+			{L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select>
+
+			<input class="button2" type="submit" name="submit" value="{L_GO}" />
+		</fieldset>
+		</form>
+	<!-- ENDIF -->
+
+	<br /><br />
+
+	<!-- include tooltip file -->
+	<script type="text/javascript" src="style/tooltip.js"></script>
+	<script type="text/javascript">
+	// <![CDATA[
+		window.onload = function(){enable_tooltips_select('set-permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
+	// ]]>
+	</script>
+
+	<form id="set-permissions" method="post" action="{U_ACTION}">
+
+	{S_HIDDEN_FIELDS}
+
+	<!-- INCLUDE permission_mask.html -->
+
+	<br /><br />
+
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+		<input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />
+		<input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" />
+		{S_FORM_TOKEN}
+	</fieldset>
+
+	<br /><br />
+
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_php_info.html b/phpBB/adm/style/acp_php_info.html
new file mode 100644
index 0000000000..de065c4896
--- /dev/null
+++ b/phpBB/adm/style/acp_php_info.html
@@ -0,0 +1,13 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_PHP_INFO}</h1>
+
+<p>{L_ACP_PHP_INFO_EXPLAIN}</p>
+
+<div class="phpinfo">
+	{PHPINFO}
+</div>
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
new file mode 100644
index 0000000000..85d37568c2
--- /dev/null
+++ b/phpBB/adm/style/acp_profile.html
@@ -0,0 +1,236 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<!-- IF ERROR_MSG -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="add_profile_field" method="post" action="{U_ACTION}">
+
+	<!-- IF S_STEP_ONE -->
+
+		<fieldset>
+			<legend>{L_TITLE}</legend>
+		<dl>
+			<dt><label>{L_FIELD_TYPE}:</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
+			<dd><strong>{FIELD_TYPE}</strong></dd>
+		</dl>
+		<!-- IF S_EDIT_MODE -->
+		<dl>
+			<dt><label>{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
+			<dd><input type="hidden" name="field_ident" value="{FIELD_IDENT}" /><strong>{FIELD_IDENT}</strong></dd>
+		</dl>
+		<!-- ELSE -->
+		<dl>
+			<dt><label for="field_ident">{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
+			<dd><input class="text medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>
+		</dl>
+		<!-- ENDIF -->
+		<dl>
+			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}:</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		</fieldset>
+
+		<fieldset>
+			<legend>{L_VISIBILITY_OPTION}</legend>
+		<dl>
+			<dt><label for="field_show_profile">{L_DISPLAY_AT_PROFILE}:</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_show_profile" name="field_show_profile" value="1"<!-- IF S_SHOW_PROFILE --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		<dl>
+			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}:</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		<dl>
+			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}:</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		<dl>
+			<dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_required" name="field_required" value="1"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		<dl>
+			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}:</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		</fieldset>
+
+		<!-- IF S_EDIT_MODE -->
+			<fieldset class="quick">
+				<input class="button1" type="submit" name="save" value="{L_SAVE}" />
+			</fieldset>
+		<!-- ENDIF -->
+
+		<fieldset>
+			<legend>{L_LANG_SPECIFIC}</legend>
+		<dl>
+			<dt><label for="lang_name">{L_USER_FIELD_NAME}:</label></dt>
+			<dd><input class="text medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}:</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>
+			<dd><textarea id="lang_explain" name="lang_explain" rows="3" cols="80">{LANG_EXPLAIN}</textarea></dd>
+		</dl>
+		<!-- IF S_TEXT or S_STRING -->
+			<dl>
+				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}:</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>
+				<dd><!-- IF S_STRING --><input class="text medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd>
+			</dl>
+		<!-- ENDIF -->
+		<!-- IF S_BOOL or S_DROPDOWN -->
+			<dl>
+				<dt><label for="lang_options">{L_ENTRIES}:</label>
+					<!-- IF S_EDIT_MODE and S_DROPDOWN -->
+						<br /><span>{L_EDIT_DROPDOWN_LANG_EXPLAIN}</span>
+					<!-- ELSE -->
+						<br /><span>{L_LANG_OPTIONS_EXPLAIN}</span>
+					<!-- ENDIF -->
+				</dt>
+			<!-- IF S_DROPDOWN -->
+				<dd><textarea id="lang_options" name="lang_options" rows="5" cols="80">{LANG_OPTIONS}</textarea></dd>
+			<!-- ELSE -->
+				<dd><input class="medium" id="lang_options" name="lang_options[0]" value="{FIRST_LANG_OPTION}" /> {L_FIRST_OPTION}</dd>
+				<dd><input class="medium" name="lang_options[1]" value="{SECOND_LANG_OPTION}" /> {L_SECOND_OPTION}</dd>
+			<!-- ENDIF -->
+			</dl>
+		<!-- ENDIF -->
+		</fieldset>
+
+		<fieldset class="quick">
+			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
+			<input class="button1" type="submit" name="next" value="{L_PROFILE_TYPE_OPTIONS}" />
+		</fieldset>
+
+	<!-- ELSEIF S_STEP_TWO -->
+
+		<fieldset>
+			<legend>{L_TITLE}</legend>
+		<!-- BEGIN option -->
+			<dl>
+				<dt><label>{option.TITLE}:</label><!-- IF option.EXPLAIN --><br /><span>{option.EXPLAIN}</span><!-- ENDIF --></dt>
+				<dd>{option.FIELD}</dd>
+			</dl>
+		<!-- END option -->
+		</fieldset>
+
+		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+			<input class="button1" type="submit" name="prev" value="{L_PROFILE_BASIC_OPTIONS}" />
+		</fieldset>
+
+		<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
+			<input class="button1" type="submit" name="next" value="{L_NEXT_STEP}" />
+		</fieldset>
+
+	<!-- ELSEIF S_STEP_THREE -->
+
+		<!-- BEGIN options -->
+			<fieldset>
+				<legend>{options.LANGUAGE}</legend>
+			<!-- BEGIN field -->
+				<dl>
+					<dt><label>{options.field.L_TITLE}:</label><!-- IF options.field.L_EXPLAIN --><br /><span>{options.field.L_EXPLAIN}</span><!-- ENDIF --></dt>
+					{options.field.FIELD}
+				</dl>
+			<!-- END field -->
+			</fieldset>
+		<!-- END options -->
+
+		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+			<input class="button1" type="submit" name="prev" value="{L_PROFILE_TYPE_OPTIONS}" />
+		</fieldset>
+
+		<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+			{S_HIDDEN_FIELDS}
+			<input class="button1" type="submit" name="save" value="{L_SAVE}" />
+			{S_FORM_TOKEN}
+		</fieldset>
+
+	<!-- ENDIF -->
+
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_ACP_CUSTOM_PROFILE_FIELDS}</h1>
+
+	<!-- IF S_NEED_EDIT -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{L_CUSTOM_FIELDS_NOT_TRANSLATED}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_FIELD_IDENT}</th>
+		<th>{L_FIELD_TYPE}</th>
+		<th colspan="2">{L_OPTIONS}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN fields -->
+		<!-- IF fields.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+		<td>{fields.FIELD_IDENT}</td>
+		<td>{fields.FIELD_TYPE}</td>
+		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>
+
+		<td style="width: 80px; text-align: right; white-space: nowrap;">
+			<!-- IF fields.S_FIRST_ROW && not fields.S_LAST_ROW -->
+				{ICON_MOVE_UP_DISABLED}
+				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+			<!-- ELSEIF not fields.S_FIRST_ROW && not fields.S_LAST_ROW-->
+				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+			<!-- ELSEIF fields.S_LAST_ROW && not fields.S_FIRST_ROW -->
+				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+				{ICON_MOVE_DOWN_DISABLED}
+			<!-- ENDIF -->
+			<!-- IF not fields.S_NEED_EDIT -->
+				<a href="{fields.U_EDIT}">{ICON_EDIT}</a>
+			<!-- ELSE -->
+				{ICON_EDIT_DISABLED}
+			<!-- ENDIF -->
+			<a href="{fields.U_DELETE}">{ICON_DELETE}</a>
+		</td>
+
+	</tr>
+	<!-- BEGINELSE -->
+	<tr class="row3">
+		<td colspan="4">{L_ACP_NO_ITEMS}</td>
+	</tr>
+	<!-- END fields -->
+	</tbody>
+	</table>
+
+	<form id="profile_fields" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick">
+		<input class="text small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select>
+		<input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}" />
+		<input type="hidden" name="create" value="1" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html
new file mode 100644
index 0000000000..069d2c91c3
--- /dev/null
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -0,0 +1,108 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_PRUNED -->
+
+	<h1>{L_FORUM_PRUNE}</h1>
+
+	<p>{L_PRUNE_SUCCESS}</p>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_FORUM}</th>
+		<th>{L_TOPICS_PRUNED}</th>
+		<th>{L_POSTS_PRUNED}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN pruned -->
+		<!-- IF pruned.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<td style="text-align: center;">{pruned.FORUM_NAME}</td>
+		<td style="text-align: center;">{pruned.NUM_TOPICS}</td>
+		<td style="text-align: center;">{pruned.NUM_POSTS}</td>
+	</tr>
+	<!-- BEGINELSE -->
+		<tr>
+			<td colspan="3" class="row3" style="text-align: center;">{L_NO_PRUNE}</td>
+		</tr>
+	<!-- END pruned -->
+	</tbody>
+	</table>
+
+<!-- ELSEIF S_SELECT_FORUM -->
+
+	<h1>{L_ACP_PRUNE_FORUMS}</h1>
+
+	<p>{L_ACP_PRUNE_FORUMS_EXPLAIN}</p>
+
+	<form id="acp_prune" method="post" action="{U_ACTION}">
+	
+	<fieldset>
+		<legend>{L_SELECT_FORUM}</legend>
+		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
+	<dl>
+		<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
+		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
+		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>
+	</dl>
+	
+	<p class="quick">
+		<input class="button1" type="submit" value="{L_LOOK_UP_FORUM}" />
+	</p>
+	</fieldset>
+
+	</form>
+
+<!-- ELSE -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_ACP_PRUNE_FORUMS}</h1>
+
+	<p>{L_ACP_PRUNE_FORUMS_EXPLAIN}</p>
+
+	<h2>{L_FORUM}</h2>
+
+	<p>{L_SELECTED_FORUMS}: {FORUM_LIST}</p>
+
+	<form id="acp_prune" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_FORUM_PRUNE}</legend>
+	<dl>
+		<dt><label for="prune_days">{L_PRUNE_NOT_POSTED}:</label></dt>
+		<dd><input type="text" id="prune_days" name="prune_days" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}:</label></dt>
+		<dd><input type="text" id="prune_vieweddays" name="prune_vieweddays" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1" /> {L_YES}</label>
+			<label><input type="radio" class="radio" id="polls" name="prune_old_polls" value="0" checked="checked" /> {L_NO}</label></dd>
+	</dl>
+	<dl>
+		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="prune_announce" value="1" /> {L_YES}</label>
+			<label><input type="radio" class="radio" id="announce" name="prune_announce" value="0" checked="checked" /> {L_NO}</label></dd>
+	</dl>
+	<dl>
+		<dt><label for="sticky">{L_PRUNE_STICKY}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES}</label>
+			<label><input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</label></dd>
+	</dl>
+	
+	<p class="quick">
+		{S_HIDDEN_FIELDS}
+		{S_FORM_TOKEN}
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+	</p>
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
new file mode 100644
index 0000000000..0f2b23dcef
--- /dev/null
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -0,0 +1,59 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_PRUNE_USERS}</h1>
+
+<p>{L_ACP_PRUNE_USERS_EXPLAIN}</p>
+
+<form id="acp_prune" method="post" action="{U_ACTION}">
+	
+<fieldset>
+	<legend>{L_ACP_PRUNE_USERS}</legend>
+<dl>
+	<dt><label for="username">{L_USERNAME}:</label></dt>
+	<dd><input type="text" id="username" name="username" /></dd>
+</dl>
+<dl>
+	<dt><label for="email">{L_EMAIL}:</label></dt>
+	<dd><input type="text" id="email" name="email" /></dd>
+</dl>
+<dl>
+	<dt><label for="joined">{L_JOINED}:</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
+	<dd><select name="joined_select">{S_JOINED_OPTIONS}</select> <input type="text" id="joined" name="joined" /></dd>
+</dl>
+<dl>
+	<dt><label for="active">{L_LAST_ACTIVE}:</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt>
+	<dd><select name="active_select">{S_ACTIVE_OPTIONS}</select> <input type="text" id="active" name="active" /></dd>
+</dl>
+<dl>
+	<dt><label for="count">{L_POSTS}:</label></dt>
+	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" id="count" name="count" /></dd>
+</dl>
+<dl>
+	<dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
+	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
+	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+</dl>
+<dl>
+	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}</label>
+		<label><input type="radio" class="radio" id="deleteposts" name="deleteposts" value="0" checked="checked" /> {L_NO}</label></dd>
+</dl>
+<dl>
+	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}:</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label>
+		<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd>
+</dl>
+
+<p class="submit-buttons">
+	<input type="hidden" name="prune" value="1" />
+
+	<input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" />&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	{S_FORM_TOKEN}
+</p>
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
new file mode 100644
index 0000000000..9306e30269
--- /dev/null
+++ b/phpBB/adm/style/acp_ranks.html
@@ -0,0 +1,98 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<script type="text/javascript">
+	// <![CDATA[
+		function update_image(newimage)
+		{
+			document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + encodeURI(newimage) : "./images/spacer.gif";
+		}
+
+	// ]]>
+	</script>
+
+	<h1>{L_ACP_MANAGE_RANKS}</h1>
+
+	<p>{L_ACP_RANKS_EXPLAIN}</p>
+
+	<form id="acp_ranks" method="post" action="{U_ACTION}">
+	
+	<fieldset>
+		<legend>{L_ACP_RANKS}</legend>
+	<dl>
+		<dt><label for="title">{L_RANK_TITLE}:</label></dt>
+		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="rank_image">{L_RANK_IMAGE}:</label></dt>
+		<dd><select name="rank_image" id="rank_image" onchange="update_image(this.options[selectedIndex].value);">{S_FILENAME_LIST}</select></dd>
+		<dd><img src="{RANK_IMAGE}" id="image" alt="" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="special_rank">{L_RANK_SPECIAL}:</label></dt>
+		<dd><label><input onchange="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
+			<label><input onchange="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
+	<dl>
+		<dt><label for="min_posts">{L_RANK_MINIMUM}:</label></dt>
+		<dd><input name="min_posts" type="text" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
+	</dl>
+	</div>
+
+	<p class="submit-buttons">
+		<input type="hidden" name="action" value="save" />
+
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_ACP_MANAGE_RANKS}</h1>
+
+	<p>{L_ACP_RANKS_EXPLAIN}</p>
+
+	<form id="acp_ranks" method="post" action="{U_ACTION}">
+	<fieldset class="tabulated">
+	<legend>{L_ACP_MANAGE_RANKS}</legend>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_RANK_IMAGE}</th>
+		<th>{L_RANK_TITLE}</th>
+		<th>{L_RANK_MINIMUM}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN ranks -->
+		<!-- IF ranks.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
+		<td style="text-align: center;">{ranks.RANK_TITLE}</td>
+		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->&nbsp; - &nbsp;<!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td>
+		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}">{ICON_DELETE}</a></td>
+	</tr>
+	<!-- END ranks -->
+	</tbody>
+	</table>
+
+	<p class="quick">
+		<input class="button2" name="add" type="submit" value="{L_ADD_RANK}" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html
new file mode 100644
index 0000000000..23fcfbdeb8
--- /dev/null
+++ b/phpBB/adm/style/acp_reasons.html
@@ -0,0 +1,127 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT_REASON -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_REASON_EDIT_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<!-- IF not S_TRANSLATED -->
+		<h3>{L_AVAILABLE_TITLES}</h3>
+
+		<p>{S_AVAILABLE_TITLES}</p>
+	<!-- ENDIF -->
+
+	<form id="acp_reasons" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_TITLE}</legend>
+		<p><!-- IF S_TRANSLATED -->{L_IS_TRANSLATED_EXPLAIN}<!-- ELSE -->{L_IS_NOT_TRANSLATED_EXPLAIN}<!-- ENDIF --></p>
+	<dl>
+		<dt><label for="reason_title">{L_REASON_TITLE}:</label></dt>
+		<dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" maxlength="255" /></dd>
+	</dl>
+	<!-- IF S_TRANSLATED -->
+	<dl>
+		<dt>{L_REASON_TITLE_TRANSLATED}</dt>
+		<dd>{TRANSLATED_TITLE}</dd>
+	</dl>
+	<!-- ENDIF -->
+	<dl>
+		<dt><label for="reason_description">{L_REASON_DESCRIPTION}:</label></dt>
+		<dd><textarea name="reason_description" id="reason_description" rows="8" cols="80">{REASON_DESCRIPTION}</textarea></dd>
+	</dl>
+	<!-- IF S_TRANSLATED -->
+	<dl>
+		<dt>{L_REASON_DESC_TRANSLATED}</dt>
+		<dd>{TRANSLATED_DESCRIPTION}</dd>
+	</dl>
+	<!-- ENDIF -->
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_ACP_REASONS}</h1>
+
+	<p>{L_ACP_REASONS_EXPLAIN}</p>
+
+	<form id="reasons" method="post" action="{U_ACTION}">
+	<fieldset class="tabulated">
+	<legend>{L_ACP_REASONS}</legend>
+
+	<!-- IF .reasons -->
+		<table cellspacing="1">
+			<col class="row1" /><col class="row1" /><col class="row2" />
+		<thead>
+		<tr>
+			<th>{L_REASON}</th>
+			<th>{L_USED_IN_REPORTS}</th>
+			<th>{L_OPTIONS}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN reasons -->
+			<tr>
+				<td>
+					<i style="float: {S_CONTENT_FLOW_END}; font-size: .9em;"><!-- IF reasons.S_TRANSLATED -->{L_IS_TRANSLATED}<!-- ELSE -->{L_IS_NOT_TRANSLATED}<!-- ENDIF --></i>
+					<strong>{reasons.REASON_TITLE}<!-- IF reasons.S_OTHER_REASON --> *<!-- ENDIF --></strong>
+					<br /><span>{reasons.REASON_DESCRIPTION}</span>
+				</td>
+				<td style="width: 100px;">{reasons.REASON_COUNT}</td>
+				<td style="width: 80px; text-align: right; white-space: nowrap;">
+					<!-- IF reasons.S_FIRST_ROW && not reasons.S_LAST_ROW -->
+						{ICON_MOVE_UP_DISABLED}
+						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF not reasons.S_FIRST_ROW && not reasons.S_LAST_ROW-->
+						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
+						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
+					<!-- ELSEIF reasons.S_LAST_ROW && not reasons.S_FIRST_ROW -->
+						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ENDIF -->
+					<a href="{reasons.U_EDIT}">{ICON_EDIT}</a> 
+					<!-- IF reasons.U_DELETE -->
+						<a href="{reasons.U_DELETE}">{ICON_DELETE}</a>
+					<!-- ELSE -->
+						{ICON_DELETE_DISABLED}
+					<!-- ENDIF -->
+				</td>
+			</tr>
+		<!-- END reasons -->
+		</tbody>
+		</table>
+
+	<!-- ENDIF -->
+
+	<p class="quick">
+		<input type="hidden" name="action" value="add" />
+
+		<input type="text" name="reason_title" /> 
+		<input class="button2" name="addreason" type="submit" value="{L_ADD_NEW_REASON}" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+	
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
new file mode 100644
index 0000000000..5fd7a23d97
--- /dev/null
+++ b/phpBB/adm/style/acp_search.html
@@ -0,0 +1,157 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_SETTINGS -->
+	<h1>{L_ACP_SEARCH_SETTINGS}</h1>
+
+	<p>{L_ACP_SEARCH_SETTINGS_EXPLAIN}</p>
+
+	<form id="acp_search" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>
+	<dl>
+		<dt><label for="load_search">{L_YES_SEARCH}:</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl>
+		<dt><label for="search_interval">{L_SEARCH_INTERVAL}:</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
+		<dd><input id="search_interval" type="text" size="4" maxlength="4" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
+	</dl>
+	<dl>
+		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}:</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
+		<dd><input id="search_anonymous_interval" type="text" size="4" maxlength="4" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
+	</dl>
+	<dl>
+		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}:</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
+		<dd><input id="limit_search_load" type="text" size="4" maxlength="4" name="config[limit_search_load]" value="{LIMIT_SEARCH_LOAD}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}:</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
+		<dd><input id="min_search_author_chars" type="text" size="4" maxlength="4" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}:</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
+		<dd><input id="max_num_search_keywords" type="text" size="4" maxlength="4" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}:</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
+		<dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_SEARCH_TYPE}</legend>
+	<dl>
+		<dt><label for="search_type">{L_SEARCH_TYPE}:</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
+		<dd><select id="search_type" name="config[search_type]">{S_SEARCH_TYPES}</select></dd>
+	</dl>
+	</fieldset>
+
+	<!-- BEGIN backend -->
+
+		<fieldset>
+			<legend>{backend.NAME}</legend>
+		{backend.SETTINGS}
+		</fieldset>
+
+	<!-- END backend -->
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_INDEX -->
+
+	<script type="text/javascript">
+	// <![CDATA[
+		/**
+		* Popup search progress bar
+		*/
+		function popup_progress_bar(progress_type)
+		{
+			close_waitscreen = 0;
+			// no scrollbars
+			popup('{UA_PROGRESS_BAR}&amp;type=' + progress_type, 400, 240, '_index');
+		}
+	// ]]>
+	</script>
+
+	<h1>{L_ACP_SEARCH_INDEX}</h1>
+
+	<!-- IF S_CONTINUE_INDEXING -->
+		<p>{L_CONTINUE_EXPLAIN}</p>
+
+		<form id="acp_search_continue" method="post" action="{U_CONTINUE_INDEXING}">
+			<fieldset class="submit-buttons">
+				<legend>{L_SUBMIT}</legend>
+				<input class="button1" type="submit" id="continue" name="continue" value="{L_CONTINUE}" onclick="popup_progress_bar('{S_CONTINUE_INDEXING}');" />&nbsp;
+				<input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" />
+				{S_FORM_TOKEN}
+			</fieldset>
+		</form>
+	<!-- ELSE -->
+
+		<p>{L_ACP_SEARCH_INDEX_EXPLAIN}</p>
+
+		<!-- BEGIN backend -->
+
+			<!-- IF backend.S_STATS -->
+
+			<form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}">
+
+				<fieldset class="tabulated">
+
+				{backend.S_HIDDEN_FIELDS}
+
+				<legend>{L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>
+
+				<table cellspacing="1">
+					<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>
+					<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+				<thead>
+				<tr>
+					<th>{L_STATISTIC}</th>
+					<th>{L_VALUE}</th>
+					<th>{L_STATISTIC}</th>
+					<th>{L_VALUE}</th>
+				</tr>
+				</thead>
+				<tbody>
+				<!-- BEGIN data -->
+					<tr>
+						<td>{backend.data.STATISTIC_1}:</td>
+						<td>{backend.data.VALUE_1}</td>
+						<td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->:<!-- ENDIF --></td>
+						<td>{backend.data.VALUE_2}</td>
+					</tr>
+				<!-- END data -->
+				</tbody>
+				</table>
+
+			<!-- ENDIF -->
+
+			<p class="quick">
+			<!-- IF backend.S_INDEXED -->
+				<input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
+			<!-- ELSE -->
+				<input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
+			<!-- ENDIF -->
+			</p>
+			{S_FORM_TOKEN}
+			</fieldset>
+
+			</form>
+		<!-- END backend -->
+
+	<!-- ENDIF -->
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html
new file mode 100644
index 0000000000..2a9b61f314
--- /dev/null
+++ b/phpBB/adm/style/acp_send_statistics.html
@@ -0,0 +1,71 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_SEND_STATISTICS}</h1>
+
+<p>{L_EXPLAIN_SEND_STATISTICS}</p>
+
+<script type="text/javascript">
+//<![CDATA[
+var iframect = 0;
+
+function iframe_updated()
+{
+	if (iframect++ == 0)
+	{
+		return;
+	}
+
+	dE('questionnaire-form', -1);
+	dE('questionnaire-thanks', 1);
+}
+//]]>
+</script>
+
+<iframe onload="iframe_updated();" name="questionaire_result" style="display: none;"></iframe>
+
+<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
+
+	<p><a href="{U_ACP_MAIN}">{L_DONT_SEND_STATISTICS}</a></p>
+
+	<p>{L_EXPLAIN_SHOW_STATISTICS}</p>
+
+	<p id="show-button"><input type="button" class="button2" onclick="dE('configlist', 1); dE('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>
+
+	<div id="configlist">
+		<input type="button" class="button2" onclick="dE('show-button', 1); dE('configlist', -1);" value="{L_HIDE_STATISTICS}" />
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
+		</p>
+
+		<!-- BEGIN providers -->
+		<fieldset>
+			<legend>{providers.NAME}</legend>
+			<!-- BEGIN values -->
+			<dl>
+				<dt>{providers.values.KEY}</dt>
+				<dd>{providers.values.VALUE}</dd>
+			</dl>
+			<!-- END values -->
+		</fieldset>
+		<!-- END providers -->
+	</div>
+	<p class="submit-buttons">
+		<input type="hidden" name="systemdata" value="{RAW_DATA}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
+	</p>
+</form>
+
+<div id="questionnaire-thanks" class="successbox">
+	<p><strong>{L_THANKS_SEND_STATISTICS}</strong><br /><br /><a href="{U_ACP_MAIN}">&laquo; {L_GO_ACP_MAIN}</a></p>
+</div>
+
+<script type="text/javascript">
+//<![CDATA[
+	dE('configlist', -1);
+	dE('questionnaire-thanks', -1);
+//]]>
+</script>
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
new file mode 100644
index 0000000000..5bde4008ad
--- /dev/null
+++ b/phpBB/adm/style/acp_styles.html
@@ -0,0 +1,521 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_DELETE -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<form id="acp_styles" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_TITLE}</legend>
+	<dl>
+		<dt><label>{L_NAME}:</label></dt>
+		<dd><strong>{NAME}</strong></dd>
+	</dl>
+	<dl>
+		<dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt>
+		<dd><select id="new_id" name="new_id">{S_REPLACE_OPTIONS}</select></dd>
+	</dl>
+
+	<p class="quick">
+		<input class="button1" type="submit" name="update" value="{L_DELETE}" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_EDIT_IMAGESET -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<!-- IF SUCCESS -->
+		<div class="successbox">
+			<p>{L_IMAGESET_UPDATED}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<!-- IF ERROR -->
+		<div class="errorbox">
+			<p>{L_NO_IMAGE}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<script type="text/javascript" defer="defer">
+	// <![CDATA[
+		function update_image(newimage)
+		{
+			document.getElementById('newimg').src = (newimage) ? '../styles/{A_PATH}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
+		}
+	// ]]>
+	</script>
+	<script type="text/javascript">
+	// <![CDATA[
+		/**
+		* Handle displaying/hiding the dimension fields
+		*/
+		function display_options(value)
+		{
+			if (value == 0)
+			{
+				dE('img_dimensions', -1);
+			}
+			else
+			{
+				dE('img_dimensions', 1);
+			}
+		}
+
+		/**
+		* Init the wanted display functionality if javascript is enabled.
+		* If javascript is not available, the user is still able to properly administrate.
+		*/
+		onload = function()
+		{
+			<!-- IF not IMAGE_SIZE -->
+				dE('img_dimensions', -1);
+			<!-- ENDIF -->
+		}
+	// ]]>
+	</script>
+
+	<form method="post" action="{U_ACTION}">
+
+	<fieldset class="quick" style="text-align: left;">
+		<legend>{L_SELECT_IMAGE}</legend>
+		{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit();">
+		<!-- BEGIN category -->
+			<option class="sep" value="" disabled="disabled">{category.NAME}</option>
+				<!-- BEGIN images --><option value="{category.images.VALUE}"<!-- IF category.images.SELECTED--> selected="selected"<!-- ENDIF -->>&nbsp;&nbsp;&nbsp;&nbsp;{category.images.TEXT}</option>
+				<!-- END images -->
+			<!-- END category -->
+		</select>&nbsp; <input class="button1" type="submit" value="{L_SELECT}" tabindex="100" />
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_EDIT_IMAGESET}</legend>
+	<dl>
+		<dt><label>{L_CURRENT_IMAGE}:</label></dt>
+		<dd><img src="<!-- IF IMAGE_REQUEST -->{IMAGE_REQUEST}<!-- ELSE -->images/no_image.png<!-- ENDIF -->" alt="" /></dd>
+	</dl>
+	<dl>
+		<dt><label>{L_SELECTED_IMAGE}:</label></dt>
+		<dd><img src="{IMG_SRC}" id="newimg" alt="" /></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+	<legend>{L_IMAGE}</legend>
+	<dl>
+		<dt><label for="imgpath">{L_IMAGE}:</label></dt>
+		<dd><select id="imgpath" name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>
+			<!-- BEGIN imagesetlist -->
+			<option class="sep" value=""><!-- IF imagesetlist.TYPE -->{L_LOCALISED_IMAGES}<!-- ELSE -->{L_GLOBAL_IMAGES}<!-- ENDIF --></option>
+				<!-- BEGIN images -->
+				<option value="{imagesetlist.images.VALUE}"<!-- IF imagesetlist.images.SELECTED--> selected="selected"<!-- ENDIF -->>{imagesetlist.images.TEXT}</option>
+				<!-- END images -->
+			<!-- END imagesetlist -->
+			</select>
+		</dd>
+	</dl>
+	<dl>
+		<dt><label for="imgsize">{L_INCLUDE_DIMENSIONS}:</label><br /><span>{L_DIMENSIONS_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" name="imgsize" id="imgsize" onclick="display_options(1);" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="imgsize" onclick="display_options(0);" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<div id="img_dimensions">
+		<dl>
+			<dt><label for="imgwidth">{L_IMAGE_WIDTH}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
+			<dd><input id="imgwidth" type="text" name="imgwidth" value="{IMAGE_SIZE}" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="imgheight">{L_IMAGE_HEIGHT}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
+			<dd><input id="imgheight" type="text" name="imgheight" value="{IMAGE_HEIGHT}" /></dd>
+		</dl>
+	</div>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="button2" type="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_EDIT}</h1>
+
+	<p>{L_EDIT_EXPLAIN}</p>
+
+	<p>{L_SELECTED}: <strong>{SELECTED_TEMPLATE}</strong></p>
+
+	<form id="acp_styles" method="post" action="{U_ACTION}">
+
+	<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
+	<fieldset>
+		<legend>{L_SELECT}</legend>
+	<dl>
+		<dt><label for="template_file">{L_FILE}:</label></dt>
+		<dd><select id="template_file" name="template_file" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_TEMPLATES}</select> <input class="button2" type="submit" value="{L_SELECT}" /></dd>
+	</dl>
+	{S_FORM_TOKEN}
+	</fieldset>
+	<!-- ENDIF -->
+	</form>
+
+	<!-- IF TEMPLATE_FILE or (S_EDIT_THEME and S_THEME_IN_DB) -->
+		<script type="text/javascript" defer="defer">
+		// <![CDATA[
+
+			function change_editor_height(height)
+			{
+				height = Number(height);
+
+				if (isNaN(height))
+				{
+					return;
+				}
+
+				editor = document.getElementById('template_data');
+				editor.rows = Math.max(5, Math.min(height, 999));
+
+				append_text_rows('acp_styles', height);
+				append_text_rows('acp_template', height);
+			}
+
+			function append_text_rows(form_name, value)
+			{
+				value = Number(value);
+
+				if (isNaN(value))
+				{
+					return;
+				}
+
+				url = document.getElementById(form_name).action;
+
+				// Make sure &amp; is actually... &
+				url = url.replace(/&amp;/g, '&');
+
+				var_start = url.indexOf('&text_rows=');
+				if (var_start == -1)
+				{
+					document.getElementById(form_name).action = url + "&text_rows=" + value;
+				}
+				else
+				{
+					url_start = url.substring(0, var_start + 1);
+					var_end = url.substring(var_start + 1).indexOf('&');
+					if (var_end == -1)
+					{
+						document.getElementById(form_name).action = url_start + "text_rows=" + value;
+					}
+					else
+					{
+						document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value;
+					}
+				}
+			}
+
+		// ]]>
+		</script>
+
+		<form id="acp_template" method="post" action="{U_ACTION}">
+
+		<fieldset>
+			<legend>{L_EDITOR}</legend>
+		<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
+		<dl>
+			<dt><label>{L_SELECTED_FILE}:</label></dt>
+			<dd>{TEMPLATE_FILE}</dd>
+		</dl>
+		<!-- ENDIF -->
+		<dl>
+			<dt><label for="text_rows">{L_EDITOR_HEIGHT}:</label></dt>
+			<dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button2" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd>
+		</dl>
+		<textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea>
+		</fieldset>
+
+		<fieldset class="submit-buttons">
+			<legend>{L_SUBMIT}</legend>
+			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
+			<input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" />
+		</fieldset>
+		</form>
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_CACHE -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TEMPLATE_CACHE}</h1>
+
+	<p>{L_TEMPLATE_CACHE_EXPLAIN}</p>
+
+	<form id="acp_styles" method="post" action="{U_ACTION}">
+	<fieldset class="tabulated">
+	<legend>{L_TEMPLATE_CACHE}</legend>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_CACHE_FILENAME}</th>
+		<th>{L_CACHE_FILESIZE}</th>
+		<th>{L_CACHE_CACHED}</th>
+		<th>{L_CACHE_MODIFIED}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN file -->
+		<!-- IF file.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td><a href="{file.U_VIEWSOURCE}" onclick="popup(this.href, 750, 550, '_source'); return false;">{file.FILENAME_PATH}</a></td>
+			<td>{file.FILESIZE}</td>
+			<td>{file.CACHED}</td>
+			<td>{file.MODIFIED}</td>
+			<td><input type="checkbox" class="radio" name="delete[]" value="{file.FILENAME}" /></td>
+		</tr>
+	<!-- BEGINELSE -->
+		<tr class="row1">
+			<td colspan="5">{L_TEMPLATE_CACHE_EMPTY}</td>
+		</tr>
+	<!-- END file -->
+	</tbody>
+	</table>
+
+	<p class="quick">
+		<span class="small"><a href="#" onclick="marklist('acp_styles', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('acp_styles', 'delete', false); return false;">{L_UNMARK_ALL}</a></span><br />
+		{S_FORM_TOKEN}
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_DELETE_MARKED}" />
+	</p>
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_EXPORT -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<!-- IF S_ERROR_MSG -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="acp_styles" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_TITLE}</legend>
+	<dl>
+		<dt><label>{L_NAME}:</label></dt>
+		<dd><strong>{NAME}</strong></dd>
+	</dl>
+	<!-- IF S_STYLE -->
+		<dl>
+			<dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt>
+			<dd><label><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="inc_template" value="0" /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt>
+			<dd><label><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="inc_theme" value="0" /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt>
+			<dd><label><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="inc_imageset" value="0" /> {L_NO}</label></dd>
+		</dl>
+	<!-- ENDIF -->
+	<dl>
+		<dt><label for="store">{L_DOWNLOAD_STORE}:</label><br /><span>{L_DOWNLOAD_STORE_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" id="store" name="store" value="1" checked="checked" /> {L_EXPORT_STORE}</label>
+			<label><input type="radio" class="radio" name="store" value="0" /> {L_EXPORT_DOWNLOAD}</label></dd>
+	</dl>
+	<dl>
+		<dt><label for="format">{L_ARCHIVE_FORMAT}:</label></dt>
+		<dd>{FORMAT_BUTTONS}</dd>
+	</dl>
+
+	<p class="quick">
+		{S_FORM_TOKEN}
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	</p>
+	</fieldset>
+
+
+	</form>
+
+<!-- ELSEIF S_FRONTEND -->
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<!-- IF S_STYLE --> <!-- DEFINE $COLSPAN = 5 --> <!-- ELSE --> <!-- DEFINE $COLSPAN = 4 --> <!-- ENDIF -->
+
+	<table cellspacing="1">
+		<col class="row1" /><!-- IF S_STYLE --><col class="row1" /><!-- ENDIF --><col class="row2" /><col class="row2" />
+	<thead>
+	<tr>
+		<th>{L_NAME}</th>
+		<!-- IF S_STYLE --><th>{L_STYLE_USED_BY}</th><!-- ENDIF -->
+		<th>{L_OPTIONS}</th>
+		<th>{L_ACTIONS}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<tr>
+		<td class="row3" colspan="{$COLSPAN}"><strong>{L_INSTALLED}</strong></td>
+	</tr>
+	<!-- BEGIN installed -->
+	<tr>
+		<td><strong>{installed.NAME}</strong><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
+		<!-- IF S_STYLE -->
+			<td style="text-align: center;">{installed.STYLE_COUNT}</td>
+		<!-- ENDIF -->
+		<td style="text-align: center;">
+			{installed.S_OPTIONS}
+		</td>
+		<td style="text-align: center;">
+			<!-- IF S_STYLE -->
+				<a href="{installed.U_STYLE_ACT_DEACT}">{installed.L_STYLE_ACT_DEACT}</a> |
+			<!-- ENDIF -->
+			{installed.S_ACTIONS}
+			<!-- IF S_STYLE -->
+				| <a href="{installed.U_PREVIEW}">{L_PREVIEW}</a>
+			<!-- ENDIF -->
+		</td>
+	</tr>
+	<!-- END installed -->
+	<tr>
+		<td class="row3" colspan="{$COLSPAN}"><strong>{L_UNINSTALLED}</strong></td>
+	</tr>
+	<!-- IF not .uninstalled -->
+		<tr>
+			<td class="row1" colspan="{$COLSPAN}" style="text-align: center;">{L_NO_UNINSTALLED}</td>
+		</tr>
+	<!-- ENDIF -->
+	<!-- BEGIN uninstalled -->
+		<tr>
+			<td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><strong>{uninstalled.NAME}</strong><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td>
+			<td style="text-align: center;" colspan="2"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td>
+		</tr>
+	<!-- END uninstalled -->
+	</tbody>
+	</table>
+
+	<!-- IF S_STYLE -->
+		<form id="acp_styles" method="post" action="{U_ACTION}">
+
+		<fieldset class="quick">
+			<legend>{L_CREATE}</legend>
+			{L_CREATE}: <input type="text" name="name" value="" /> {L_FROM} <select name="basis">{S_BASIS_OPTIONS}</select> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" />
+		</fieldset>
+
+		</form>
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_DETAILS -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<!-- IF S_ERROR_MSG -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="acp_styles" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_TITLE}</legend>
+	<dl>
+		<dt><label for="name">{L_NAME}:</label></dt>
+		<dd><!-- IF S_INSTALL --><strong id="name">{NAME}</strong><!-- ELSE --><input type="text" id="name" name="name" value="{NAME}" /><!-- ENDIF --></dd>
+	</dl>
+	<dl>
+		<dt><label for="copyright">{L_COPYRIGHT}:</label></dt>
+		<dd><!-- IF S_INSTALL --><strong id="copyright">{COPYRIGHT}</strong><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd>
+	</dl>
+	<!-- IF S_SUPERTEMPLATE -->
+	<dl>
+		<dt><label for="inheriting">{L_INHERITING_FROM}:</label></dt>
+		<dd><strong id="inheriting">{S_SUPERTEMPLATE}</strong></dd>
+	</dl>
+	<!-- ENDIF -->
+	<!-- IF S_STYLE and not S_BASIS -->
+		<dl>
+			<dt><label for="template_id">{L_STYLE_TEMPLATE}:</label></dt>
+			<dd><!-- IF S_INSTALL --><strong id="template_id">{TEMPLATE_NAME}</strong><!-- ELSE --><select id="template_id" name="template_id">{S_TEMPLATE_OPTIONS}</select><!-- ENDIF --></dd>
+		</dl>
+		<dl>
+			<dt><label for="theme_id">{L_STYLE_THEME}:</label></dt>
+			<dd><!-- IF S_INSTALL --><strong id="theme_id">{THEME_NAME}</strong><!-- ELSE --><select id="theme_id" name="theme_id">{S_THEME_OPTIONS}</select><!-- ENDIF --></dd>
+		</dl>
+		<dl>
+			<dt><label for="imageset_id">{L_STYLE_IMAGESET}:</label></dt>
+			<dd><!-- IF S_INSTALL --><strong id="imageset_id">{IMAGESET_NAME}</strong><!-- ELSE --><select id="imageset_id" name="imageset_id">{S_IMAGESET_OPTIONS}</select><!-- ENDIF --></dd>
+		</dl>
+	<!-- ENDIF -->
+	<!-- IF (S_TEMPLATE or S_THEME) and (S_LOCATION or not S_INSTALL) -->
+		<dl>
+			<dt><label for="store_db">{L_LOCATION}:</label><br /><span><!-- IF S_STORE_DB_DISABLED -->{L_LOCATION_DISABLED_EXPLAIN}<!-- ELSE -->{L_LOCATION_EXPLAIN}<!-- ENDIF --></span></dt>
+			<dd><label><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF --> />{L_STORE_FILESYSTEM}</label>
+				<label><input type="radio" class="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF -->/> {L_STORE_DATABASE}</label></dd>
+		</dl>
+	<!-- ENDIF -->
+	<!-- IF S_STYLE -->
+		</fieldset>
+
+		<fieldset>
+			<legend>{L_OPTIONS}</legend>
+		<dl>
+			<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt>
+			<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<!-- IF not S_STYLE_DEFAULT -->
+			<dl>
+				<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt>
+				<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label>
+					<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>
+			</dl>
+		<!-- ENDIF -->
+	<!-- ENDIF -->
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html
new file mode 100644
index 0000000000..34d4f6934e
--- /dev/null
+++ b/phpBB/adm/style/acp_update.html
@@ -0,0 +1,46 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+	
+<!-- IF S_VERSION_CHECK -->
+
+	<h1>{L_VERSION_CHECK}</h1>
+
+	<p>{L_VERSION_CHECK_EXPLAIN}</p>
+
+	<!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO -->
+		<div class="successbox">
+			<p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+		</div>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend></legend>
+	<dl>
+		<dt><label>{L_CURRENT_VERSION}</label></dt>
+		<dd><strong><!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->{AUTO_VERSION}<!-- ELSE -->{CURRENT_VERSION}<!-- ENDIF --></strong></dd>
+	</dl>
+	<dl>
+		<dt><label>{L_LATEST_VERSION}</label></dt>
+		<dd><strong>{LATEST_VERSION}</strong></dd>
+	</dl>
+	</fieldset>
+
+	<!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->
+		{L_UPDATE_INSTRUCTIONS_INCOMPLETE}
+		<br /><br />
+		{UPDATE_INSTRUCTIONS}
+		<br /><br />
+	<!-- ENDIF -->
+	<!-- IF not S_UP_TO_DATE -->
+		{UPDATE_INSTRUCTIONS}
+		<br /><br />
+	<!-- ENDIF -->
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
new file mode 100644
index 0000000000..e266654649
--- /dev/null
+++ b/phpBB/adm/style/acp_users.html
@@ -0,0 +1,234 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_SELECT_USER -->
+
+	<h1>{L_USER_ADMIN}</h1>
+
+	<p>{L_USER_ADMIN_EXPLAIN}</p>
+
+	<form id="select_user" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_SELECT_USER}</legend>
+	<dl>
+		<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
+		<dd><input class="text medium" type="text" id="username" name="username" /></dd>
+		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+		<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+	</dl>
+
+	<p class="quick">
+		<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
+	</p>
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_SELECT_FORUM -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_USER_ADMIN}</h1>
+
+	<p>{L_USER_ADMIN_EXPLAIN}</p>
+
+	<form id="select_forum" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_USER_ADMIN_MOVE_POSTS}</legend>
+	<dl>
+		<dt><label for="new_forum">{L_USER_ADMIN_MOVE_POSTS}</label><br /><span>{L_MOVE_POSTS_EXPLAIN}</span></dt>
+		<dd><select id="new_forum" name="new_f">{S_FORUM_OPTIONS}</select></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="quick">
+		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_USER_ADMIN} :: {MANAGED_USERNAME}</h1>
+
+	<p>{L_USER_ADMIN_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="mode_select" method="post" action="{U_MODE_SELECT}">
+
+	<fieldset class="quick">
+		{L_SELECT_FORM}: <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- IF S_OVERVIEW -->
+
+<!-- INCLUDE acp_users_overview.html -->
+
+<!-- ELSEIF S_FEEDBACK -->
+
+<!-- INCLUDE acp_users_feedback.html -->
+
+<!-- ELSEIF S_WARNINGS -->
+
+<!-- INCLUDE acp_users_warnings.html -->
+
+<!-- ELSEIF S_PROFILE -->
+
+<!-- INCLUDE acp_users_profile.html -->
+
+<!-- ELSEIF S_PREFS -->
+
+<!-- INCLUDE acp_users_prefs.html -->
+
+<!-- ELSEIF S_AVATAR -->
+
+<!-- INCLUDE acp_users_avatar.html -->
+
+<!-- ELSEIF S_RANK -->
+
+	<form id="user_prefs" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_ACP_USER_RANK}</legend>
+	<dl>
+		<dt><label for="user_rank">{L_USER_RANK}:</label></dt>
+		<dd><select name="user_rank" id="user_rank">{S_RANK_OPTIONS}</select></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_SIGNATURE -->
+
+<!-- INCLUDE acp_users_signature.html -->
+
+<!-- ELSEIF S_GROUPS -->
+
+	<form id="user_groups" method="post" action="{U_ACTION}">
+
+	<table cellspacing="1">
+	<tbody>
+	<!-- BEGIN group -->
+		<!-- IF group.S_NEW_GROUP_TYPE -->
+		<tr>
+			<td class="row3" colspan="4"><strong>{group.GROUP_TYPE}</strong></td>
+		</tr>
+		<!-- ELSE -->
+			<!-- IF group.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+				<td><a href="{group.U_EDIT_GROUP}">{group.GROUP_NAME}</a></td>
+				<td><!-- IF group.S_IS_MEMBER --><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --><!-- ELSEIF not group.S_IS_MEMBER and group.U_APPROVE --><a href="{group.U_APPROVE}">{L_GROUP_APPROVE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
+				<td><!-- IF group.S_IS_MEMBER and not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
+				<td><a href="{group.U_DELETE}">{L_GROUP_DELETE}</a></td>
+			</tr>
+		<!-- ENDIF -->
+	<!-- END group -->
+	</tbody>
+	</table>
+
+	<!-- IF S_GROUP_OPTIONS -->
+		<fieldset class="quick">
+			{L_USER_GROUP_ADD}: <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+			{S_FORM_TOKEN}
+		</fieldset>
+	<!-- ENDIF -->
+	</form>
+
+<!-- ELSEIF S_ATTACHMENTS -->
+
+	<form id="user_attachments" method="post" action="{U_ACTION}">
+
+
+	<!-- IF PAGINATION -->
+	<div class="pagination">
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	</div>
+	<!-- ENDIF -->
+
+	<!-- IF .attach -->
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_FILENAME}</th>
+		<th>{L_POST_TIME}</th>
+		<th>{L_FILESIZE}</th>
+		<th>{L_DOWNLOADS}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN attach -->
+		<!-- IF attach.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}: </strong><!-- ELSE --><strong>{L_POST}: </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>
+		<td style="text-align: center">{attach.POST_TIME}</td>
+		<td style="text-align: center">{attach.SIZE}</td>
+		<td style="text-align: center">{attach.DOWNLOAD_COUNT}</td>
+		<td style="text-align: center"><input type="checkbox" class="radio" name="mark[]" value="{attach.ATTACH_ID}" /></td>
+	</tr>
+	<!-- END attach -->
+	</tbody>
+	</table>
+	<!-- ELSE -->
+	<div class="errorbox">
+		<p>{L_USER_NO_ATTACHMENTS}</p>
+	</div>
+	<!-- ENDIF -->
+	<fieldset class="display-options">
+		{L_SORT_BY}: <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select>
+		<input class="button2" type="submit" value="{L_GO}" name="sort" />
+	</fieldset>
+	<hr />
+	<!-- IF PAGINATION -->
+	<div class="pagination">
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	</div>
+	<!-- ENDIF -->
+
+	<fieldset class="quick">
+		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
+		<p class="small"><a href="#" onclick="marklist('user_attachments', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('user_attachments', 'mark', false);">{L_UNMARK_ALL}</a></p>
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_PERMISSIONS -->
+
+	<div style="float: {S_CONTENT_FLOW_END};">
+		<a href="{U_USER_PERMISSIONS}">&raquo; {L_SET_USERS_PERMISSIONS}</a><br />
+		<a href="{U_USER_FORUM_PERMISSIONS}">&raquo; {L_SET_USERS_FORUM_PERMISSIONS}</a>
+	</div>
+
+	<form id="select_forum" method="post" action="{U_ACTION}">
+
+		<fieldset class="quick" style="text-align: left;">
+			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select>
+			<input class="button2" type="submit" value="{L_GO}" name="select" />
+			{S_FORM_TOKEN}
+		</fieldset>
+	</form>
+
+	<div class="clearfix">&nbsp;</div>
+
+	<!-- INCLUDE permission_mask.html -->
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
new file mode 100644
index 0000000000..deed41e16e
--- /dev/null
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -0,0 +1,78 @@
+	<form id="avatar_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
+
+	<fieldset>
+		<legend>{L_ACP_USER_AVATAR}</legend>
+	<dl>
+		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+		<dd>{AVATAR_IMAGE}</dd>
+		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
+	</dl>
+	<!-- IF not S_IN_AVATAR_GALLERY -->
+		<!-- IF S_UPLOAD_FILE -->
+			<dl> 
+				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+				<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd>
+			</dl>
+		<!-- ENDIF -->
+		<!-- IF S_REMOTE_UPLOAD -->
+			<dl>
+				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
+			</dl>
+		<!-- ENDIF -->
+		<!-- IF S_ALLOW_REMOTE -->
+			<dl>
+				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
+			</dl>
+			<dl>
+				<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+				<dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>px</span></dd>
+			</dl>
+		<!-- ENDIF -->
+		<!-- IF S_DISPLAY_GALLERY -->
+			<dl> 
+				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
+				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
+			</dl>
+		<!-- ENDIF -->
+	<!-- ELSE -->
+		</fieldset>
+
+		<fieldset>
+			<legend>{L_AVATAR_GALLERY}</legend>
+		<dl>
+			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
+			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
+		</dl>
+		<dl>
+			<table cellspacing="1">
+			<!-- BEGIN avatar_row -->
+			<tr> 
+				<!-- BEGIN avatar_column -->
+					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
+				<!-- END avatar_column -->
+			</tr>
+			<tr>
+				<!-- BEGIN avatar_option_column -->
+					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
+				<!-- END avatar_option_column -->
+			</tr>
+			<!-- END avatar_row -->
+			</table>
+		</dl>
+		</fieldset>
+		
+		<fieldset class="quick" style="margin-top: -15px;">
+			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+		</fieldset>
+	
+	<!-- ENDIF -->
+	</fieldset>
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	
+	</form>
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html
new file mode 100644
index 0000000000..e11a8e6ec1
--- /dev/null
+++ b/phpBB/adm/style/acp_users_feedback.html
@@ -0,0 +1,76 @@
+	<form id="list" method="post" action="{U_ACTION}">
+
+	<!-- IF PAGINATION -->
+	<div class="pagination">
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	</div>
+	<!-- ENDIF -->
+
+	<!-- IF .log -->
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_REPORT_BY}</th>
+		<th>{L_IP}</th>
+		<th>{L_TIME}</th>
+		<th>{L_FEEDBACK}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN log -->
+		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+			<td>{log.USERNAME}</td>
+			<td style="text-align: center;">{log.IP}</td>
+			<td style="text-align: center;">{log.DATE}</td>
+			<td>
+				{log.ACTION}
+				<!-- IF log.DATA --><br />&#187; <span class="gensmall">[ {log.DATA} ]</span><!-- ENDIF -->
+			</td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
+		</tr>
+	<!-- END log -->
+	</tbody>
+	</table>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_NO_ENTRIES}</p>
+		</div>
+	<!-- ENDIF -->
+	
+	<fieldset class="display-options">
+		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
+		<input class="button2" type="submit" value="{L_GO}" name="sort" />
+	</fieldset>
+	<hr />
+	<!-- IF PAGINATION -->
+	<div class="pagination">
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	</div>
+	<!-- ENDIF -->
+
+	<!-- IF S_CLEARLOGS -->
+		<fieldset class="quick">
+			<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
+			<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
+			<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
+		</fieldset>
+	<!-- ENDIF -->
+
+	<h1>{L_ADD_FEEDBACK}</h1>
+
+	<p>{L_ADD_FEEDBACK_EXPLAIN}</p>
+
+	<fieldset>
+		<legend>{L_ACP_USER_FEEDBACK}</legend>
+		<dl>
+			<dd class="full"><textarea name="message" id="message" rows="10" cols="76"></textarea></dd>
+		</dl>
+	</fieldset>
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	</fieldset>
+	{S_FORM_TOKEN}
+	</form>
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
new file mode 100644
index 0000000000..e3eff369cc
--- /dev/null
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -0,0 +1,144 @@
+<form id="user_overview" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_ACP_USER_OVERVIEW}</legend>
+<dl>
+	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
+	<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
+	<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
+</dl>
+<!-- IF S_USER_INACTIVE -->
+<dl>
+	<dt><label>{L_USER_IS_INACTIVE}:</label></dt>
+	<dd><strong>{USER_INACTIVE_REASON}</strong></dd>
+</dl>
+<!-- ENDIF -->
+<dl>
+	<dt><label>{L_REGISTERED}:</label></dt>
+	<dd><strong>{USER_REGISTERED}</strong></dd>
+</dl>
+<!-- IF S_USER_IP -->
+<dl>
+	<dt><label>{L_REGISTERED_IP}:</label></dt>
+	<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>
+	<dd>[ <a href="{U_WHOIS}" onclick="popup(this.href, 700, 500, '_whois'); return false;">{L_WHOIS}</a> ]</dd>
+</dl>
+<!-- ENDIF -->
+<dl>
+	<dt><label>{L_LAST_ACTIVE}:</label></dt>
+	<dd><strong>{USER_LASTACTIVE}</strong></dd>
+</dl>
+<dl>
+	<dt><label>{L_POSTS}:</label></dt>
+	<dd><strong>{USER_POSTS}</strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd>
+</dl>
+<dl>
+	<dt><label>{L_WARNINGS}:</label></dt>
+	<dd><strong>{USER_WARNINGS}</strong></dd>
+</dl>
+<dl>
+	<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_NO}</label></dd>
+</dl>
+<dl>
+	<dt><label for="user_email">{L_EMAIL}:</label></dt>
+	<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" /></dd>
+</dl>
+<dl>
+	<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
+	<dd><input class="text medium" type="text" id="email_confirm" name="email_confirm" value="" /></dd>
+</dl>
+<dl>
+	<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
+	<dd><input type="password" id="new_password" name="new_password" value="" /></dd>
+</dl>
+<dl>
+	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
+	<dd><input type="password" id="password_confirm" name="password_confirm" value="" /></dd>
+</dl>
+
+<p class="quick">
+	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	<input type="hidden" name="action" value="" />
+	{S_FORM_TOKEN}
+</p>
+
+</fieldset>
+</form>
+
+<!-- IF not S_USER_FOUNDER or S_FOUNDER -->
+
+	<script type="text/javascript">
+	// <![CDATA[
+
+		function display_reason(option)
+		{
+			if (option != 'banuser' && option != 'banemail' && option != 'banip')
+			{
+				dE('reasons', -1);
+				return;
+			}
+
+			dE('reasons', 1);
+
+			element = document.getElementById('user_quick_tools').ban_reason;
+
+			if (element.value && element.value != '{LA_USER_ADMIN_BAN_NAME_REASON}' && element.value != '{LA_USER_ADMIN_BAN_EMAIL_REASON}' && element.value != '{LA_USER_ADMIN_BAN_IP_REASON}')
+			{
+				return;
+			}
+
+			if (option == 'banuser')
+			{
+				element.value = '{LA_USER_ADMIN_BAN_NAME_REASON}';
+			}
+			else if (option == 'banemail')
+			{
+				element.value = '{LA_USER_ADMIN_BAN_EMAIL_REASON}';
+			}
+			else if (option == 'banip')
+			{
+				element.value = '{LA_USER_ADMIN_BAN_IP_REASON}';
+			}
+		}
+
+	// ]]>
+	</script>
+
+	<form id="user_quick_tools" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_USER_TOOLS}</legend>
+	<dl>
+		<dt><label for="quicktools">{L_QUICK_TOOLS}:</label></dt>
+		<dd><select id="quicktools" name="action" onchange="display_reason(this.options[this.selectedIndex].value);">{S_ACTION_OPTIONS}</select></dd>
+	</dl>
+	<div style="display: none;" id="reasons">
+		<dl>
+			<dt><label for="ban_reason">{L_BAN_REASON}:</label></dt>
+			<dd><input name="ban_reason" type="text" class="text medium" maxlength="3000" id="ban_reason" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}:</label></dt>
+			<dd><input name="ban_give_reason" type="text" class="text medium" maxlength="3000" id="ban_give_reason" /></dd>
+		</dl>
+	</div>
+		<!-- IF not S_OWN_ACCOUNT -->
+			<dl>
+				<dt><label for="delete_user">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
+				<dd><input type="checkbox" class="radio" name="delete" value="1" /></dd>
+				<dd><select id="delete_user" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
+			</dl>
+		<!-- ENDIF -->
+
+	<p class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
+	</p>
+
+	</fieldset>
+
+	</form>
+
+<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
new file mode 100644
index 0000000000..07a9bc5c78
--- /dev/null
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -0,0 +1,158 @@
+<script type="text/javascript">
+// <![CDATA[
+	var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
+// ]]>
+</script>
+
+	<form id="user_prefs" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_UCP_PREFS_PERSONAL}</legend>
+	<dl> 
+		<dt><label for="viewemail">{L_SHOW_EMAIL}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="viewemail" value="0"<!-- IF not VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="massemail">{L_ADMIN_EMAIL}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="massemail" value="1"<!-- IF MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="massemail" value="0"<!-- IF not MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="allowpm">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" name="allowpm" value="1"<!-- IF ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="allowpm" value="0"<!-- IF not ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="hideonline">{L_HIDE_ONLINE}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="notifymethod">{L_NOTIFY_METHOD}:</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
+			<label><input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
+			<label><input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="notifypm">{L_NOTIFY_ON_PM}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="popuppm">{L_POPUP_ON_PM}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
+		<dd><select id="lang" name="lang">{S_LANG_OPTIONS}</select></dd>
+	</dl>
+	<dl> 
+		<dt><label for="style">{L_BOARD_STYLE}:</label></dt>
+		<dd><select id="style" name="style">{S_STYLE_OPTIONS}</select></dd>
+	</dl>
+	<dl> 
+		<dt><label for="tz">{L_BOARD_TIMEZONE}:</label></dt>
+		<dd><select id="tz" name="tz" style="width: 100%;">{S_TZ_OPTIONS}</select></dd>
+	</dl>
+	<dl> 
+		<dt><label for="dst">{L_BOARD_DST}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="dst" value="1"<!-- IF DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="dst" value="0"<!-- IF not DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
+		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
+		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_UCP_PREFS_POST}</legend>
+	<dl> 
+		<dt><label for="bbcode">{L_DEFAULT_BBCODE}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="smilies">{L_DEFAULT_SMILIES}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="sig">{L_DEFAULT_ADD_SIG}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="sig" value="1"<!-- IF ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="sig" value="0"<!-- IF not ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="notify">{L_DEFAULT_NOTIFY}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_UCP_PREFS_VIEW}</legend>
+	<dl> 
+		<dt><label for="view_images">{L_VIEW_IMAGES}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_images" value="0"<!-- IF not VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="view_flash">{L_VIEW_FLASH}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="view_flash" value="1"<!-- IF VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_flash" value="0"<!-- IF not VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="view_smilies">{L_VIEW_SMILIES}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="view_smilies" value="1"<!-- IF VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_smilies" value="0"<!-- IF not VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="view_sigs">{L_VIEW_SIGS}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="view_sigs" value="1"<!-- IF VIEW_SIGS --> id="view_sigs" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_sigs" value="0"<!-- IF not VIEW_SIGS --> id="view_sigss" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="view_avatars">{L_VIEW_AVATARS}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="view_avatars" value="1"<!-- IF VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_avatars" value="0"<!-- IF not VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="view_wordcensor" value="1"<!-- IF VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_wordcensor" value="0"<!-- IF not VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt>
+		<dd>{S_TOPIC_SORT_DAYS}</dd>
+	</dl>
+	<dl> 
+		<dt><label>{L_VIEW_TOPICS_KEY}:</label></dt>
+		<dd>{S_TOPIC_SORT_KEY}</dd>
+	</dl>
+	<dl> 
+		<dt><label>{L_VIEW_TOPICS_DIR}:</label></dt>
+		<dd>{S_TOPIC_SORT_DIR}</dd>
+	</dl>
+	<dl> 
+		<dt><label>{L_VIEW_POSTS_DAYS}:</label></dt>
+		<dd>{S_POST_SORT_DAYS}</dd>
+	</dl>
+	<dl> 
+		<dt><label>{L_VIEW_POSTS_KEY}:</label></dt>
+		<dd>{S_POST_SORT_KEY}</dd>
+	</dl>
+	<dl> 
+		<dt><label>{L_VIEW_POSTS_DIR}:</label></dt>
+		<dd>{S_POST_SORT_DIR}</dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+
+	</form>
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
new file mode 100644
index 0000000000..0d1c6f8e46
--- /dev/null
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -0,0 +1,66 @@
+	<form id="user_profile" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_USER_PROFILE}</legend>
+	<dl>
+		<dt><label for="icq">{L_UCP_ICQ}:</label></dt>
+		<dd><input type="text" id="icq" name="icq" value="{ICQ}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="aim">{L_UCP_AIM}:</label></dt>
+		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="msn">{L_UCP_MSNM}:</label></dt>
+		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="yim">{L_UCP_YIM}:</label></dt>
+		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="jabber">{L_UCP_JABBER}:</label></dt>
+		<dd><input type="text" id="jabber" name="jabber" value="{JABBER}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="website">{L_WEBSITE}:</label></dt>
+		<dd><input type="text" id="website" name="website" value="{WEBSITE}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="location">{L_LOCATION}:</label></dt>
+		<dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="occupation">{L_OCCUPATION}:</label></dt>
+		<dd><textarea id="occupation" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></dd>
+	</dl>
+	<dl>
+		<dt><label for="interests">{L_INTERESTS}:</label></dt>
+		<dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>
+	</dl>
+	<dl> 
+		<dt><label for="birthday">{L_BIRTHDAY}:</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
+		<dd>{L_DAY}: <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}: <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}: <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
+	</dl>
+	</fieldset>
+
+	<!-- IF .profile_fields -->
+		<fieldset>
+			<legend>{L_USER_CUSTOM_PROFILE_FIELDS}</legend>
+		<!-- BEGIN profile_fields -->
+		<dl> 
+			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dd>{profile_fields.FIELD}</dd>
+			<!-- IF profile_fields.ERROR -->
+				<dd><span class="small" style="color: red;">{profile_fields.ERROR}</span></dd>
+			<!-- ENDIF -->
+		</dl>
+		<!-- END profile_fields -->
+		</fieldset>
+	<!-- ENDIF -->
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
new file mode 100644
index 0000000000..0ea5328c3c
--- /dev/null
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -0,0 +1,117 @@
+<script type="text/javascript">
+// <![CDATA[
+
+	var form_name = 'user_signature';
+	var text_name = 'signature';
+
+	// Define the bbCode tags
+	var bbcode = new Array();
+	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
+	var imageTag = false;
+
+	// Helpline messages
+	var help_line = {
+		b: '{LA_BBCODE_B_HELP}',
+		i: '{LA_BBCODE_I_HELP}',
+		u: '{LA_BBCODE_U_HELP}',
+		q: '{LA_BBCODE_Q_HELP}',
+		c: '{LA_BBCODE_C_HELP}',
+		l: '{LA_BBCODE_L_HELP}',
+		o: '{LA_BBCODE_O_HELP}',
+		p: '{LA_BBCODE_P_HELP}',
+		w: '{LA_BBCODE_W_HELP}',
+		s: '{LA_BBCODE_S_HELP}',
+		f: '{LA_BBCODE_F_HELP}',
+		e: '{LA_BBCODE_E_HELP}',
+		d: '{LA_BBCODE_D_HELP}',
+		t: '{LA_BBCODE_T_HELP}',
+		tip: '{L_STYLES_TIP}'
+		<!-- BEGIN custom_tags -->
+			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
+		<!-- END custom_tags -->
+	}
+
+// ]]>
+</script>
+<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
+
+<form id="user_signature" method="post" action="{U_ACTION}">
+
+	<!-- IF SIGNATURE_PREVIEW -->
+		<fieldset>
+			<legend>{L_ADMIN_SIG_PREVIEW}</legend>
+			<p>{SIGNATURE_PREVIEW}</p>
+		</fieldset>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_SIGNATURE}</legend>
+		<p>{L_SIGNATURE_EXPLAIN}</p>
+
+		<div id="format-buttons">
+			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="t" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
+			<!-- IF S_BBCODE_IMG -->
+				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
+			<!-- ENDIF -->
+			<!-- IF S_LINKS_ALLOWED -->
+				<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseout="helpline('tip')" />
+			<!-- ENDIF -->
+			<!-- IF S_BBCODE_FLASH -->
+				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
+			<!-- ENDIF -->
+
+			{L_FONT_SIZE}: <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}" onmouseover="helpline('f')" onmouseout="helpline('tip')">
+				<option value="50">{L_FONT_TINY}</option>
+				<option value="85">{L_FONT_SMALL}</option>
+				<option value="100" selected="selected">{L_FONT_NORMAL}</option>
+				<option value="150">{L_FONT_LARGE}</option>
+				<option value="200">{L_FONT_HUGE}</option>
+			</select>
+		<!-- IF .custom_tags -->
+			<br /><br />
+			<!-- BEGIN custom_tags -->
+				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
+			<!-- END custom_tags -->
+		<!-- ENDIF -->
+
+		</div>
+
+		<p><input type="text" class="text full" style="border: 0; background: none;" name="helpbox" value="{L_STYLES_TIP}" /></p>
+
+		<dl>
+			<dt style="width: 90px;">
+				<script type="text/javascript">
+				// <![CDATA[
+					colorPalette('v', 12, 10);
+				// ]]>
+				</script>
+			</dt>
+			<dd style="margin-left: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{SIGNATURE}</textarea></dd>
+			<dd style="margin-left: 90px; margin-top: 5px;">
+			<!-- IF S_BBCODE_ALLOWED -->
+				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
+			<!-- ENDIF -->
+			<!-- IF S_SMILIES_ALLOWED -->
+				<label><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label>
+			<!-- ENDIF -->
+			<!-- IF S_LINKS_ALLOWED -->
+				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
+			<!-- ENDIF -->
+			</dd>
+			<dd style="margin-left: 90px; margin-top: 10px;"><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
+		</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+</form>
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_warnings.html b/phpBB/adm/style/acp_users_warnings.html
new file mode 100644
index 0000000000..d27f3800fc
--- /dev/null
+++ b/phpBB/adm/style/acp_users_warnings.html
@@ -0,0 +1,36 @@
+	<form id="list" method="post" action="{U_ACTION}">
+
+	<!-- IF .warn -->
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_REPORT_BY}</th>
+		<th>{L_TIME}</th>
+		<th>{L_FEEDBACK}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN warn -->
+		<!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td>{warn.USERNAME}</td>
+			<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td>
+			<td>{warn.ACTION}</td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td>
+		</tr>
+	<!-- END warn -->
+	</tbody>
+	</table>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_NO_WARNINGS}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset class="quick">
+		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
+		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
+		<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
+	</fieldset>
+	{S_FORM_TOKEN}
+	</form>
diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html
new file mode 100644
index 0000000000..3fa4cfc91c
--- /dev/null
+++ b/phpBB/adm/style/acp_words.html
@@ -0,0 +1,77 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT_WORD -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_ACP_WORDS}</h1>
+
+	<p>{L_ACP_WORDS_EXPLAIN}</p>
+
+	<form id="acp_words" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_EDIT_WORD}</legend>
+		<dl>
+			<dt><label for="word">{L_WORD}</label></dt>
+			<dd><input id="word" type="text" name="word" value="{WORD}" maxlength="255" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="replacement">{L_REPLACEMENT}</label></dt>
+			<dd><input id="replacement" type="text" name="replacement" value="{REPLACEMENT}" maxlength="255" /></dd>
+		</dl>
+		{S_HIDDEN_FIELDS}
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="save" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_ACP_WORDS}</h1>
+
+	<p>{L_ACP_WORDS_EXPLAIN}</p>
+
+	<form id="acp_words" method="post" action="{U_ACTION}">
+
+	<fieldset class="tabulated">
+	<legend>{L_ACP_WORDS}</legend>
+	<p class="quick">
+		{S_HIDDEN_FIELDS}
+		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}" />
+	</p>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_WORD}</th>
+		<th>{L_REPLACEMENT}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN words -->
+		<!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<td style="text-align: center;">{words.WORD}</td>
+		<td style="text-align: center;">{words.REPLACEMENT}</td>
+		<td>&nbsp;<a href="{words.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{words.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
+	</tr>
+	<!-- BEGINELSE -->
+	<tr class="row3">
+		<td colspan="3">{L_ACP_NO_ITEMS}</td>
+	</tr>
+	<!-- END words -->
+	</tbody>
+	</table>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
new file mode 100644
index 0000000000..5f1f01c0a9
--- /dev/null
+++ b/phpBB/adm/style/admin.css
@@ -0,0 +1,1655 @@
+/*  phpBB 3.0 Admin Style Sheet
+	------------------------------------------------------------------------
+	Original author:	subBlue ( http://www.subblue.com/ )
+	Copyright 2007 phpBB Group ( http://www.phpbb.com/ )
+	------------------------------------------------------------------------
+*/
+
+/* General markup styles
+---------------------------------------- */
+* {
+	/* Reset browsers default margin, padding and font sizes */
+	margin: 0;
+	padding: 0;
+	font-size: 100%;
+}
+
+body, div, p, th, td, li, dd {
+	font-size: x-small;
+	voice-family: "\"}\"";
+	voice-family: inherit;
+	font-size: small
+}
+
+html>body, html>div, html>p, html>th, html>td, html>li, html>dd {
+	font-size: small
+}
+
+html {
+	color: #536482;
+	background: #DBD7D1;
+	/* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-ie browsers */
+	height: 100%;
+	margin-bottom: 1px;
+}
+
+body {
+	/* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */
+	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
+	color: #536482;
+	background: #DBD7D1;
+	font-size: 62.5%;	/* This sets the default font size to be equivalent to 10px */
+	margin: 10px 15px;
+}
+
+img {
+	border: 0;
+}
+
+h1 {
+	font-family: "Trebuchet MS", Helvetica, sans-serif;
+	font-size: 1.70em;
+	font-weight: normal;
+	color: #333333;
+}
+
+h2, caption {
+	font-family: "Trebuchet MS", Helvetica, sans-serif;
+	font-size: 1.40em;
+	font-weight: normal;
+	color: #115098;
+	text-align: left;
+	margin-top: 25px;
+}
+
+.rtl h2, .rtl caption {
+	text-align: right;
+}
+
+h3, h4 {
+	font-family: "Trebuchet MS", Helvetica, sans-serif;
+	font-size: 1.20em;
+	text-decoration: none;
+	line-height: 1.20em;
+	margin-top: 25px;
+}
+
+p {
+	margin-bottom: 0.7em;
+	line-height: 1.40em;
+	font-size: 0.90em;
+}
+
+ul {
+	list-style: disc;
+	margin: 0 0 1em 2em;
+}
+
+.rtl ul {
+	margin: 0 2em 1em 0;
+}
+
+hr {
+	border: 0 none;
+	border-top: 1px dashed #999999;
+	margin-bottom: 5px;
+	padding-bottom: 5px;
+	height: 1px;
+}
+
+.small {
+	font-size: 0.85em;
+}
+
+/* General links  */
+a:link, a:visited {
+	color: #105289;
+	text-decoration: none;
+}
+
+a:hover {
+	color: #BC2A4D;
+	text-decoration: underline;
+}
+
+a:active {
+	color: #368AD2;
+	text-decoration: none;
+}
+
+.install-body p a {
+	font-weight: bold;
+}
+
+/* List items */
+ul, ol {
+	list-style-position: inside;
+	margin-left: 1em;
+}
+
+li {
+	display: list-item;
+	list-style-type: inherit;
+}
+
+/* Main blocks
+---------------------------------------- */
+#wrap {
+	padding: 0 0 15px 0;
+	min-width: 615px;
+}
+
+#page-header {
+	clear: both;
+	text-align: right;
+	background: url("../images/phpbb_logo.gif") top left no-repeat;
+	height: 49px;
+	font-size: 0.85em;
+	margin-bottom: 10px;
+}
+
+.rtl #page-header {
+	text-align: left;
+	background: url("../images/phpbb_logo.gif") top right no-repeat;
+}
+
+#page-header h1 {
+	color: #767676;
+	font-family: "Trebuchet MS",Helvetica,sans-serif;
+	font-size: 1.70em;
+	padding-top: 10px;
+}
+
+#page-header p {
+	font-size: 1.00em;
+}
+
+#page-header p#skip {
+	display: none;
+}
+
+#page-body {
+	clear: both;
+	min-width: 700px;
+}
+
+#page-footer {
+	clear: both;
+	font-size: 0.75em;
+	text-align: center;
+}
+
+#content {
+	padding: 30px 10px 10px;
+	position: relative;
+}
+
+#content h1 {
+	color: #115098;
+	line-height: 1.2em;
+	margin-bottom: 0;
+}
+
+#main {
+	float: left;
+	width: 76%;
+	margin: 0 0 0 3%;
+	min-height: 350px;
+}
+
+.rtl #main {
+	float: right;
+	margin: 0 3% 0 0;
+}
+
+* html #main {
+	height: 350px;
+}
+
+#page-body.simple-page-body {
+	padding: 0;
+	padding-right: 10px;
+	min-width: 0;
+}
+
+/* Tabbed menu
+	Based on: http://www.alistapart.com/articles/slidingdoors2/
+----------------------------------------*/
+#tabs {
+	line-height: normal;
+	margin: 0 0 -6px 7px;
+	min-width: 600px;
+}
+
+.rtl #tabs {
+	margin: 0 7px -6px 0;
+}
+
+#tabs ul {
+	margin:0;
+	padding: 0;
+	list-style: none;
+}
+
+#tabs li {
+	display: inline;
+	margin: 0;
+	padding: 0;
+	font-size: 0.85em;
+	font-weight: bold;
+}
+
+#tabs a {
+	float: left;
+	background:url("../images/bg_tabs1.gif") no-repeat 0% -34px;
+	margin: 0 1px 0 0;
+	padding: 0 0 0 7px;
+	text-decoration: none;
+	position: relative;
+}
+
+.rtl #tabs a {
+	float: right;
+}
+
+#tabs a span {
+	float: left;
+	display: block;
+	background: url("../images/bg_tabs2.gif") no-repeat 100% -34px;
+	padding: 7px 10px 4px 4px;
+	color: #767676;
+	white-space: nowrap;
+	font-family: Arial, Helvetica, sans-serif;
+	text-transform: uppercase;
+	font-weight: bold;
+}
+
+.rtl #tabs a span {
+	float: right;
+}
+
+/* Commented Backslash Hack hides rule from IE5-Mac \*/
+#tabs a span, .rtl #tabs a span { float:none;}
+/* End hack */
+
+#tabs a:hover span {
+	color: #BC2A4D;
+}
+
+#tabs #activetab a {
+	background-position: 0 0;
+	border-bottom: 1px solid #DCDEE2;
+}
+
+#tabs #activetab a span {
+	background-position: 100% 0;
+	padding-bottom: 5px;
+	color: #23649F;
+}
+
+#tabs a:hover {
+	background-position: 0 -69px;
+}
+
+#tabs a:hover span {
+	background-position: 100% -69px;
+}
+
+#tabs #activetab a:hover span {
+	color: #115098;
+}
+
+
+/* Main Panel
+---------------------------------------- */
+#acp {
+	margin: 4px 0;
+	padding: 3px 1px;
+	min-width: 550px;
+	background-color: #FFFFFF;
+	border: 1px #999999 solid;
+}
+
+.panel {
+	background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top;
+	padding: 0;
+}
+
+span.corners-top, span.corners-bottom,
+span.corners-top span, span.corners-bottom span {
+	font-size: 1px;
+	line-height: 1px;
+	display: block;
+	height: 5px;
+	background-repeat: no-repeat;
+}
+
+span.corners-top {
+	background-image: url("../images/corners_left.gif");
+	background-position: 0 0;
+	margin: -4px -2px 0;
+}
+
+span.corners-top span {
+	background-image: url("../images/corners_right.gif");
+	background-position: 100% 0;
+}
+
+span.corners-bottom {
+	background-image: url("../images/corners_left.gif");
+	background-position: 0 100%;
+	margin: 0 -2px -4px;
+	clear: both;
+}
+
+span.corners-bottom span {
+	background-image: url("../images/corners_right.gif");
+	background-position: 100% 100%;
+}
+
+/* WinIE tweaks \*/
+* html span.corners-top, * html span.corners-bottom { background-image: url("../images/corners_left.gif"); }
+* html span.corners-top span, * html span.corners-bottom span { background-image: url("../images/corners_right.gif"); }
+/* End tweaks */
+
+/* Sub-navigation Menu
+---------------------------------------- */
+
+/* Toggle */
+#toggle {
+	padding: 5px;
+	width: 5%;
+	height: 100px;
+	position: absolute;
+	left: 15%;
+	top: 28px;
+	margin-left: 2px;
+}
+
+.rtl #toggle {
+	left: 75%;
+	margin-right: 0;
+	margin-left: 6px;
+}
+
+#toggle-handle {
+	display: block;
+	width: 18px;
+	height: 19px;
+	float: right;
+	background-image: url(../images/toggle.gif);
+}
+
+.rtl #toggle-handle {
+	background-image: url(../images/toggle.gif);
+	background-position: 100% 50%;
+}
+
+/* Menu */
+#menu {
+	float: left;
+	width: 20%;
+	font-size: 1.00em;
+	padding: 0;
+	border-right: 1px solid #CCCFD3;
+}
+
+.rtl #menu {
+	float: right;
+	border: none;
+	border-left: 1px solid #CCCFD3;
+}
+
+#menu p {
+	font-size: 0.85em;
+}
+
+#menu ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+
+/* Default list state */
+#menu li {
+	padding: 0;
+	margin: 0;
+	font-size: 0.85em;
+	font-weight: bold;
+	display: inline;
+}
+
+/* Link styles for the sub-section links */
+#menu li span {
+	display: block;
+	padding: 3px 3px 3px 8px;
+	margin: 1px 0;
+	text-decoration: none;
+	font-weight: normal;
+	color: #138ECB;
+}
+
+.rtl #menu li span {
+	padding: 3px 8px 3px 3px;
+}
+
+#menu li a:hover, #menu li a:hover span {
+	text-decoration: none;
+	background-color: #FFFFFF;
+	color: #BC2A4D;
+}
+
+#menu li a:active, #menu li a:active span {
+	color: #F632A0;
+}
+
+#menu li#activemenu a span {
+	text-decoration: none;
+	font-weight: bold;
+	color: #1180B7;
+	background: transparent url("../images/arrow_right.gif") 0% 50% no-repeat;
+}
+
+.rtl #menu li#activemenu a span {
+	background: transparent url("../images/arrow_left.gif") 100% 50% no-repeat;
+}
+
+#menu li#activemenu a:hover span, #menu li#activemenu span {
+	text-decoration: none;
+	font-weight: bold;
+	color: #BC2A4D;
+	background: #FFFFFF url("../images/arrow_right.gif") 1% 50% no-repeat;
+}
+
+.rtl #menu li#activemenu a:hover span, .rtl #menu li#activemenu span {
+	background: #FFFFFF url("../images/arrow_left.gif") 99% 50% no-repeat;
+}
+
+#menu li a:active, #menu li a:active span, #menu li#activemenu a:active span {
+	color: #F632A0;
+}
+
+#menu li span.completed {
+	text-decoration: none;
+	padding: 3px 3px 3px 12px;
+	background: url("../images/arrow_down.gif") 1% 50% no-repeat;
+}
+
+.rtl #menu li span.completed {
+	text-decoration: none;
+	padding: 3px 12px 3px 3px;
+	background: url("../images/arrow_down.gif") 99% 50% no-repeat;
+}
+
+#menu li.header {
+	font-family: Tahoma, Helvetica, sans-serif;
+	display: block;
+	font-weight: bold;
+	color: #115098;
+	border-bottom: 1px solid #327AA5;
+	padding: 4px 0 2px;
+	margin-top: 15px;
+	text-transform: uppercase;
+	font-size: 0.75em;
+}
+
+/* Table styles
+---------------------------------------- */
+
+table {
+	width: 100%;
+	border: 1px solid #CCCFD3;
+	background-color: #FFFFFF;
+	padding: 1px;
+}
+
+th {
+	padding: 3px 4px;
+	color: #FFFFFF;
+	background: #70AED3 url("../images/gradient2b.gif") bottom left repeat-x;
+	border-top: 1px solid #6DACD2;
+	border-bottom: 1px solid #327AA5;
+	text-align: left;
+	font-size: 0.75em;
+	text-transform: uppercase;
+}
+
+td {
+	text-align: left;
+	font-size: 0.85em;
+	padding: 4px;
+	line-height: 1.20em;
+}
+
+.rtl th, .rtl td {
+	text-align: right;
+}
+
+table.type2 {
+	border: none;
+	background: none;
+	padding: 0;
+}
+
+table.type2 th {
+	background: none;
+	border-top: none;
+	text-align: center;
+	color: #115098;
+	padding: 2px 0;
+}
+
+table.type2 td {
+	padding: 0;
+	font-size: 1em;
+}
+
+table.type2 td.name {
+	padding: 2px;
+	vertical-align: middle;
+}
+
+table.type3  {
+	float: right;
+	width: 300px;
+	border: none;
+	background-color: transparent;
+	padding: 0;
+}
+
+.rtl table.type3 {
+	float: left;
+}
+
+table.type3 thead th {
+	background-color: transparent;
+	border-top: none;
+	text-align: center;
+	color: #115098;
+	padding: 0 3px;
+	font-size: 0.85em;
+	font-weight: normal;
+	text-transform: none;
+}
+
+table.type3 tbody th {
+	border-top: none;
+	text-align: left;
+	text-transform: none;
+	padding: 0;
+	border: none;
+	font-size: 0.90em;
+	font-weight: normal;
+	width: 100%;
+}
+
+.rtl table.type3 tbody th {
+	text-align: right;
+}
+
+table.type3 td {
+	text-align: center;
+	padding: 1px;
+}
+
+th.name {
+	text-align: left;
+	width: auto;
+}
+
+.rtl th.name {
+	text-align: right;
+}
+
+td.name {
+	text-align: left;
+	font-weight: bold;
+}
+
+.rtl td.name {
+	text-align: right;
+}
+
+.entry {
+	text-align: left;
+	font-weight: normal;
+}
+
+.rtl .entry {
+	text-align: right;
+}
+
+.row1 { background-color: #F9F9F9; }
+.row2 { background-color: #DCEBFE; }
+.row3 { background-color: #DBDFE2; }
+.row4 { background-color: #E4E8EB; }
+.col1 { background-color: #DCEBFE; }
+.col2 { background-color: #F9F9F9; }
+
+.spacer {
+	background-color: #DBDFE2;
+	height: 1px;
+	line-height: 1px;
+}
+
+/* General form styles
+----------------------------------------*/
+fieldset {
+	margin: 15px 0;
+	padding: 10px;
+	border-top: 1px solid #D7D7D7;
+	border-right: 1px solid #CCCCCC;
+	border-bottom: 1px solid #CCCCCC;
+	border-left: 1px solid #D7D7D7;
+	background-color: #FFFFFF;
+	position: relative;
+}
+
+.rtl fieldset {
+	border-top: 1px solid #D7D7D7;
+	border-right: 1px solid #D7D7D7;
+	border-bottom: 1px solid #CCCCCC;
+	border-left: 1px solid #CCCCCC;
+}
+
+* html fieldset {
+	padding: 0 10px 5px 10px;
+}
+
+fieldset p {
+	font-size: 0.85em;
+}
+
+legend {
+	padding: 1px 0;
+	font-family: Tahoma,arial,Verdana,Sans-serif;
+	font-size: .9em;
+	font-weight: bold;
+	color: #115098;
+	margin-top: -.4em;
+	position: relative;
+	text-transform: none;
+	line-height: 1.2em;
+	top: 0;
+	vertical-align: middle;
+}
+
+/* Hide from macIE \*/
+legend { top: -1.2em; }
+/* end */
+
+* html legend {
+	margin: 0 0 -10px -7px;
+	line-height: 1em;
+	font-size: .85em;
+}
+
+/* Holly hack, .rtl comes after html */
+* html .rtl legend {
+	margin: 0;
+	margin-right: -7px;
+}
+
+input, textarea {
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	font-size: 0.90em;
+	font-weight: normal;
+	cursor: text;
+	vertical-align: middle;
+	padding: 2px;
+	color: #111111;
+	border-left: 1px solid #AFAEAA;
+	border-top: 1px solid #AFAEAA;
+	border-right: 1px solid #D5D5C8;
+	border-bottom: 1px solid #D5D5C8;
+	background-color: #E3DFD8;
+}
+
+.rtl input, .rtl textarea {
+	border-left: 1px solid #D5D5C8;
+	border-top: 1px solid #AFAEAA;
+	border-right: 1px solid #AFAEAA;
+	border-bottom: 1px solid #D5D5C8;
+}
+
+input:hover, textarea:hover {
+	border-left: 1px solid #AFAEAA;
+	border-top: 1px solid #AFAEAA;
+	border-right: 1px solid #AFAEAA;
+	border-bottom: 1px solid #AFAEAA;
+	background-color: #E9E9E2;
+}
+
+input.langvalue, textarea.langvalue {
+	width: 90%;
+}
+
+optgroup, select {
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	font-size: 0.85em;
+	font-weight: normal;
+	font-style: normal;
+	cursor: pointer;
+	vertical-align: middle;
+	width: auto;
+	color: #000;
+}
+
+optgroup {
+	font-size: 1.00em;
+	font-weight: bold;
+}
+
+optgroup.disabled-options {
+	display: none;
+	background-color: gray;
+}
+
+option {
+	padding: 0 1em 0 0;
+	color: #000;
+}
+
+option.disabled-option {
+	color: graytext;
+}
+
+.rtl option {
+	padding: 0 0 0 1em;
+}
+
+.sep {
+	font-weight: bold;
+}
+
+.username-coloured {
+	font-weight: bold;
+}
+
+textarea {
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	font-size: 0.85em;
+	width: 60%;
+	padding: 2px;
+}
+
+label {
+	cursor: pointer;
+	font-size: 0.85em;
+	padding: 0 5px 0 0;
+}
+
+.rtl label {
+	padding: 0 0 0 5px;
+}
+
+label input {
+	font-size: 1.00em;
+	vertical-align: middle;
+}
+
+label img {
+	vertical-align: middle;
+}
+
+fieldset.quick, p.quick {
+	margin: 0 0 5px;
+	padding: 5px 0 0;
+	border: none;
+	background-color: transparent;
+	text-align: right;
+}
+
+.rtl fieldset.quick, .rtl p.quick {
+	text-align: left;
+}
+
+fieldset.quick legend {
+	display: none;
+}
+
+fieldset.tabulated {
+	background: none;
+	margin: 0;
+	padding: 0;
+	padding-top: 5px;
+	border: 0;
+}
+
+fieldset.tabulated legend {
+	display: none;
+}
+
+fieldset.nobg {
+	margin: 15px 0 0 0;
+	padding: 0;
+	border: none;
+	background-color: transparent;
+}
+
+fieldset.display-options {
+	margin: 15px 0 2px 0;
+	padding: 0 0 4px 0;
+	border: none;
+	background-color: transparent;
+	text-align: center;
+	font-size: 0.75em;
+}
+
+fieldset.display-options select, fieldset.display-options input, fieldset.display-options label {
+	font-size: 1.00em;
+	vertical-align: middle;
+}
+
+select option.disabled {
+	background-color: #bbb;
+	color: #fff;
+}
+
+/* Special case inputs */
+select#board_timezone,
+select#full_folder_action {
+	width: 95%;
+}
+
+/* Definition list layout for forms
+	Other general def. list properties defined in prosilver_main.css
+---------------------------------------- */
+dl {
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	font-size: 1.00em;
+}
+
+dt {
+	float: left;
+	width: auto;
+}
+
+.rtl dt {
+	float: right;
+}
+
+dd { color: #666666;}
+dd + dd { padding-top: 5px;}
+dt span { padding: 0 5px 0 0;}
+.rtl dt span { padding: 0 0 0 5px;}
+
+dt .explain { font-style: italic;}
+
+dt label {
+	font-size: 1.00em;
+	text-align: left;
+	font-weight: bold;
+	color: #4A5A73;
+}
+
+.rtl dt label {
+	text-align: right;
+}
+
+dd label {
+	font-size: 1.00em;
+	white-space: nowrap;
+	margin: 0 10px 0 0;
+	color: #4A5A73;
+}
+
+.rtl dd label {
+	margin: 0 0 0 10px;
+}
+
+html>body dd label input { vertical-align: text-bottom;}	/* Tweak for Moz to align checkboxes/radio buttons nicely */
+
+dd input {
+	font-size: 1.00em;
+	max-width: 100%;
+}
+
+dd select {
+	font-size: 100%;
+	width: auto;
+	max-width: 100%;
+}
+
+dd textarea {
+	font-size: 0.90em;
+	width: 90%;
+}
+
+dd select {
+	width: auto;
+	font-size: 1.00em;
+}
+
+fieldset dl {
+	margin-bottom: 10px;
+	font-size: 0.85em;
+}
+
+fieldset dt {
+	width: 45%;
+	text-align: left;
+	border: none;
+	border-right: 1px solid #CCCCCC;
+	padding-top: 3px;
+}
+
+.rtl fieldset dt {
+	text-align: right;
+	border: none;
+	border-left: 1px solid #CCCCCC;
+}
+
+fieldset dd {
+	margin: 0 0 0 45%;
+	padding: 0 0 0 5px;
+	border: none;
+	border-left: 1px solid #CCCCCC;
+	vertical-align: top;
+	font-size: 1.00em;
+}
+
+.rtl fieldset dd {
+	margin: 0 45% 0 0;
+	padding: 0 5px 0 0;
+	border: none;
+	border-right: 1px solid #CCCCCC;
+}
+
+dd.full, .rtl dd.full {
+	margin: 0;
+	border: 0;
+	padding: 0;
+	padding-top: 3px;
+	text-align: center;
+	width: 95%;
+}
+
+/* Hover highlights for form rows */
+fieldset dl:hover dt, fieldset dl:hover dd {
+	border-color: #666666;
+}
+
+fieldset dl:hover dt label {
+	color: #000000;
+}
+
+fieldset dl dd label:hover {
+	color: #BC2A4D;
+}
+
+input:focus, textarea:focus {
+	border: 1px solid #BC2A4D;
+	background-color: #E9E9E2;
+	color: #BC2A4D;
+}
+
+/* Submit button fieldset or paragraph
+---------------------------------------- */
+fieldset.submit-buttons {
+	text-align: center;
+	border: none;
+	background-color: transparent;
+	margin: 0;
+	padding: 4px;
+	margin-top: -1px;
+}
+
+p.submit-buttons {
+	text-align: center;
+	margin: 0;
+	padding: 4px;
+	margin-top: 10px;
+}
+
+fieldset.submit-buttons input, p.submit-buttons input {
+	padding: 3px 2px;
+}
+
+fieldset.submit-buttons legend {
+	display: none;
+}
+
+/* Input field styles
+---------------------------------------- */
+
+input.radio, input.permissions-checkbox {
+	width: auto !important;
+	background-color: transparent;
+	border: none;
+	cursor: default;
+}
+
+input.full,
+textarea.full {
+	width: 99%;
+}
+
+* html input.full, * html textarea.full { width: 95%;}
+input.medium { width: 50%;}
+input.narrow { width: 25%;}
+input.tiny { width: 10%;}
+input.autowidth { width: auto !important;}
+.box2 .inputbox { background-color: #E9E9E9;}
+
+/* Form button styles
+---------------------------------------- */
+a.button1, input.button1, input.button3,
+a.button2, input.button2 {
+	width: auto !important;
+	padding: 1px 3px 0 3px;
+	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
+	color: #000;
+	font-size: 0.85em;
+	background: #EFEFEF url("../images/bg_button.gif") repeat-x top;
+	cursor: pointer;
+}
+
+a.button1, input.button1 {
+	font-weight: bold;
+	border: 1px solid #666666;
+}
+
+/* Alternative button */
+a.button2, input.button2 {
+	border: 1px solid #666666;
+}
+
+/* <a> button in the style of the form buttons */
+a.button1, a.button1:link, a.button1:visited, a.button1:active,
+a.button2, a.button2:link, a.button2:visited, a.button2:active {
+	text-decoration: none;
+	color: #000000;
+	padding: 4px 8px;
+}
+
+/* Hover states */
+a.button1:hover, input.button1:hover,
+a.button2:hover, input.button2:hover {
+	border: 1px solid #BC2A4D;
+	background: #EFEFEF url("../images/bg_button.gif") repeat bottom;
+	color: #BC2A4D;
+}
+
+input.disabled {
+	font-weight: normal;
+	color: #666666;
+}
+
+/* Pagination
+---------------------------------------- */
+.pagination {
+	height: 1%; /* IE tweak (holly hack) */
+	width: auto;
+	text-align: right;
+	margin-top: 5px;
+	font-size: 0.85em;
+	padding-bottom: 2px;
+}
+
+.rtl .pagination {
+	text-align: left;
+}
+
+.pagination strong,
+.pagination b {
+	font-weight: normal;
+}
+
+.pagination span.page-sep {
+	display:none;
+}
+
+.pagination span strong {
+	padding: 0 2px;
+	margin: 0 2px;
+	font-weight: normal;
+	font-size: 0.85em;
+	color: #FFFFFF;
+	background: #4692BF;
+	border: 1px solid #4692BF;
+}
+
+.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active {
+	font-weight: normal;
+	font-size: 0.85em;
+	text-decoration: none;
+	color: #5C758C;
+	margin: 0 2px;
+	padding: 0 2px;
+	background: #ECEDEE;
+	border: 1px solid #B4BAC0;
+}
+
+.pagination span a:hover {
+	border-color: #368AD2;
+	background: #368AD2;
+	color: #FFFFFF;
+	text-decoration: none;
+}
+
+.pagination img {
+	vertical-align: middle;
+}
+
+
+/* Action Highlighting
+---------------------------------------- */
+.successbox, .errorbox {
+	padding: 8px;
+	margin: 10px 0;
+	color: #FFFFFF;
+	text-align: center;
+}
+
+.success {
+	color: #228822;
+}
+
+.error {
+	color: #BC2A4D;
+}
+
+.successbox {
+	background-color: #228822;
+}
+
+.errorbox {
+	background-color: #BC2A4D;
+}
+
+* html .errorbox, * html .successbox { height: 1%; } /* Pixel shift fix for IE */
+
+.successbox h3, .errorbox h3 {
+	color: #FFFFFF;
+	margin: 0 0 0.5em;
+	font-size: 1.10em;
+	font-family: "Lucida Grande",Verdana,Helvetica,Arial,sans-serif;
+}
+
+.successbox p, .errorbox p {
+	color: #FFFFFF;
+	font-size: 0.85em;
+	margin-bottom: 0;
+}
+
+.errorbox a:link, .errorbox a:active, .errorbox a:visited,
+.successbox a:link, .successbox a:active, .successbox a:visited {
+	color: #DBD7D1;
+	text-decoration: underline;
+	font-weight: bold;
+}
+
+.errorbox a:hover, .successbox a:hover {
+	color: #FFFFFF;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+.notice {
+	background-color: #62A5CC;
+}
+
+/* Special cases for the error page */
+#errorpage #page-header a {
+	font-weight: bold;
+	line-height: 6em;
+}
+
+#errorpage #content {
+	padding-top: 10px;
+}
+
+#errorpage #content h1 {
+	color: #DF075C;
+}
+
+#errorpage #content h2 {
+	margin-top: 20px;
+	margin-bottom: 5px;
+	border-bottom: 1px solid #CCCCCC;
+	padding-bottom: 5px;
+	color: #333333;
+}
+
+/* Tooltip for permission roles */
+.tooltip {
+	width: 200px;
+	color: #000;
+	text-align: center;
+	border: 1px solid #AAA;
+}
+
+.tooltip span.top {
+	background: #EFEFEF;
+	font-weight: bold;
+	padding: 2px;
+}
+
+.tooltip span.bottom {
+	padding: 5px;
+	color: #000000;
+	background: #FFFFFF;
+}
+
+/*
+ Format Buttons for signature editor
+*/
+#format-buttons {
+	margin: 15px 0 2px 0;
+}
+
+#format-buttons input, #format-buttons select {
+	vertical-align: middle;
+}
+
+/* Nice method for clearing floated blocks without having to insert any extra markup
+	From http://www.positioniseverything.net/easyclearing.html
+.clearfix:after, #tabs:after, .row:after, #content:after, fieldset dl:after, #page-body:after {
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;
+}*/
+
+.clearfix, #tabs, .row, #content, fieldset dl, #page-body {
+	height: 1%;
+	overflow: hidden;
+}
+
+/* Syntax Highlighting
+---------------------------------------- */
+.sourcenum {
+	color: gray;
+	font-family: Monaco, 'Courier New', monospace;
+	font-size: 1.25em;
+	font-weight: bold;
+	line-height: 1.20em;
+	text-align: right;
+	padding: 0;
+}
+
+.rtl .sourcenum {
+	text-align: left;
+}
+
+.source {
+	font-family: Monaco, 'Courier New', monospace;
+	font-size: 1.25em;
+	line-height: 1.20em;
+	padding: 0;
+}
+
+.syntaxbg {
+	color: #FFFFFF;
+}
+
+.syntaxcomment {
+	color: #FF8000;
+}
+
+.syntaxdefault {
+	color: #0000BB;
+}
+
+.syntaxhtml {
+	color: #000000;
+}
+
+.syntaxkeyword {
+	color: #007700;
+}
+
+.syntaxstring {
+	color: #DD0000;
+}
+
+/* Permission interface
+---------------------------------------- */
+
+fieldset.permissions legend {
+	text-transform: none;
+}
+
+fieldset.permissions legend input{
+	height: 1.1em;
+}
+
+/* Permission sections */
+fieldset.permissions .permissions-simple {
+	text-align: left;
+	padding-top: 3px;
+}
+
+.rtl fieldset.permissions .permissions-simple {
+	text-align: right;
+}
+
+fieldset.permissions .permissions-advanced {
+	padding: 10px 0 0 5px;
+	vertical-align: top;
+	clear: right;
+}
+
+.rtl fieldset.permissions .permissions-advanced {
+	padding: 10px 5px 0 0;
+	clear: left;
+}
+
+fieldset.permissions .permissions-switch {
+	float: right;
+}
+
+.rtl fieldset.permissions .permissions-switch {
+	float: left;
+}
+
+fieldset.permissions .padding {
+}
+
+.permissions-switch {
+	margin-top: -6px;
+	font-size: .9em;
+}
+
+.permissions-switch a {
+	text-decoration: underline;
+}
+
+.permissions-reset {
+	padding-bottom: 10px;
+}
+
+.permissions-reset a {
+	font-size: .85em;
+}
+
+/* Tabbed menu */
+.permissions-category {
+	line-height: normal;
+	margin: 0 0 -1px 7px;
+	min-width: 570px;
+	font-size: 0.85em;
+}
+
+.rtl .permissions-category {
+	margin: 0 7px -1px 0;
+}
+
+.permissions-category ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+.permissions-category li {
+	display: inline;
+	margin: 0;
+	padding: 0;
+	font-size: 1em;
+	font-weight: bold;
+}
+
+.permissions-category a {
+	float: left;
+	background: url("../images/bg_tabs_alt1.gif") no-repeat 0% -35px;
+	margin: 0 1px 0 0;
+	padding: 0 0 0 6px;
+	text-decoration: none;
+	position: relative;
+}
+
+.rtl .permissions-category a {
+	float: right;
+}
+
+.permissions-category a span.tabbg {
+	float: left;
+	display: block;
+	background: url("../images/bg_tabs_alt2.gif") no-repeat 100% -35px;
+	padding: 7px 12px 6px 6px;
+	color: #536482;
+	white-space: nowrap;
+}
+
+.rtl .permissions-category a span.tabbg {
+	float: right;
+}
+
+/* Commented Backslash Hack hides rule from IE5-Mac \*/
+.permissions-category a span.tabbg, .rtl .permissions-category a span.tabbg { float: none;}
+/* End hack */
+
+.permissions-category a:hover span.tabbg {
+	color: #DD6900;
+}
+
+.permissions-category .activetab a {
+	background-position: 0 0;
+}
+
+.permissions-category .activetab a span.tabbg {
+	background-position: 100% 0;
+	padding-bottom: 7px;
+	color: #333333;
+}
+
+.permissions-category a:hover {
+	background-position: 0 -70px;
+}
+
+.permissions-category a:hover span.tabbg {
+	background-position: 100% -70px;
+}
+
+.permissions-category .activetab a:hover span.tabbg {
+	color: #333333;
+	background-position: 100% 0;
+}
+
+.permissions-category .activetab a:hover {
+	background-position: 0 0;
+}
+
+.permissions-category a span.colour {
+	border: 1px solid #536482;
+	display: block;
+	float: left;
+	width: 10px;
+	height: 10px;
+	margin: 0 5px 0 0;
+}
+
+/* Most browsers will have to live with a left aligned icon in RTL mode, as (currently) only Firefox 3.0 Alpha 3 renders it correctly without destroying it
+.rtl .permissions-category a span.colour {
+	float: right;
+	margin: 0 0 0 5px;
+}
+*/
+
+.permissions-category .activetab span.colour {
+	border-color: #333333;
+}
+
+.permissions-category a:hover span.colour {
+	border-color: #DD6900;
+}
+
+.permissions-category .activetab a:hover span.colour {
+	border-color: #333333;
+}
+
+/* Permission preset colours */
+.permissions-preset-yes span.colour,
+.yes {
+	background-color: #86F786;
+}
+
+.permissions-preset-custom span.colour {
+	background-color: #B2BBDD;
+}
+
+.permissions-preset-never span.colour {
+	background-color: #DD0000;
+}
+
+.permissions-preset-no span.colour,
+.never {
+	background-color: #EFB0B2;
+}
+
+/* Permission panel
+---------------------------------------- */
+.permissions-panel {
+	float: left;
+	background-color: #CADCEB;
+	width: 100%;
+}
+
+.rtl .permissions-panel {
+	float: right;
+}
+
+.permissions-panel span.corners-top {
+	background-image: url("../images/corners_left2.gif");
+}
+
+.permissions-panel span.corners-top span {
+	background-image: url("../images/corners_right2.gif");
+}
+
+.permissions-panel span.corners-bottom {
+	background-image: url("../images/corners_left2.gif");
+}
+
+.permissions-panel span.corners-bottom span {
+	background-image: url("../images/corners_right2.gif");
+}
+
+.permissions-panel span.corners-top, .permissions-panel span.corners-bottom,
+.permissions-panel span.corners-top span, .permissions-panel span.corners-bottom span {
+	font-size: 1px;
+	line-height: 1px;
+	display: block;
+	height: 5px;
+	background-repeat: no-repeat;
+}
+
+.permissions-panel span.corners-top {
+	background-image: url("../images/corners_left2.gif");
+	background-position: 0 0;
+	margin: 0 0;
+}
+
+.permissions-panel span.corners-top span {
+	background-image: url("../images/corners_right2.gif");
+	background-position: 100% 0;
+}
+
+.permissions-panel span.corners-bottom {
+	background-image: url("../images/corners_left2.gif");
+	background-position: 0 100%;
+	margin: 0 0;
+	clear: both;
+}
+
+.permissions-panel span.corners-bottom span {
+	background-image: url("../images/corners_right2.gif");
+	background-position: 100% 100%;
+}
+
+/* Permission table
+---------------------------------------- */
+.permissions-panel .tablewrap {
+	margin: 0 10px;
+}
+
+.permissions-panel table {
+	width: 100%;
+}
+
+.permissions-panel th {
+	text-transform: none;
+}
+
+.permissions-panel th.value {
+	text-align: center;
+}
+
+.permissions-panel th.name {
+	text-align: left;
+	width: auto;
+	text-transform: none;
+}
+
+.rtl .permissions-panel th.name {
+	text-align: right;
+}
+
+.permissions-panel th.permissions-name {
+	border: none;
+	color: #536482;
+	font-weight: normal;
+}
+
+.permissions-panel th.permissions-name a.trace {
+	display: inline;
+}
+
+.permissions-panel th.row3 {
+	background-image: none;
+	background-color: #D1D7DC;
+	color: #536482;
+	border: none;
+}
+
+.permissions-panel th.row4 {
+	background-image: none;
+	background-color: #E4E8EB;
+	color: #536482;
+	border: none;
+}
+
+.permissions-panel th a:link, .permissions-panel th a:hover, .permissions-panel th a:visited {
+	display: block;
+	color: #FFFFFF;
+	text-decoration: underline;
+}
+
+.permissions-panel td.permissions-yes label:hover {
+	background-color: #86F786;
+}
+
+.permissions-panel td.permissions-no label:hover {
+	background-color: #EFB0B2;
+}
+
+.permissions-panel td.permissions-never label:hover {
+	background-color: #DD0000;
+}
+
+.permissions-panel td {
+	padding: 0;
+	text-align: center;
+	width: 10%;
+}
+
+.permissions-panel td label {
+	display: block;
+	margin: 0;
+	padding: 0;
+}
+
+/* Classes for additional tasks
+---------------------------------------- */
+
+.phpinfo {
+	overflow: auto;
+	width: 99%;
+	direction: ltr;
+}
+
+.phpinfo td, .phpinfo th, .phpinfo h2, .phpinfo h1 {
+	text-align: left;
+}
diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html
new file mode 100644
index 0000000000..0b1434f7e0
--- /dev/null
+++ b/phpBB/adm/style/captcha_default_acp_demo.html
@@ -0,0 +1,4 @@
+<dl>
+	<dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
+	<dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd>
+</dl>
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html
new file mode 100644
index 0000000000..d0bb758cfe
--- /dev/null
+++ b/phpBB/adm/style/captcha_gd_acp.html
@@ -0,0 +1,74 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+	<a href="{U_ACTION}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+<h1>{L_ACP_VC_SETTINGS}</h1>
+
+<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
+
+
+<form id="acp_captcha" method="post" action="{U_ACTION}">
+
+<fieldset>
+<legend>{L_GENERAL_OPTIONS}</legend>
+
+<dl>
+	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}:</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>
+	<dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+</dl>
+<dl>
+	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
+	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd>
+</dl>
+<dl>
+	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
+	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd>
+</dl>
+<dl>
+	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}:</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>
+	<dd><label><input id="captcha_gd_wave" name="captcha_gd_wave" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input name="captcha_gd_wave" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+</dd>
+</dl>
+<dl>
+	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}:</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt>
+	<dd><label><input id="captcha_gd_3d_noise" name="captcha_gd_3d_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input name="captcha_gd_3d_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+</dd>
+</dl>
+<dl>
+	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}:</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt>
+	<dd><label><input id="captcha_gd_fonts" name="captcha_gd_fonts" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 1 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_DEFAULT}</label>
+		<label><input name="captcha_gd_fonts" value="2" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 2 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_NEW}</label>
+		<label><input name="captcha_gd_fonts" value="3" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 3 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_LOWER}</label>
+
+</dd>
+</dl>
+
+</fieldset>
+<fieldset>
+	<legend>{L_PREVIEW}</legend>
+	<!-- IF CAPTCHA_PREVIEW -->
+	<!-- INCLUDE {CAPTCHA_PREVIEW} -->
+	<!-- ENDIF -->
+
+</fieldset>
+
+<fieldset>
+	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
+		<input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" />&nbsp;
+	</p>
+
+	<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" />
+	<input type="hidden" name="configure" value="1" />
+
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html
new file mode 100644
index 0000000000..e0fc6fc67e
--- /dev/null
+++ b/phpBB/adm/style/captcha_qa_acp.html
@@ -0,0 +1,92 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+
+	<a href="<!-- IF U_LIST -->{U_LIST}<!-- ELSE -->{U_ACTION}<!-- ENDIF -->" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_QUESTIONS}</h1>
+
+	<p>{L_QUESTIONS_EXPLAIN}</p>
+<!-- IF S_LIST -->
+	<form id="captcha_qa" method="post" action="{U_ACTION}">
+
+	<fieldset class="tabulated">
+	<legend>{L_QUESTIONS}</legend>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th colspan="3">{L_QUESTIONS}</th>
+	</tr>
+	<tr class="row3">
+		<td style="text-align: center;">{L_QUESTION_TEXT}</td>
+		<td style="width: 5%; text-align: center;">{L_QUESTION_LANG}</td>
+		<td style="vertical-align: top; width: 50px; text-align: center; white-space: nowrap;">{L_ACTION}</td>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN questions -->
+
+		<!-- IF questions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+		<td style="text-align: left;">{questions.QUESTION_TEXT}</td>
+		<td style="text-align: center;">{questions.QUESTION_LANG}</td>
+		<td style="text-align: center;"><a href="{questions.U_EDIT}">{ICON_EDIT}</a>&nbsp;<a href="{questions.U_DELETE}">{ICON_DELETE}</a></td>
+		</tr>
+		<!-- END questions -->
+	</tbody>
+	</table>
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="add" value="{L_ADD}" />
+		<input  type="hidden" name="action" value="add" />
+		<input  type="hidden" name="configure" value="1" />
+		<input  type="hidden" name="select_captcha" value="{CLASS}" />
+
+		{S_FORM_TOKEN}
+	</fieldset>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+<!-- ELSE -->
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{L_QA_ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+	<form id="captcha_qa" method="post" action="{U_ACTION}">
+	<fieldset>
+		<legend>{L_EDIT_QUESTION}</legend>
+	<dl>
+		<dt><label for="strict">{L_QUESTION_STRICT}:</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" name="strict" value="1"<!-- IF STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="strict" value="0"<!-- IF not STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+
+	<dl>
+		<dt><label for="lang_iso">{L_QUESTION_LANG}</label><br /><span>{L_QUESTION_LANG_EXPLAIN}</span></dt>
+		<dd><select id="lang_iso" name="lang_iso"><!-- BEGIN langs --><option value="{langs.ISO}" <!-- IF langs.ISO == LANG_ISO --> selected="selected" <!-- ENDIF -->>{langs.NAME}</option><!-- END langs --></select></dd>
+	</dl>
+	<dl>
+		<dt><label for="question_text">{L_QUESTION_TEXT}</label><br /><span>{L_QUESTION_TEXT_EXPLAIN}</span></dt>
+		<dd><input id="question_text" maxlength="255" size="60" name="question_text" type="text" value="{QUESTION_TEXT}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="answers">{L_QUESTION_ANSWERS}</label><br /><span>{L_ANSWERS_EXPLAIN}</span></dt>
+		<dd><textarea id="answers" style="word-wrap: normal; overflow-x: scroll;" name="answers" rows="15" cols="800" >{ANSWERS}</textarea></dd>
+	</dl>
+	</fieldset>
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="submit" value="{L_SUBMIT}" />
+		<input type="hidden" name="question_id" value="{QUESTION_ID}" />
+		<input type="hidden" name="action" value="add" />
+		<input  type="hidden" name="configure" value="1" />
+		<input  type="hidden" name="select_captcha" value="{CLASS}" />
+
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/captcha_qa_acp_demo.html b/phpBB/adm/style/captcha_qa_acp_demo.html
new file mode 100644
index 0000000000..57bed8af53
--- /dev/null
+++ b/phpBB/adm/style/captcha_qa_acp_demo.html
@@ -0,0 +1,7 @@
+<dl>
+	<dt><label for="answer">{L_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
+
+	<dd>
+		<input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}"  />
+	</dd>
+</dl>
diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html
new file mode 100644
index 0000000000..e4fa5dd426
--- /dev/null
+++ b/phpBB/adm/style/captcha_recaptcha.html
@@ -0,0 +1,33 @@
+<!-- IF S_RECAPTCHA_AVAILABLE -->
+	<dl>
+	<dd>
+		<script type="text/javascript">
+		// <![CDATA[
+		var RecaptchaOptions = {
+			lang : '{L_RECAPTCHA_LANG}',
+		};
+		// ]]>
+		</script>
+		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script>
+		<script type="text/javascript">
+		// <![CDATA[
+		<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+			document.getElementById('recaptcha_table').style.direction = 'ltr';
+		<!-- ENDIF -->
+		// ]]>
+		</script>
+
+
+	<noscript>
+	<div>
+		<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
+		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
+		<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
+	</div>
+	</noscript>
+
+	</dd>
+	</dl>
+<!-- ELSE -->
+{L_RECAPTCHA_NOT_AVAILABLE}
+<!-- ENDIF -->
diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html
new file mode 100644
index 0000000000..5b97cff984
--- /dev/null
+++ b/phpBB/adm/style/captcha_recaptcha_acp.html
@@ -0,0 +1,50 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_VC_SETTINGS}</h1>
+
+<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
+
+
+<form id="acp_captcha" method="post" action="{U_ACTION}">
+
+<fieldset>
+<legend>{L_GENERAL_OPTIONS}</legend>
+
+<dl>
+	<dt><label for="recaptcha_pubkey">{L_RECAPTCHA_PUBLIC}:</label><br /><span>{L_RECAPTCHA_PUBLIC_EXPLAIN}</span></dt>
+	<dd><input id="recaptcha_pubkey" name="recaptcha_pubkey" value="{RECAPTCHA_PUBKEY}" size="50" type="text" /></dd>
+</dl>
+<dl>
+	<dt><label for="recaptcha_privkey">{L_RECAPTCHA_PRIVATE}:</label><br /><span>{L_RECAPTCHA_PRIVATE_EXPLAIN}</span></dt>
+	<dd><input id="recaptcha_privkey" name="recaptcha_privkey" value="{RECAPTCHA_PRIVKEY}" size="50" type="text" /></dd>
+</dl>
+
+
+</fieldset>
+<fieldset>
+	<legend>{L_PREVIEW}</legend>
+<!-- IF PREVIEW -->
+	<div class="successbox">
+		<h3>{L_WARNING}</h3>
+		<p>{L_CAPTCHA_PREVIEW_MSG}</p>
+	</div>
+<!-- ENDIF -->
+<!-- INCLUDE {CAPTCHA_PREVIEW} -->
+</fieldset>
+
+<fieldset>
+	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
+	</p>
+	<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" />
+	<input type="hidden" name="configure" value="1" />
+
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
new file mode 100644
index 0000000000..c9e89980d8
--- /dev/null
+++ b/phpBB/adm/style/colour_swatch.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta http-equiv="imagetoolbar" content="no" />
+<title>{L_COLOUR_SWATCH}</title>
+
+<style type="text/css">
+/* <![CDATA[ */
+	body {
+		background-color: #404040;
+		color: #fff;
+	}
+
+	td {
+		border: solid 1px #333; 
+	}
+
+	.over { 
+		border-color: white; 
+	}
+
+	.out {
+		border-color: #333333; 
+	}
+
+	img {
+		border: 0;
+	}
+/* ]]> */
+</style>
+</head>
+
+<body>
+
+<script type="text/javascript">
+// <![CDATA[
+	var r = 0, g = 0, b = 0;
+
+	var numberList = new Array(6);
+	numberList[0] = '00';
+	numberList[1] = '33';
+	numberList[2] = '66';
+	numberList[3] = '99';
+	numberList[4] = 'CC';
+	numberList[5] = 'FF';
+
+	document.writeln('<table cellspacing="0" cellpadding="0" border="0">');
+
+	for (r = 0; r < 6; r++)
+	{
+		document.writeln('<tr>');
+
+		for (g = 0; g < 6; g++)
+		{
+			for (b = 0; b < 6; b++)
+			{
+				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
+				document.write('<td style="background-color: #' + color + ';" onmouseover="this.className=\'over\'" onmouseout="this.className=\'out\'">');
+				document.write('<a href="#" onclick="cell(\'' + color + '\'); return false;"><img src="{T_IMAGES_PATH}spacer.gif" width="15" height="12" alt="#' + color + '" title="#' + color + '" \/><\/a>');
+				document.writeln('<\/td>');
+			}
+		}
+		document.writeln('<\/tr>');
+	}
+	document.writeln('<\/table>');
+
+	function cell(color)
+	{
+		opener.document.forms["{OPENER}"].{NAME}.value = color;
+	}
+// ]]>
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/phpBB/adm/style/confirm_body.html b/phpBB/adm/style/confirm_body.html
new file mode 100644
index 0000000000..2fbb1a60d7
--- /dev/null
+++ b/phpBB/adm/style/confirm_body.html
@@ -0,0 +1,20 @@
+<!-- INCLUDE overall_header.html -->
+
+<form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
+
+<fieldset>
+	<h1>{MESSAGE_TITLE}</h1>
+	<p>{MESSAGE_TEXT}</p>
+
+	{S_HIDDEN_FIELDS}
+
+	<div style="text-align: center;">
+		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
+		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+	</div>
+
+</fieldset>
+		
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/confirm_body_prune.html b/phpBB/adm/style/confirm_body_prune.html
new file mode 100644
index 0000000000..9481386231
--- /dev/null
+++ b/phpBB/adm/style/confirm_body_prune.html
@@ -0,0 +1,30 @@
+<!-- INCLUDE overall_header.html -->
+
+<form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
+
+<fieldset>
+	<h1>{MESSAGE_TITLE}</h1>
+	<p>{MESSAGE_TEXT}</p>
+
+	{S_HIDDEN_FIELDS}
+
+	<div style="text-align: center;">
+		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
+		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+	</div>
+
+	<h2>{L_PRUNE_USERS_LIST}</h2>
+	<!-- IF S_DEACTIVATE --><p>{L_PRUNE_USERS_LIST_DEACTIVATE}</p><!-- ELSE --><p>{L_PRUNE_USERS_LIST_DELETE}</p><!-- ENDIF -->
+
+	<br />
+	<!-- BEGIN users -->
+	&raquo; <a href="{users.U_PROFILE}">{users.USERNAME}</a><!-- IF users.U_USER_ADMIN --> [<a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a>]<!-- ENDIF --><br />
+	<!-- END users -->
+
+	<br /><br />
+
+</fieldset>
+
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html
new file mode 100644
index 0000000000..351397d3c7
--- /dev/null
+++ b/phpBB/adm/style/custom_profile_fields.html
@@ -0,0 +1,32 @@
+
+<!-- BEGIN dropdown -->
+	<select name="{dropdown.FIELD_IDENT}" id="{dropdown.FIELD_IDENT}">
+		<!-- BEGIN options --><option value="{dropdown.options.OPTION_ID}"{dropdown.options.SELECTED}>{dropdown.options.VALUE}</option><!-- END options -->
+	</select>
+<!-- END dropdown -->
+
+<!-- BEGIN text -->
+	<textarea name="{text.FIELD_IDENT}" id="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}">{text.FIELD_VALUE}</textarea>
+<!-- END text -->
+
+<!-- BEGIN string -->
+	<input type="text" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
+<!-- END string -->
+
+<!-- BEGIN bool -->
+	<!-- IF bool.FIELD_LENGTH eq 1 -->
+		<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}</label> <!-- END options -->
+	<!-- ELSE -->
+		<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}" value="1"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> />
+	<!-- ENDIF -->
+<!-- END bool -->
+
+<!-- BEGIN int -->
+	<input type="text" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
+<!-- END int -->
+
+<!-- BEGIN date -->
+	<span>{L_DAY}:</span> <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select>
+	<span>{L_MONTH}:</span> <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select>
+	<span>{L_YEAR}:</span> <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select>
+<!-- END date -->
diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
new file mode 100644
index 0000000000..cd4e75f51f
--- /dev/null
+++ b/phpBB/adm/style/editor.js
@@ -0,0 +1,398 @@
+/**
+* bbCode control by subBlue design [ www.subBlue.com ]
+* Includes unixsafe colour palette selector by SHS`
+*/
+
+// Startup variables
+var imageTag = false;
+var theSelection = false;
+
+// Check for Browser & Platform for PC & IE specific bits
+// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
+var clientPC = navigator.userAgent.toLowerCase(); // Get client info
+var clientVer = parseInt(navigator.appVersion); // Get browser version
+
+var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
+var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
+
+var baseHeight;
+
+/**
+* Shows the help messages in the helpline window
+*/
+function helpline(help)
+{
+	document.forms[form_name].helpbox.value = help_line[help];
+}
+
+/**
+* Fix a bug involving the TextRange object. From
+* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
+*/ 
+function initInsertions() 
+{
+	var doc;
+	if(document.forms[form_name])
+	{
+		doc = document;
+	}
+	else
+	{
+		doc = opener.document;
+	}
+
+	var textarea = doc.forms[form_name].elements[text_name];
+	if (is_ie && typeof(baseHeight) != 'number')
+	{
+		textarea.focus();
+		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
+		// document.body.focus();
+	}
+}
+
+/**
+* bbstyle
+*/
+function bbstyle(bbnumber)
+{
+	if (bbnumber != -1)
+	{
+		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
+	}
+	else
+	{
+		insert_text('[*]');
+		document.forms[form_name].elements[text_name].focus();		
+	}
+}
+
+/**
+* Apply bbcodes
+*/
+function bbfontstyle(bbopen, bbclose)
+{
+	theSelection = false;
+		
+	var textarea = document.forms[form_name].elements[text_name];
+
+	textarea.focus();
+
+	if ((clientVer >= 4) && is_ie && is_win)
+	{
+		// Get text selection
+		theSelection = document.selection.createRange().text;
+
+		if (theSelection)
+		{
+			// Add tags around selection
+			document.selection.createRange().text = bbopen + theSelection + bbclose;
+			document.forms[form_name].elements[text_name].focus();
+			theSelection = '';
+			return;
+		}
+	}
+	else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0))
+	{
+		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);
+		document.forms[form_name].elements[text_name].focus();
+		theSelection = '';
+		return;
+	}
+	
+	//The new position for the cursor after adding the bbcode
+	var caret_pos = getCaretPosition(textarea).start;
+	var new_pos = caret_pos + bbopen.length;		
+
+	// Open tag
+	insert_text(bbopen + bbclose);
+
+	// Center the cursor when we don't have a selection
+	// Gecko and proper browsers
+	if (!isNaN(textarea.selectionStart))
+	{
+		textarea.selectionStart = new_pos;
+		textarea.selectionEnd = new_pos;
+	}	
+	// IE
+	else if (document.selection)
+	{
+		var range = textarea.createTextRange(); 
+		range.move("character", new_pos); 
+		range.select();
+		storeCaret(textarea);
+	}
+
+	textarea.focus();
+	return;
+}
+
+/**
+* Insert text at position
+*/
+function insert_text(text, spaces, popup)
+{
+	var textarea;
+	
+	if (!popup)
+	{
+		textarea = document.forms[form_name].elements[text_name];
+	}
+	else
+	{
+		textarea = opener.document.forms[form_name].elements[text_name];
+	}
+
+	if (spaces)
+	{
+		text = ' ' + text + ' ';
+	}
+
+	if (!isNaN(textarea.selectionStart))
+	{
+		var sel_start = textarea.selectionStart;
+		var sel_end = textarea.selectionEnd;
+
+		mozWrap(textarea, text, '')
+		textarea.selectionStart = sel_start + text.length;
+		textarea.selectionEnd = sel_end + text.length;
+	}	
+	
+	else if (textarea.createTextRange && textarea.caretPos)
+	{
+		if (baseHeight != textarea.caretPos.boundingHeight) 
+		{
+			textarea.focus();
+			storeCaret(textarea);
+		}
+		var caret_pos = textarea.caretPos;
+		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
+		
+	}
+	else
+	{
+		textarea.value = textarea.value + text;
+	}
+
+	if (!popup)
+	{
+		textarea.focus();
+	}
+
+}
+
+/**
+* Add inline attachment at position
+*/
+function attach_inline(index, filename)
+{
+	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
+	document.forms[form_name].elements[text_name].focus();
+}
+
+/**
+* Add quote text to message
+*/
+function addquote(post_id, username)
+{
+	var message_name = 'message_' + post_id;
+	var theSelection = '';
+	var divarea = false;
+
+	if (document.all)
+	{
+		divarea = document.all[message_name];
+	}
+	else
+	{
+		divarea = document.getElementById(message_name);
+	}
+
+	// Get text selection - not only the post content :(
+	if (window.getSelection)
+	{
+		theSelection = window.getSelection().toString();
+	}
+	else if (document.getSelection)
+	{
+		theSelection = document.getSelection();
+	}
+	else if (document.selection)
+	{
+		theSelection = document.selection.createRange().text;
+	}
+
+	if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
+	{
+		if (divarea.innerHTML)
+		{
+			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
+			theSelection = theSelection.replace(/<br\/>/ig, '\n');
+			theSelection = theSelection.replace(/&lt\;/ig, '<');
+			theSelection = theSelection.replace(/&gt\;/ig, '>');
+			theSelection = theSelection.replace(/&amp\;/ig, '&');			
+		}
+		else if (document.all)
+		{
+			theSelection = divarea.innerText;
+		}
+		else if (divarea.textContent)
+		{
+			theSelection = divarea.textContent;
+		}
+		else if (divarea.firstChild.nodeValue)
+		{
+			theSelection = divarea.firstChild.nodeValue;
+		}
+	}
+
+	if (theSelection)
+	{
+		insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
+	}
+
+	return;
+}
+
+/**
+* From http://www.massless.org/mozedit/
+*/
+function mozWrap(txtarea, open, close)
+{
+	var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength;
+	var selStart = txtarea.selectionStart;
+	var selEnd = txtarea.selectionEnd;
+	var scrollTop = txtarea.scrollTop;
+
+	if (selEnd == 1 || selEnd == 2) 
+	{
+		selEnd = selLength;
+	}
+
+	var s1 = (txtarea.value).substring(0,selStart);
+	var s2 = (txtarea.value).substring(selStart, selEnd)
+	var s3 = (txtarea.value).substring(selEnd, selLength);
+
+	txtarea.value = s1 + open + s2 + close + s3;
+	txtarea.selectionStart = selEnd + open.length + close.length;
+	txtarea.selectionEnd = txtarea.selectionStart;
+	txtarea.focus();
+	txtarea.scrollTop = scrollTop;
+
+	return;
+}
+
+/**
+* Insert at Caret position. Code from
+* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
+*/
+function storeCaret(textEl)
+{
+	if (textEl.createTextRange)
+	{
+		textEl.caretPos = document.selection.createRange().duplicate();
+	}
+}
+
+/**
+* Color pallette
+*/
+function colorPalette(dir, width, height)
+{
+	var r = 0, g = 0, b = 0;
+	var numberList = new Array(6);
+	var color = '';
+
+	numberList[0] = '00';
+	numberList[1] = '40';
+	numberList[2] = '80';
+	numberList[3] = 'BF';
+	numberList[4] = 'FF';
+
+	document.writeln('<table class="type2">');
+
+	for (r = 0; r < 5; r++)
+	{
+		if (dir == 'h')
+		{
+			document.writeln('<tr>');
+		}
+
+		for (g = 0; g < 5; g++)
+		{
+			if (dir == 'v')
+			{
+				document.writeln('<tr>');
+			}
+			
+			for (b = 0; b < 5; b++)
+			{
+				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
+				document.write('<td bgcolor="#' + color + '">');
+				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" onmouseover="helpline(\'s\');"  onmouseout="helpline(\'tip\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
+				document.writeln('</td>');
+			}
+
+			if (dir == 'v')
+			{
+				document.writeln('</tr>');
+			}
+		}
+
+		if (dir == 'h')
+		{
+			document.writeln('</tr>');
+		}
+	}
+	document.writeln('</table>');
+}
+
+
+/**
+* Caret Position object
+*/
+function caretPosition()
+{
+	var start = null;
+	var end = null;
+}
+
+
+/**
+* Get the caret position in an textarea
+*/
+function getCaretPosition(txtarea)
+{
+	var caretPos = new caretPosition();
+	
+	// simple Gecko/Opera way
+	if (txtarea.selectionStart || txtarea.selectionStart == 0)
+	{
+		caretPos.start = txtarea.selectionStart;
+		caretPos.end = txtarea.selectionEnd;
+	}
+	// dirty and slow IE way
+	else if (document.selection)
+	{
+		// get current selection
+		var range = document.selection.createRange();
+
+		// a new selection of the whole textarea
+		var range_all = document.body.createTextRange();
+		range_all.moveToElementText(txtarea);
+		
+		// calculate selection start point by moving beginning of range_all to beginning of range
+		var sel_start;
+		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
+		{
+			range_all.moveStart('character', 1);
+		}
+	
+		txtarea.sel_start = sel_start;
+	
+		// we ignore the end value for IE, this is already dirty enough and we don't need it
+		caretPos.start = txtarea.sel_start;
+		caretPos.end = txtarea.sel_start;			
+	}
+
+	return caretPos;
+}
\ No newline at end of file
diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html
new file mode 100644
index 0000000000..783e89d6bf
--- /dev/null
+++ b/phpBB/adm/style/install_convert.html
@@ -0,0 +1,134 @@
+<!-- INCLUDE install_header.html -->
+
+<!-- IF S_NOT_INSTALLED -->
+
+	<h1>{TITLE}</h1>
+
+	<p>{BODY}</p>
+
+<!-- ELSE -->
+
+	<form id="install_convert" method="post" action="{U_ACTION}">
+
+	<h1>{TITLE}</h1>
+
+	<p>{BODY}</p>
+
+	<!-- IF S_ERROR_BOX -->
+	<div class="errorbox">
+		<h3>{ERROR_TITLE}</h3>
+		<p>{ERROR_MSG}</p>
+	</div>
+	<!-- ENDIF -->
+
+	<!-- IF S_LIST -->
+		<table cellspacing="1">
+			<caption>{L_AVAILABLE_CONVERTORS}</caption>
+			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+		<thead>
+		<tr>
+			<th>{L_SOFTWARE}</th>
+			<th>{L_VERSION}</th>
+			<th>{L_AUTHOR}</th>
+			<th>{L_OPTIONS}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- IF .convertors -->
+			<!-- BEGIN convertors -->
+			<tr>
+				<td>{convertors.SOFTWARE}</td>
+				<td>{convertors.VERSION}</td>
+				<td>{convertors.AUTHOR}</td>
+				<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
+			</tr>
+			<!-- END convertors -->
+		<!-- ELSE -->
+			<tr>
+				<td>{L_NO_CONVERTORS}</td>
+				<td>-</td>
+				<td>-</td>
+				<td>-</td>
+			</tr>
+		<!-- ENDIF -->
+		</tbody>
+		</table>
+	<!-- ENDIF -->
+
+	<!-- IF S_CONTINUE -->
+		</form>
+
+		<fieldset class="submit-buttons">
+			<form method="post" action="{U_NEW_ACTION}">
+				<input class="button1" type="submit" name="submit_new" value="{L_NEW}" />
+			</form>
+			<br />
+			<form method="post" action="{U_CONTINUE_ACTION}">
+				<input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}" />
+			</form>
+		</fieldset>
+
+		<form method="post" action="{U_ACTION}">
+	<!-- ENDIF -->
+
+	<!-- IF .checks -->
+		<fieldset>
+
+		<!-- BEGIN checks -->
+			<!-- IF checks.S_LEGEND -->
+				<!-- IF not checks.S_FIRST_ROW -->
+				</fieldset>
+
+				<fieldset>
+				<!-- ENDIF -->
+					<legend>{checks.LEGEND}</legend>
+					<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
+			<!-- ELSE -->
+
+				<dl>
+					<dt><label>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dd>{checks.RESULT}</dd>
+				</dl>
+			<!-- ENDIF -->
+		<!-- END checks -->
+
+		</fieldset>
+	<!-- ENDIF -->
+
+	<!-- IF .options -->
+		<fieldset>
+
+		<!-- BEGIN options -->
+			<!-- IF options.S_LEGEND -->
+				<!-- IF not options.S_FIRST_ROW -->
+					</fieldset>
+
+					<fieldset>
+				<!-- ENDIF -->
+					<legend>{options.LEGEND}</legend>
+			<!-- ELSE -->
+
+				<dl>
+					<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dd>{options.CONTENT}</dd>
+				</dl>
+
+			<!-- ENDIF -->
+		<!-- END options -->
+
+		</fieldset>
+	<!-- ENDIF -->
+
+	<!-- IF L_SUBMIT -->
+		<!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF -->
+
+		<fieldset class="submit-buttons">
+			{S_HIDDEN}
+			<!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
+		</fieldset>
+	<!-- ENDIF -->
+
+	</form>
+<!-- ENDIF -->
+
+<!-- INCLUDE install_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install_error.html b/phpBB/adm/style/install_error.html
new file mode 100644
index 0000000000..ad53433207
--- /dev/null
+++ b/phpBB/adm/style/install_error.html
@@ -0,0 +1,8 @@
+<!-- INCLUDE install_header.html -->
+
+<div class="errorbox">
+	<h3>{MESSAGE_TITLE}</h3>
+	<p>{MESSAGE_TEXT}</p>
+</div>
+
+<!-- INCLUDE install_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
new file mode 100644
index 0000000000..4df43eaaa0
--- /dev/null
+++ b/phpBB/adm/style/install_footer.html
@@ -0,0 +1,27 @@
+
+					</div>
+				</div>
+			<span class="corners-bottom"><span></span></span>
+			<div class="clear"></div>
+		</div>
+		</div>
+	</div>
+	
+	<!--
+		We request you retain the full copyright notice below including the link to www.phpbb.com.
+		This not only gives respect to the large amount of time given freely by the developers
+		but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
+		the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
+		"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
+		forums may be affected.
+	
+		The phpBB Group : 2006
+	// -->
+	
+	<div id="page-footer">
+		Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
+	</div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
new file mode 100644
index 0000000000..fbb6a7b409
--- /dev/null
+++ b/phpBB/adm/style/install_header.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta http-equiv="imagetoolbar" content="no" />
+<!-- IF META -->{META}<!-- ENDIF -->
+<title>{PAGE_TITLE}</title>
+
+<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+
+<script type="text/javascript">
+// <![CDATA[
+
+/**
+* Set display of page element
+* s[-1,0,1] = hide,toggle display,show
+*/
+function dE(n, s, type)
+{
+	if (!type)
+	{
+		type = 'block';
+	}
+
+	var e = document.getElementById(n);
+	if (!s)
+	{
+		s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
+	}
+	e.style.display = (s == 1) ? type : 'none';
+}
+
+// ]]>
+</script>
+
+</head>
+
+<body class="{S_CONTENT_DIRECTION}">
+<div id="wrap">
+	<div id="page-header">
+		<h1>{L_INSTALL_PANEL}</h1>
+		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
+		<!-- IF S_LANG_SELECT -->
+		<form method="post" action="">
+			<fieldset class="nobg">
+				<label for="language">{L_SELECT_LANG}:</label>
+				{S_LANG_SELECT}
+				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
+			</fieldset>
+		</form>
+		<!-- ENDIF -->
+	</div>
+	
+	<div id="page-body">
+		<div id="tabs">
+			<ul>
+			<!-- BEGIN t_block1 -->
+				<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
+			<!-- END t_block1 -->
+			</ul>
+		</div>
+
+		<div id="acp">
+		<div class="panel">
+			<span class="corners-top"><span></span></span>
+				<div id="content">
+					<div id="menu">
+						<ul>
+						<!-- BEGIN l_block1 -->
+							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
+						<!-- END l_block1 -->
+						<!-- BEGIN l_block2 -->
+							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>
+						<!-- END l_block2 -->
+						</ul>
+					</div>
+	
+					<div id="main" class="install-body">
diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html
new file mode 100644
index 0000000000..79006fba69
--- /dev/null
+++ b/phpBB/adm/style/install_install.html
@@ -0,0 +1,77 @@
+<!-- INCLUDE install_header.html -->
+
+<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
+
+<!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF -->
+<!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
+
+<!-- IF .checks -->
+	<fieldset>
+
+	<!-- BEGIN checks -->
+		<!-- IF checks.S_LEGEND -->
+			<!-- IF not checks.S_FIRST_ROW -->
+			</fieldset>
+
+			<fieldset>
+			<!-- ENDIF -->
+				<legend>{checks.LEGEND}</legend>
+				<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
+		<!-- ELSE -->
+
+			<dl>
+				<dt>{checks.TITLE}:<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dd>{checks.RESULT}</dd>
+			</dl>
+		<!-- ENDIF -->
+	<!-- END checks -->
+
+	</fieldset>
+<!-- ENDIF -->
+
+<!-- IF .options -->
+	<fieldset>
+
+	<!-- BEGIN options -->
+		<!-- IF options.S_LEGEND -->
+			<!-- IF not options.S_FIRST_ROW -->
+				</fieldset>
+		
+				<fieldset>
+			<!-- ENDIF -->
+				<legend>{options.LEGEND}</legend>
+		<!-- ELSE -->
+
+			<dl>
+				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dd>{options.CONTENT}</dd>
+			</dl>
+
+		<!-- ENDIF -->
+	<!-- END options -->
+
+	</fieldset>
+<!-- ENDIF -->
+
+<!-- IF S_SHOW_DOWNLOAD -->
+	<h1>{L_DL_CONFIG}</h1>
+	<p>{L_DL_CONFIG_EXPLAIN}</p>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_DL_CONFIG}</legend>
+		{S_HIDDEN}
+		<input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}" />&nbsp;<input class="button1" type="submit" id="dldone" name="dldone" value="{L_DL_DONE}" />
+	</fieldset>
+<!-- ENDIF -->
+
+<!-- IF L_SUBMIT -->
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		{S_HIDDEN}
+		<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
+	</fieldset>
+<!-- ENDIF -->
+
+</form>
+
+<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install_main.html b/phpBB/adm/style/install_main.html
new file mode 100644
index 0000000000..2c318bfd65
--- /dev/null
+++ b/phpBB/adm/style/install_main.html
@@ -0,0 +1,6 @@
+<!-- INCLUDE install_header.html -->
+
+	<h1>{TITLE}</h1>
+	<p>{BODY}</p>
+
+<!-- INCLUDE install_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
new file mode 100644
index 0000000000..4b89537acb
--- /dev/null
+++ b/phpBB/adm/style/install_update.html
@@ -0,0 +1,475 @@
+<!-- INCLUDE install_header.html -->
+
+<script type="text/javascript">
+// <![CDATA[
+	function popup(url, width, height, name)
+	{
+		if (!name)
+		{
+			name = '_popup';
+		}
+
+		window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
+		return false;
+	}
+
+	function diff_popup(url)
+	{
+		popup(url, 950, 600, '_diff');
+		return false;
+	}
+// ]]>
+</script>
+
+<!-- IF S_ERROR -->
+	<div class="errorbox" style="margin-top: 0;">
+		<h3>{L_NOTICE}</h3>
+		<p>{ERROR_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
+<!-- IF S_IN_PROGRESS -->
+
+	<div class="successbox" style="margin-top: 0;">
+		<h3>{L_IN_PROGRESS}</h3>
+		<p>{L_IN_PROGRESS_EXPLAIN}</p>
+	</div>
+
+<!-- ELSEIF S_INTRO -->
+
+	<!-- IF S_WARNING -->
+	<div class="successbox" style="margin-top: 0;">
+		<h3>{L_NOTICE}</h3>
+		<p>{WARNING_MSG}</p>
+	</div>
+	<!-- ENDIF -->
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<h1>{L_UPDATE_INSTALLATION}</h1>
+	<p>{L_UPDATE_INSTALLATION_EXPLAIN}</p>
+
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" name="submit" value="{L_NEXT_STEP}" />
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_UPLOAD_SUCCESS -->
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<h1>{L_UPDATE_SUCCESS}</h1>
+	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
+
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" name="check_again" value="{L_CONTINUE_UPDATE}" />
+	</fieldset>
+
+	</form>
+
+<!-- ENDIF -->
+
+<!-- IF S_VERSION_CHECK -->
+
+	<h1>{L_VERSION_CHECK}</h1>
+
+	<p>{L_VERSION_CHECK_EXPLAIN}</p>
+
+	<!-- IF S_UP_TO_DATE -->
+		<div class="successbox">
+			<p>{L_VERSION_UP_TO_DATE}</p>
+		</div>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_VERSION_NOT_UP_TO_DATE}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend></legend>
+	<dl>
+		<dt><label>{L_CURRENT_VERSION}</label></dt>
+		<dd><strong>{CURRENT_VERSION}</strong></dd>
+	</dl>
+	<dl>
+		<dt><label>{L_LATEST_VERSION}</label></dt>
+		<dd><strong>{LATEST_VERSION}</strong></dd>
+	</dl>
+	<!-- IF PACKAGE_VERSION and not S_UP_TO_DATE -->
+	<dl>
+		<dt><label>{L_PACKAGE_UPDATES_TO}</label></dt>
+		<dd><strong>{PACKAGE_VERSION}</strong></dd>
+	</dl>
+	<!-- ENDIF -->
+	</fieldset>
+
+	<!-- IF not S_UP_TO_DATE -->
+
+		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<p>{L_UPDATE_DATABASE_EXPLAIN}</p>
+			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
+		</fieldset>
+
+		</form>
+
+	<!-- ELSE -->
+		<form id="install_update" method="post" action="{U_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<p>{L_CHECK_FILES_UP_TO_DATE}</p>
+			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
+		</fieldset>
+
+		</form>
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_DB_UPDATE -->
+
+	<!-- IF not S_DB_UPDATE_FINISHED -->
+
+		<h1>{L_PERFORM_DATABASE_UPDATE}</h1>
+
+		<p>
+			{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
+		</p>
+
+		<br /><br />
+
+		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<a href="{U_DB_UPDATE}" class="button1">{L_RUN_DATABASE_SCRIPT}</a>
+
+			<!-- input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" / -->
+		</fieldset>
+
+		</form>
+
+	<!-- ELSE -->
+
+		<h1>{L_UPDATE_DB_SUCCESS}</h1>
+
+		<br /><br />
+
+		<form id="install_update" method="post" action="{U_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<p>{L_CHECK_FILES_EXPLAIN}</p>
+			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
+		</fieldset>
+
+		</form>
+
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_FILE_CHECK -->
+
+	<!-- IF S_ALL_UP_TO_DATE -->
+
+		<div class="successbox">
+			<h3>{L_UPDATE_SUCCESS}</h3>
+			<p>{L_ALL_FILES_UP_TO_DATE}</p>
+		</div>
+
+	<!-- ELSE -->
+		<h1>{L_COLLECTED_INFORMATION}</h1>
+
+		<p>{L_COLLECTED_INFORMATION_EXPLAIN}</p>
+
+		<!-- IF S_NO_UPDATE_FILES -->
+			<div class="errorbox">
+				<h3>{L_NO_UPDATE_FILES}</h3>
+
+				<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
+
+				<strong>{NO_UPDATE_FILES}</strong>
+
+			</div>
+		<!-- ENDIF -->
+
+		<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
+
+		<!-- IF .up_to_date -->
+			<h2>{L_FILES_UP_TO_DATE}</h2>
+			<p>{L_FILES_UP_TO_DATE_EXPLAIN}</p>
+
+			<fieldset>
+				<legend><img src="{T_IMAGE_PATH}file_up_to_date.gif" alt="{L_STATUS_UP_TO_DATE}" /></legend>
+			<!-- BEGIN up_to_date -->
+				<dl>
+					<dd class="full" style="text-align: left;"><strong>{up_to_date.FILENAME}</strong></dd>
+				</dl>
+			<!-- END up_to_date -->
+			</fieldset>
+
+		<!-- ENDIF -->
+
+		<!-- IF .new -->
+			<h2>{L_FILES_NEW}</h2>
+			<p>{L_FILES_NEW_EXPLAIN}</p>
+
+			<fieldset>
+				<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
+			<!-- BEGIN new -->
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br /><!-- ENDIF -->{new.FILE_PART}</strong>
+					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+				</dt>
+				<dd style="margin-left: 60%;">
+					<!-- IF not new.S_BINARY -->[<a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+				</dd>
+				<!-- IF new.S_CUSTOM -->
+					<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+				<!-- ENDIF -->
+				</dl>
+			<!-- END new -->
+			</fieldset>
+
+		<!-- ENDIF -->
+
+		<!-- IF .not_modified -->
+			<h2>{L_FILES_NOT_MODIFIED}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
+
+			<fieldset id="not_modified" style="display: none;">
+				<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
+			<!-- BEGIN not_modified -->
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong>
+						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+					</dt>
+					<dd style="margin-left: 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
+					<!-- IF not_modified.S_CUSTOM -->
+						<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+					<!-- ENDIF -->
+				</dl>
+			<!-- END not_modified -->
+			</fieldset>
+
+		<!-- ENDIF -->
+
+		<!-- IF .modified -->
+			<h2>{L_FILES_MODIFIED}</h2>
+			<p>{L_FILES_MODIFIED_EXPLAIN}</p>
+
+			<!-- BEGIN modified -->
+			<fieldset>
+				<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong>
+					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+				</dt>
+				<dd style="margin-left: 60%;">&nbsp;</dd>
+				<!-- IF modified.S_CUSTOM -->
+					<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+				<!-- ENDIF -->
+				</dl>
+				<dl>
+					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
+					<dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
+				</dl>
+				<dl>
+					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+					<dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+				</dl>
+				<dl>
+					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
+					<dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+				</dl>
+			</fieldset>
+			<!-- END modified -->
+
+		<!-- ENDIF -->
+
+		<!-- IF .new_conflict -->
+			<h2>{L_FILES_NEW_CONFLICT}</h2>
+			<p>{L_FILES_NEW_CONFLICT_EXPLAIN}</p>
+
+			<fieldset>
+				<legend><img src="{T_IMAGE_PATH}file_new_conflict.gif" alt="{L_STATUS_NEW_CONFLICT}" /></legend>
+			<!-- BEGIN new_conflict -->
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong>
+					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+				</dt>
+				<dd style="margin-left: 60%;">
+					<!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+				</dd>
+				<!-- IF new_conflict.S_CUSTOM -->
+					<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+				<!-- ENDIF -->
+				</dl>
+			<!-- END new_conflict -->
+			</fieldset>
+
+		<!-- ENDIF -->
+
+		<!-- IF .conflict -->
+			<h2>{L_FILES_CONFLICT}</h2>
+			<p>{L_FILES_CONFLICT_EXPLAIN}</p>
+
+			<!-- BEGIN conflict -->
+			<fieldset>
+				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong>
+						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}: {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
+					</dt>
+					<dd style="margin-left: 60%;">
+						<!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
+						<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+					</dd>
+					<!-- IF conflict.S_CUSTOM -->
+						<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+					<!-- ENDIF -->
+				</dl>
+				<!-- IF conflict.S_BINARY -->
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+						<dd style="margin-left: 60%;">&nbsp;</dd>
+					</dl>
+				<!-- ELSE -->
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
+						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
+					</dl>
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
+						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
+					</dl>
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+					</dl>
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
+						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+					</dl>
+				<!-- ENDIF -->
+			</fieldset>
+			<!-- END conflict -->
+
+		<!-- ENDIF -->
+
+		<br />
+
+		<fieldset class="quick">
+			<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
+		</fieldset>
+
+		<br />
+
+		<h1>{L_UPDATE_METHOD}</h1>
+
+		<p>{L_UPDATE_METHOD_EXPLAIN}</p>
+
+		<fieldset class="submit-buttons">
+			<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD_BUTTON}" />
+		</fieldset>
+
+		</form>
+
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_DOWNLOAD_FILES -->
+
+	<h1>{L_DOWNLOAD_UPDATE_METHOD}</h1>
+
+	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
+	<dl>
+		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
+		<dd>{RADIO_BUTTONS}</dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		{S_HIDDEN_FIELDS}
+		<input type="submit" class="button2" value="{L_CONTINUE_UPDATE}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
+	</fieldset>
+
+	</form>
+
+	<br /><br />
+
+	<p>{L_MAPPING_FILE_STRUCTURE}</p>
+
+	<table cellspacing="1">
+		<col class="row1" /><col class="row2" /><col class="row1" />
+	<thead>
+	<tr>
+		<th style="width: 49%">{L_ARCHIVE_FILE}</th>
+		<th style="width: 2%">&nbsp;</th>
+		<th style="width: 49%">{L_DESTINATION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN location -->
+	<tr>
+		<td>{location.SOURCE}</td>
+		<td><strong>&raquo;</strong></td>
+		<td>{location.DESTINATION}</td>
+	</tr>
+	<!-- END location -->
+	</tbody>
+	</table>
+
+<!-- ELSEIF S_FTP_UPLOAD -->
+
+	<h1>{L_SELECT_FTP_SETTINGS}</h1>
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<!-- IF S_CONNECTION_SUCCESS -->
+		<div class="successbox">
+			<p>{L_CONNECTION_SUCCESS}</p>
+		</div>
+	<!-- ELSEIF S_CONNECTION_FAILED -->
+		<div class="successbox">
+			<p>{L_TRY_DOWNLOAD_METHOD}</p>
+
+			<fieldset class="quick">
+				<input class="button1" type="submit" name="download" value="{L_TRY_DOWNLOAD_METHOD_BUTTON}" />
+			</fieldset>
+		</div>
+
+		<div class="errorbox">
+			<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_FTP_SETTINGS}</legend>
+	<dl>
+		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
+		<dd><strong>{UPLOAD_METHOD}</strong></dd>
+	</dl>
+	<!-- BEGIN data -->
+	<dl>
+		<dt><label for="{data.DATA}">{data.NAME}:</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="submit-buttons">
+		{S_HIDDEN_FIELDS}
+		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
+		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
+		<input class="button1" type="submit" name="submit" value="{L_UPDATE_FILES}" />
+	</fieldset>
+
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
new file mode 100644
index 0000000000..b65a014312
--- /dev/null
+++ b/phpBB/adm/style/install_update_diff.html
@@ -0,0 +1,262 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta http-equiv="imagetoolbar" content="no" />
+<!-- IF META -->{META}<!-- ENDIF -->
+<title>{PAGE_TITLE}</title>
+
+<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+
+<script type="text/javascript">
+// <![CDATA[
+function resize_panel()
+{
+	var block = document.getElementById('codepanel');
+	var height;
+
+	if (window.innerHeight)
+	{
+		height = window.innerHeight - 150;
+		block.style.height = height + 'px';
+	}
+	else
+	{
+		//whatever IE needs to do this
+	}
+}
+
+window.onresize = resize_panel;
+
+// ]]>
+</script>
+
+<style type="text/css">
+/* <![CDATA[ */
+
+#main {
+	font-size: 1em;
+	line-height: 0.7em;
+	margin: 0;
+	padding: 0;
+	width: 99%;
+}
+
+#diff_content {
+	padding: 30px 10px 10px;
+}
+
+<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
+div#codepanel {
+	width: 100%;
+}
+<!-- ELSE -->
+div#codepanel {
+	background-color: #eee;
+}
+<!-- ENDIF -->
+
+<!-- IF DIFF_MODE neq 'unified' and DIFF_MODE neq 'side_by_side'  -->
+div#diff_content pre {
+	overflow: auto;
+	height: 414px;
+	width: 100% !important;
+}
+<!-- ENDIF -->
+
+<!-- IF not S_DIFF_NEW_FILE -->
+/**
+* Unified Diff
+*/
+.file {
+	line-height: .7em;
+	overflow: auto;
+	height: 414px;
+}
+
+.diff {
+	margin: 0;
+}
+
+.added {
+	background-color: #dfd;
+}
+
+.removed {
+	background-color: #fdd;
+}
+
+.info {
+	color: #888;
+}
+
+.context {
+	background-color: #eee;
+}
+
+/**
+* Inline Diff
+*/
+.ins {
+	background-color: #dfd;
+	text-decoration: underline;
+}
+
+.del {
+	background-color: #fdd;
+	text-decoration: line-through;
+}
+
+/**
+* Column Diff
+*/
+table.hrdiff {
+	margin: 0 0 8px 5px;
+	width: 100%;
+	overflow: hidden;
+	border-bottom: 1px solid #999;
+	table-layout: fixed;
+}
+
+table.hrdiff th {
+	text-align: left;
+	width: 50%;
+	color: #333;
+	font-family: Verdana,Helvetica,sans-serif;
+	font-size: 11px;
+	border-bottom: 1px solid #999;
+	background: transparent;
+}
+
+table.hrdiff thead th {
+	font-weight: bold;
+	font-size: 110%;
+	padding: 2px;
+}
+
+table.hrdiff tr:first-child th {
+	border-top: none;
+}
+
+table.hrdiff tbody th {
+	padding: 2em 1px 1px 1px;
+	font-size: 80%;
+	border-top: 1px solid #999;
+}
+
+table.hrdiff tbody td.old {
+	border-left: 1px solid #999;
+	border-right: 1px solid #999;
+}
+table.hrdiff tbody td.new {
+	border-right: 1px solid #999;
+}
+
+table.hrdiff td pre {
+	overflow: auto;
+	display: block;
+	width: 100%;
+	overflow: auto;
+	display: block;
+}
+
+table.hrdiff .unmodified {
+	background: #fff;
+}
+
+table.hrdiff .added {
+	background: #9f9;
+}
+
+table.hrdiff .added_empty {
+	background: #cfc;
+}
+
+table.hrdiff .modified {
+	background: #fd9;
+}
+
+table.hrdiff .removed {
+	background: #f99;
+}
+
+table.hrdiff .removed_empty {
+	background: #fcc;
+}
+
+table.hrdiff caption {
+	caption-side: top;
+	text-align: left;
+	margin: 0 0 8px 5px;
+	font-size: 90%;
+	font-weight: bold;
+	padding: 5px;
+}
+
+table.hrdiff caption span {
+	height: 10px;
+	width: 10px;
+	line-height: 10px;
+	letter-spacing: 10px;
+	border: 1px solid #000;
+	margin-left: 0.5em;
+	vertical-align: baseline;
+}
+
+<!-- ENDIF -->
+
+/* ]]> */
+</style>
+
+</head>
+
+<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
+<body onload="resize_panel();">
+<!-- ELSE -->
+<body>
+<!-- ENDIF -->
+
+<div id="wrap">
+	<div id="page-header">
+<!-- IF S_DIFF_NEW_FILE -->
+
+		<h1>{L_VIEWING_FILE_CONTENTS}</h1>
+<!-- ELSE -->
+		<h1>{L_VIEWING_FILE_DIFF}</h1>
+<!-- ENDIF -->
+<!-- IF not S_DIFF_NEW_FILE -->
+		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
+		<form method="post" action="">
+		<fieldset class="quick">
+			<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
+			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
+
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
+		</fieldset>
+		</form>
+<!-- ENDIF -->
+<!-- IF S_DIFF_CONFLICT_FILE -->
+		<div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
+		<br style="clear: both;" />
+<!-- ENDIF -->
+	</div>
+
+	<div id="page-body">
+		<div id="acp">
+		<div class="panel" id="codepanel">
+			<span class="corners-top"><span></span></span>
+				<div id="diff_content">
+					<div id="main">
+						{DIFF_CONTENT}
+					</div>
+				</div>
+			<span class="corners-bottom"><span></span></span>
+		</div>
+		</div>
+	</div>
+
+
+<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/message_body.html b/phpBB/adm/style/message_body.html
new file mode 100644
index 0000000000..5d907e911c
--- /dev/null
+++ b/phpBB/adm/style/message_body.html
@@ -0,0 +1,8 @@
+<!-- INCLUDE overall_header.html -->
+
+<div <!-- IF S_USER_NOTICE -->class="successbox"<!-- ELSE -->class="errorbox"<!-- ENDIF -->>
+	<h3>{MESSAGE_TITLE}</h3>
+	<p>{MESSAGE_TEXT}</p>
+</div>
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
new file mode 100644
index 0000000000..8af299ad57
--- /dev/null
+++ b/phpBB/adm/style/overall_footer.html
@@ -0,0 +1,35 @@
+
+					</div>
+				</div>
+			<span class="corners-bottom"><span></span></span>
+			<div class="clear"></div>
+		</div>
+		</div>
+	</div>
+	
+	<!--
+		We request you retain the full copyright notice below including the link to www.phpbb.com.
+		This not only gives respect to the large amount of time given freely by the developers
+		but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
+		the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
+		"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
+		forums may be affected.
+	
+		The phpBB Group : 2006
+	// -->
+	
+	<div id="page-footer">
+		<!-- IF S_COPYRIGHT_HTML -->
+			Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
+			<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+		<!-- ENDIF -->
+
+		<!-- IF DEBUG_OUTPUT -->
+			<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->
+			{DEBUG_OUTPUT}
+		<!-- ENDIF -->
+	</div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
new file mode 100644
index 0000000000..a376884507
--- /dev/null
+++ b/phpBB/adm/style/overall_header.html
@@ -0,0 +1,221 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta http-equiv="imagetoolbar" content="no" />
+<!-- IF META -->{META}<!-- ENDIF -->
+<title>{PAGE_TITLE}</title>
+
+<link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+
+<script type="text/javascript">
+// <![CDATA[
+var jump_page = '{LA_JUMP_PAGE}:';
+var on_page = '{ON_PAGE}';
+var per_page = '{PER_PAGE}';
+var base_url = '{A_BASE_URL}';
+
+var menu_state = 'shown';
+
+
+/**
+* Jump to page
+*/
+function jumpto()
+{
+	var page = prompt(jump_page, on_page);
+
+	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
+	{
+		if (base_url.indexOf('?') == -1)
+		{
+			document.location.href = base_url + '?start=' + ((page - 1) * per_page);
+		}
+		else
+		{
+			document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
+		}
+	}
+}
+
+/**
+* Set display of page element
+* s[-1,0,1] = hide,toggle display,show
+*/
+function dE(n, s, type)
+{
+	if (!type)
+	{
+		type = 'block';
+	}
+
+	var e = document.getElementById(n);
+	if (!s)
+	{
+		s = (e.style.display == '') ? -1 : 1;
+	}
+	e.style.display = (s == 1) ? type : 'none';
+}
+
+/**
+* Mark/unmark checkboxes
+* id = ID of parent container, name = name prefix, state = state [true/false]
+*/
+function marklist(id, name, state)
+{
+	var parent = document.getElementById(id);
+	if (!parent)
+	{
+		eval('parent = document.' + id);
+	}
+
+	if (!parent)
+	{
+		return;
+	}
+
+	var rb = parent.getElementsByTagName('input');
+	
+	for (var r = 0; r < rb.length; r++)
+	{
+		if (rb[r].name.substr(0, name.length) == name)
+		{
+			rb[r].checked = state;
+		}
+	}
+}
+
+/**
+* Find a member
+*/
+function find_username(url)
+{
+	popup(url, 760, 570, '_usersearch');
+	return false;
+}
+
+/**
+* Window popup
+*/
+function popup(url, width, height, name)
+{
+	if (!name)
+	{
+		name = '_popup';
+	}
+
+	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
+	return false;
+}
+
+/**
+* Hiding/Showing the side menu
+*/
+function switch_menu()
+{
+	var menu = document.getElementById('menu');
+	var main = document.getElementById('main');
+	var toggle = document.getElementById('toggle');
+	var handle = document.getElementById('toggle-handle');
+
+	switch (menu_state)
+	{
+		// hide
+		case 'shown':
+			main.style.width = '93%';
+			menu_state = 'hidden';
+			menu.style.display = 'none';
+			toggle.style.width = '20px';
+			handle.style.backgroundImage = 'url(images/toggle.gif)';
+			handle.style.backgroundRepeat = 'no-repeat';
+
+			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+				handle.style.backgroundPosition = '0% 50%';
+				toggle.style.left = '96%';
+			<!-- ELSE -->
+				handle.style.backgroundPosition = '100% 50%';
+				toggle.style.left = '0';
+			<!-- ENDIF -->
+		break;
+
+		// show
+		case 'hidden':
+			main.style.width = '76%';
+			menu_state = 'shown';
+			menu.style.display = 'block';
+			toggle.style.width = '5%';
+			handle.style.backgroundImage = 'url(images/toggle.gif)';
+			handle.style.backgroundRepeat = 'no-repeat';
+
+			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+				handle.style.backgroundPosition = '100% 50%';
+				toggle.style.left = '75%';
+			<!-- ELSE -->
+				handle.style.backgroundPosition = '0% 50%';
+				toggle.style.left = '15%';
+			<!-- ENDIF -->
+		break;
+	}
+}
+
+// ]]>
+</script>
+</head>
+
+<body class="{S_CONTENT_DIRECTION}">
+
+<div id="wrap">
+	<div id="page-header">
+		<h1>{L_ADMIN_PANEL}</h1>
+		<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
+		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
+	</div>
+	
+	<div id="page-body">
+		<div id="tabs">
+			<ul>
+			<!-- BEGIN t_block1 -->
+				<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
+			<!-- END t_block1 -->
+			</ul>
+		</div>
+
+		<div id="acp">
+		<div class="panel">
+			<span class="corners-top"><span></span></span>
+				<div id="content">
+					<!-- IF not S_USER_NOTICE --> 
+					<div id="toggle">
+						<a id="toggle-handle" accesskey="m" title="{L_MENU_TOGGLE}" onclick="switch_menu(); return false;" href="#"></a></div>
+					<!-- ENDIF -->
+					<div id="menu">
+						<p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;][&nbsp;<a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a>&nbsp;]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
+						<ul>
+						<!-- DEFINE $LI_USED = 0 -->
+						<!-- BEGIN l_block1 -->
+							<!-- IF l_block1.S_SELECTED -->
+	
+						<!-- BEGIN l_block2 -->
+							<!-- IF .l_block1.l_block2.l_block3 -->
+							<li class="header">{l_block1.l_block2.L_TITLE}</li>
+							<!-- DEFINE $LI_USED = 1 -->
+							<!-- ENDIF -->
+	
+							<!-- BEGIN l_block3 -->
+								<li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li>
+								<!-- DEFINE $LI_USED = 1 -->
+							<!-- END l_block3 -->
+						<!-- END l_block2 -->
+						
+							<!-- ENDIF -->
+						<!-- END l_block1 -->
+						<!-- IF not $LI_USED -->
+							<li></li>
+						<!-- ENDIF -->
+						</ul>
+					</div>
+	
+					<div id="main">
diff --git a/phpBB/adm/style/permission_forum_copy.html b/phpBB/adm/style/permission_forum_copy.html
new file mode 100644
index 0000000000..c919310035
--- /dev/null
+++ b/phpBB/adm/style/permission_forum_copy.html
@@ -0,0 +1,40 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+	<h1>{L_ACP_FORUM_PERMISSIONS_COPY}</h1>
+
+	{L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN}
+
+	<form id="forum_perm_copy" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_LOOK_UP_FORUM}</legend>
+
+		<dl>
+			<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
+			<dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>
+		</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_LOOK_UP_FORUM}</legend>
+		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
+
+		<dl>
+			<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
+			<dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
+		</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_HIDDEN_FIELDS}
+		{S_FORM_TOKEN}
+	</fieldset>
+
+	</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
new file mode 100644
index 0000000000..fb4d3ef143
--- /dev/null
+++ b/phpBB/adm/style/permission_mask.html
@@ -0,0 +1,139 @@
+
+<script type="text/javascript">
+// <![CDATA[
+	var active_pmask = '0';
+	var active_fmask = '0';
+	var active_cat = '0';
+
+	var id = '000';
+
+	var role_options = new Array();
+
+	<!-- IF S_ROLE_JS_ARRAY -->
+		{S_ROLE_JS_ARRAY}
+	<!-- ENDIF -->
+// ]]>
+</script>
+<script type="text/javascript" src="style/permissions.js"></script>
+
+<!-- BEGIN p_mask -->
+<div class="clearfix"></div>
+<h3>{p_mask.NAME}<!-- IF p_mask.S_LOCAL --> <span class="small"> [{p_mask.L_ACL_TYPE}]</span><!-- ENDIF --></h3>
+
+<!-- BEGIN f_mask -->
+<div class="clearfix"></div>
+<fieldset class="permissions" id="perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
+	<legend id="legend{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
+		<!-- IF not p_mask.S_VIEW -->
+			<input type="checkbox" style="display: none;" class="permissions-checkbox" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" id="checkbox{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" value="1" onclick="toggle_opacity('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" /> 
+		<!-- ELSE -->
+		<!-- ENDIF -->
+		<!-- IF p_mask.f_mask.PADDING --><span class="padding">{p_mask.f_mask.PADDING}{p_mask.f_mask.PADDING}</span><!-- ENDIF -->{p_mask.f_mask.NAME}
+	</legend>
+	<!-- IF not p_mask.S_VIEW -->
+		<div class="permissions-switch">
+			<div class="permissions-reset">
+				<a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_YES}</a> &middot; <a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_NO}</a> &middot; <a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_NEVER}</a>
+			</div>
+			<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0', true); return false;">{L_ADVANCED_PERMISSIONS}</a><!-- IF not p_mask.S_VIEW and p_mask.f_mask.S_CUSTOM --> *<!-- ENDIF -->
+		</div>
+		<dl class="permissions-simple">
+			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}:</label></dt>
+			<!-- IF p_mask.f_mask.S_ROLE_OPTIONS -->
+				<dd style="margin-left: 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd>
+			<!-- ELSE -->
+				<dd>{L_NO_ROLE_AVAILABLE}</dd>
+			<!-- ENDIF -->
+		</dl>
+	<!-- ENDIF -->
+
+	<!-- BEGIN category -->
+		<!-- IF p_mask.f_mask.category.S_FIRST_ROW -->
+			<!-- IF not p_mask.S_VIEW -->
+				<div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" style="display: none;">
+			<!-- ELSE -->
+				<div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
+			<!-- ENDIF -->
+
+			<div class="permissions-category">
+				<ul>
+		<!-- ENDIF -->
+ 		
+		<!-- IF p_mask.f_mask.category.S_YES -->
+			<li class="permissions-preset-yes<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+		<!-- ELSEIF p_mask.f_mask.category.S_NEVER -->
+			<li class="permissions-preset-never<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+		<!-- ELSEIF p_mask.f_mask.category.S_NO -->
+			<li class="permissions-preset-no<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+		<!-- ELSE -->
+			<li class="permissions-preset-custom<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+		<!-- ENDIF -->
+		<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '{p_mask.f_mask.category.S_ROW_COUNT}', false<!-- IF p_mask.S_VIEW -->, true<!-- ENDIF -->); return false;"><span class="tabbg"><span class="colour"></span>{p_mask.f_mask.category.CAT_NAME}</span></a></li>
+	<!-- END category -->
+				</ul>
+			</div>
+
+	<!-- BEGIN category -->
+		<div class="permissions-panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
+			<span class="corners-top"><span></span></span>
+			<div class="tablewrap">
+				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1">
+				<colgroup>
+					<col class="permissions-name" />
+					<col class="permissions-yes" />
+					<col class="permissions-no" />
+					<!-- IF not p_mask.S_VIEW -->
+						<col class="permissions-never" />
+					<!-- ENDIF -->
+				</colgroup>
+				<thead>
+				<tr>
+					<th class="name" scope="col"><strong>{L_ACL_SETTING}</strong></th>
+				<!-- IF p_mask.S_VIEW -->
+					<th class="value" scope="col">{L_ACL_YES}</th>
+					<th class="value" scope="col">{L_ACL_NEVER}</th>
+				<!-- ELSE -->
+					<th class="value permissions-yes" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
+					<th class="value permissions-no" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
+					<th class="value permissions-never" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
+				<!-- ENDIF -->
+				</tr>
+				</thead>
+				<tbody>
+				<!-- BEGIN mask -->
+					<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
+					<th class="permissions-name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="{p_mask.f_mask.category.mask.U_TRACE}" class="trace" onclick="popup(this.href, 750, 515, '_trace'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
+					<!-- IF p_mask.S_VIEW -->
+						<td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ENDIF -->>&nbsp;</td>
+						<td<!-- IF p_mask.f_mask.category.mask.S_NEVER --> class="never"<!-- ENDIF -->></td>
+					<!-- ELSE -->
+						<td class="permissions-yes"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
+						<td class="permissions-no"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
+						<td class="permissions-never"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
+					<!-- ENDIF -->
+				</tr>
+				<!-- END mask -->
+				</tbody>
+				</table>
+			</div>
+			
+			<!-- IF not p_mask.S_VIEW -->
+			<fieldset class="quick" style="margin-right: 11px;">
+				<p class="small">{L_APPLY_PERMISSIONS_EXPLAIN}</p>
+				<input class="button1" type="submit" name="psubmit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" value="{L_APPLY_PERMISSIONS}" />
+				<!-- IF .p_mask.f_mask gt 1 or .p_mask gt 1 -->
+					<p class="small"><a href="#" onclick="reset_opacity(0, '{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="reset_opacity(1, '{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_UNMARK_ALL}</a></p>
+				<!-- ENDIF -->
+			</fieldset>
+		
+			<!-- ENDIF -->
+
+			<span class="corners-bottom"><span></span></span>
+		</div>
+	<!-- END category -->
+			<div class="clearfix"></div>
+	</div>
+</fieldset>
+<!-- END f_mask -->
+
+<!-- END p_mask -->
diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html
new file mode 100644
index 0000000000..e88c5fd2ba
--- /dev/null
+++ b/phpBB/adm/style/permission_roles_mask.html
@@ -0,0 +1,38 @@
+
+<!-- BEGIN role_mask -->
+
+	<table cellspacing="1">
+		<caption><!-- IF role_mask.FORUM_ID -->{L_FORUM}: <!-- ENDIF -->{role_mask.NAME}</caption>
+	<tbody>
+	<tr>
+		<th>{L_USERS}</th>
+	</tr>
+	<tr>
+		<td class="row1">
+			<!-- BEGIN users -->
+				<a href="{role_mask.users.U_PROFILE}">{role_mask.users.USERNAME}</a><!-- IF not role_mask.users.S_LAST_ROW --> :: <!-- ENDIF -->
+			<!-- BEGINELSE -->
+				{L_USERS_NOT_ASSIGNED}
+			<!-- END users -->
+		</td>
+	</tr>
+	<tr>
+		<th>{L_GROUPS}</th>
+	</tr>
+	<tr>
+		<td class="row2">
+			<!-- BEGIN groups -->
+				<a href="{role_mask.groups.U_PROFILE}">{role_mask.groups.GROUP_NAME}</a><!-- IF not role_mask.groups.S_LAST_ROW --> :: <!-- ENDIF -->
+			<!-- BEGINELSE -->
+				{L_GROUPS_NOT_ASSIGNED}
+			<!-- END users -->
+		</td>
+	</tr>
+	</tbody>
+	</table>
+
+<!-- BEGINELSE -->
+	
+	<p>{L_ROLE_NOT_ASSIGNED}</p>
+
+<!-- END role_mask -->
\ No newline at end of file
diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html
new file mode 100644
index 0000000000..186bb28b67
--- /dev/null
+++ b/phpBB/adm/style/permission_trace.html
@@ -0,0 +1,58 @@
+<!-- INCLUDE simple_header.html -->
+
+<div style="background-color: #fff; padding: 10px; margin-top: 10px;" class="permissions">
+
+	<!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a><!-- ENDIF -->
+
+	<h3>{L_TRACE_FOR}: {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3>
+
+	<br />
+
+	<table cellspacing="1" class="type1">
+	<thead>
+	<tr>
+		<th>{L_TRACE_WHO}</th>
+		<th style="width: 50px;">{L_ACL_SETTING}</th>
+		<th style="width: 50px;">{L_TRACE_TOTAL}</th>
+		<th>{L_INFORMATION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN trace -->
+		<!-- IF trace.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
+		<td style="white-space: nowrap;"><strong>{trace.WHO}</strong></td>
+
+		<!-- IF trace.S_SETTING_NEVER -->
+			<td class="never">{L_ACL_NEVER}</td>
+		<!-- ELSEIF trace.S_SETTING_YES -->
+			<td class="yes">{L_ACL_YES}</td>
+		<!-- ELSE -->
+			<td class="no">{L_ACL_NO}</td>
+		<!-- ENDIF -->
+
+		<!-- IF trace.S_TOTAL_NEVER -->
+			<td class="never">{L_ACL_NEVER}</td>
+		<!-- ELSEIF trace.S_TOTAL_YES -->
+			<td class="yes">{L_ACL_YES}</td>
+		<!-- ELSE -->
+			<td class="no">{L_ACL_NO}</td>
+		<!-- ENDIF -->
+
+		<td>{trace.INFORMATION}</td>
+	</tr>
+	<!-- END trace -->
+	<tr class="row2">
+		<td style="white-space: nowrap;"><strong>{L_TRACE_RESULT}</strong></td>
+		<td colspan="2" style="text-align: center;" class="<!-- IF S_RESULT_NEVER -->never<!-- ELSEIF S_RESULT_YES -->yes<!-- ELSE -->no<!-- ENDIF -->">
+		<!-- IF S_RESULT_NEVER -->{L_ACL_NEVER}<!-- ELSEIF S_RESULT_YES -->{L_ACL_YES}<!-- ELSE -->{L_ACL_NO}<!-- ENDIF -->
+		</td>
+		<td>{L_RESULTING_PERMISSION}</td>
+	</tr>
+	</tbody>
+	</table>
+
+	<br />
+
+</div>
+
+<!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/adm/style/permissions.js b/phpBB/adm/style/permissions.js
new file mode 100644
index 0000000000..adc8995c23
--- /dev/null
+++ b/phpBB/adm/style/permissions.js
@@ -0,0 +1,359 @@
+/**
+* Hide and show all checkboxes
+* status = true (show boxes), false (hide boxes)
+*/
+function display_checkboxes(status) 
+{
+	var form = document.getElementById('set-permissions');
+	var cb = document.getElementsByTagName('input');
+	var display;
+
+	//show
+	if (status)
+	{
+		display = 'inline';
+	}
+	//hide
+	else
+	{
+		display = 'none';
+	}
+	
+	for (var i = 0; i < cb.length; i++ )
+	{
+		if (cb[i].className == 'permissions-checkbox')
+		{
+			cb[i].style.display = display;
+		}
+		
+	}	
+	
+}
+
+
+/**
+* Change opacity of element
+* e = element
+* value = 0 (hidden) till 10 (fully visible)
+*/
+function set_opacity(e, value) {
+	e.style.opacity = value/10;
+	
+	//IE opacity currently turned off, because of its astronomical stupidity
+	//e.style.filter = 'alpha(opacity=' + value*10 + ')';
+}
+
+/**
+* Reset the opacity and checkboxes
+* block_id = id of the element that needs to be toggled
+*/
+function toggle_opacity(block_id) {
+	var cb = document.getElementById('checkbox' + block_id);
+	var fs = document.getElementById('perm' + block_id);
+	
+	if (cb.checked) 
+	{
+		set_opacity(fs, 5);
+	} 
+	else 
+	{
+		set_opacity(fs, 10);
+	}
+}
+
+/**
+* Reset the opacity and checkboxes
+* value = 0 (checked) and 1 (unchecked)
+* except_id = id of the element not to hide
+*/
+function reset_opacity(status, except_id) {
+	var perm = document.getElementById('set-permissions');
+	var fs = perm.getElementsByTagName('fieldset');
+	var opacity = 5;
+
+	if (status)
+	{
+		opacity = 10;	
+	}
+	
+	for (var i = 0; i < fs.length; i++ )
+	{
+		if (fs[i].className != 'quick')
+		{
+			set_opacity(fs[i], opacity);
+		}
+	}
+
+	if (typeof(except_id) != 'undefined')
+	{
+		set_opacity(document.getElementById('perm' + except_id), 10);
+	}
+
+	//reset checkboxes too
+	marklist('set-permissions', 'inherit', !status);
+}
+
+
+/**
+* Check whether we have a full radiobutton row of true
+* index = offset for the row of inputs (0 == first row, 1 == second, 2 == third),
+* rb = array of radiobuttons
+*/
+function get_radio_status(index, rb) 
+{
+	for (var i = index; i < rb.length; i = i + 3 )
+	{
+		if (rb[i].checked != true)
+		{
+			if (i > index)
+			{
+				//at least one is true, but not all (custom)
+				return 2;
+			}
+			//first one is not true
+			return 0;
+		}
+	}
+
+	// all radiobuttons true
+	return 1;
+}
+
+/**
+* Set tab colours
+* id = panel the tab needs to be set for, 
+* init = initialising on open, 
+* quick = If no calculation needed, this contains the colour
+*/
+function set_colours(id, init, quick)
+{
+	var table = document.getElementById('table' + id);
+	var tab = document.getElementById('tab' + id);
+
+	if (typeof(quick) != 'undefined') 
+	{
+		tab.className = 'permissions-preset-' + quick + ' activetab';
+		return;
+	}
+
+	var rb = table.getElementsByTagName('input');
+	var colour = 'custom';
+
+	var status = get_radio_status(0, rb);
+
+	if (status == 1)
+	{
+		colour = 'yes';
+	}
+	else if (status == 0) 
+	{
+		// We move on to No
+		status = get_radio_status(1, rb);
+
+		if (status == 1)
+		{
+			colour = 'no';
+		}
+		else if (status == 0) 
+		{
+			// We move on to Never
+			status = get_radio_status(2, rb);
+
+			if (status == 1)
+			{
+				colour = 'never';
+			}
+		}
+	}
+
+	if (init)
+	{
+		tab.className = 'permissions-preset-' + colour;
+	}
+	else
+	{
+		tab.className = 'permissions-preset-' + colour + ' activetab';
+	}
+}
+
+/**
+* Initialise advanced tab colours on first load
+* block_id = block that is opened
+*/
+function init_colours(block_id)
+{	
+	var block = document.getElementById('advanced' + block_id);
+	var panels = block.getElementsByTagName('div');
+	var tab = document.getElementById('tab' + id);
+
+	for (var i = 0; i < panels.length; i++)
+	{
+		if(panels[i].className == 'permissions-panel')
+		{
+			set_colours(panels[i].id.replace(/options/, ''), true);
+		}
+	}
+
+	tab.className = tab.className + ' activetab';
+}
+
+/**
+* Show/hide option panels
+* value = suffix for ID to show
+* adv = we are opening advanced permissions
+* view = called from view permissions
+*/
+function swap_options(pmask, fmask, cat, adv, view)
+{
+	id = pmask + fmask + cat;
+	active_option = active_pmask + active_fmask + active_cat;
+
+	var	old_tab = document.getElementById('tab' + active_option);	
+	var new_tab = document.getElementById('tab' + id);
+	var adv_block = document.getElementById('advanced' + pmask + fmask);
+
+	if (adv_block.style.display == 'block' && adv == true)
+	{
+		dE('advanced' + pmask + fmask, -1);
+		reset_opacity(1);
+		display_checkboxes(false);
+		return;
+	}
+
+	// no need to set anything if we are clicking on the same tab again
+	if (new_tab == old_tab && !adv)
+	{
+		return;
+	}
+
+	// init colours
+	if (adv && (pmask + fmask) != (active_pmask + active_fmask))
+	{
+		init_colours(pmask + fmask);
+		display_checkboxes(true);
+		reset_opacity(1);
+	} 
+	else if (adv) 
+	{
+		//Checkbox might have been clicked, but we need full visibility
+		display_checkboxes(true);
+		reset_opacity(1);
+	}
+
+	// set active tab
+	old_tab.className = old_tab.className.replace(/\ activetab/g, '');
+	new_tab.className = new_tab.className + ' activetab';
+
+	if (id == active_option && adv != true)
+	{
+		return;
+	}
+
+	dE('options' + active_option, -1);
+	
+	//hiding and showing the checkbox
+	if (document.getElementById('checkbox' + active_pmask + active_fmask))
+	{
+		dE('checkbox' + pmask + fmask, -1);	
+		
+		if ((pmask + fmask) != (active_pmask + active_fmask))
+		{
+			document.getElementById('checkbox' + active_pmask + active_fmask).style.display = 'inline';
+		}
+	}
+
+	if (!view)
+	{
+		dE('advanced' + active_pmask + active_fmask, -1);
+	}
+
+	if (!view)
+	{
+		dE('advanced' + pmask + fmask, 1);
+	}
+	dE('options' + id, 1);
+
+	active_pmask = pmask;
+	active_fmask = fmask;
+	active_cat = cat;
+}
+
+/**
+* Mark all radio buttons in one panel
+* id = table ID container, s = status ['y'/'u'/'n']
+*/
+function mark_options(id, s)
+{
+	var t = document.getElementById(id);
+
+	if (!t)
+	{
+		return;
+	}
+
+	var rb = t.getElementsByTagName('input');
+
+	for (var r = 0; r < rb.length; r++)
+	{
+		if (rb[r].id.substr(rb[r].id.length-1) == s)
+		{
+			rb[r].checked = true;
+		}
+	}
+}
+
+function mark_one_option(id, field_name, s)
+{
+	var t = document.getElementById(id);
+
+	if (!t)
+	{
+		return;
+	}
+
+	var rb = t.getElementsByTagName('input');
+
+	for (var r = 0; r < rb.length; r++)
+	{
+		if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) == field_name && rb[r].id.substr(rb[r].id.length-1) == s)
+		{
+			rb[r].checked = true;
+		}
+	}
+}
+
+/**
+* Reset role dropdown field to Select role... if an option gets changed
+*/
+function reset_role(id)
+{
+	var t = document.getElementById(id);
+
+	if (!t)
+	{
+		return;
+	}
+
+	t.options[0].selected = true;
+}
+
+/**
+* Load role and set options accordingly
+*/
+function set_role_settings(role_id, target_id)
+{
+	settings = role_options[role_id];
+
+	if (!settings)
+	{
+		return;
+	}
+
+	// Mark all options to no (unset) first...
+	mark_options(target_id, 'u');
+
+	for (var r in settings)
+	{
+		mark_one_option(target_id, r, (settings[r] == 1) ? 'y' : 'n');
+	}
+}
diff --git a/phpBB/adm/style/progress_bar.html b/phpBB/adm/style/progress_bar.html
new file mode 100644
index 0000000000..00e1e5e885
--- /dev/null
+++ b/phpBB/adm/style/progress_bar.html
@@ -0,0 +1,40 @@
+<!-- INCLUDE simple_header.html -->
+
+<script type="text/javascript">
+// <![CDATA[
+	/**
+	* Close previously opened popup
+	*/
+	function close_popup()
+	{
+		if (opener != null)
+		{
+			if (opener.close_waitscreen != null)
+			{
+				if (opener.close_waitscreen == 1)
+				{
+					opener.close_waitscreen = 0;
+					self.close();
+					return 0;
+				}
+			}
+		}
+		setTimeout("close_popup()", 1000);
+		return 0;
+	}
+// ]]>
+</script>
+
+<div class="successbox">
+	<h3>{L_PROGRESS}</h3>
+	<img src="images/progress_bar.gif" alt="{L_PROGRESS}" />
+	<p>{L_PROGRESS_EXPLAIN}</p>
+</div>
+
+<script type="text/javascript">
+// <![CDATA[
+	close_popup();
+// ]]>
+</script>
+
+<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/simple_body.html b/phpBB/adm/style/simple_body.html
new file mode 100644
index 0000000000..0b1e11b9a2
--- /dev/null
+++ b/phpBB/adm/style/simple_body.html
@@ -0,0 +1,8 @@
+<!-- INCLUDE simple_header.html -->
+
+<div class="successbox">
+	<h3>{MESSAGE_TITLE}</h3>
+	<p>{MESSAGE_TEXT}</p>
+</div>
+
+<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
new file mode 100644
index 0000000000..65cf724c2f
--- /dev/null
+++ b/phpBB/adm/style/simple_footer.html
@@ -0,0 +1,31 @@
+		<div style="text-align: {S_CONTENT_FLOW_END};"><a href="#" onclick="self.close(); return false;">{L_CLOSE_WINDOW}</a></div>
+	<br /><br />
+</div>
+
+<!--
+	We request you retain the full copyright notice below including the link to www.phpbb.com.
+	This not only gives respect to the large amount of time given freely by the developers
+	but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
+	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
+	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
+	forums may be affected.
+
+	The phpBB Group : 2006
+// -->
+
+<div id="page-footer">
+
+	<!-- IF S_COPYRIGHT_HTML -->
+		<br />Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
+		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+	<!-- ENDIF -->
+
+	<!-- IF DEBUG_OUTPUT -->
+		<!-- IF S_COPYRIGHT_HTML --><br /><br /><!-- ENDIF -->
+		{DEBUG_OUTPUT}
+	<!-- ENDIF -->
+
+</div>
+
+</body>
+</html>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
new file mode 100644
index 0000000000..2339b70a93
--- /dev/null
+++ b/phpBB/adm/style/simple_header.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta http-equiv="imagetoolbar" content="no" />
+<!-- IF META -->{META}<!-- ENDIF -->
+<title>{PAGE_TITLE}</title>
+
+<link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+
+<script type="text/javascript">
+// <![CDATA[
+var jump_page = '{LA_JUMP_PAGE}:';
+var on_page = '{ON_PAGE}';
+var per_page = '{PER_PAGE}';
+var base_url = '{A_BASE_URL}';
+
+/**
+* Window popup
+*/
+function popup(url, width, height, name)
+{
+	if (!name)
+	{
+		name = '_popup';
+	}
+
+	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
+	return false;
+}
+
+/**
+* Jump to page
+*/
+function jumpto()
+{
+	var page = prompt(jump_page, on_page);
+
+	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
+	{
+		if (base_url.indexOf('?') == -1)
+		{
+			document.location.href = base_url + '?start=' + ((page - 1) * per_page);
+		}
+		else
+		{
+			document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
+		}
+	}
+}
+
+/**
+* Set display of page element
+* s[-1,0,1] = hide,toggle display,show
+*/
+function dE(n, s, type)
+{
+	if (!type)
+	{
+		type = 'block';
+	}
+
+	var e = document.getElementById(n);
+	if (!s)
+	{
+		s = (e.style.display == '') ? -1 : 1;
+	}
+	e.style.display = (s == 1) ? type : 'none';
+}
+
+/**
+* Mark/unmark checkboxes
+* id = ID of parent container, name = name prefix, state = state [true/false]
+*/
+function marklist(id, name, state)
+{
+	var parent = document.getElementById(id);
+	if (!parent)
+	{
+		return;
+	}
+
+	var rb = parent.getElementsByTagName('input');
+	
+	for (var r = 0; r < rb.length; r++)
+	{
+		if (rb[r].name.substr(0, name.length) == name)
+		{
+			rb[r].checked = state;
+		}
+	}
+}
+
+/**
+* Find a member
+*/
+function find_username(url)
+{
+	popup(url, 760, 570, '_usersearch');
+	return false;
+}
+
+// ]]>
+</script>
+</head>
+
+<body class="{S_CONTENT_DIRECTION}">
+
+<div id="page-body" class="simple-page-body">
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
new file mode 100644
index 0000000000..20610b52fe
--- /dev/null
+++ b/phpBB/adm/style/tooltip.js
@@ -0,0 +1,251 @@
+/*
+javascript for Bubble Tooltips by Alessandro Fulciniti
+- http://pro.html.it - http://web-graphics.com 
+obtained from: http://web-graphics.com/mtarchive/001717.php
+
+phpBB Development Team:
+	- modified to adhere to our coding guidelines
+	- integration into our design
+	- added ability to perform tooltips on select elements
+	- further adjustements
+*/
+
+var head_text, tooltip_mode;
+
+/**
+* Enable tooltip replacements for links
+*/
+function enable_tooltips_link(id, headline, sub_id)
+{
+	var links, i, hold;
+	
+	head_text = headline;
+
+	if (!document.getElementById || !document.getElementsByTagName)
+	{
+		return;
+	}
+
+	hold = document.createElement('span');
+	hold.id = '_tooltip_container';
+	hold.setAttribute('id', '_tooltip_container');
+	hold.style.position = 'absolute';
+
+	document.getElementsByTagName('body')[0].appendChild(hold);
+
+	if (id == null)
+	{
+		links = document.getElementsByTagName('a');
+	}
+	else
+	{
+		links = document.getElementById(id).getElementsByTagName('a');
+	}
+
+	for (i = 0; i < links.length; i++)
+	{
+		if (sub_id)
+		{
+			if (links[i].id.substr(0, sub_id.length) == sub_id)
+			{
+				prepare(links[i]);
+			}
+		}
+		else
+		{
+			prepare(links[i]);
+		}
+	}
+
+	tooltip_mode = 'link';
+}
+
+/**
+* Enable tooltip replacements for selects
+*/
+function enable_tooltips_select(id, headline, sub_id)
+{
+	var links, i, hold;
+	
+	head_text = headline;
+
+	if (!document.getElementById || !document.getElementsByTagName)
+	{
+		return;
+	}
+
+	hold = document.createElement('span');
+	hold.id = '_tooltip_container';
+	hold.setAttribute('id', '_tooltip_container');
+	hold.style.position = 'absolute';
+
+	document.getElementsByTagName('body')[0].appendChild(hold);
+
+	if (id == null)
+	{
+		links = document.getElementsByTagName('option');
+	}
+	else
+	{
+		links = document.getElementById(id).getElementsByTagName('option');
+	}
+
+	for (i = 0; i < links.length; i++)
+	{
+		if (sub_id)
+		{
+			if (links[i].parentNode.id.substr(0, sub_id.length) == sub_id)
+			{
+				prepare(links[i]);
+			}
+		}
+		else
+		{
+			prepare(links[i]);
+		}
+	}
+
+	tooltip_mode = 'select';
+}
+
+/**
+* Prepare elements to replace
+*/
+function prepare(element)
+{
+	var tooltip, text, desc, title;
+
+	text = element.getAttribute('title');
+
+	if (text == null || text.length == 0)
+	{
+		return;
+	}
+
+	element.removeAttribute('title');
+	tooltip = create_element('span', 'tooltip');
+
+	title = create_element('span', 'top');
+	title.appendChild(document.createTextNode(head_text));
+	tooltip.appendChild(title);
+
+	desc = create_element('span', 'bottom');
+	desc.innerHTML = text;
+	tooltip.appendChild(desc);
+
+	set_opacity(tooltip);
+
+	element.tooltip = tooltip;
+	element.onmouseover = show_tooltip;
+	element.onmouseout = hide_tooltip;
+
+	if (tooltip_mode == 'link')
+	{
+		element.onmousemove = locate;
+	}
+}
+
+/**
+* Show tooltip
+*/
+function show_tooltip(e)
+{
+	document.getElementById('_tooltip_container').appendChild(this.tooltip);
+	locate(this);
+}
+
+/**
+* Hide tooltip
+*/
+function hide_tooltip(e)
+{
+	var d = document.getElementById('_tooltip_container');
+	if (d.childNodes.length > 0)
+	{
+		d.removeChild(d.firstChild);
+	}
+}
+
+/**
+* Set opacity on tooltip element
+*/
+function set_opacity(element)
+{
+	element.style.filter = 'alpha(opacity:95)';
+	element.style.KHTMLOpacity = '0.95';
+	element.style.MozOpacity = '0.95';
+	element.style.opacity = '0.95';
+}
+
+/**
+* Create new element
+*/
+function create_element(tag, c)
+{
+	var x = document.createElement(tag);
+	x.className = c;
+	x.style.display = 'block';
+	return x;
+}
+
+/**
+* Correct positioning of tooltip container
+*/
+function locate(e)
+{
+	var posx = 0;
+	var posy = 0;
+
+	e = e.parentNode;
+
+	if (e.offsetParent)
+	{
+		for (var posx = 0, posy = 0; e.offsetParent; e = e.offsetParent)
+		{
+			posx += e.offsetLeft;
+			posy += e.offsetTop;
+		}
+	}
+	else
+	{
+		posx = e.offsetLeft;
+		posy = e.offsetTop;
+	}
+
+	if (tooltip_mode == 'link')
+	{
+		document.getElementById('_tooltip_container').style.top=(posy+20) + 'px';
+		document.getElementById('_tooltip_container').style.left=(posx-20) + 'px';
+	}
+	else
+	{
+		document.getElementById('_tooltip_container').style.top=(posy+30) + 'px';
+		document.getElementById('_tooltip_container').style.left=(posx-205) + 'px';
+	}
+
+/*
+	if (e == null)
+	{
+		e = window.event;
+	}
+
+	if (e.pageX || e.pageY)
+	{
+		posx = e.pageX;
+		posy = e.pageY;
+	}
+	else if (e.clientX || e.clientY)
+	{
+		if (document.documentElement.scrollTop)
+		{
+			posx = e.clientX+document.documentElement.scrollLeft;
+			posy = e.clientY+document.documentElement.scrollTop;
+		}
+		else
+		{
+			posx = e.clientX+document.body.scrollLeft;
+			posy = e.clientY+document.body.scrollTop;
+		}
+	}
+*/
+}
diff --git a/phpBB/adm/style/viewsource.html b/phpBB/adm/style/viewsource.html
new file mode 100644
index 0000000000..f127c9626f
--- /dev/null
+++ b/phpBB/adm/style/viewsource.html
@@ -0,0 +1,21 @@
+<!-- INCLUDE simple_header.html -->
+<div id="acp" style="padding: 0;">
+<div class="panel" style="padding: 10px;">
+<div style="overflow: auto;">
+	<h1>{FILENAME}</h1>
+
+	<table class="type2">
+	<tbody>
+	<!-- BEGIN source -->
+		<tr valign="top">
+			<td class="sourcenum">{source.LINENUM}&nbsp;&nbsp;</td>
+			<td class="source">{source.LINE}</td>
+		</tr>
+	<!-- END source -->
+	</tbody>
+	</table>
+
+</div>
+</div>
+</div>
+<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
-- 
cgit v1.2.1


From b68de2323d6444b4b3685a98bbcb9500a38e45cb Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 16 Dec 2009 15:48:23 +0000
Subject: merge changes from 3.0.x branch

git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_ban.html            |  6 +++---
 phpBB/adm/style/acp_users_overview.html | 23 ++++++++++++++++-------
 phpBB/adm/style/captcha_recaptcha.html  |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
index bc326345b0..539e8032dd 100644
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -93,15 +93,15 @@
 	</dl>
 	<dl>
 		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
-		<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbanlength" id="unbanlength" /></dd>
+		<dd><input style="border: 0;" type="text" class="text full" readonly="readonly" name="unbanlength" id="unbanlength" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
-		<dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbanreason" id="unbanreason" rows="5" cols="80">&nbsp;</textarea></dd>
+		<dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbanreason" id="unbanreason" rows="5" cols="80">&nbsp;</textarea></dd>
 	</dl>
 	<dl>
 		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
-		<dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbangivereason" id="unbangivereason" rows="5" cols="80">&nbsp;</textarea></dd>
+		<dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbangivereason" id="unbangivereason" rows="5" cols="80">&nbsp;</textarea></dd>
 	</dl>
 
 	<p class="submit-buttons">
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index e3eff369cc..d48cfa57be 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -124,13 +124,6 @@
 			<dd><input name="ban_give_reason" type="text" class="text medium" maxlength="3000" id="ban_give_reason" /></dd>
 		</dl>
 	</div>
-		<!-- IF not S_OWN_ACCOUNT -->
-			<dl>
-				<dt><label for="delete_user">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
-				<dd><input type="checkbox" class="radio" name="delete" value="1" /></dd>
-				<dd><select id="delete_user" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
-			</dl>
-		<!-- ENDIF -->
 
 	<p class="quick">
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
@@ -141,4 +134,20 @@
 
 	</form>
 
+	<!-- IF not S_OWN_ACCOUNT -->
+	<form id="user_delete" method="post" action="{U_ACTION}">
+	<fieldset>
+		<legend>{L_DELETE_USER}</legend>
+		<dl>
+			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
+			<dd><select id="delete_type" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
+		</dl>
+		<p class="quick">
+			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+			<input type="hidden" name="delete" value="1" />
+			{S_FORM_TOKEN}
+		</p>
+	</fieldset>
+	<!-- ENDIF -->
+	</form>
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html
index e4fa5dd426..702a4a1099 100644
--- a/phpBB/adm/style/captcha_recaptcha.html
+++ b/phpBB/adm/style/captcha_recaptcha.html
@@ -4,7 +4,7 @@
 		<script type="text/javascript">
 		// <![CDATA[
 		var RecaptchaOptions = {
-			lang : '{L_RECAPTCHA_LANG}',
+			lang : '{LA_RECAPTCHA_LANG}'
 		};
 		// ]]>
 		</script>
-- 
cgit v1.2.1


From 30016a7084845fd50d7d18c2c556e26b62fa14ee Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 14 Oct 2010 08:54:28 +0200
Subject: [feature/request-class] Remove direct access to _REQUEST in
 acp_search

PHPBB3-9716
---
 phpBB/adm/style/acp_search.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index 5fd7a23d97..baadb70855 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -139,9 +139,11 @@
 
 			<p class="quick">
 			<!-- IF backend.S_INDEXED -->
-				<input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
+				<input type="hidden" name="action" value="delete" />
+				<input class="button2" type="submit" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
 			<!-- ELSE -->
-				<input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
+				<input type="hidden" name="action" value="create" />
+				<input class="button2" type="submit" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
 			<!-- ENDIF -->
 			</p>
 			{S_FORM_TOKEN}
-- 
cgit v1.2.1


From af5b9a96409d788733fcb1ff367e0c7fb0583702 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Tue, 9 Nov 2010 08:59:25 +0100
Subject: [ticket/9556] Drop php closing tags, add trailing newline

Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
---
 phpBB/adm/style/acp_attachments.html       | 2 +-
 phpBB/adm/style/acp_ban.html               | 2 +-
 phpBB/adm/style/acp_inactive.html          | 2 +-
 phpBB/adm/style/acp_main.html              | 2 +-
 phpBB/adm/style/acp_permission_roles.html  | 2 +-
 phpBB/adm/style/acp_permissions.html       | 2 +-
 phpBB/adm/style/acp_php_info.html          | 2 +-
 phpBB/adm/style/acp_send_statistics.html   | 2 +-
 phpBB/adm/style/acp_update.html            | 2 +-
 phpBB/adm/style/acp_users_avatar.html      | 2 +-
 phpBB/adm/style/acp_users_feedback.html    | 2 +-
 phpBB/adm/style/acp_users_prefs.html       | 2 +-
 phpBB/adm/style/acp_users_profile.html     | 2 +-
 phpBB/adm/style/acp_users_signature.html   | 2 +-
 phpBB/adm/style/colour_swatch.html         | 2 +-
 phpBB/adm/style/editor.js                  | 2 +-
 phpBB/adm/style/install_convert.html       | 2 +-
 phpBB/adm/style/install_error.html         | 2 +-
 phpBB/adm/style/install_footer.html        | 2 +-
 phpBB/adm/style/install_main.html          | 2 +-
 phpBB/adm/style/install_update_diff.html   | 2 +-
 phpBB/adm/style/message_body.html          | 2 +-
 phpBB/adm/style/overall_footer.html        | 2 +-
 phpBB/adm/style/permission_roles_mask.html | 2 +-
 phpBB/adm/style/progress_bar.html          | 2 +-
 phpBB/adm/style/simple_body.html           | 2 +-
 phpBB/adm/style/viewsource.html            | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 9573c34248..22f271ea82 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -373,4 +373,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
index cf44f4aaa7..cbcc6dfa60 100644
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -121,4 +121,4 @@
 
 </form>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index 3b20043dd9..d7bf99f853 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -74,4 +74,4 @@
 
 </form>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 7d3b6945ac..f3a26305ef 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -252,4 +252,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index 220e7dafbe..54bee54c77 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -199,4 +199,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index 63583093b0..6a6db11659 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -354,4 +354,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_php_info.html b/phpBB/adm/style/acp_php_info.html
index de065c4896..24648f0816 100644
--- a/phpBB/adm/style/acp_php_info.html
+++ b/phpBB/adm/style/acp_php_info.html
@@ -10,4 +10,4 @@
 	{PHPINFO}
 </div>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html
index 2a9b61f314..15eae8be6f 100644
--- a/phpBB/adm/style/acp_send_statistics.html
+++ b/phpBB/adm/style/acp_send_statistics.html
@@ -68,4 +68,4 @@ function iframe_updated()
 //]]>
 </script>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html
index a87366a78b..1e499a16b5 100644
--- a/phpBB/adm/style/acp_update.html
+++ b/phpBB/adm/style/acp_update.html
@@ -49,4 +49,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 2b2676a19a..35d8374237 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -75,4 +75,4 @@
 		{S_FORM_TOKEN}
 	</fieldset>
 	
-	</form>
\ No newline at end of file
+	</form>
diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html
index e11a8e6ec1..aa92353807 100644
--- a/phpBB/adm/style/acp_users_feedback.html
+++ b/phpBB/adm/style/acp_users_feedback.html
@@ -73,4 +73,4 @@
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 	</fieldset>
 	{S_FORM_TOKEN}
-	</form>
\ No newline at end of file
+	</form>
diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
index 07a9bc5c78..a519447b2f 100644
--- a/phpBB/adm/style/acp_users_prefs.html
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -155,4 +155,4 @@
 		{S_FORM_TOKEN}
 	</fieldset>
 
-	</form>
\ No newline at end of file
+	</form>
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 0d1c6f8e46..ea7204e2e4 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -63,4 +63,4 @@
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 		{S_FORM_TOKEN}
 	</fieldset>
-	</form>
\ No newline at end of file
+	</form>
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index 69c6d8f3fb..27fd957e61 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -114,4 +114,4 @@
 		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
 		{S_FORM_TOKEN}
 	</fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
index c9e89980d8..795e277949 100644
--- a/phpBB/adm/style/colour_swatch.html
+++ b/phpBB/adm/style/colour_swatch.html
@@ -75,4 +75,4 @@
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index 217aa699e2..c9e8afe08e 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -400,4 +400,4 @@ function getCaretPosition(txtarea)
 	}
 
 	return caretPos;
-}
\ No newline at end of file
+}
diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html
index 783e89d6bf..cf78f30b50 100644
--- a/phpBB/adm/style/install_convert.html
+++ b/phpBB/adm/style/install_convert.html
@@ -131,4 +131,4 @@
 	</form>
 <!-- ENDIF -->
 
-<!-- INCLUDE install_footer.html -->
\ No newline at end of file
+<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install_error.html b/phpBB/adm/style/install_error.html
index ad53433207..3f7c8b9ed4 100644
--- a/phpBB/adm/style/install_error.html
+++ b/phpBB/adm/style/install_error.html
@@ -5,4 +5,4 @@
 	<p>{MESSAGE_TEXT}</p>
 </div>
 
-<!-- INCLUDE install_footer.html -->
\ No newline at end of file
+<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index 4df43eaaa0..9e586f8a10 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -24,4 +24,4 @@
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpBB/adm/style/install_main.html b/phpBB/adm/style/install_main.html
index 2c318bfd65..73e73ad578 100644
--- a/phpBB/adm/style/install_main.html
+++ b/phpBB/adm/style/install_main.html
@@ -3,4 +3,4 @@
 	<h1>{TITLE}</h1>
 	<p>{BODY}</p>
 
-<!-- INCLUDE install_footer.html -->
\ No newline at end of file
+<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index b65a014312..8b0708cfdb 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -259,4 +259,4 @@ table.hrdiff caption span {
 	</div>
 
 
-<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
+<!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/adm/style/message_body.html b/phpBB/adm/style/message_body.html
index 5d907e911c..3ea9e5bc24 100644
--- a/phpBB/adm/style/message_body.html
+++ b/phpBB/adm/style/message_body.html
@@ -5,4 +5,4 @@
 	<p>{MESSAGE_TEXT}</p>
 </div>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 8af299ad57..0f2b74fa2c 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -32,4 +32,4 @@
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html
index e88c5fd2ba..485858da74 100644
--- a/phpBB/adm/style/permission_roles_mask.html
+++ b/phpBB/adm/style/permission_roles_mask.html
@@ -35,4 +35,4 @@
 	
 	<p>{L_ROLE_NOT_ASSIGNED}</p>
 
-<!-- END role_mask -->
\ No newline at end of file
+<!-- END role_mask -->
diff --git a/phpBB/adm/style/progress_bar.html b/phpBB/adm/style/progress_bar.html
index 00e1e5e885..1822675c15 100644
--- a/phpBB/adm/style/progress_bar.html
+++ b/phpBB/adm/style/progress_bar.html
@@ -37,4 +37,4 @@
 // ]]>
 </script>
 
-<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
+<!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/adm/style/simple_body.html b/phpBB/adm/style/simple_body.html
index 0b1e11b9a2..ca06bc4f10 100644
--- a/phpBB/adm/style/simple_body.html
+++ b/phpBB/adm/style/simple_body.html
@@ -5,4 +5,4 @@
 	<p>{MESSAGE_TEXT}</p>
 </div>
 
-<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
+<!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/adm/style/viewsource.html b/phpBB/adm/style/viewsource.html
index f127c9626f..03e9ff50e5 100644
--- a/phpBB/adm/style/viewsource.html
+++ b/phpBB/adm/style/viewsource.html
@@ -18,4 +18,4 @@
 </div>
 </div>
 </div>
-<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
+<!-- INCLUDE simple_footer.html -->
-- 
cgit v1.2.1


From 4f2b0d9d42869d743a04e6e2b2541383ffeff16c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 9 Feb 2011 21:05:10 +0100
Subject: [ticket/9549] Add the module and files for the ACP.

PHPBB3-9549
---
 phpBB/adm/style/acp_groups_position.html | 158 +++++++++++++++++++++++++++++++
 1 file changed, 158 insertions(+)
 create mode 100644 phpBB/adm/style/acp_groups_position.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
new file mode 100644
index 0000000000..9b18701179
--- /dev/null
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -0,0 +1,158 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+	<h1>{L_MANAGE_LEGEND}</h1>
+
+	<form id="legend_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
+
+	<fieldset>
+		<legend>{L_LEGEND_SETTINGS}</legend>
+		<dl>
+			<dt><label for="legend_sort_groupname">{L_LEGEND_SORT_GROUPNAME}:</label><br /><span>{L_LEGEND_SORT_GROUPNAME_EXPLAIN}</span></dt>
+			<dd>
+				<label><input type="radio" name="legend_sort_groupname" class="radio" value="1"<!-- IF LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			</dd>
+		</dl>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input type="hidden" name="action" value="set_config_legend" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+	</form>
+
+	<p>{L_LEGEND_EXPLAIN}</p>
+
+	<table cellspacing="1">
+		<col class="col1" /><col class="col2" /><col class="col2" />
+	<thead>
+	<tr>
+		<th style="width: 50%">{L_GROUP}</th>
+		<th>{L_GROUP_TYPE}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN legend -->
+		<tr>
+			<td><strong{legend.GROUP_COLOUR}>{legend.GROUP_NAME}</strong></td>
+			<td style="text-align: center;">{legend.GROUP_TYPE}</td>
+			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
+				<!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
+					{ICON_MOVE_UP_DISABLED}
+					<a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+				<!-- ELSEIF not legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
+					<a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+					<a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+				<!-- ELSEIF legend.S_LAST_ROW && not legend.S_FIRST_ROW -->
+					<a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+					{ICON_MOVE_DOWN_DISABLED}
+				<!-- ELSE -->
+					{ICON_MOVE_UP_DISABLED}
+					{ICON_MOVE_DOWN_DISABLED}
+				<!-- ENDIF -->
+				<a href="{legend.U_DELETE}">{ICON_DELETE}</a>
+			</td>
+		</tr>
+	<!-- BEGINELSE -->
+		<tr>
+			<td colspan="3" class="row3">{L_NO_GROUPS_ADDED}</td>
+		</tr>
+	<!-- END legend -->
+	</tbody>
+	</table>
+
+	<form id="acp_groups" method="post" action="{U_ACTION_LEGEND}">
+		<fieldset class="quick">
+			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_LEGEND}</select>
+			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
+			<input type="hidden" name="action" value="add" />
+			{S_FORM_TOKEN}
+		</fieldset>
+	</form>
+
+	<h1>{L_MANAGE_TEAMPAGE}</h1>
+
+	<form id="teampage_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
+
+	<fieldset>
+		<legend>{L_TEAMPAGE_SETTINGS}</legend>
+		<dl>
+			<dt><label for="teampage_multiple">{L_TEAMPAGE_MULTIPLE}:</label><br /><span>{L_TEAMPAGE_MULTIPLE_EXPLAIN}</span></dt>
+			<dd>
+				<label><input type="radio" name="teampage_multiple" class="radio" value="1"<!-- IF DISPLAY_MULTIPLE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" name="teampage_multiple" class="radio" value="0"<!-- IF not DISPLAY_MULTIPLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			</dd>
+		</dl>
+		<dl>
+			<dt><label for="teampage_forums">{L_TEAMPAGE_FORUMS}:</label><br /><span>{L_TEAMPAGE_FORUMS_EXPLAIN}</span></dt>
+			<dd>
+				<label><input type="radio" name="teampage_forums" class="radio" value="1"<!-- IF DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" name="teampage_forums" class="radio" value="0"<!-- IF not DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			</dd>
+		</dl>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input type="hidden" name="action" value="set_config_teampage" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+	</form>
+
+	<p>{L_TEAMPAGE_EXPLAIN}</p>
+
+	<table cellspacing="1">
+		<col class="col1" /><col class="col2" /><col class="col2" />
+	<thead>
+	<tr>
+		<th style="width: 50%">{L_GROUP}</th>
+		<th>{L_GROUP_TYPE}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN teampage -->
+		<tr>
+			<td><strong{teampage.GROUP_COLOUR}>{teampage.GROUP_NAME}</strong></td>
+			<td style="text-align: center;">{teampage.GROUP_TYPE}</td>
+			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
+				<!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
+					{ICON_MOVE_UP_DISABLED}
+					<a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+				<!-- ELSEIF not teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
+					<a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+					<a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+				<!-- ELSEIF teampage.S_LAST_ROW && not teampage.S_FIRST_ROW -->
+					<a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+					{ICON_MOVE_DOWN_DISABLED}
+				<!-- ELSE -->
+					{ICON_MOVE_UP_DISABLED}
+					{ICON_MOVE_DOWN_DISABLED}
+				<!-- ENDIF -->
+				<a href="{teampage.U_DELETE}">{ICON_DELETE}</a>
+			</td>
+		</tr>
+	<!-- BEGINELSE -->
+		<tr>
+			<td colspan="3" class="row3">{L_NO_GROUPS_ADDED}</td>
+		</tr>
+	<!-- END teampage -->
+	</tbody>
+	</table>
+
+	<form id="acp_groups" method="post" action="{U_ACTION_TEAMPAGE}">
+		<fieldset class="quick">
+			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_TEAMPAGE}</select>
+			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
+			<input type="hidden" name="action" value="add" />
+			{S_FORM_TOKEN}
+		</fieldset>
+	</form>
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
-- 
cgit v1.2.1


From d2e2ccf8a49a3d62d3de3145e114d3ed0b255465 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 16 Feb 2011 10:47:41 +0100
Subject: [ticket/9549] Fix some minor issues with descriptions and
 coding-guidelines.

PHPBB3-9549
---
 phpBB/adm/style/acp_groups_position.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 9b18701179..bf6fda8742 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -155,4 +155,4 @@
 		</fieldset>
 	</form>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From d9f092a18b149d62afd5ac8a1c6f7d8e7263d17b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 17 Feb 2011 23:53:05 +0100
Subject: [ticket/9549] Only add group to legend/teampage when the checkbox is
 checked.

The checkbox for the teampage was also missing from the template file.

PHPBB3-9549
---
 phpBB/adm/style/acp_groups.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 07f7d072e8..2f812c443d 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -70,6 +70,10 @@
 		<dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt>
 		<dd><input name="group_legend" type="checkbox" value="1" class="radio" id="group_legend"{GROUP_LEGEND} /></dd>
 	</dl>
+	<dl>
+		<dt><label for="group_teampage">{L_GROUP_TEAMPAGE}:</label></dt>
+		<dd><input name="group_teampage" type="checkbox" value="1" class="radio" id="group_teampage"{GROUP_TEAMPAGE} /></dd>
+	</dl>
 	<dl>
 		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</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>
-- 
cgit v1.2.1


From 7554469b6b0aa60dc1e37e782e29e735fb24275d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 1 Mar 2011 17:47:42 -0500
Subject: [ticket/10070] Fixed line endings after ticket/9549.

PHPBB3-10070
---
 phpBB/adm/style/acp_groups_position.html | 316 +++++++++++++++----------------
 1 file changed, 158 insertions(+), 158 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index bf6fda8742..49212a4408 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -1,158 +1,158 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-	<h1>{L_MANAGE_LEGEND}</h1>
-
-	<form id="legend_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
-
-	<fieldset>
-		<legend>{L_LEGEND_SETTINGS}</legend>
-		<dl>
-			<dt><label for="legend_sort_groupname">{L_LEGEND_SORT_GROUPNAME}:</label><br /><span>{L_LEGEND_SORT_GROUPNAME_EXPLAIN}</span></dt>
-			<dd>
-				<label><input type="radio" name="legend_sort_groupname" class="radio" value="1"<!-- IF LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		<input type="hidden" name="action" value="set_config_legend" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-	<p>{L_LEGEND_EXPLAIN}</p>
-
-	<table cellspacing="1">
-		<col class="col1" /><col class="col2" /><col class="col2" />
-	<thead>
-	<tr>
-		<th style="width: 50%">{L_GROUP}</th>
-		<th>{L_GROUP_TYPE}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN legend -->
-		<tr>
-			<td><strong{legend.GROUP_COLOUR}>{legend.GROUP_NAME}</strong></td>
-			<td style="text-align: center;">{legend.GROUP_TYPE}</td>
-			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
-				<!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
-					{ICON_MOVE_UP_DISABLED}
-					<a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-				<!-- ELSEIF not legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
-					<a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-					<a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-				<!-- ELSEIF legend.S_LAST_ROW && not legend.S_FIRST_ROW -->
-					<a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-					{ICON_MOVE_DOWN_DISABLED}
-				<!-- ELSE -->
-					{ICON_MOVE_UP_DISABLED}
-					{ICON_MOVE_DOWN_DISABLED}
-				<!-- ENDIF -->
-				<a href="{legend.U_DELETE}">{ICON_DELETE}</a>
-			</td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td colspan="3" class="row3">{L_NO_GROUPS_ADDED}</td>
-		</tr>
-	<!-- END legend -->
-	</tbody>
-	</table>
-
-	<form id="acp_groups" method="post" action="{U_ACTION_LEGEND}">
-		<fieldset class="quick">
-			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_LEGEND}</select>
-			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
-			<input type="hidden" name="action" value="add" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	</form>
-
-	<h1>{L_MANAGE_TEAMPAGE}</h1>
-
-	<form id="teampage_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
-
-	<fieldset>
-		<legend>{L_TEAMPAGE_SETTINGS}</legend>
-		<dl>
-			<dt><label for="teampage_multiple">{L_TEAMPAGE_MULTIPLE}:</label><br /><span>{L_TEAMPAGE_MULTIPLE_EXPLAIN}</span></dt>
-			<dd>
-				<label><input type="radio" name="teampage_multiple" class="radio" value="1"<!-- IF DISPLAY_MULTIPLE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" name="teampage_multiple" class="radio" value="0"<!-- IF not DISPLAY_MULTIPLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-		<dl>
-			<dt><label for="teampage_forums">{L_TEAMPAGE_FORUMS}:</label><br /><span>{L_TEAMPAGE_FORUMS_EXPLAIN}</span></dt>
-			<dd>
-				<label><input type="radio" name="teampage_forums" class="radio" value="1"<!-- IF DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" name="teampage_forums" class="radio" value="0"<!-- IF not DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		<input type="hidden" name="action" value="set_config_teampage" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-	<p>{L_TEAMPAGE_EXPLAIN}</p>
-
-	<table cellspacing="1">
-		<col class="col1" /><col class="col2" /><col class="col2" />
-	<thead>
-	<tr>
-		<th style="width: 50%">{L_GROUP}</th>
-		<th>{L_GROUP_TYPE}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN teampage -->
-		<tr>
-			<td><strong{teampage.GROUP_COLOUR}>{teampage.GROUP_NAME}</strong></td>
-			<td style="text-align: center;">{teampage.GROUP_TYPE}</td>
-			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
-				<!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
-					{ICON_MOVE_UP_DISABLED}
-					<a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-				<!-- ELSEIF not teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
-					<a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-					<a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-				<!-- ELSEIF teampage.S_LAST_ROW && not teampage.S_FIRST_ROW -->
-					<a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-					{ICON_MOVE_DOWN_DISABLED}
-				<!-- ELSE -->
-					{ICON_MOVE_UP_DISABLED}
-					{ICON_MOVE_DOWN_DISABLED}
-				<!-- ENDIF -->
-				<a href="{teampage.U_DELETE}">{ICON_DELETE}</a>
-			</td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td colspan="3" class="row3">{L_NO_GROUPS_ADDED}</td>
-		</tr>
-	<!-- END teampage -->
-	</tbody>
-	</table>
-
-	<form id="acp_groups" method="post" action="{U_ACTION_TEAMPAGE}">
-		<fieldset class="quick">
-			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_TEAMPAGE}</select>
-			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
-			<input type="hidden" name="action" value="add" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	</form>
-
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+	<h1>{L_MANAGE_LEGEND}</h1>
+
+	<form id="legend_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
+
+	<fieldset>
+		<legend>{L_LEGEND_SETTINGS}</legend>
+		<dl>
+			<dt><label for="legend_sort_groupname">{L_LEGEND_SORT_GROUPNAME}:</label><br /><span>{L_LEGEND_SORT_GROUPNAME_EXPLAIN}</span></dt>
+			<dd>
+				<label><input type="radio" name="legend_sort_groupname" class="radio" value="1"<!-- IF LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			</dd>
+		</dl>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input type="hidden" name="action" value="set_config_legend" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+	</form>
+
+	<p>{L_LEGEND_EXPLAIN}</p>
+
+	<table cellspacing="1">
+		<col class="col1" /><col class="col2" /><col class="col2" />
+	<thead>
+	<tr>
+		<th style="width: 50%">{L_GROUP}</th>
+		<th>{L_GROUP_TYPE}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN legend -->
+		<tr>
+			<td><strong{legend.GROUP_COLOUR}>{legend.GROUP_NAME}</strong></td>
+			<td style="text-align: center;">{legend.GROUP_TYPE}</td>
+			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
+				<!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
+					{ICON_MOVE_UP_DISABLED}
+					<a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+				<!-- ELSEIF not legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
+					<a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+					<a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+				<!-- ELSEIF legend.S_LAST_ROW && not legend.S_FIRST_ROW -->
+					<a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+					{ICON_MOVE_DOWN_DISABLED}
+				<!-- ELSE -->
+					{ICON_MOVE_UP_DISABLED}
+					{ICON_MOVE_DOWN_DISABLED}
+				<!-- ENDIF -->
+				<a href="{legend.U_DELETE}">{ICON_DELETE}</a>
+			</td>
+		</tr>
+	<!-- BEGINELSE -->
+		<tr>
+			<td colspan="3" class="row3">{L_NO_GROUPS_ADDED}</td>
+		</tr>
+	<!-- END legend -->
+	</tbody>
+	</table>
+
+	<form id="acp_groups" method="post" action="{U_ACTION_LEGEND}">
+		<fieldset class="quick">
+			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_LEGEND}</select>
+			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
+			<input type="hidden" name="action" value="add" />
+			{S_FORM_TOKEN}
+		</fieldset>
+	</form>
+
+	<h1>{L_MANAGE_TEAMPAGE}</h1>
+
+	<form id="teampage_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
+
+	<fieldset>
+		<legend>{L_TEAMPAGE_SETTINGS}</legend>
+		<dl>
+			<dt><label for="teampage_multiple">{L_TEAMPAGE_MULTIPLE}:</label><br /><span>{L_TEAMPAGE_MULTIPLE_EXPLAIN}</span></dt>
+			<dd>
+				<label><input type="radio" name="teampage_multiple" class="radio" value="1"<!-- IF DISPLAY_MULTIPLE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" name="teampage_multiple" class="radio" value="0"<!-- IF not DISPLAY_MULTIPLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			</dd>
+		</dl>
+		<dl>
+			<dt><label for="teampage_forums">{L_TEAMPAGE_FORUMS}:</label><br /><span>{L_TEAMPAGE_FORUMS_EXPLAIN}</span></dt>
+			<dd>
+				<label><input type="radio" name="teampage_forums" class="radio" value="1"<!-- IF DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" name="teampage_forums" class="radio" value="0"<!-- IF not DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			</dd>
+		</dl>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input type="hidden" name="action" value="set_config_teampage" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+	</form>
+
+	<p>{L_TEAMPAGE_EXPLAIN}</p>
+
+	<table cellspacing="1">
+		<col class="col1" /><col class="col2" /><col class="col2" />
+	<thead>
+	<tr>
+		<th style="width: 50%">{L_GROUP}</th>
+		<th>{L_GROUP_TYPE}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN teampage -->
+		<tr>
+			<td><strong{teampage.GROUP_COLOUR}>{teampage.GROUP_NAME}</strong></td>
+			<td style="text-align: center;">{teampage.GROUP_TYPE}</td>
+			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
+				<!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
+					{ICON_MOVE_UP_DISABLED}
+					<a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+				<!-- ELSEIF not teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
+					<a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+					<a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+				<!-- ELSEIF teampage.S_LAST_ROW && not teampage.S_FIRST_ROW -->
+					<a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+					{ICON_MOVE_DOWN_DISABLED}
+				<!-- ELSE -->
+					{ICON_MOVE_UP_DISABLED}
+					{ICON_MOVE_DOWN_DISABLED}
+				<!-- ENDIF -->
+				<a href="{teampage.U_DELETE}">{ICON_DELETE}</a>
+			</td>
+		</tr>
+	<!-- BEGINELSE -->
+		<tr>
+			<td colspan="3" class="row3">{L_NO_GROUPS_ADDED}</td>
+		</tr>
+	<!-- END teampage -->
+	</tbody>
+	</table>
+
+	<form id="acp_groups" method="post" action="{U_ACTION_TEAMPAGE}">
+		<fieldset class="quick">
+			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_TEAMPAGE}</select>
+			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
+			<input type="hidden" name="action" value="add" />
+			{S_FORM_TOKEN}
+		</fieldset>
+	</form>
+
+<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 97864d69ee66134f04936137e2357caf99cd9f30 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Thu, 17 Feb 2011 23:31:05 +0700
Subject: [feature/attachment-management-no-reassignment] Attachments
 management

This feature allows to manage attachments in posts and PMs via ACP.

PHPBB3-9721
---
 phpBB/adm/style/acp_attachments.html | 68 ++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 22f271ea82..c11d3c7117 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -371,6 +371,74 @@
 	</fieldset>
 	</form>
 
+<!-- ELSEIF S_ATTACHMENTS -->
+
+	<form id="attachments" method="post" action="{U_ACTION}">
+
+	<fieldset class="tabulated">
+	<legend>{L_TITLE}</legend>
+
+	<!-- IF PAGINATION  or TOTAL_FILES -->
+	<div class="pagination">
+		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE}<!-- IF S_ON_PAGE --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {S_ON_PAGE}<!-- ENDIF --><!-- ENDIF -->
+	</div>
+	<!-- ENDIF -->
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_FILENAME}</th>
+		<th>{L_FILEDATE}</th>
+		<th>{L_FILESIZE}</th>
+		<th>{L_ATTACH_POST_ID}</th>
+		<th>{L_DELETE}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN attachments -->
+		<!-- IF attachments.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br />{attachments.L_DOWNLOAD_COUNT}<br /><!-- IF attachments.S_IN_MESSAGE -->{L_IN} {L_PRIVATE_MESSAGE}<!-- ELSE -->{L_TOPIC}: <!-- ENDIF --><a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a></td>
+			<td>{attachments.FILETIME}<br />{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}</td>
+			<td>{attachments.FILESIZE}</td>
+			<td>
+				<input type="text" name="post_id[{attachments.ATTACH_ID}]" size="7" maxlength="10" value="{attachments.POST_ID}" {attachments.DISABLED} />
+				<input type="hidden" name="current_post_id[{attachments.ATTACH_ID}]" value="{attachments.POST_ID}" />
+				<input type="hidden" name="current_topic_id[{attachments.ATTACH_ID}]" value="{attachments.TOPIC_ID}" />
+			</td>
+			<td><input type="checkbox" class="radio" name="delete[{attachments.ATTACH_ID}]" /></td>
+		</tr>
+	<!-- END attachments -->
+	<tr class="row4">
+		<td colspan="4">&nbsp;</td>
+		<td class="small"><a href="#" onclick="marklist('attachments', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('attachments', 'delete', false); return false;">{L_UNMARK_ALL}</a></td>
+	</tr>
+	</tbody>
+	</table>
+
+	<fieldset class="display-options">
+		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
+		<input class="button2" type="submit" value="{L_GO}" name="sort" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	<hr />
+
+	<!-- IF PAGINATION  or TOTAL_FILES -->
+	<div class="pagination">
+		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE}<!-- IF S_ON_PAGE --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {S_ON_PAGE}<!-- ENDIF --><!-- ENDIF -->
+	</div>
+	<!-- ENDIF -->
+
+	<br />
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+
+	</fieldset>
+
+	</form>
+
 <!-- ENDIF -->
 
 <!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From d811820bc11bac61076d5a92d741d22df9944af8 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 11 Apr 2011 19:59:50 +0800
Subject: [feature/attachment-management-no-reassignment] Further feature
 adjustments.

-add database update entry;
- add files statistics checks;
- improve files deletion procedure;
- improve reversed order for pagination;
- adjust template file;
- add missing comma for orphan key in info module;
- change module mode name;
- fix module explanation text;
- add files comments output;
- change attachments per page amount from posts to topics per page value.

PHPBB3-9721
---
 phpBB/adm/style/acp_attachments.html | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index c11d3c7117..4a75a9b63b 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -371,7 +371,7 @@
 	</fieldset>
 	</form>
 
-<!-- ELSEIF S_ATTACHMENTS -->
+<!-- ELSEIF S_MANAGE -->
 
 	<form id="attachments" method="post" action="{U_ACTION}">
 
@@ -388,41 +388,34 @@
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
-		<th>{L_FILEDATE}</th>
+		<th>{L_POSTED}</th>
 		<th>{L_FILESIZE}</th>
-		<th>{L_ATTACH_POST_ID}</th>
 		<th>{L_DELETE}</th>
 	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN attachments -->
 		<!-- IF attachments.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br />{attachments.L_DOWNLOAD_COUNT}<br /><!-- IF attachments.S_IN_MESSAGE -->{L_IN} {L_PRIVATE_MESSAGE}<!-- ELSE -->{L_TOPIC}: <!-- ENDIF --><a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a></td>
+			<td><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br /><!-- IF attachments.S_IN_MESSAGE -->{L_IN} {L_PRIVATE_MESSAGE}<!-- ELSE -->{L_TOPIC}: <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF --></td>
 			<td>{attachments.FILETIME}<br />{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}</td>
 			<td>{attachments.FILESIZE}</td>
-			<td>
-				<input type="text" name="post_id[{attachments.ATTACH_ID}]" size="7" maxlength="10" value="{attachments.POST_ID}" {attachments.DISABLED} />
-				<input type="hidden" name="current_post_id[{attachments.ATTACH_ID}]" value="{attachments.POST_ID}" />
-				<input type="hidden" name="current_topic_id[{attachments.ATTACH_ID}]" value="{attachments.TOPIC_ID}" />
-			</td>
 			<td><input type="checkbox" class="radio" name="delete[{attachments.ATTACH_ID}]" /></td>
 		</tr>
 	<!-- END attachments -->
 	<tr class="row4">
-		<td colspan="4">&nbsp;</td>
+		<td colspan="3">&nbsp;</td>
 		<td class="small"><a href="#" onclick="marklist('attachments', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('attachments', 'delete', false); return false;">{L_UNMARK_ALL}</a></td>
 	</tr>
 	</tbody>
 	</table>
 
+	<!-- IF TOTAL_FILES -->
 	<fieldset class="display-options">
 		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
 		<input class="button2" type="submit" value="{L_GO}" name="sort" />
-		{S_FORM_TOKEN}
 	</fieldset>
 	<hr />
 
-	<!-- IF PAGINATION  or TOTAL_FILES -->
 	<div class="pagination">
 		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE}<!-- IF S_ON_PAGE --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {S_ON_PAGE}<!-- ENDIF --><!-- ENDIF -->
 	</div>
@@ -434,7 +427,7 @@
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</p>
-
+	{S_FORM_TOKEN}
 	</fieldset>
 
 	</form>
-- 
cgit v1.2.1


From baba66a22991e93908a8b4e7f8bfa104b3588450 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 24 Apr 2011 23:33:51 +0800
Subject: [feature/attachment-management-no-reassignment] Handle privacy and
 some more.

- restrict files info for PM attachments;
- add an option to resync files stats if wrong;
- replace post_id sorting with post type (PM/regular post) one;
- some language fixes.

PHPBB3-9721
---
 phpBB/adm/style/acp_attachments.html | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 4a75a9b63b..d938135440 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -396,7 +396,10 @@
 	<tbody>
 	<!-- BEGIN attachments -->
 		<!-- IF attachments.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br /><!-- IF attachments.S_IN_MESSAGE -->{L_IN} {L_PRIVATE_MESSAGE}<!-- ELSE -->{L_TOPIC}: <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF --></td>
+			<td>
+				<!-- IF attachments.S_IN_MESSAGE -->{L_EXTENSION_GROUP}: <strong><!-- IF attachments.EXT_GROUP_NAME -->{attachments.EXT_GROUP_NAME}<!-- ELSE -->{L_NO_EXT_GROUP}<!-- ENDIF --></strong><br />{attachments.L_DOWNLOAD_COUNT}<br />{L_IN} {L_PRIVATE_MESSAGE}
+				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br />{L_TOPIC}: <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF -->
+			</td>
 			<td>{attachments.FILETIME}<br />{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}</td>
 			<td>{attachments.FILESIZE}</td>
 			<td><input type="checkbox" class="radio" name="delete[{attachments.ATTACH_ID}]" /></td>
@@ -414,6 +417,7 @@
 		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
 		<input class="button2" type="submit" value="{L_GO}" name="sort" />
 	</fieldset>
+
 	<hr />
 
 	<div class="pagination">
@@ -421,17 +425,25 @@
 	</div>
 	<!-- ENDIF -->
 
-	<br />
-
 	<p class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
+	<!-- IF S_ACTION_OPTIONS -->
+	<fieldset>
+		<legend>{L_RESYNC_STATS}</legend>
+		<form id="action_stats_form" method="post" action="{U_ACTION}">
+			<dl>
+				<dt><label for="action_stats">{L_RESYNC_FILES_STATS}</label><br /><span>{L_RESYNC_FILES_STATS_EXPLAIN}</span></dt>
+				<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
+			</dl>
+		</form>
+	</fieldset>
+	<!-- ENDIF -->
 <!-- ENDIF -->
 
 <!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From fe347ec1124de7022bbbf37d0a1fffeff56c7271 Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Tue, 25 May 2010 10:52:01 -0500
Subject: [feature/prune-users] Adjust some language strings for new features

Adjust two language strings for ACP prune feature to include descriptions for
new features.

PHPBB3-9622
---
 phpBB/adm/style/acp_prune_users.html    | 27 +++++++++++++++++++++++++--
 phpBB/adm/style/confirm_body_prune.html | 28 +++++++++++++++++-----------
 2 files changed, 42 insertions(+), 13 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index 0f2b23dcef..a6c5679a11 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -9,7 +9,7 @@
 <form id="acp_prune" method="post" action="{U_ACTION}">
 	
 <fieldset>
-	<legend>{L_ACP_PRUNE_USERS}</legend>
+	<legend>{L_CRITERIA}</legend>
 <dl>
 	<dt><label for="username">{L_USERNAME}:</label></dt>
 	<dd><input type="text" id="username" name="username" /></dd>
@@ -18,9 +18,16 @@
 	<dt><label for="email">{L_EMAIL}:</label></dt>
 	<dd><input type="text" id="email" name="email" /></dd>
 </dl>
+<dl>
+	<dt><label for="email">{L_WEBSITE}:</label></dt>
+	<dd><input type="text" id="website" name="website" /></dd>
+</dl>
 <dl>
 	<dt><label for="joined">{L_JOINED}:</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
-	<dd><select name="joined_select">{S_JOINED_OPTIONS}</select> <input type="text" id="joined" name="joined" /></dd>
+	<dd>
+		<strong>{L_AFTER}</strong> <input type="text" id="joined_after" name="joined_after" />
+		<br /> <br /> <strong>{L_BEFORE}</strong> <input type="text" id="joined_before" name="joined_before" />
+	</dd>
 </dl>
 <dl>
 	<dt><label for="active">{L_LAST_ACTIVE}:</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt>
@@ -30,11 +37,27 @@
 	<dt><label for="count">{L_POSTS}:</label></dt>
 	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" id="count" name="count" /></dd>
 </dl>
+<dl>
+	<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}:</label></dt>
+	<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="text" id="posts_on_queue" name="posts_on_queue" /></select>
+</dl>
+<dl>
+	<dt><label for="group_id">{L_GROUP}:</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</dt>
+	<dd><select name="group_id">{S_GROUP_LIST}</select></dd>
+</dl>
+</fieldset>
+
+<fieldset>
+	<legend>{L_USERNAMES}</legend>
 <dl>
 	<dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
 	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
 	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 </dl>
+</fieldset>
+
+<fieldset>
+	<legend>{L_OPTIONS}</legend>
 <dl>
 	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}</label>
diff --git a/phpBB/adm/style/confirm_body_prune.html b/phpBB/adm/style/confirm_body_prune.html
index 9481386231..92e0a22e71 100644
--- a/phpBB/adm/style/confirm_body_prune.html
+++ b/phpBB/adm/style/confirm_body_prune.html
@@ -2,6 +2,23 @@
 
 <form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
 
+<fieldset id="userlist">
+	<h2>{L_PRUNE_USERS_LIST}</h2>
+	<!-- IF S_DEACTIVATE --><p>{L_PRUNE_USERS_LIST_DEACTIVATE}</p><!-- ELSE --><p>{L_PRUNE_USERS_LIST_DELETE}</p><!-- ENDIF -->
+
+	<br />
+	<!-- BEGIN users -->
+	&raquo; <input type="checkbox" name="user_ids[]" value="{users.USER_ID}" checked="checked" />
+	<a href="{users.U_PROFILE}">{users.USERNAME}</a>
+	<!-- IF users.U_USER_ADMIN --> [<a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a>]<!-- ENDIF --><br />
+	<!-- END users -->
+	<br />
+	<span class="small">
+	<a href="#" onclick="marklist('userlist', 'user_ids', true)">{L_MARK_ALL}</a> &bull;
+	<a href="#" onclick="marklist('userlist', 'user_ids', false)">{L_UNMARK_ALL}</a>
+	</span>
+</fieldset>
+
 <fieldset>
 	<h1>{MESSAGE_TITLE}</h1>
 	<p>{MESSAGE_TEXT}</p>
@@ -12,17 +29,6 @@
 		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
 		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
 	</div>
-
-	<h2>{L_PRUNE_USERS_LIST}</h2>
-	<!-- IF S_DEACTIVATE --><p>{L_PRUNE_USERS_LIST_DEACTIVATE}</p><!-- ELSE --><p>{L_PRUNE_USERS_LIST_DELETE}</p><!-- ENDIF -->
-
-	<br />
-	<!-- BEGIN users -->
-	&raquo; <a href="{users.U_PROFILE}">{users.USERNAME}</a><!-- IF users.U_USER_ADMIN --> [<a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a>]<!-- ENDIF --><br />
-	<!-- END users -->
-
-	<br /><br />
-
 </fieldset>
 
 </form>
-- 
cgit v1.2.1


From 8fa44cc3b9778f84ca20eab1c1d404c4f848eab4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 19 Oct 2010 17:06:23 +0200
Subject: [ticket/8542] Display custom profile fields in private messages

Introduce an option to display the cpf in the PM view.

PHPBB3-8542
---
 phpBB/adm/style/acp_profile.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 85d37568c2..c1143e9ba4 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -55,6 +55,10 @@
 			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}:</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
+		<dl>
+			<dt><label for="field_show_on_pm">{L_DISPLAY_ON_PM}:</label><br /><span>{L_DISPLAY_ON_PM_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_show_on_pm" name="field_show_on_pm" value="1"<!-- IF S_SHOW_ON_PM --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
 		<dl>
 			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}:</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF --> /></dd>
-- 
cgit v1.2.1


From 766537035ea2f04c5aa3c59c15edc15f4ecd050f Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 9 Jul 2011 15:28:33 +0200
Subject: [ticket/10258] Change the DOCTYPE to HTML5

PHPBB3-10258
---
 phpBB/adm/style/colour_swatch.html       |  9 ++++-----
 phpBB/adm/style/install_header.html      | 10 ++++------
 phpBB/adm/style/install_update_diff.html | 10 ++++------
 phpBB/adm/style/overall_header.html      | 10 ++++------
 phpBB/adm/style/simple_header.html       | 10 ++++------
 5 files changed, 20 insertions(+), 29 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
index 795e277949..b8620a73db 100644
--- a/phpBB/adm/style/colour_swatch.html
+++ b/phpBB/adm/style/colour_swatch.html
@@ -1,9 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<!DOCTYPE html>
+<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta charset="{S_CONTENT_ENCODING}">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta http-equiv="imagetoolbar" content="no" />
 <title>{L_COLOUR_SWATCH}</title>
 
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index fbb6a7b409..8d597d868c 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -1,10 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<!DOCTYPE html>
+<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta charset="{S_CONTENT_ENCODING}">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta http-equiv="imagetoolbar" content="no" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index 8b0708cfdb..d736fad969 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -1,10 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<!DOCTYPE html>
+<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta charset="{S_CONTENT_ENCODING}">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta http-equiv="imagetoolbar" content="no" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index a376884507..549af462fa 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -1,10 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<!DOCTYPE html>
+<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta charset="{S_CONTENT_ENCODING}">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta http-equiv="imagetoolbar" content="no" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 2339b70a93..8b6423d7eb 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -1,10 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<!DOCTYPE html>
+<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta charset="{S_CONTENT_ENCODING}">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta http-equiv="imagetoolbar" content="no" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
-- 
cgit v1.2.1


From 854c14f9f6ae78318e159e27724178579ff48dcc Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 10 Jul 2011 23:04:14 +0200
Subject: [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags

These meta tags are IE specific and do not validate as HTML5.

PHPBB3-10258
---
 phpBB/adm/style/colour_swatch.html       | 2 --
 phpBB/adm/style/install_header.html      | 2 --
 phpBB/adm/style/install_update_diff.html | 2 --
 phpBB/adm/style/overall_header.html      | 2 --
 phpBB/adm/style/simple_header.html       | 2 --
 5 files changed, 10 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
index b8620a73db..81e3bd9af6 100644
--- a/phpBB/adm/style/colour_swatch.html
+++ b/phpBB/adm/style/colour_swatch.html
@@ -2,8 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="{S_CONTENT_ENCODING}">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta http-equiv="imagetoolbar" content="no" />
 <title>{L_COLOUR_SWATCH}</title>
 
 <style type="text/css">
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 8d597d868c..58bbd68673 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -2,8 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="{S_CONTENT_ENCODING}">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta http-equiv="imagetoolbar" content="no" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index d736fad969..2f38aa1ed4 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -2,8 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="{S_CONTENT_ENCODING}">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta http-equiv="imagetoolbar" content="no" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 549af462fa..d6d4717537 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -2,8 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="{S_CONTENT_ENCODING}">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta http-equiv="imagetoolbar" content="no" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 8b6423d7eb..166d02b0c1 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -2,8 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="{S_CONTENT_ENCODING}">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta http-equiv="imagetoolbar" content="no" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-- 
cgit v1.2.1


From c945fc9355fca866bfb095a2e79c51408a709387 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 11 Jul 2011 09:55:18 +0200
Subject: [ticket/10155] Add jQuery, introduce global assets path

Add the jQuery JavaScript library to all pages, giving modifications
instant access and allowing for any future core JavaScript to take
advantage of it.

Also introduce a global /assets directory for assets that are shared
between styles.

PHPBB3-10155
---
 phpBB/adm/style/install_header.html | 1 +
 phpBB/adm/style/overall_header.html | 1 +
 phpBB/adm/style/simple_header.html  | 1 +
 3 files changed, 3 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index fbb6a7b409..0a49e57afa 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -11,6 +11,7 @@
 
 <link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 <script type="text/javascript">
 // <![CDATA[
 
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index a376884507..5772c6ca15 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -11,6 +11,7 @@
 
 <link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 <script type="text/javascript">
 // <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}:';
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 2339b70a93..30392007cb 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -11,6 +11,7 @@
 
 <link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 <script type="text/javascript">
 // <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}:';
-- 
cgit v1.2.1


From 136a932303d7d7a427043d1834b6df40dc219b0e Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Tue, 12 Jul 2011 01:32:00 +0200
Subject: [ticket/10258] Remove the meta charset tag

The charset tag is useless, because if a charset content-type header is
present it takes precedence. And phpBB always sends such a header.

PHPBB3-10258
---
 phpBB/adm/style/colour_swatch.html       | 1 -
 phpBB/adm/style/install_header.html      | 1 -
 phpBB/adm/style/install_update_diff.html | 1 -
 phpBB/adm/style/overall_header.html      | 1 -
 phpBB/adm/style/simple_header.html       | 1 -
 5 files changed, 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
index 81e3bd9af6..b5627a790f 100644
--- a/phpBB/adm/style/colour_swatch.html
+++ b/phpBB/adm/style/colour_swatch.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta charset="{S_CONTENT_ENCODING}">
 <title>{L_COLOUR_SWATCH}</title>
 
 <style type="text/css">
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 58bbd68673..cc36643e10 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta charset="{S_CONTENT_ENCODING}">
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index 2f38aa1ed4..7fccb06b5a 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta charset="{S_CONTENT_ENCODING}">
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index d6d4717537..0b0bd3274d 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta charset="{S_CONTENT_ENCODING}">
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 166d02b0c1..ef9b21bb15 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta charset="{S_CONTENT_ENCODING}">
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-- 
cgit v1.2.1


From 17bf983cdc9de05273d0279af5f0b5043d3d53b4 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 17 Jul 2011 10:05:40 +0200
Subject: [ticket/10155] Move jQuery inclusion to footer

PHPBB3-10155
---
 phpBB/adm/style/install_footer.html | 2 ++
 phpBB/adm/style/install_header.html | 1 -
 phpBB/adm/style/overall_footer.html | 2 ++
 phpBB/adm/style/overall_header.html | 1 -
 phpBB/adm/style/simple_footer.html  | 2 ++
 phpBB/adm/style/simple_header.html  | 1 -
 6 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index fabbee1911..1b3134b5e1 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -12,5 +12,7 @@
 	</div>
 </div>
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+
 </body>
 </html>
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 0a49e57afa..fbb6a7b409 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -11,7 +11,6 @@
 
 <link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 <script type="text/javascript">
 // <![CDATA[
 
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 689452c268..dc03d2cfb5 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -20,5 +20,7 @@
 	</div>
 </div>
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+
 </body>
 </html>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 5772c6ca15..a376884507 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -11,7 +11,6 @@
 
 <link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 <script type="text/javascript">
 // <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}:';
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index ac9c26a690..272fd5e3fb 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -16,5 +16,7 @@
 
 </div>
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+
 </body>
 </html>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 30392007cb..2339b70a93 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -11,7 +11,6 @@
 
 <link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 <script type="text/javascript">
 // <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}:';
-- 
cgit v1.2.1


From 681c4a478d6eff7dbcebadca04f4afa28da750a8 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 29 Jul 2011 16:32:22 +0200
Subject: [ticket/10258] Add HTML5 meta charset tag

This allows knowing the charset when saving web pages to disk. Also, this is
supported by all browsers.

PHPBB3-10258
---
 phpBB/adm/style/colour_swatch.html       | 1 +
 phpBB/adm/style/install_header.html      | 1 +
 phpBB/adm/style/install_update_diff.html | 1 +
 phpBB/adm/style/overall_header.html      | 1 +
 phpBB/adm/style/simple_header.html       | 1 +
 5 files changed, 5 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
index b5627a790f..e731620bd3 100644
--- a/phpBB/adm/style/colour_swatch.html
+++ b/phpBB/adm/style/colour_swatch.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
+<meta charset="utf-8">
 <title>{L_COLOUR_SWATCH}</title>
 
 <style type="text/css">
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index cc36643e10..e306d8f6bf 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
+<meta charset="utf-8">
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index 7fccb06b5a..39c73d5652 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
+<meta charset="utf-8">
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 0b0bd3274d..be5ac29131 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
+<meta charset="utf-8">
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index ef9b21bb15..84ff665acc 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
+<meta charset="utf-8">
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-- 
cgit v1.2.1


From 98590201d862ad75e24971a8817a06fa66466f77 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 3 Sep 2011 18:57:16 +0300
Subject: [feature/remove-imagesets] Changing admin control panel styles module

Removing imagesets. Changing admin control panel styles module

PHPBB3-10336
---
 phpBB/adm/style/acp_styles.html | 136 +---------------------------------------
 1 file changed, 1 insertion(+), 135 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 098cc723d9..d503f323e0 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -32,10 +32,6 @@
 			<dt><label for="new_theme_id">{L_DELETE_THEME}:</label><br /><span>{L_REPLACE_THEME_EXPLAIN}</span></dt>
 			<dd><select id="new_theme_id" name="new_theme_id">{S_REPLACE_THEME_OPTIONS}</select></dd>
 		</dl>
-		<dl>
-			<dt><label for="new_imageset_id">{L_DELETE_IMAGESET}:</label><br /><span>{L_REPLACE_IMAGESET_EXPLAIN}</span></dt>
-			<dd><select id="new_imageset_id" name="new_imageset_id">{S_REPLACE_IMAGESET_OPTIONS}</select></dd>
-		</dl>
 	<!-- ENDIF -->
 
 	<p class="quick">
@@ -45,127 +41,6 @@
 	</fieldset>
 	</form>
 
-<!-- ELSEIF S_EDIT_IMAGESET -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF SUCCESS -->
-		<div class="successbox">
-			<p>{L_IMAGESET_UPDATED}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF ERROR -->
-		<div class="errorbox">
-			<p>{L_NO_IMAGE}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<script type="text/javascript" defer="defer">
-	// <![CDATA[
-		function update_image(newimage)
-		{
-			document.getElementById('newimg').src = (newimage) ? '../styles/{A_PATH}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
-		}
-	// ]]>
-	</script>
-	<script type="text/javascript">
-	// <![CDATA[
-		/**
-		* Handle displaying/hiding the dimension fields
-		*/
-		function display_options(value)
-		{
-			if (value == 0)
-			{
-				dE('img_dimensions', -1);
-			}
-			else
-			{
-				dE('img_dimensions', 1);
-			}
-		}
-
-		/**
-		* Init the wanted display functionality if javascript is enabled.
-		* If javascript is not available, the user is still able to properly administer.
-		*/
-		onload = function()
-		{
-			<!-- IF not IMAGE_SIZE -->
-				dE('img_dimensions', -1);
-			<!-- ENDIF -->
-		}
-	// ]]>
-	</script>
-
-	<form method="post" action="{U_ACTION}">
-
-	<fieldset class="quick" style="text-align: left;">
-		<legend>{L_SELECT_IMAGE}</legend>
-		{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit();">
-		<!-- BEGIN category -->
-			<option class="sep" value="" disabled="disabled">{category.NAME}</option>
-				<!-- BEGIN images --><option value="{category.images.VALUE}"<!-- IF category.images.SELECTED--> selected="selected"<!-- ENDIF -->>&nbsp;&nbsp;&nbsp;&nbsp;{category.images.TEXT}</option>
-				<!-- END images -->
-			<!-- END category -->
-		</select>&nbsp; <input class="button1" type="submit" value="{L_SELECT}" tabindex="100" />
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_EDIT_IMAGESET}</legend>
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label></dt>
-		<dd><img src="<!-- IF IMAGE_REQUEST -->{IMAGE_REQUEST}<!-- ELSE -->images/no_image.png<!-- ENDIF -->" alt="" /></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_SELECTED_IMAGE}:</label></dt>
-		<dd><img src="{IMG_SRC}" id="newimg" alt="" /></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-	<legend>{L_IMAGE}</legend>
-	<dl>
-		<dt><label for="imgpath">{L_IMAGE}:</label></dt>
-		<dd><select id="imgpath" name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>
-			<!-- BEGIN imagesetlist -->
-			<option class="sep" value=""><!-- IF imagesetlist.TYPE -->{L_LOCALISED_IMAGES}<!-- ELSE -->{L_GLOBAL_IMAGES}<!-- ENDIF --></option>
-				<!-- BEGIN images -->
-				<option value="{imagesetlist.images.VALUE}"<!-- IF imagesetlist.images.SELECTED--> selected="selected"<!-- ENDIF -->>{imagesetlist.images.TEXT}</option>
-				<!-- END images -->
-			<!-- END imagesetlist -->
-			</select>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="imgsize">{L_INCLUDE_DIMENSIONS}:</label><br /><span>{L_DIMENSIONS_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="imgsize" id="imgsize" onclick="display_options(1);" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="imgsize" onclick="display_options(0);" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<div id="img_dimensions">
-		<dl>
-			<dt><label for="imgwidth">{L_IMAGE_WIDTH}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
-			<dd><input id="imgwidth" type="text" name="imgwidth" value="{IMAGE_SIZE}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="imgheight">{L_IMAGE_HEIGHT}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
-			<dd><input id="imgheight" type="text" name="imgheight" value="{IMAGE_HEIGHT}" /></dd>
-		</dl>
-	</div>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="button2" type="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
 <!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME -->
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
@@ -354,11 +229,6 @@
 			<dd><label><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="inc_theme" value="0" /> {L_NO}</label></dd>
 		</dl>
-		<dl>
-			<dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="inc_imageset" value="0" /> {L_NO}</label></dd>
-		</dl>
 	<!-- ENDIF -->
 	<dl>
 		<dt><label for="store">{L_DOWNLOAD_STORE}:</label><br /><span>{L_DOWNLOAD_STORE_EXPLAIN}</span></dt>
@@ -491,15 +361,11 @@
 			<dt><label for="theme_id">{L_STYLE_THEME}:</label></dt>
 			<dd><!-- IF S_INSTALL --><strong id="theme_id">{THEME_NAME}</strong><!-- ELSE --><select id="theme_id" name="theme_id">{S_THEME_OPTIONS}</select><!-- ENDIF --></dd>
 		</dl>
-		<dl>
-			<dt><label for="imageset_id">{L_STYLE_IMAGESET}:</label></dt>
-			<dd><!-- IF S_INSTALL --><strong id="imageset_id">{IMAGESET_NAME}</strong><!-- ELSE --><select id="imageset_id" name="imageset_id">{S_IMAGESET_OPTIONS}</select><!-- ENDIF --></dd>
-		</dl>
 	<!-- ENDIF -->
 	<!-- IF (S_TEMPLATE or S_THEME) and (S_LOCATION or not S_INSTALL) -->
 		<dl>
 			<dt><label for="store_db">{L_LOCATION}:</label><br /><span><!-- IF S_STORE_DB_DISABLED -->{L_LOCATION_DISABLED_EXPLAIN}<!-- ELSE -->{L_LOCATION_EXPLAIN}<!-- ENDIF --></span></dt>
-			<dd><label><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF --> />{L_STORE_FILESYSTEM}</label>
+			<dd><label><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF --> /> {L_STORE_FILESYSTEM}</label>
 				<label><input type="radio" class="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF -->/> {L_STORE_DATABASE}</label></dd>
 		</dl>
 	<!-- ENDIF -->
-- 
cgit v1.2.1


From 3f61075a15c6c1cd32c11831234b91b6a33500ae Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 11 Sep 2011 12:10:46 -0700
Subject: [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

When validating for HTML5, the name attribute is obsolete/deprecated
when used in anchor tags. The ID tag should be used here instead.

PHPBB3-10362
---
 phpBB/adm/style/acp_attachments.html       | 2 +-
 phpBB/adm/style/acp_ban.html               | 2 +-
 phpBB/adm/style/acp_bbcodes.html           | 2 +-
 phpBB/adm/style/acp_board.html             | 2 +-
 phpBB/adm/style/acp_bots.html              | 2 +-
 phpBB/adm/style/acp_captcha.html           | 2 +-
 phpBB/adm/style/acp_database.html          | 2 +-
 phpBB/adm/style/acp_disallow.html          | 2 +-
 phpBB/adm/style/acp_email.html             | 2 +-
 phpBB/adm/style/acp_forums.html            | 2 +-
 phpBB/adm/style/acp_groups.html            | 2 +-
 phpBB/adm/style/acp_groups_position.html   | 2 +-
 phpBB/adm/style/acp_icons.html             | 2 +-
 phpBB/adm/style/acp_inactive.html          | 2 +-
 phpBB/adm/style/acp_jabber.html            | 2 +-
 phpBB/adm/style/acp_language.html          | 4 ++--
 phpBB/adm/style/acp_logs.html              | 2 +-
 phpBB/adm/style/acp_main.html              | 2 +-
 phpBB/adm/style/acp_modules.html           | 2 +-
 phpBB/adm/style/acp_permission_roles.html  | 6 +++---
 phpBB/adm/style/acp_permissions.html       | 2 +-
 phpBB/adm/style/acp_php_info.html          | 2 +-
 phpBB/adm/style/acp_profile.html           | 2 +-
 phpBB/adm/style/acp_prune_forums.html      | 2 +-
 phpBB/adm/style/acp_prune_users.html       | 2 +-
 phpBB/adm/style/acp_ranks.html             | 2 +-
 phpBB/adm/style/acp_reasons.html           | 2 +-
 phpBB/adm/style/acp_search.html            | 2 +-
 phpBB/adm/style/acp_send_statistics.html   | 2 +-
 phpBB/adm/style/acp_styles.html            | 2 +-
 phpBB/adm/style/acp_update.html            | 2 +-
 phpBB/adm/style/acp_users.html             | 2 +-
 phpBB/adm/style/acp_words.html             | 2 +-
 phpBB/adm/style/captcha_gd_acp.html        | 2 +-
 phpBB/adm/style/captcha_qa_acp.html        | 2 +-
 phpBB/adm/style/captcha_recaptcha_acp.html | 2 +-
 phpBB/adm/style/permission_forum_copy.html | 2 +-
 37 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index d938135440..33ef8062a6 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF U_BACK -->
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
index 2eeb748e4b..d564e89312 100644
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <p>{L_ACP_BAN_EXPLAIN}</p>
 
diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index c81c198fd5..b85e8eca81 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_EDIT_BBCODE -->
 
diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
index bb16204801..781f5c6bce 100644
--- a/phpBB/adm/style/acp_board.html
+++ b/phpBB/adm/style/acp_board.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <h1>{L_TITLE}</h1>
 
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
index 7783356574..886005caa3 100644
--- a/phpBB/adm/style/acp_bots.html
+++ b/phpBB/adm/style/acp_bots.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_EDIT_BOT -->
 
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index 8eee370284..83314ab633 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <h1>{L_ACP_VC_SETTINGS}</h1>
 
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html
index de02ac6dbe..28ac2db1b9 100644
--- a/phpBB/adm/style/acp_database.html
+++ b/phpBB/adm/style/acp_database.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF MODE eq 'restore' -->
 	<h1>{L_ACP_RESTORE}</h1>
diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html
index b68d3ab3c0..776f54d66c 100644
--- a/phpBB/adm/style/acp_disallow.html
+++ b/phpBB/adm/style/acp_disallow.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <h1>{L_ACP_DISALLOW_USERNAMES}</h1>
 
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html
index ff52500dca..1339ac6529 100644
--- a/phpBB/adm/style/acp_email.html
+++ b/phpBB/adm/style/acp_email.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <h1>{L_ACP_MASS_EMAIL}</h1>
 
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 8577c08860..447c0ce466 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_EDIT_FORUM -->
 
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 2f812c443d..158751623a 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_EDIT -->
 
diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 49212a4408..54c1cee769 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 	<h1>{L_MANAGE_LEGEND}</h1>
 
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index eedf39b440..9ec7111848 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_EDIT -->
 
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index d7bf99f853..0889eaf400 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <h2>{L_INACTIVE_USERS}</h2>
 
diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html
index 0c4512ba98..2ba1424bda 100644
--- a/phpBB/adm/style/acp_jabber.html
+++ b/phpBB/adm/style/acp_jabber.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <h1>{L_ACP_JABBER_SETTINGS}</h1>
 
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index 95ac1d5852..81276287c1 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_SELECT_METHOD -->
 
@@ -98,7 +98,7 @@
 		<br /><br />
 	<!-- ENDIF -->
 
-	<a name="entries"></a>
+	<a id="entries"></a>
 
 	<h1>{L_LANGUAGE_ENTRIES}</h1>
 
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index f2fa5dbc26..f1c770d33b 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <h1>{L_TITLE}</h1>
 
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index f3a26305ef..8946903e28 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_RESTORE_PERMISSIONS -->
 
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index 5396e78557..3f1c0bf50b 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_EDIT_MODULE -->
 
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index 54bee54c77..658d8dd0c8 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_EDIT -->
 
@@ -60,7 +60,7 @@
 
 	<p>
 
-	<a name="acl"></a>
+	<a id="acl"></a>
 
 	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
 	<br /><br />
@@ -189,7 +189,7 @@
 
 	<!-- IF S_DISPLAY_ROLE_MASK -->
 
-		<a name="assigned_to"></a>
+		<a id="assigned_to"></a>
 
 		<h1>{L_ROLE_ASSIGNED_TO}</h1>
 
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index 6a6db11659..b44cca782e 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_INTRO -->
 
diff --git a/phpBB/adm/style/acp_php_info.html b/phpBB/adm/style/acp_php_info.html
index 24648f0816..760cd0e9f6 100644
--- a/phpBB/adm/style/acp_php_info.html
+++ b/phpBB/adm/style/acp_php_info.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <h1>{L_ACP_PHP_INFO}</h1>
 
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index c1143e9ba4..0ac0d78a64 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_EDIT -->
 
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html
index 069d2c91c3..dfc5827117 100644
--- a/phpBB/adm/style/acp_prune_forums.html
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_PRUNED -->
 
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index 0f2b23dcef..968d307832 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <h1>{L_ACP_PRUNE_USERS}</h1>
 
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index 1f45109517..2f77a256b1 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_EDIT -->
 
diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html
index 23fcfbdeb8..522aec5930 100644
--- a/phpBB/adm/style/acp_reasons.html
+++ b/phpBB/adm/style/acp_reasons.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_EDIT_REASON -->
 
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index baadb70855..ff83f6b792 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_SETTINGS -->
 	<h1>{L_ACP_SEARCH_SETTINGS}</h1>
diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html
index 15eae8be6f..2d6c4837fd 100644
--- a/phpBB/adm/style/acp_send_statistics.html
+++ b/phpBB/adm/style/acp_send_statistics.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <h1>{L_SEND_STATISTICS}</h1>
 
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 098cc723d9..4c6be9a5b6 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_DELETE -->
 
diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html
index 1e499a16b5..00d37515b3 100644
--- a/phpBB/adm/style/acp_update.html
+++ b/phpBB/adm/style/acp_update.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 	
 <!-- IF S_VERSION_CHECK -->
 
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index e266654649..87bd9ac882 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_SELECT_USER -->
 
diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html
index 3fa4cfc91c..113f58ef92 100644
--- a/phpBB/adm/style/acp_words.html
+++ b/phpBB/adm/style/acp_words.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <!-- IF S_EDIT_WORD -->
 
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html
index d0bb758cfe..e2804bbc7d 100644
--- a/phpBB/adm/style/captcha_gd_acp.html
+++ b/phpBB/adm/style/captcha_gd_acp.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 	<a href="{U_ACTION}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 <h1>{L_ACP_VC_SETTINGS}</h1>
diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html
index e0fc6fc67e..4eb46d2d3c 100644
--- a/phpBB/adm/style/captcha_qa_acp.html
+++ b/phpBB/adm/style/captcha_qa_acp.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 
 	<a href="<!-- IF U_LIST -->{U_LIST}<!-- ELSE -->{U_ACTION}<!-- ENDIF -->" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html
index 5b97cff984..34912c7955 100644
--- a/phpBB/adm/style/captcha_recaptcha_acp.html
+++ b/phpBB/adm/style/captcha_recaptcha_acp.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 <h1>{L_ACP_VC_SETTINGS}</h1>
 
diff --git a/phpBB/adm/style/permission_forum_copy.html b/phpBB/adm/style/permission_forum_copy.html
index c919310035..a4c00c12ae 100644
--- a/phpBB/adm/style/permission_forum_copy.html
+++ b/phpBB/adm/style/permission_forum_copy.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 	<h1>{L_ACP_FORUM_PERMISSIONS_COPY}</h1>
 
-- 
cgit v1.2.1


From 9e4349e7faac65403de02fd090a837fee92b764a Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Thu, 4 Sep 2008 11:39:25 +0000
Subject: [feature/remove-db-styles] Removed database storage of style
 components.

The bulk of database storage of templates is removed, rendering template
stored in the database as useless.

Theme database storage is reduced to a skeleton for full removal soon.

This commit was cherry picked from the old feature/ascraeus-experiment branch
the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e.

PHPBB3-9741
---
 phpBB/adm/style/acp_styles.html | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index d503f323e0..4076cf1ba6 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -362,13 +362,6 @@
 			<dd><!-- IF S_INSTALL --><strong id="theme_id">{THEME_NAME}</strong><!-- ELSE --><select id="theme_id" name="theme_id">{S_THEME_OPTIONS}</select><!-- ENDIF --></dd>
 		</dl>
 	<!-- ENDIF -->
-	<!-- IF (S_TEMPLATE or S_THEME) and (S_LOCATION or not S_INSTALL) -->
-		<dl>
-			<dt><label for="store_db">{L_LOCATION}:</label><br /><span><!-- IF S_STORE_DB_DISABLED -->{L_LOCATION_DISABLED_EXPLAIN}<!-- ELSE -->{L_LOCATION_EXPLAIN}<!-- ENDIF --></span></dt>
-			<dd><label><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF --> /> {L_STORE_FILESYSTEM}</label>
-				<label><input type="radio" class="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF -->/> {L_STORE_DATABASE}</label></dd>
-		</dl>
-	<!-- ENDIF -->
 	<!-- IF S_STYLE -->
 		</fieldset>
 
-- 
cgit v1.2.1


From 56c6476233646e7c735aa4e3b98c4a6b62df5c7d Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 25 Sep 2011 15:12:56 -0700
Subject: [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Add an option to the ACP so admins can choose to host jQuery
from the local version shipped with phpBB, or via a popular CDN.

PHPBB3-10390
---
 phpBB/adm/style/install_footer.html | 3 ++-
 phpBB/adm/style/overall_footer.html | 3 ++-
 phpBB/adm/style/simple_footer.html  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index 1b3134b5e1..a3b2294025 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -12,7 +12,8 @@
 	</div>
 </div>
 
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
+<!-- IF S_JQUERY_FALLBACK --><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 -->
 
 </body>
 </html>
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index dc03d2cfb5..f05e9c56c5 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -20,7 +20,8 @@
 	</div>
 </div>
 
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
+<!-- IF S_JQUERY_FALLBACK --><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 -->
 
 </body>
 </html>
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 272fd5e3fb..0d697aec1d 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -16,7 +16,8 @@
 
 </div>
 
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
+<!-- IF S_JQUERY_FALLBACK --><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 -->
 
 </body>
 </html>
-- 
cgit v1.2.1


From 2a28b6fc401e4481a3a4eb6085b45b9bd7746f43 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 26 Sep 2011 20:21:14 -0700
Subject: [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback

HTML5 styles (ACP / Prosilver) do not need to use escaped javascript
wrapped in an unescape function, so we can simplify it! Only subsilver2 will
use the escaped version of the fallback code, because it is still XHTML.

PHPBB3-10390
---
 phpBB/adm/style/install_footer.html | 2 +-
 phpBB/adm/style/overall_footer.html | 2 +-
 phpBB/adm/style/simple_footer.html  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index a3b2294025..342d8d4151 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -13,7 +13,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_JQUERY_FALLBACK --><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_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write('<script src="{T_ASSETS_PATH}/javascript/jquery.js"><\/script>')</script><!-- ENDIF -->
 
 </body>
 </html>
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index f05e9c56c5..a190b2299a 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -21,7 +21,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_JQUERY_FALLBACK --><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_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write('<script src="{T_ASSETS_PATH}/javascript/jquery.js"><\/script>')</script><!-- ENDIF -->
 
 </body>
 </html>
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 0d697aec1d..5632d3fc9c 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_JQUERY_FALLBACK --><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_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write('<script src="{T_ASSETS_PATH}/javascript/jquery.js"><\/script>')</script><!-- ENDIF -->
 
 </body>
 </html>
-- 
cgit v1.2.1


From 2d0f96e8cc48ba6eed06f99efb33193fc495eab7 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 5 Oct 2011 21:24:34 -0700
Subject: [ticket/10390] Revert back to escaped script tags inside
 document.write

Revert all script tags inside a document.write back to the escaped
version so they won't trip up any XML parsers.

PHPBB3-10390
---
 phpBB/adm/style/install_footer.html | 2 +-
 phpBB/adm/style/overall_footer.html | 2 +-
 phpBB/adm/style/simple_footer.html  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index 342d8d4151..a3b2294025 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -13,7 +13,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write('<script src="{T_ASSETS_PATH}/javascript/jquery.js"><\/script>')</script><!-- ENDIF -->
+<!-- IF S_JQUERY_FALLBACK --><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 -->
 
 </body>
 </html>
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index a190b2299a..f05e9c56c5 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -21,7 +21,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write('<script src="{T_ASSETS_PATH}/javascript/jquery.js"><\/script>')</script><!-- ENDIF -->
+<!-- IF S_JQUERY_FALLBACK --><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 -->
 
 </body>
 </html>
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 5632d3fc9c..0d697aec1d 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_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write('<script src="{T_ASSETS_PATH}/javascript/jquery.js"><\/script>')</script><!-- ENDIF -->
+<!-- IF S_JQUERY_FALLBACK --><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 -->
 
 </body>
 </html>
-- 
cgit v1.2.1


From 65a34fd047f4ac1ff3638a568f44d3fe7d664d88 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 14 Oct 2011 00:54:11 +0200
Subject: [ticket/10410] Add option to display users in their first teampage
 group

PHPBB3-10410
---
 phpBB/adm/style/acp_groups_position.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 54c1cee769..3a03573756 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -82,10 +82,11 @@
 	<fieldset>
 		<legend>{L_TEAMPAGE_SETTINGS}</legend>
 		<dl>
-			<dt><label for="teampage_multiple">{L_TEAMPAGE_MULTIPLE}:</label><br /><span>{L_TEAMPAGE_MULTIPLE_EXPLAIN}</span></dt>
+			<dt><label for="teampage_multiple">{L_TEAMPAGE_MEMBERSHIPS}:</label></dt>
 			<dd>
-				<label><input type="radio" name="teampage_multiple" class="radio" value="1"<!-- IF DISPLAY_MULTIPLE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" name="teampage_multiple" class="radio" value="0"<!-- IF not DISPLAY_MULTIPLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label><input type="radio" name="teampage_memberships" class="radio" value="0"<!-- IF DISPLAY_MEMBERSHIPS == 0 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_FIRST}</label><br />
+				<label><input type="radio" name="teampage_memberships" class="radio" value="1"<!-- IF DISPLAY_MEMBERSHIPS == 1 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_DEFAULT}</label><br />
+				<label><input type="radio" name="teampage_memberships" class="radio" value="2"<!-- IF DISPLAY_MEMBERSHIPS == 2 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_ALL}</label>
 			</dd>
 		</dl>
 		<dl>
-- 
cgit v1.2.1


From 4baa2bb52c47b0b0e316c3a25f34e7bc27075ffd Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 23 Dec 2011 21:55:49 +0000
Subject: [ticket/10535] Removed email confirm field from acp_users module

PHPBB3-10535
---
 phpBB/adm/style/acp_users_overview.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 9237e45daf..1f10e7f66e 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -45,10 +45,6 @@
 	<dt><label for="user_email">{L_EMAIL}:</label></dt>
 	<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd>
 </dl>
-<dl>
-	<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
-	<dd><input class="text medium" type="text" id="email_confirm" name="email_confirm" value="" autocomplete="off" /></dd>
-</dl>
 <dl>
 	<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
 	<dd><input type="password" id="new_password" name="new_password" value="" autocomplete="off" /></dd>
-- 
cgit v1.2.1


From a1fee699dda3d28b22a5b18f8940c104b5e441d8 Mon Sep 17 00:00:00 2001
From: jellydoughnut <a_jelly_doughnut@phpbb.com>
Date: Mon, 12 Dec 2011 20:17:31 -0600
Subject: [feature/prune-users] Minor UI adjustment and bug fixes

Removed unneeded hidden fields in confirmation page.  Do not show group prune
dropdown if there are no groups, etc.

PHPBB3-9622
---
 phpBB/adm/style/acp_prune_users.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index a6c5679a11..5c4d89f794 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -41,10 +41,12 @@
 	<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}:</label></dt>
 	<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="text" id="posts_on_queue" name="posts_on_queue" /></select>
 </dl>
+<!-- IF S_GROUP_LIST -->
 <dl>
 	<dt><label for="group_id">{L_GROUP}:</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</dt>
 	<dd><select name="group_id">{S_GROUP_LIST}</select></dd>
 </dl>
+<!-- ENDIF -->
 </fieldset>
 
 <fieldset>
-- 
cgit v1.2.1


From 6d227894f59c14dbc1f907bfd4d7cd5bb0df3dcd Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Mon, 13 Feb 2012 12:28:01 +0200
Subject: [ticket/10645] Missing CSS for checkboxes

Missing CSS for checkboxes, invalid cursor for radio input

PHPBB3-10645
---
 phpBB/adm/style/admin.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 666f4921ba..ceda824e5a 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1007,11 +1007,11 @@ fieldset.submit-buttons legend {
 /* Input field styles
 ---------------------------------------- */
 
-input.radio, input.permissions-checkbox {
+input.radio, input.checkbox, input.permissions-checkbox {
 	width: auto !important;
 	background-color: transparent;
 	border: none;
-	cursor: default;
+	cursor: pointer;
 }
 
 input.full,
-- 
cgit v1.2.1


From 162f9b738aaa74684ea42e3ce4d6a911a183a996 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 18 Feb 2012 16:35:43 +0200
Subject: [feature/purge-cache] Allow all admins to purge cache

Allow all administrators to purge cache

PHPBB3-10659
---
 phpBB/adm/style/acp_main.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 11f7fedd38..63ca3a1c79 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -194,13 +194,14 @@
 					<dd><input type="hidden" name="action" value="purge_sessions" /><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
+			<!-- ENDIF -->
+
 			<form id="action_purge_cache_form" method="post" action="{U_ACTION}">
 				<dl>
 					<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
-			<!-- ENDIF -->
   		</fieldset>
 	<!-- ENDIF -->
 
-- 
cgit v1.2.1


From f32cc3ae8fc3fbd28f4fe9e6b7e2a4eb27cfac03 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 18 Feb 2012 01:20:21 +0200
Subject: [feature/merging-style-components] Admin.css additions for acp_styles

Adding background colors for row iterations and font color for disabled rows to admin control panel css.

PHPBB3-10632
---
 phpBB/adm/style/admin.css | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index ceda824e5a..14a2b6dded 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -626,12 +626,29 @@ td.name {
 .col1 { background-color: #DCEBFE; }
 .col2 { background-color: #F9F9F9; }
 
+/* 4 row background colours for trees */
+.row1a { background-color: #F9F9F9; }
+.row1b { background-color: #F6F6F6; }
+.row2a { background-color: #E7EEF4; }
+.row2b { background-color: #E3EBF2; }
+
 .spacer {
 	background-color: #DBDFE2;
 	height: 1px;
 	line-height: 1px;
 }
 
+/* Deactivated row */
+.row-inactive { 
+	color: #999; 
+}
+.row-inactive a, .row-inactive strong { 
+	color: #888;
+}
+.row-inactive a:hover {
+	color: #BC2A4D;
+}
+
 /* General form styles
 ----------------------------------------*/
 fieldset {
-- 
cgit v1.2.1


From 39944a08b9ea031dfc156f61ad0d8f4c594882e5 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 15 Mar 2012 00:20:11 +0200
Subject: [feature/merging-style-components] New acp_styles template

New acp_styles.html, completely rewritten

PHPBB3-10632
---
 phpBB/adm/style/acp_styles.html | 478 +++++++++++-----------------------------
 1 file changed, 123 insertions(+), 355 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index dc89aa247a..b09cbafc95 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -2,399 +2,167 @@
 
 <a id="maincontent"></a>
 
-<!-- IF S_DELETE -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<form id="acp_styles" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TITLE}</legend>
-	<dl>
-		<dt><label>{L_NAME}:</label></dt>
-		<dd><strong>{NAME}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt>
-		<dd><select id="new_id" name="new_id">{S_REPLACE_OPTIONS}</select></dd>
-	</dl>
-	<!-- IF S_DELETE_STYLE -->
-		<hr />
-		<dl>
-			<dt><label for="new_template_id">{L_DELETE_TEMPLATE}:</label><br /><span>{L_REPLACE_TEMPLATE_EXPLAIN}</span></dt>
-			<dd><select id="new_template_id" name="new_template_id">{S_REPLACE_TEMPLATE_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="new_theme_id">{L_DELETE_THEME}:</label><br /><span>{L_REPLACE_THEME_EXPLAIN}</span></dt>
-			<dd><select id="new_theme_id" name="new_theme_id">{S_REPLACE_THEME_OPTIONS}</select></dd>
-		</dl>
+<!-- IF S_CONFIRM_ACTION -->
+<form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
+
+<fieldset>
+	<h1>{MESSAGE_TITLE}</h1>
+	<p>{MESSAGE_TEXT}</p>
+	<!-- IF S_CONFIRM_DELETE -->
+	<label><input type="checkbox" class="checkbox" name="confirm_delete_files" /> {L_DELETE_FROM_FS}</label>
 	<!-- ENDIF -->
 
-	<p class="quick">
-		<input class="button1" type="submit" name="update" value="{L_DELETE}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME -->
+	{S_HIDDEN_FIELDS}
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<div style="text-align: center;">
+		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
+		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+	</div>
 
-	<h1>{L_EDIT}</h1>
+</fieldset>
+		
+</form>
+<!-- ELSE -->
 
-	<p>{L_EDIT_EXPLAIN}</p>
+<!-- IF L_TITLE --><h1>{L_TITLE}</h1><!-- ENDIF -->
 
-	<p>{L_SELECTED}: <strong>{SELECTED_TEMPLATE}</strong></p>
+<!-- IF L_EXPLAIN --><p>{L_EXPLAIN}</p><!-- ENDIF -->
 
-	<form id="acp_styles" method="post" action="{U_ACTION}">
+<form id="acp_styles" method="post" action="{U_ACTION}">
+{S_HIDDEN_FIELDS}
+{S_FORM_TOKEN}
 
-	<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
+<!-- IF S_STYLE_DETAILS -->
+	<input type="hidden" name="id" value="{STYLE_ID}" />
 	<fieldset>
-		<legend>{L_SELECT}</legend>
 	<dl>
-		<dt><label for="template_file">{L_FILE}:</label></dt>
-		<dd><select id="template_file" name="template_file" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_TEMPLATES}</select> <input class="button2" type="submit" value="{L_SELECT}" /></dd>
+		<dt><label for="name">{L_STYLE_NAME}:</label></dt>
+		<dd><input type="text" id="name" name="style_name" value="{STYLE_NAME}" /></dd>
 	</dl>
-	{S_FORM_TOKEN}
-	</fieldset>
-	<!-- ENDIF -->
-	</form>
-
-	<!-- IF TEMPLATE_FILE or (S_EDIT_THEME and S_THEME_IN_DB) -->
-		<script type="text/javascript" defer="defer">
-		// <![CDATA[
-
-			function change_editor_height(height)
-			{
-				height = Number(height);
-
-				if (isNaN(height))
-				{
-					return;
-				}
-
-				editor = document.getElementById('template_data');
-				editor.rows = Math.max(5, Math.min(height, 999));
-
-				append_text_rows('acp_styles', height);
-				append_text_rows('acp_template', height);
-			}
-
-			function append_text_rows(form_name, value)
-			{
-				value = Number(value);
-
-				if (isNaN(value))
-				{
-					return;
-				}
-
-				url = document.getElementById(form_name).action;
-
-				// Make sure &amp; is actually... &
-				url = url.replace(/&amp;/g, '&');
-
-				var_start = url.indexOf('&text_rows=');
-				if (var_start == -1)
-				{
-					document.getElementById(form_name).action = url + "&text_rows=" + value;
-				}
-				else
-				{
-					url_start = url.substring(0, var_start + 1);
-					var_end = url.substring(var_start + 1).indexOf('&');
-					if (var_end == -1)
-					{
-						document.getElementById(form_name).action = url_start + "text_rows=" + value;
-					}
-					else
-					{
-						document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value;
-					}
-				}
-			}
-
-		// ]]>
-		</script>
-
-		<form id="acp_template" method="post" action="{U_ACTION}">
-
-		<fieldset>
-			<legend>{L_EDITOR}</legend>
-		<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
-		<dl>
-			<dt><label>{L_SELECTED_FILE}:</label></dt>
-			<dd>{TEMPLATE_FILE}</dd>
-		</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label for="text_rows">{L_EDITOR_HEIGHT}:</label></dt>
-			<dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button2" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd>
-		</dl>
-		<textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea>
-		</fieldset>
-
-		<fieldset class="submit-buttons">
-			<legend>{L_SUBMIT}</legend>
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" />
-		</fieldset>
-		</form>
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_CACHE -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TEMPLATE_CACHE}</h1>
-
-	<p>{L_TEMPLATE_CACHE_EXPLAIN}</p>
-
-	<form id="acp_styles" method="post" action="{U_ACTION}">
-	<fieldset class="tabulated">
-	<legend>{L_TEMPLATE_CACHE}</legend>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_CACHE_FILENAME}</th>
-		<th>{L_CACHE_FILESIZE}</th>
-		<th>{L_CACHE_CACHED}</th>
-		<th>{L_CACHE_MODIFIED}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN file -->
-		<!-- IF file.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{file.U_VIEWSOURCE}" onclick="popup(this.href, 750, 550, '_source'); return false;">{file.FILENAME_PATH}</a></td>
-			<td>{file.FILESIZE}</td>
-			<td>{file.CACHED}</td>
-			<td>{file.MODIFIED}</td>
-			<td><input type="checkbox" class="radio" name="delete[]" value="{file.FILENAME}" /></td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr class="row1">
-			<td colspan="5">{L_TEMPLATE_CACHE_EMPTY}</td>
-		</tr>
-	<!-- END file -->
-	</tbody>
-	</table>
-
-	<p class="quick">
-		<span class="small"><a href="#" onclick="marklist('acp_styles', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('acp_styles', 'delete', false); return false;">{L_UNMARK_ALL}</a></span><br />
-		{S_FORM_TOKEN}
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_DELETE_MARKED}" />
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_EXPORT -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF S_ERROR_MSG -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="acp_styles" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TITLE}</legend>
 	<dl>
-		<dt><label>{L_NAME}:</label></dt>
-		<dd><strong>{NAME}</strong></dd>
+		<dt><label>{L_STYLE_PATH}</label></dt>
+		<dd><strong>{STYLE_PATH}</strong></dd>
+	</dl>
+	<dl>
+		<dt><label for="name">{L_COPYRIGHT}:</label></dt>
+		<dd><strong>{STYLE_COPYRIGHT}</strong></dd>
 	</dl>
-	<!-- IF S_STYLE -->
-		<dl>
-			<dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="inc_template" value="0" /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="inc_theme" value="0" /> {L_NO}</label></dd>
-		</dl>
-	<!-- ENDIF -->
 	<dl>
-		<dt><label for="store">{L_DOWNLOAD_STORE}:</label><br /><span>{L_DOWNLOAD_STORE_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" id="store" name="store" value="1" checked="checked" /> {L_EXPORT_STORE}</label>
-			<label><input type="radio" class="radio" name="store" value="0" /> {L_EXPORT_DOWNLOAD}</label></dd>
+		<dt><label for="style_parent">{L_INHERITING_FROM}:</label></dt>
+		<dd><select id="style_parent" name="style_parent">
+			<option value=""<!-- IF STYLE_PARENT == 0 --> selected="selected"<!-- ENDIF -->> - </option>
+			<!-- BEGIN parent_styles -->
+				<option value="{parent_styles.STYLE_ID}"<!-- IF parent_styles.STYLE_ID == STYLE_PARENT --> selected="selected"<!-- ENDIF -->>{parent_styles.SPACER}{parent_styles.STYLE_NAME}</option>
+			<!-- END parent_styles -->
+		</select></dd>
 	</dl>
 	<dl>
-		<dt><label for="format">{L_ARCHIVE_FORMAT}:</label></dt>
-		<dd>{FORMAT_BUTTONS}</dd>
+		<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
+	<!-- IF not S_STYLE_DEFAULT -->
+		<dl>
+			<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt>
+			<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label>
+				<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>
+		</dl>
+	<!-- ENDIF -->
+	</fieldset>
 
-	<p class="quick">
-		{S_FORM_TOKEN}
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</p>
+		<a href="{U_ACTION}" class="button2">{L_BACK}</a>
+		{S_FORM_TOKEN}
 	</fieldset>
+<!-- ENDIF -->
 
-
-	</form>
-
-<!-- ELSEIF S_FRONTEND -->
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF S_STYLE --> <!-- DEFINE $COLSPAN = 5 --> <!-- ELSE --> <!-- DEFINE $COLSPAN = 4 --> <!-- ENDIF -->
-
+<!-- IF .styles_list -->
 	<table cellspacing="1">
-		<col class="row1" /><!-- IF S_STYLE --><col class="row1" /><!-- ENDIF --><col class="row2" /><col class="row2" />
 	<thead>
 	<tr>
-		<th>{L_NAME}</th>
-		<!-- IF S_STYLE --><th>{L_STYLE_USED_BY}</th><!-- ENDIF -->
-		<th>{L_OPTIONS}</th>
-		<th>{L_ACTIONS}</th>
+		<th>{L_STYLE_NAME}</th>
+		<!-- IF not STYLES_LIST_HIDE_COUNT --><th width="10%" style="white-space: nowrap; text-align: center;">{L_STYLE_USED_BY}</th><!-- ENDIF -->
+		<th width="25%" style="white-space: nowrap; text-align: center;">{L_ACTIONS}</th>
+		{STYLES_LIST_EXTRA}
+		<th>&nbsp;</th>
 	</tr>
 	</thead>
-	<tbody>
-	<tr>
-		<td class="row3" colspan="{$COLSPAN}"><strong>{L_INSTALLED}</strong></td>
-	</tr>
-	<!-- BEGIN installed -->
-	<!-- IF installed.S_INACTIVE and not $INACTIVE_STYLES -->
-		<!-- DEFINE $INACTIVE_STYLES = 1 -->
-		<tr>
-			<td class="row3" colspan="{$COLSPAN}"><strong>{L_INACTIVE_STYLES}</strong></td>
-		</tr>
-	<!-- ENDIF -->
-	<tr>
-		<td><strong>{installed.NAME}</strong><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
-		<!-- IF S_STYLE -->
-			<td style="text-align: center;">{installed.STYLE_COUNT}</td>
+	<!-- BEGIN styles_list -->
+	<tbody id="styles-list-{styles_list.S_ROW_COUNT}">
+	<tr<!-- IF styles_list.STYLE_ID and not styles_list.STYLE_ACTIVE --> class="row-inactive"<!-- ENDIF -->>
+		<!-- IF styles_list.LEVEL is odd -->
+			<!-- IF $ROW_CLASS == 'row1a' --><!-- DEFINE $ROW_CLASS = 'row1b' --><!-- ELSE --><!-- DEFINE $ROW_CLASS = 'row1a' --><!-- ENDIF -->
+		<!-- ELSE -->
+			<!-- IF $ROW_CLASS == 'row2a' --><!-- DEFINE $ROW_CLASS = 'row2b' --><!-- ELSE --><!-- DEFINE $ROW_CLASS = 'row2a' --><!-- ENDIF -->
 		<!-- ENDIF -->
-		<td style="text-align: center;">
-			{installed.S_OPTIONS}
-		</td>
-		<td style="text-align: center;">
-			<!-- IF S_STYLE -->
-				<a href="{installed.U_STYLE_ACT_DEACT}">{installed.L_STYLE_ACT_DEACT}</a> |
+		<td class="{$ROW_CLASS}" style="padding-left: {styles_list.PADDING}px;">
+			<!-- IF styles_list.STYLE_ID and styles_list.COMMENT == '' and styles_list.STYLE_ACTIVE -->
+				<div class="default-style" style="display: none; float: right;">
+					<input class="radio" type="radio" name="default" value="{styles_list.STYLE_ID}"<!-- IF styles_list.DEFAULT --> checked="checked"<!-- ELSE --><!-- DEFINE $S_DEFAULT = 1 --><!-- ENDIF --> title="{L_STYLE_DEFAULT}" />
+				</div>
+			<!-- ENDIF -->
+			<!-- IF styles_list.DEFAULT or styles_list.SHOW_COPYRIGHT -->
+				<strong>{styles_list.STYLE_NAME}</strong>
+				<!-- IF styles_list.SHOW_COPYRIGHT and styles_list.COMMENT == '' --><span><br />{styles_list.STYLE_COPYRIGHT}</span><!-- ENDIF -->
+			<!-- ELSE -->
+				<span>{styles_list.STYLE_NAME}</span>
 			<!-- ENDIF -->
-			{installed.S_ACTIONS}
-			<!-- IF S_STYLE -->
-				| <a href="{installed.U_PREVIEW}">{L_PREVIEW}</a>
+			<!-- IF styles_list.COMMENT != '' -->
+				<span class="error"><br />{styles_list.COMMENT}</span>
+			<!-- ENDIF -->
+			<!-- IF not styles_list.STYLE_ID and styles_list.COMMENT == '' -->
+				<span class="style-path"><br />{L_STYLE_PATH} {styles_list.STYLE_PATH_FULL}</span>
+			<!-- ENDIF -->
+		</td>
+		<!-- IF not STYLES_LIST_HIDE_COUNT -->
+			<td class="{$ROW_CLASS}" style="text-align: center;">{styles_list.USERS}</td>
+		<!-- ENDIF -->
+		<td class="{$ROW_CLASS}" style="text-align: center;">
+			<!-- BEGIN actions -->
+				<!-- IF styles_list.actions.S_ROW_COUNT > 0 --> | <!-- ENDIF -->
+				<!-- IF styles_list.actions.U_ACTION -->
+					<a href="{styles_list.actions.U_ACTION}"{styles_list.actions.U_ACTION_ATTR}>{styles_list.actions.L_ACTION}</a>
+				<!-- ENDIF -->
+				{styles_list.actions.HTML}
+			<!-- END actions -->
+		</td>
+		{styles_list.EXTRA}
+		<td class="{$ROW_CLASS}" width="20" style="text-align: center;">
+			<!-- IF styles_list.STYLE_ID -->
+				<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" />
+			<!-- ELSE -->
+				<!-- IF styles_list.COMMENT != '' -->
+					&nbsp;
+				<!-- ELSE -->
+					<input class="checkbox" type="checkbox" name="dirs[]" value="{styles_list.STYLE_PATH}" />
+				<!-- ENDIF -->
 			<!-- ENDIF -->
 		</td>
 	</tr>
-	<!-- END installed -->
-	<tr>
-		<td class="row3" colspan="{$COLSPAN}"><strong>{L_UNINSTALLED}</strong></td>
-	</tr>
-	<!-- IF not .uninstalled -->
-		<tr>
-			<td class="row1" colspan="{$COLSPAN}" style="text-align: center;">{L_NO_UNINSTALLED}</td>
-		</tr>
-	<!-- ENDIF -->
-	<!-- BEGIN uninstalled -->
-		<tr>
-			<td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><strong>{uninstalled.NAME}</strong><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td>
-			<td style="text-align: center;" colspan="2"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td>
-		</tr>
-	<!-- END uninstalled -->
 	</tbody>
+	<!-- END styles_list -->
 	</table>
+<!-- ENDIF -->
 
-	<!-- IF S_STYLE -->
-		<form id="acp_styles" method="post" action="{U_ACTION}">
-
-		<fieldset class="quick">
-			<legend>{L_CREATE}</legend>
-			{L_CREATE}: <input type="text" name="name" value="" /> {L_FROM} <select name="basis">{S_BASIS_OPTIONS}</select> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" />
-		</fieldset>
-
-		</form>
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_DETAILS -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF S_ERROR_MSG -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="acp_styles" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TITLE}</legend>
-	<dl>
-		<dt><label for="name">{L_NAME}:</label></dt>
-		<dd><!-- IF S_INSTALL --><strong id="name">{NAME}</strong><!-- ELSE --><input type="text" id="name" name="name" value="{NAME}" /><!-- ENDIF --></dd>
-	</dl>
-	<dl>
-		<dt><label for="copyright">{L_COPYRIGHT}:</label></dt>
-		<dd><!-- IF S_INSTALL --><strong id="copyright">{COPYRIGHT}</strong><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd>
-	</dl>
-	<!-- IF S_SUPERTEMPLATE -->
-	<dl>
-		<dt><label for="inheriting">{L_INHERITING_FROM}:</label></dt>
-		<dd><strong id="inheriting">{S_SUPERTEMPLATE}</strong></dd>
-	</dl>
-	<!-- ENDIF -->
-	<!-- IF S_STYLE and not S_BASIS -->
-		<dl>
-			<dt><label for="template_id">{L_STYLE_TEMPLATE}:</label></dt>
-			<dd><!-- IF S_INSTALL --><strong id="template_id">{TEMPLATE_NAME}</strong><!-- ELSE --><select id="template_id" name="template_id">{S_TEMPLATE_OPTIONS}</select><!-- ENDIF --></dd>
-		</dl>
-		<dl>
-			<dt><label for="theme_id">{L_STYLE_THEME}:</label></dt>
-			<dd><!-- IF S_INSTALL --><strong id="theme_id">{THEME_NAME}</strong><!-- ELSE --><select id="theme_id" name="theme_id">{S_THEME_OPTIONS}</select><!-- ENDIF --></dd>
-		</dl>
-	<!-- ENDIF -->
-	<!-- IF S_STYLE -->
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_OPTIONS}</legend>
-		<dl>
-			<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<!-- IF not S_STYLE_DEFAULT -->
-			<dl>
-				<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt>
-				<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label>
-					<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ENDIF -->
+<!-- IF .extra_actions -->
+	<fieldset class="quick">
+		<!-- BEGIN extra_actions -->
+			<input type="submit" name="{extra_actions.ACTION_NAME}" class="button2" value="{extra_actions.L_ACTION}" />
+		<!-- END extra_actions -->
 	</fieldset>
+<!-- ENDIF -->
 
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
+<!-- IF .extra_links -->
+	<fieldset class="quick">
+		<!-- BEGIN extra_links -->
+			<a class="button2" href="{extra_links.U_ACTION}">{extra_links.L_ACTION}</a>
+		<!-- END extra_links -->
 	</fieldset>
+<!-- ENDIF -->
 
-	</form>
+</form>
 
 <!-- ENDIF -->
 
-- 
cgit v1.2.1


From 56a7038aa57a1ec473196e01f68b7c8a1d0a89b6 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 15 Mar 2011 07:56:21 -0400
Subject: [feature/new-tz-handling] Removed DST options from templates.

PHPBB3-9558
---
 phpBB/adm/style/acp_users_prefs.html | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
index a519447b2f..90db62984e 100644
--- a/phpBB/adm/style/acp_users_prefs.html
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -56,11 +56,6 @@
 		<dt><label for="tz">{L_BOARD_TIMEZONE}:</label></dt>
 		<dd><select id="tz" name="tz" style="width: 100%;">{S_TZ_OPTIONS}</select></dd>
 	</dl>
-	<dl> 
-		<dt><label for="dst">{L_BOARD_DST}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="dst" value="1"<!-- IF DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="dst" value="0"<!-- IF not DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
 	<dl> 
 		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
 		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
-- 
cgit v1.2.1


From 84099e5bc1f452e1a4643fd78658929875ab1eee Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Wed, 20 Apr 2011 23:14:38 -0700
Subject: [feature/avatars] Support proper avatar deletion, stub ACP

Fixing avatar deletion in the UCP and ACP, and stubbing the ACP
configuration page. I'll admit I kind of got caught carried away, so
this really should be a couple separate commits.

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_local.html  | 14 +++++
 phpBB/adm/style/acp_avatar_options_remote.html | 11 ++++
 phpBB/adm/style/acp_avatar_options_upload.html | 11 ++++
 phpBB/adm/style/acp_users_avatar.html          | 85 +++++---------------------
 4 files changed, 51 insertions(+), 70 deletions(-)
 create mode 100644 phpBB/adm/style/acp_avatar_options_local.html
 create mode 100644 phpBB/adm/style/acp_avatar_options_remote.html
 create mode 100644 phpBB/adm/style/acp_avatar_options_upload.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
new file mode 100644
index 0000000000..0dd83db017
--- /dev/null
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -0,0 +1,14 @@
+<label for="category">{L_AVATAR_CATEGORY}: <select name="av_local_cat" id="category">
+<option value="">{L_NO_AVATAR_CATEGORY}</option>
+<!-- BEGIN av_local_cats -->
+<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
+<!-- END av_local_cats -->
+</select></label>
+<input type="submit" value="{L_GO}" name="av_local_go" class="button2" />
+
+<div id="gallery">
+<!-- BEGIN av_local_imgs -->
+	<label for="av-{av_local_imgs.S_ROW_COUNT}"><img src="{av_local_imgs.AVATAR_IMAGE}" alt="" /><br />
+	<input type="radio" name="av_local_file" id="av-{av_local_imgs.S_ROW_COUNT}" value="{av_local_imgs.AVATAR_FILE}" /></label>
+<!-- END av_local_imgs -->
+</div>
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
new file mode 100644
index 0000000000..02704c5be8
--- /dev/null
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -0,0 +1,11 @@
+<dl>
+	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd>
+</dl>
+<dl>
+	<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dd>
+		<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+	</dd>
+</dl>
diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html
new file mode 100644
index 0000000000..9c8dd9af01
--- /dev/null
+++ b/phpBB/adm/style/acp_avatar_options_upload.html
@@ -0,0 +1,11 @@
+<dl>
+	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AV_UPLOAD_SIZE}" /><input type="file" name="av_upload_file" id="av_upload_file" class="inputbox autowidth" /></dd>
+</dl>
+
+<!-- IF S_UPLOAD_AVATAR_URL -->
+	<dl>
+		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dd><input type="text" name="av_upload_url" id="av_upload_url" value="" class="inputbox" /></dd>
+	</dl>
+<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 35d8374237..3d6754830b 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -1,78 +1,23 @@
-	<form id="avatar_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
+	<form id="avatar_settings" method="post" action="{U_ACTION}" enctype="multipart/form-data">
 
 	<fieldset>
 		<legend>{L_ACP_USER_AVATAR}</legend>
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd>{AVATAR_IMAGE}</dd>
-		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
-	</dl>
-	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_UPLOAD_FILE -->
-			<dl> 
-				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-				<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_REMOTE_UPLOAD -->
-			<dl>
-				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_ALLOW_REMOTE -->
-			<dl>
-				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-				<dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>{L_PIXEL} &times; </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_GALLERY -->
-			<dl> 
-				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
-				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_AVATAR_GALLERY}</legend>
-		<dl>
-			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
-			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-		</dl>
+	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
-			<table cellspacing="1">
-			<!-- BEGIN avatar_row -->
-			<tr> 
-				<!-- BEGIN avatar_column -->
-					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
-				<!-- END avatar_column -->
-			</tr>
-			<tr>
-				<!-- BEGIN avatar_option_column -->
-					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-				<!-- END avatar_option_column -->
-			</tr>
-			<!-- END avatar_row -->
-			</table>
+			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
+			<!-- IF AVATAR --><dd><input type="submit" name="submit" id="delete" value="{LA_DELETE_AVATAR}" /></dd><!-- ENDIF -->
 		</dl>
+	</fieldset>
+	<!-- BEGIN avatar_drivers -->
+		<fieldset>
+			<legend>{avatar_drivers.L_TITLE}</legend>
+			<p>{avatar_drivers.L_EXPLAIN}</p>
+			{avatar_drivers.OUTPUT}
 		</fieldset>
-		
-		<fieldset class="quick" style="margin-top: -15px;">
-			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+		<fieldset class="quick">
+			<input type="reset" value="{L_RESET}" name="reset" class="button2" /> &nbsp;
+			<input type="submit" name="submit_av_{avatar_drivers.DRIVER}" value="{L_SUBMIT}" class="button1" />
 		</fieldset>
-	
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	
+	<!-- END avatar_drivers -->
 	</form>
-- 
cgit v1.2.1


From 22c864cb3a945b52fe9b91765d247abfe00b50bc Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Wed, 15 Jun 2011 12:58:02 -0700
Subject: [feature/avatars] Dynamically list the avatar types in UCP and ACP

List the avatar types more nicely, adding UCP modify user support

PHPBB3-10018
---
 phpBB/adm/style/acp_users_avatar.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 3d6754830b..c0ec9e5f8c 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -5,8 +5,8 @@
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
-			<!-- IF AVATAR --><dd><input type="submit" name="submit" id="delete" value="{LA_DELETE_AVATAR}" /></dd><!-- ENDIF -->
+			<dd>{AVATAR}</dd>
+			<!-- IF AV_SHOW_DELETE --><dd><input type="submit" name="av_delete" id="av_delete" value="{LA_DELETE_AVATAR}" class="button2" /></dd><!-- ENDIF -->
 		</dl>
 	</fieldset>
 	<!-- BEGIN avatar_drivers -->
@@ -16,8 +16,8 @@
 			{avatar_drivers.OUTPUT}
 		</fieldset>
 		<fieldset class="quick">
-			<input type="reset" value="{L_RESET}" name="reset" class="button2" /> &nbsp;
 			<input type="submit" name="submit_av_{avatar_drivers.DRIVER}" value="{L_SUBMIT}" class="button1" />
 		</fieldset>
 	<!-- END avatar_drivers -->
+	{S_FORM_TOKEN}
 	</form>
-- 
cgit v1.2.1


From d0bb14ded1960de47eb07d955a483d74fd9e0af2 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@cullenwalsh.com>
Date: Sat, 18 Jun 2011 22:05:54 -0700
Subject: [feature/avatars] Update ACP manage users, fix gallery focus issue

Updated ACP to match UCP with dropdown. Correctly determe which
avatar to focus on by checking if the form was submitted and
avatar_driver is set.

PHPBB3-10018
---
 phpBB/adm/style/acp_users_avatar.html | 56 ++++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 11 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index c0ec9e5f8c..6316ff4a22 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -6,18 +6,52 @@
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
-			<!-- IF AV_SHOW_DELETE --><dd><input type="submit" name="av_delete" id="av_delete" value="{LA_DELETE_AVATAR}" class="button2" /></dd><!-- ENDIF -->
 		</dl>
 	</fieldset>
-	<!-- BEGIN avatar_drivers -->
-		<fieldset>
-			<legend>{avatar_drivers.L_TITLE}</legend>
-			<p>{avatar_drivers.L_EXPLAIN}</p>
-			{avatar_drivers.OUTPUT}
-		</fieldset>
-		<fieldset class="quick">
-			<input type="submit" name="submit_av_{avatar_drivers.DRIVER}" value="{L_SUBMIT}" class="button1" />
-		</fieldset>
-	<!-- END avatar_drivers -->
+	<fieldset>
+		<legend>{L_AVATAR_SELECT_NEW}</legend>
+		<dl>
+			<dt><label>{L_AVATAR_TYPE}</label></dt>
+			<dd><select name="avatar_driver" id="avatar_driver">
+				<option value="">{L_NO_AVATAR}</option>
+				<!-- BEGIN avatar_drivers -->
+				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+				<!-- END avatar_drivers -->
+			</select></dd>
+		</dl>
+		<div id="av_options">
+		<!-- BEGIN avatar_drivers -->
+			<div id="av_option_{avatar_drivers.DRIVER}">
+				<p>{avatar_drivers.L_EXPLAIN}</p>
+				{avatar_drivers.OUTPUT}
+			</div>
+		<!-- END avatar_drivers -->
+		</div>
+	</fieldset>
+	<script type="text/javascript">
+		// <![CDATA[
+			function avatar_simplify() {
+				var node = document.getElementById('av_options');
+				for (var i = 0; i < node.children.length; i++) {
+					child = node.children[i];
+					child.style.display = 'none';
+				}
+
+				var selected = document.getElementById('avatar_driver').value;
+				var id = 'av_option_' + selected;
+				node = document.getElementById(id);
+				if (node != null) {
+					node.style.display = 'block';
+				}
+			}
+
+			avatar_simplify();
+			document.getElementById('avatar_driver').onchange = avatar_simplify;
+		// ]]>
+	</script>
+
+	<fieldset class="quick">
+		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
+	</fieldset>
 	{S_FORM_TOKEN}
 	</form>
-- 
cgit v1.2.1


From 8416bf3dc9539df19530e3bef85352d40ac795f2 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@cullenwalsh.com>
Date: Sat, 18 Jun 2011 23:49:04 -0700
Subject: [feature/avatars] Made ACP avatar gallery in Manage Users prettier

Added row/column information so avatars can be displayed nicely in
the ACP

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_local.html | 39 +++++++++++++++++----------
 1 file changed, 25 insertions(+), 14 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 0dd83db017..0a50a4eed4 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -1,14 +1,25 @@
-<label for="category">{L_AVATAR_CATEGORY}: <select name="av_local_cat" id="category">
-<option value="">{L_NO_AVATAR_CATEGORY}</option>
-<!-- BEGIN av_local_cats -->
-<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
-<!-- END av_local_cats -->
-</select></label>
-<input type="submit" value="{L_GO}" name="av_local_go" class="button2" />
-
-<div id="gallery">
-<!-- BEGIN av_local_imgs -->
-	<label for="av-{av_local_imgs.S_ROW_COUNT}"><img src="{av_local_imgs.AVATAR_IMAGE}" alt="" /><br />
-	<input type="radio" name="av_local_file" id="av-{av_local_imgs.S_ROW_COUNT}" value="{av_local_imgs.AVATAR_FILE}" /></label>
-<!-- END av_local_imgs -->
-</div>
+<dl>
+	<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
+	<dd><select name="av_local_cat" id="category">
+		<option value="">{L_NO_AVATAR_CATEGORY}</option>
+		<!-- BEGIN av_local_cats -->
+		<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
+		<!-- END av_local_cats -->
+	</select>&nbsp;<input type="submit" value="{L_GO}" name="av_local_go" class="button2" /></dd>
+</dl>
+<dl>
+	<table cellspacing="1">
+	<!-- BEGIN av_local_row -->
+	<tr>
+		<!-- BEGIN av_local_col -->
+			<td class="row1" style="text-align: center;"><img src="{av_local_row.av_local_col.AVATAR_IMAGE}" alt="{av_local_row.av_local_col.AVATAR_NAME}" title="{av_local_row.av_local_col.AVATAR_NAME}"/></td>
+		<!-- END av_local_col -->
+	</tr>
+	<tr>
+		<!-- BEGIN av_local_col -->
+			<td class="row2" style="text-align: center;"><input type="radio" name="av_local_file" id="av-{av_local_row.av_local_col.S_ROW_COUNT}" value="{av_local_row.av_local_col.AVATAR_FILE}" /></td>
+		<!-- END av_local_col -->
+	</tr>
+	<!-- END av_local_row -->
+	</table>
+</dl>
-- 
cgit v1.2.1


From 48e61b1b45655b38660740abb0de9704234af849 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@cullenwalsh.com>
Date: Mon, 4 Jul 2011 16:58:35 -0700
Subject: [feature/avatars] Support editing of group avatars in ACP

Edited templates for group avatars so they can be properly modified in ACP

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_local.html |  2 +
 phpBB/adm/style/acp_groups.html               | 98 +++++++++++----------------
 2 files changed, 41 insertions(+), 59 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 0a50a4eed4..d762fa9008 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -8,6 +8,7 @@
 	</select>&nbsp;<input type="submit" value="{L_GO}" name="av_local_go" class="button2" /></dd>
 </dl>
 <dl>
+	<!-- IF AV_LOCAL_SHOW -->
 	<table cellspacing="1">
 	<!-- BEGIN av_local_row -->
 	<tr>
@@ -22,4 +23,5 @@
 	</tr>
 	<!-- END av_local_row -->
 	</table>
+	<!-- ENDIF -->
 </dl>
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 158751623a..1c78c0c344 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -104,66 +104,46 @@
 		<legend>{L_GROUP_AVATAR}</legend>
 	<dl>
 		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd>{AVATAR_IMAGE}</dd>
-		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
+		<dd>{AVATAR}</dd>
 	</dl>
-	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_CAN_UPLOAD -->
-			<dl>
-				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-				<dd><input type="file" id="uploadfile" name="uploadfile" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-			<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-			<dd><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>{L_PIXEL} &times; </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>
-		</dl>
-		<!-- IF S_DISPLAY_GALLERY -->
-			<dl>
-				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
-				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_AVATAR_GALLERY}</legend>
-		<dl>
-			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
-			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-		</dl>
-		<dl>
-			<table cellspacing="1">
-			<!-- BEGIN avatar_row -->
-			<tr>
-				<!-- BEGIN avatar_column -->
-					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
-				<!-- END avatar_column -->
-			</tr>
-			<tr>
-				<!-- BEGIN avatar_option_column -->
-					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-				<!-- END avatar_option_column -->
-			</tr>
-			<!-- END avatar_row -->
-			</table>
-		</dl>
-		</fieldset>
-
-		<fieldset class="quick" style="margin-top: -15px;">
-			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-		</fieldset>
-
-	<!-- ENDIF -->
+	<dl>
+		<dt><label>{L_AVATAR_TYPE}</label></dt>
+		<dd><select name="avatar_driver" id="avatar_driver">
+			<option value="">{L_NO_AVATAR}</option>
+			<!-- BEGIN avatar_drivers -->
+			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+			<!-- END avatar_drivers -->
+		</select></dd>
+	</dl>
+	<div id="av_options">
+	<!-- BEGIN avatar_drivers -->
+	<div id="av_option_{avatar_drivers.DRIVER}">
+		<p>{avatar_drivers.L_EXPLAIN}</p>
+		{avatar_drivers.OUTPUT}
+	</div>
+	<!-- END avatar_drivers -->
+	</div>
+	<script type="text/javascript">
+		// <![CDATA[
+			function avatar_simplify() {
+				var node = document.getElementById('av_options');
+				for (var i = 0; i < node.children.length; i++) {
+					child = node.children[i];
+					child.style.display = 'none';
+				}
+
+				var selected = document.getElementById('avatar_driver').value;
+				var id = 'av_option_' + selected;
+				node = document.getElementById(id);
+				if (node != null) {
+					node.style.display = 'block';
+				}
+			}
+
+			avatar_simplify();
+			document.getElementById('avatar_driver').onchange = avatar_simplify;
+		// ]]>
+	</script>
 	</fieldset>
 
 	<fieldset class="submit-buttons">
-- 
cgit v1.2.1


From bb7a03f738c97dc225873691c459f2bf9e612ef6 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 27 Jul 2011 12:57:58 +0100
Subject: [ticket/10281] AJAXified reordering forums in the ACP.

PHPBB3-10281
---
 phpBB/adm/style/acp_forums.html     | 18 +++++++++---------
 phpBB/adm/style/overall_footer.html |  4 ++++
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 447c0ce466..b2b3ad6d40 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -443,7 +443,7 @@
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<tbody>
 		<!-- BEGIN forums -->
-			<tr>
+			<tr data-down="{forums.U_MOVE_DOWN}" data-up="{forums.U_MOVE_UP}">
 				<td style="width: 5%; text-align: center;">{forums.FOLDER_IMAGE}</td>
 				<td>
 					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
@@ -453,17 +453,17 @@
 				</td>
 				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
-						{ICON_MOVE_UP_DISABLED}
-						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+						<span class="up">{ICON_MOVE_UP_DISABLED}</span>
+						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="forum_down">{ICON_MOVE_DOWN}</a></span>
 					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
-						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="forum_up">{ICON_MOVE_UP}</a></span>
+						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="forum_down">{ICON_MOVE_DOWN}</a></span>
 					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
-						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-						{ICON_MOVE_DOWN_DISABLED}
+						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="forum_up">{ICON_MOVE_UP}</a></span>
+						<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 					<!-- ELSE -->
-						{ICON_MOVE_UP_DISABLED}
-						{ICON_MOVE_DOWN_DISABLED}
+						<span class="up">{ICON_MOVE_UP_DISABLED}</span>
+						<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 					<!-- ENDIF -->
 					<a href="{forums.U_EDIT}">{ICON_EDIT}</a>
 					<!-- IF not forums.S_FORUM_LINK -->
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index f05e9c56c5..3740122d9b 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -17,6 +17,10 @@
 			<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->
 			{DEBUG_OUTPUT}
 		<!-- ENDIF -->
+
+		<!-- tmp -->
+		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
+		<script src="../styles/script.js"></script>
 	</div>
 </div>
 
-- 
cgit v1.2.1


From 6efb9dd0b6e0119009d5b10d198722ba2b19f0e2 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 11:34:41 +0100
Subject: [ticket/10270] Added jQuery popup CSS to the ACP.

It was missing previously, meaning that it displayed wrong and in the
footer.

PHPBB3-10270
---
 phpBB/adm/style/admin.css | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index ceda824e5a..70c06f2d62 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1070,6 +1070,40 @@ input.disabled {
 	color: #666666;
 }
 
+/* jQuery popups
+---------------------------------------- */
+.jalert {
+	background-color: #FFFFFF;
+	border: 1px solid #999999;
+	position: fixed;
+	display: none;
+	top: 100px;
+	left: 35%;
+	width: 30%;
+	z-index: 50;
+	padding: 25px;
+	padding: 0 25px 20px 25px;
+}
+
+.jalert p {
+	margin: 8px 0;
+	padding-bottom: 8px;
+}
+
+#darkenwrapper {
+	display: none;
+}
+
+#darken {
+	position: fixed;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	background-color: #000000;
+	opacity: 0.5;
+}
+
 /* Pagination
 ---------------------------------------- */
 .pagination {
-- 
cgit v1.2.1


From 420de9c9a0a638135da147a498436dbe7abfd4bd Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 11:42:39 +0100
Subject: [ticket/10270] Moved some HTML from the JavaScript to overall_footer.

PHPBB3-10270
---
 phpBB/adm/style/overall_footer.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 3740122d9b..625121f1bd 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -18,6 +18,11 @@
 			{DEBUG_OUTPUT}
 		<!-- ENDIF -->
 
+		<div id="darkenwrapper">
+			<div id="darken">&nbsp;</div>
+			<div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
+		</div>
+
 		<!-- tmp -->
 		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
 		<script src="../styles/script.js"></script>
-- 
cgit v1.2.1


From 11112314f757f4a6c65852817fba0f1a2f4526d2 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 12:46:33 +0100
Subject: [ticket/10271] AJAXified various deletions in the ACP.

The following places have had deletion AJAXified:
* Smilies and icons
* Word censors
* BBCodes
* Attachment groups
* Groups
* Admin / User / Moderator / Forum roles
* Report / denial reasons
* Module management
* Custom profile fields

PHPBB3-10271
---
 phpBB/adm/style/acp_attachments.html      | 2 +-
 phpBB/adm/style/acp_bbcodes.html          | 2 +-
 phpBB/adm/style/acp_groups.html           | 2 +-
 phpBB/adm/style/acp_icons.html            | 2 +-
 phpBB/adm/style/acp_modules.html          | 2 +-
 phpBB/adm/style/acp_permission_roles.html | 2 +-
 phpBB/adm/style/acp_profile.html          | 4 ++--
 phpBB/adm/style/acp_ranks.html            | 2 +-
 phpBB/adm/style/acp_reasons.html          | 2 +-
 phpBB/adm/style/acp_words.html            | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 33ef8062a6..c2f8b34792 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -248,7 +248,7 @@
 					<!-- ELSE --><br /><span>&raquo; {L_ALLOWED_IN_PM_POST}</span><!-- ENDIF -->
 				</td>
 				<td>{groups.CATEGORY}</td>
-				<td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{groups.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
+				<td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{groups.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>&nbsp;</td>
 			</tr>
 		<!-- END groups -->
 		</tbody>
diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index b85e8eca81..5939af24ae 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -101,7 +101,7 @@
 	<!-- BEGIN bbcodes -->
 		<!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td>
-			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}">{ICON_DELETE}</a></td>
+			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a></td>
 		</tr>
 	<!-- BEGINELSE -->
 		<tr class="row3">
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 158751623a..ed94fa985e 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -350,7 +350,7 @@
 			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
 			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
 			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
-			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
+			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
 		</tr>
 		<!-- ENDIF -->
 	<!-- END groups -->
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index 85b5343666..a8864d42f7 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -245,7 +245,7 @@
 			<td style="text-align: right; white-space: nowrap;">
 				<!-- IF items.S_FIRST_ROW and not PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
 				<!-- IF items.S_LAST_ROW and not NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
-				&nbsp;<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}">{ICON_DELETE}</a>
+				&nbsp;<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
 			</td>
 		</tr>
 	<!-- BEGINELSE -->
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index 3f1c0bf50b..6c4645e80c 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -164,7 +164,7 @@
 						{ICON_MOVE_DOWN_DISABLED}
 					<!-- ENDIF -->
 					<a href="{modules.U_EDIT}">{ICON_EDIT}</a> 
-					<a href="{modules.U_DELETE}">{ICON_DELETE}</a>
+					<a href="{modules.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
 				</td>
 			</tr>
 		<!-- END modules -->
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index 658d8dd0c8..2ac77af25d 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -174,7 +174,7 @@
 				{ICON_MOVE_DOWN_DISABLED}
 			<!-- ENDIF -->	
 			<a href="{roles.U_EDIT}" title="{L_EDIT_ROLE}">{ICON_EDIT}</a> 
-			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}">{ICON_DELETE}</a>
+			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}" data-ajax="row_delete">{ICON_DELETE}</a>
 		</td>
 	</tr>
 	<!-- END roles -->
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 0ac0d78a64..7804533d1a 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -195,7 +195,7 @@
 
 		<td>{fields.FIELD_IDENT}</td>
 		<td>{fields.FIELD_TYPE}</td>
-		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>
+		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}" data-ajax="style_act_deact">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>
 
 		<td style="width: 80px; text-align: right; white-space: nowrap;">
 			<!-- IF fields.S_FIRST_ROW && not fields.S_LAST_ROW -->
@@ -213,7 +213,7 @@
 			<!-- ELSE -->
 				{ICON_EDIT_DISABLED}
 			<!-- ENDIF -->
-			<a href="{fields.U_DELETE}">{ICON_DELETE}</a>
+			<a href="{fields.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
 		</td>
 
 	</tr>
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index 2f77a256b1..7fb7da7095 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -80,7 +80,7 @@
 		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
 		<td style="text-align: center;">{ranks.RANK_TITLE}</td>
 		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->&nbsp; - &nbsp;<!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td>
-		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}">{ICON_DELETE}</a></td>
+		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a></td>
 	</tr>
 	<!-- END ranks -->
 	</tbody>
diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html
index 522aec5930..7cf2cce4c9 100644
--- a/phpBB/adm/style/acp_reasons.html
+++ b/phpBB/adm/style/acp_reasons.html
@@ -99,7 +99,7 @@
 					<!-- ENDIF -->
 					<a href="{reasons.U_EDIT}">{ICON_EDIT}</a> 
 					<!-- IF reasons.U_DELETE -->
-						<a href="{reasons.U_DELETE}">{ICON_DELETE}</a>
+						<a href="{reasons.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
 					<!-- ELSE -->
 						{ICON_DELETE_DISABLED}
 					<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html
index 113f58ef92..4acd75f933 100644
--- a/phpBB/adm/style/acp_words.html
+++ b/phpBB/adm/style/acp_words.html
@@ -60,7 +60,7 @@
 		<!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td style="text-align: center;">{words.WORD}</td>
 		<td style="text-align: center;">{words.REPLACEMENT}</td>
-		<td>&nbsp;<a href="{words.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{words.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
+		<td>&nbsp;<a href="{words.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{words.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>&nbsp;</td>
 	</tr>
 	<!-- BEGINELSE -->
 	<tr class="row3">
-- 
cgit v1.2.1


From 1cb3b595ec70730429a9c8654b248fc6d50cf1b3 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 15:45:51 +0100
Subject: [ticket/10271] AJAXified the styles tab in the ACP.

PHPBB3-10271
---
 phpBB/adm/style/acp_styles.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index dc89aa247a..dfc8def646 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -288,7 +288,7 @@
 		</td>
 		<td style="text-align: center;">
 			<!-- IF S_STYLE -->
-				<a href="{installed.U_STYLE_ACT_DEACT}">{installed.L_STYLE_ACT_DEACT}</a> |
+				<a href="{installed.U_STYLE_ACT_DEACT}" data-ajax="style_act_deact">{installed.L_STYLE_ACT_DEACT}</a> |
 			<!-- ENDIF -->
 			{installed.S_ACTIONS}
 			<!-- IF S_STYLE -->
-- 
cgit v1.2.1


From 4ae74cd4b450ae4cca956f6f3e2371429f67deec Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 16:06:06 +0100
Subject: [ticket/10271] AJAXified buttons on acp_main.

PHPBB3-10271
---
 phpBB/adm/style/acp_main.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 63ca3a1c79..d9f833d878 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -152,35 +152,35 @@
 		<fieldset>
 			<legend>{L_STATISTIC_RESYNC_OPTIONS}</legend>
 
-			<form id="action_online_form" method="post" action="{U_ACTION}">
+			<form id="action_online_form" method="post" action="{U_ACTION}" data-ajax="true">
 				<dl>
 					<dt><label for="action_online">{L_RESET_ONLINE}</label><br /><span>&nbsp;</span></dt>
 					<dd><input type="hidden" name="action" value="online" /><input class="button2" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
 
-			<form id="action_date_form" method="post" action="{U_ACTION}">
+			<form id="action_date_form" method="post" action="{U_ACTION}" data-ajax="true">
 				<dl>
 					<dt><label for="action_date">{L_RESET_DATE}</label><br /><span>&nbsp;</span></dt>
 					<dd><input type="hidden" name="action" value="date" /><input class="button2" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
 
-			<form id="action_stats_form" method="post" action="{U_ACTION}">
+			<form id="action_stats_form" method="post" action="{U_ACTION}" data-ajax="true">
 				<dl>
 					<dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_STATS_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
 
-			<form id="action_user_form" method="post" action="{U_ACTION}">
+			<form id="action_user_form" method="post" action="{U_ACTION}" data-ajax="true">
 				<dl>
 					<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
 
-			<form id="action_db_track_form" method="post" action="{U_ACTION}">
+			<form id="action_db_track_form" method="post" action="{U_ACTION}" data-ajax="true">
 				<dl>
 					<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="db_track" /><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd>
@@ -188,7 +188,7 @@
 			</form>
 
 			<!-- IF S_FOUNDER -->
-			<form id="action_purge_sessions_form" method="post" action="{U_ACTION}">
+			<form id="action_purge_sessions_form" method="post" action="{U_ACTION}" data-ajax="true">
 				<dl>
 					<dt><label for="action_purge_sessions">{L_PURGE_SESSIONS}</label><br /><span>{L_PURGE_SESSIONS_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="purge_sessions" /><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd>
@@ -196,7 +196,7 @@
 			</form>
 			<!-- ENDIF -->
 
-			<form id="action_purge_cache_form" method="post" action="{U_ACTION}">
+			<form id="action_purge_cache_form" method="post" action="{U_ACTION}" data-ajax="true">
 				<dl>
 					<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
-- 
cgit v1.2.1


From e7e09f8da26abf0d4e625653d14d68774050a244 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 16:39:25 +0100
Subject: [ticket/10272] AJAXified the bots page in the ACP.

PHPBB3-10272
---
 phpBB/adm/style/acp_bots.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
index 886005caa3..e0e9588364 100644
--- a/phpBB/adm/style/acp_bots.html
+++ b/phpBB/adm/style/acp_bots.html
@@ -76,9 +76,9 @@
 		<!-- IF bots.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td style="width: 50%;">{bots.BOT_NAME}</td>
 			<td style="width: 15%; white-space: nowrap;" align="center">&nbsp;{bots.LAST_VISIT}&nbsp;</td>
-			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
+			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}" data-ajax="style_act_deact">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_EDIT}">{L_EDIT}</a>&nbsp;</td>
-			<td style="text-align: center;">&nbsp;<a href="{bots.U_DELETE}">{L_DELETE}</a>&nbsp;</td>
+			<td style="text-align: center;">&nbsp;<a href="{bots.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a>&nbsp;</td>
 			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{bots.BOT_ID}" /></td>
 		</tr>
 	<!-- END bots -->
-- 
cgit v1.2.1


From bcb824a9f2407523c84501ac1d4260bb27661ff1 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 16:59:05 +0100
Subject: [ticket/10272] Renamed AJAX callback "style_act_deact" to
 "act_deact".

PHPBB3-10272
---
 phpBB/adm/style/acp_bots.html    | 2 +-
 phpBB/adm/style/acp_modules.html | 2 +-
 phpBB/adm/style/acp_profile.html | 2 +-
 phpBB/adm/style/acp_styles.html  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
index e0e9588364..3a5ef72acd 100644
--- a/phpBB/adm/style/acp_bots.html
+++ b/phpBB/adm/style/acp_bots.html
@@ -76,7 +76,7 @@
 		<!-- IF bots.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td style="width: 50%;">{bots.BOT_NAME}</td>
 			<td style="width: 15%; white-space: nowrap;" align="center">&nbsp;{bots.LAST_VISIT}&nbsp;</td>
-			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}" data-ajax="style_act_deact">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
+			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}" data-ajax="act_deact">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_EDIT}">{L_EDIT}</a>&nbsp;</td>
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a>&nbsp;</td>
 			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{bots.BOT_ID}" /></td>
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index 6c4645e80c..380a037977 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -148,7 +148,7 @@
 			<tr>
 				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
 				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
-				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
+				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}" data-ajax="act-deact">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}" data-ajax="act-deact">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
 				<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;">
 					<!-- IF modules.S_FIRST_ROW && not modules.S_LAST_ROW -->
 						{ICON_MOVE_UP_DISABLED}
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 7804533d1a..d0920774f1 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -195,7 +195,7 @@
 
 		<td>{fields.FIELD_IDENT}</td>
 		<td>{fields.FIELD_TYPE}</td>
-		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}" data-ajax="style_act_deact">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>
+		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}" data-ajax="act_deact">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>
 
 		<td style="width: 80px; text-align: right; white-space: nowrap;">
 			<!-- IF fields.S_FIRST_ROW && not fields.S_LAST_ROW -->
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index dfc8def646..0b98dea603 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -288,7 +288,7 @@
 		</td>
 		<td style="text-align: center;">
 			<!-- IF S_STYLE -->
-				<a href="{installed.U_STYLE_ACT_DEACT}" data-ajax="style_act_deact">{installed.L_STYLE_ACT_DEACT}</a> |
+				<a href="{installed.U_STYLE_ACT_DEACT}" data-ajax="act_deact">{installed.L_STYLE_ACT_DEACT}</a> |
 			<!-- ENDIF -->
 			{installed.S_ACTIONS}
 			<!-- IF S_STYLE -->
-- 
cgit v1.2.1


From 431a78f34696707973f1c67f4417d6ee85713ee6 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sun, 11 Sep 2011 15:42:00 +0100
Subject: [ticket/10270] Got rid of the temporary jQuery for the AJAX changes.

The jQuery library wasn't included before, so a temporary one was
included. Now that igorws jQuery patch has been merged, the temporary
library can be removed.

PHPBB3-10270
---
 phpBB/adm/style/overall_footer.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 625121f1bd..ec3e6a30d3 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -22,15 +22,12 @@
 			<div id="darken">&nbsp;</div>
 			<div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
 		</div>
-
-		<!-- tmp -->
-		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
-		<script src="../styles/script.js"></script>
 	</div>
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><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 -->
+<script type="text/javascript" src="../styles/script.js"></script>
 
 </body>
 </html>
-- 
cgit v1.2.1


From 818d98916873945d7e0e7bf2855e982496c7fe35 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sat, 24 Sep 2011 17:41:58 +0100
Subject: [feature/ajax] Moved script.js into a few different files.

Seperated it into: assets/javascript/core.js,
styles/prosilver/template/ajax.js and adm/style/ajax.js.

PHPBB3-10270
---
 phpBB/adm/style/ajax.js             | 61 +++++++++++++++++++++++++++++++++++++
 phpBB/adm/style/overall_footer.html |  3 +-
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/adm/style/ajax.js

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
new file mode 100644
index 0000000000..407ef92110
--- /dev/null
+++ b/phpBB/adm/style/ajax.js
@@ -0,0 +1,61 @@
+(function($) {  // Avoid conflicts with other libraries
+
+
+
+phpbb.add_ajax_callback('forum_down', function(el) {
+	var tr = $(el).parents('tr');
+	if (tr.is(':first-child'))
+	{
+		$(el).parents('span').siblings('.up').html('<a href="' + tr.data('up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
+		tr.next().find('.up').html('<img src="./images/icon_up_disabled.gif" alt="Move up" title="Move up" />');
+		phpbb.ajaxify({selector: $(el).parents('span').siblings('.up').children('a')}, false, 'forum_up');
+	}
+	tr.insertAfter(tr.next());
+	if (tr.is(':last-child'))
+	{
+		$(el).html('<img src="./images/icon_down_disabled.gif" alt="Move down" title="Move down" />');
+		tr.prev().find('.down').html('<a href="' + tr.data('down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
+		phpbb.ajaxify({selector: tr.prev().find('.down').children('a')}, false, 'forum_down');
+	}
+}).add_ajax_callback('forum_up', function(el) {
+	var tr = $(el).parents('tr');
+	if (tr.is(':last-child'))
+	{
+		$(el).parents('span').siblings('.down').html('<a href="' + tr.data('down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
+		tr.prev().find('.down').html('<img src="./images/icon_down_disabled.gif" alt="Move down" title="Move down" />');
+		phpbb.ajaxify({selector: $(el).parents('span').siblings('.down').children('a')}, false, 'forum_down');
+	}
+	tr.insertBefore(tr.prev());
+	if (tr.is(':first-child'))
+	{
+		$(el).html('<img src="./images/icon_up_disabled.gif" alt="Move up" title="Move up" />');
+		tr.next().find('.up').html('<a href="' + tr.data('up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
+		phpbb.ajaxify({selector: tr.next().find('.up').children('a')}, false, 'forum_up');
+	}
+}).add_ajax_callback('act_deact', function(el, res) {
+	$(el).text(res.text);
+	var new_href = $(el).attr('href');
+	if (new_href.indexOf('deactivate') !== -1)
+	{
+		new_href = new_href.replace('deactivate', 'activate')
+	}
+	else
+	{
+		new_href = new_href.replace('activate', 'deactivate')
+	}
+	$(el).attr('href', new_href);
+}).add_ajax_callback('row_delete', function(el) {
+	var tr = $(el).parents('tr');
+	tr.remove();
+});
+
+
+
+$('[data-ajax]').each(function() {
+	var fn = ($(this).data('ajax') !== 'true') ? $(this).data('ajax') : null;
+	phpbb.ajaxify({selector: this}, $(this).data('refresh') !== undefined, fn);
+});
+
+
+
+})(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index ec3e6a30d3..b57f8261a3 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -27,7 +27,8 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><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 -->
-<script type="text/javascript" src="../styles/script.js"></script>
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js"></script>
+<script type="text/javascript" src="style/ajax.js"></script>
 
 </body>
 </html>
-- 
cgit v1.2.1


From 5b2352613ef8e2bdc4e418b74ea650df825b829c Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 28 Sep 2011 18:48:46 +0100
Subject: [ticket/10270] Added the alerts to the ACP footer.

I had forgotten to do it previously.

PHPBB3-10270
---
 phpBB/adm/style/overall_footer.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index b57f8261a3..e54f75a813 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -22,6 +22,17 @@
 			<div id="darken">&nbsp;</div>
 			<div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
 		</div>
+
+		<div id="phpbb_alert" class="phpbb_alert">
+			<a href="#"><img src="{T_THEME_PATH}/images/alert_close.png" class="alert_close" /></a>
+			<h3></h3><p></p>
+		</div>
+		<div id="phpbb_confirm" class="phpbb_alert">
+			<a href="#"><img src="{T_THEME_PATH}/images/alert_close.png" class="alert_close" /></a>
+			<p></p>
+			<input type="button" class="button1" value="{L_YES}" />&nbsp;
+			<input type="button" class="button2" value="{L_NO}" />
+		</div>
 	</div>
 </div>
 
-- 
cgit v1.2.1


From 3166cbb33d5ce44fff380d53c4c51ba5f6a2224a Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sat, 15 Oct 2011 16:21:40 +0100
Subject: [ticket/10270] Replaced find by tag names with class names in the js.

What it was before (selecting by tag name) could have caused some
problems for style authors.

PHPBB3-10270
---
 phpBB/adm/style/overall_footer.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index e54f75a813..d58ac06aaa 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -25,11 +25,11 @@
 
 		<div id="phpbb_alert" class="phpbb_alert">
 			<a href="#"><img src="{T_THEME_PATH}/images/alert_close.png" class="alert_close" /></a>
-			<h3></h3><p></p>
+			<h3 class="alert_title"></h3><p class="alert_text"></p>
 		</div>
 		<div id="phpbb_confirm" class="phpbb_alert">
 			<a href="#"><img src="{T_THEME_PATH}/images/alert_close.png" class="alert_close" /></a>
-			<p></p>
+			<p class="alert_text"></p>
 			<input type="button" class="button1" value="{L_YES}" />&nbsp;
 			<input type="button" class="button2" value="{L_NO}" />
 		</div>
-- 
cgit v1.2.1


From 1c5b1ede1c35d57e9abfb62bdee145828011b1b0 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sat, 22 Oct 2011 16:16:15 +0100
Subject: [ticket/10271] Added comments to AJAX callbacks.

PHPBB3-10271
---
 phpBB/adm/style/ajax.js | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 407ef92110..1c315eeeff 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -1,7 +1,12 @@
 (function($) {  // Avoid conflicts with other libraries
 
 
-
+/**
+ * The following callbacks are  for reording forums in acp_forums. forum_down
+ * is triggered when a forum is moved down, and forum_up is triggered when
+ * a forum is moved up. It moves the row up or down, and deactivates /
+ * activates any up / down icons that require it (the ones at the top or bottom).
+ */
 phpbb.add_ajax_callback('forum_down', function(el) {
 	var tr = $(el).parents('tr');
 	if (tr.is(':first-child'))
@@ -32,7 +37,14 @@ phpbb.add_ajax_callback('forum_down', function(el) {
 		tr.next().find('.up').html('<a href="' + tr.data('up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
 		phpbb.ajaxify({selector: tr.next().find('.up').children('a')}, false, 'forum_up');
 	}
-}).add_ajax_callback('act_deact', function(el, res) {
+});
+
+/**
+ * This callback replaces activate links with deactivate links and vice versa.
+ * It does this by replacing the text, and replacing all instances of "activate"
+ * in the href with "deactivate", and vice versa.
+ */
+phpbb.add_ajax_callback('act_deact', function(el, res) {
 	$(el).text(res.text);
 	var new_href = $(el).attr('href');
 	if (new_href.indexOf('deactivate') !== -1)
@@ -44,7 +56,13 @@ phpbb.add_ajax_callback('forum_down', function(el) {
 		new_href = new_href.replace('activate', 'deactivate')
 	}
 	$(el).attr('href', new_href);
-}).add_ajax_callback('row_delete', function(el) {
+});
+
+/**
+ * The removes the parent row of the link or form that triggered the callback,
+ * and is good for stuff like the removal of forums.
+ */
+phpbb.add_ajax_callback('row_delete', function(el) {
 	var tr = $(el).parents('tr');
 	tr.remove();
 });
-- 
cgit v1.2.1


From 95659ba92c01a3cf4c654568e9a59ba554558a7e Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sat, 22 Oct 2011 16:31:52 +0100
Subject: [ticket/10271] Reduced calls to $ in the AJAX JavaScript.

PHPBB3-10271
---
 phpBB/adm/style/ajax.js | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 1c315eeeff..2fdabd2a80 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -8,32 +8,34 @@
  * activates any up / down icons that require it (the ones at the top or bottom).
  */
 phpbb.add_ajax_callback('forum_down', function(el) {
-	var tr = $(el).parents('tr');
+	el = $(el);
+	var tr = el.parents('tr');
 	if (tr.is(':first-child'))
 	{
-		$(el).parents('span').siblings('.up').html('<a href="' + tr.data('up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
+		el.parents('span').siblings('.up').html('<a href="' + tr.data('up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
 		tr.next().find('.up').html('<img src="./images/icon_up_disabled.gif" alt="Move up" title="Move up" />');
-		phpbb.ajaxify({selector: $(el).parents('span').siblings('.up').children('a')}, false, 'forum_up');
+		phpbb.ajaxify({selector: el.parents('span').siblings('.up').children('a')}, false, 'forum_up');
 	}
 	tr.insertAfter(tr.next());
 	if (tr.is(':last-child'))
 	{
-		$(el).html('<img src="./images/icon_down_disabled.gif" alt="Move down" title="Move down" />');
+		el.html('<img src="./images/icon_down_disabled.gif" alt="Move down" title="Move down" />');
 		tr.prev().find('.down').html('<a href="' + tr.data('down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
 		phpbb.ajaxify({selector: tr.prev().find('.down').children('a')}, false, 'forum_down');
 	}
 }).add_ajax_callback('forum_up', function(el) {
-	var tr = $(el).parents('tr');
+	el = $(el);
+	var tr = el.parents('tr');
 	if (tr.is(':last-child'))
 	{
-		$(el).parents('span').siblings('.down').html('<a href="' + tr.data('down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
+		el.parents('span').siblings('.down').html('<a href="' + tr.data('down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
 		tr.prev().find('.down').html('<img src="./images/icon_down_disabled.gif" alt="Move down" title="Move down" />');
-		phpbb.ajaxify({selector: $(el).parents('span').siblings('.down').children('a')}, false, 'forum_down');
+		phpbb.ajaxify({selector: el.parents('span').siblings('.down').children('a')}, false, 'forum_down');
 	}
 	tr.insertBefore(tr.prev());
 	if (tr.is(':first-child'))
 	{
-		$(el).html('<img src="./images/icon_up_disabled.gif" alt="Move up" title="Move up" />');
+		el.html('<img src="./images/icon_up_disabled.gif" alt="Move up" title="Move up" />');
 		tr.next().find('.up').html('<a href="' + tr.data('up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
 		phpbb.ajaxify({selector: tr.next().find('.up').children('a')}, false, 'forum_up');
 	}
@@ -45,8 +47,9 @@ phpbb.add_ajax_callback('forum_down', function(el) {
  * in the href with "deactivate", and vice versa.
  */
 phpbb.add_ajax_callback('act_deact', function(el, res) {
-	$(el).text(res.text);
-	var new_href = $(el).attr('href');
+	el = $(el);
+	el.text(res.text);
+	var new_href = el.attr('href');
 	if (new_href.indexOf('deactivate') !== -1)
 	{
 		new_href = new_href.replace('deactivate', 'activate')
@@ -55,7 +58,7 @@ phpbb.add_ajax_callback('act_deact', function(el, res) {
 	{
 		new_href = new_href.replace('activate', 'deactivate')
 	}
-	$(el).attr('href', new_href);
+	el.attr('href', new_href);
 });
 
 /**
@@ -70,8 +73,9 @@ phpbb.add_ajax_callback('row_delete', function(el) {
 
 
 $('[data-ajax]').each(function() {
-	var fn = ($(this).data('ajax') !== 'true') ? $(this).data('ajax') : null;
-	phpbb.ajaxify({selector: this}, $(this).data('refresh') !== undefined, fn);
+	var $this = $(this);
+	var fn = ($this.data('ajax') !== 'true') ? $this.data('ajax') : null;
+	phpbb.ajaxify({selector: this}, $this.data('refresh') !== undefined, fn);
 });
 
 
-- 
cgit v1.2.1


From 81200236052333f88bbf6ecf0c2198080481c07a Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sat, 22 Oct 2011 16:37:35 +0100
Subject: [ticket/10271] data-ajax="false" is now ignored.

PHPBB3-10271
---
 phpBB/adm/style/ajax.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 2fdabd2a80..cb3289b936 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -74,8 +74,11 @@ phpbb.add_ajax_callback('row_delete', function(el) {
 
 $('[data-ajax]').each(function() {
 	var $this = $(this);
-	var fn = ($this.data('ajax') !== 'true') ? $this.data('ajax') : null;
-	phpbb.ajaxify({selector: this}, $this.data('refresh') !== undefined, fn);
+	if ($this.data('ajax') !== 'false')
+	{
+		var fn = ($this.data('ajax') !== 'true') ? $this.data('ajax') : null;
+		phpbb.ajaxify({selector: this}, $this.data('refresh') !== undefined, fn);
+	}
 });
 
 
-- 
cgit v1.2.1


From 03d4ae20d1fc98b43edfdf26ae2a2379e52b3182 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sat, 22 Oct 2011 17:18:09 +0100
Subject: [ticket/10271] Started using .call for javascript callbacks.

Previously, they were just being called by appending parentheses and
functions. Now, they're being called and the element is being set as the
context instead of a parameter. It's a lot cleaner.

PHPBB3-10271
---
 phpBB/adm/style/ajax.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index cb3289b936..869126ab76 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -7,8 +7,8 @@
  * a forum is moved up. It moves the row up or down, and deactivates /
  * activates any up / down icons that require it (the ones at the top or bottom).
  */
-phpbb.add_ajax_callback('forum_down', function(el) {
-	el = $(el);
+phpbb.add_ajax_callback('forum_down', function() {
+	el = $(this);
 	var tr = el.parents('tr');
 	if (tr.is(':first-child'))
 	{
@@ -23,8 +23,8 @@ phpbb.add_ajax_callback('forum_down', function(el) {
 		tr.prev().find('.down').html('<a href="' + tr.data('down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
 		phpbb.ajaxify({selector: tr.prev().find('.down').children('a')}, false, 'forum_down');
 	}
-}).add_ajax_callback('forum_up', function(el) {
-	el = $(el);
+}).add_ajax_callback('forum_up', function() {
+	el = $(this);
 	var tr = el.parents('tr');
 	if (tr.is(':last-child'))
 	{
@@ -46,8 +46,8 @@ phpbb.add_ajax_callback('forum_down', function(el) {
  * It does this by replacing the text, and replacing all instances of "activate"
  * in the href with "deactivate", and vice versa.
  */
-phpbb.add_ajax_callback('act_deact', function(el, res) {
-	el = $(el);
+phpbb.add_ajax_callback('act_deact', function(res) {
+	el = $(this);
 	el.text(res.text);
 	var new_href = el.attr('href');
 	if (new_href.indexOf('deactivate') !== -1)
@@ -65,9 +65,8 @@ phpbb.add_ajax_callback('act_deact', function(el, res) {
  * The removes the parent row of the link or form that triggered the callback,
  * and is good for stuff like the removal of forums.
  */
-phpbb.add_ajax_callback('row_delete', function(el) {
-	var tr = $(el).parents('tr');
-	tr.remove();
+phpbb.add_ajax_callback('row_delete', function() {
+	$(this).parents('tr').remove();
 });
 
 
-- 
cgit v1.2.1


From 885c2914db51f0ed8157d9e43333d89dcfdb0153 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sat, 22 Oct 2011 22:48:05 +0100
Subject: [ticket/10270] Fixed JavaScript alerts in the ACP.

PHPBB3-10270
---
 phpBB/adm/style/admin.css           | 10 ++++++++--
 phpBB/adm/style/overall_footer.html |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 70c06f2d62..01af071766 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1072,7 +1072,7 @@ input.disabled {
 
 /* jQuery popups
 ---------------------------------------- */
-.jalert {
+.phpbb_alert {
 	background-color: #FFFFFF;
 	border: 1px solid #999999;
 	position: fixed;
@@ -1085,7 +1085,13 @@ input.disabled {
 	padding: 0 25px 20px 25px;
 }
 
-.jalert p {
+.phpbb_alert img.alert_close {
+	float: right;
+	margin-top: -7px;
+	margin-right: -30px;
+}
+
+.phpbb_alert p {
 	margin: 8px 0;
 	padding-bottom: 8px;
 }
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index d58ac06aaa..5daaa4c6db 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -24,11 +24,11 @@
 		</div>
 
 		<div id="phpbb_alert" class="phpbb_alert">
-			<a href="#"><img src="{T_THEME_PATH}/images/alert_close.png" class="alert_close" /></a>
+			<a href="#"><img src="images/alert_close.png" class="alert_close" /></a>
 			<h3 class="alert_title"></h3><p class="alert_text"></p>
 		</div>
 		<div id="phpbb_confirm" class="phpbb_alert">
-			<a href="#"><img src="{T_THEME_PATH}/images/alert_close.png" class="alert_close" /></a>
+			<a href="#"><img src="images/alert_close.png" class="alert_close" /></a>
 			<p class="alert_text"></p>
 			<input type="button" class="button1" value="{L_YES}" />&nbsp;
 			<input type="button" class="button2" value="{L_NO}" />
-- 
cgit v1.2.1


From 05a88966d4d7156417c151d657989dca4ae01b87 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Thu, 17 Nov 2011 17:37:51 +0000
Subject: [ticket/10272] Renamed AJAX callback act_deact to
 activate_deactivate.

PHPBB3-10272
---
 phpBB/adm/style/acp_bots.html    | 2 +-
 phpBB/adm/style/acp_profile.html | 2 +-
 phpBB/adm/style/acp_styles.html  | 2 +-
 phpBB/adm/style/ajax.js          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
index 3a5ef72acd..87679fc33a 100644
--- a/phpBB/adm/style/acp_bots.html
+++ b/phpBB/adm/style/acp_bots.html
@@ -76,7 +76,7 @@
 		<!-- IF bots.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td style="width: 50%;">{bots.BOT_NAME}</td>
 			<td style="width: 15%; white-space: nowrap;" align="center">&nbsp;{bots.LAST_VISIT}&nbsp;</td>
-			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}" data-ajax="act_deact">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
+			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}" data-ajax="activate_deactivate">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_EDIT}">{L_EDIT}</a>&nbsp;</td>
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a>&nbsp;</td>
 			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{bots.BOT_ID}" /></td>
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index d0920774f1..4a6df768a8 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -195,7 +195,7 @@
 
 		<td>{fields.FIELD_IDENT}</td>
 		<td>{fields.FIELD_TYPE}</td>
-		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}" data-ajax="act_deact">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>
+		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}" data-ajax="activate_deactivate">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>
 
 		<td style="width: 80px; text-align: right; white-space: nowrap;">
 			<!-- IF fields.S_FIRST_ROW && not fields.S_LAST_ROW -->
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 0b98dea603..a166623f89 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -288,7 +288,7 @@
 		</td>
 		<td style="text-align: center;">
 			<!-- IF S_STYLE -->
-				<a href="{installed.U_STYLE_ACT_DEACT}" data-ajax="act_deact">{installed.L_STYLE_ACT_DEACT}</a> |
+				<a href="{installed.U_STYLE_ACT_DEACT}" data-ajax="activate_deactive">{installed.L_STYLE_ACT_DEACT}</a> |
 			<!-- ENDIF -->
 			{installed.S_ACTIONS}
 			<!-- IF S_STYLE -->
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 869126ab76..88c28fe071 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -46,7 +46,7 @@ phpbb.add_ajax_callback('forum_down', function() {
  * It does this by replacing the text, and replacing all instances of "activate"
  * in the href with "deactivate", and vice versa.
  */
-phpbb.add_ajax_callback('act_deact', function(res) {
+phpbb.add_ajax_callback('activate_deactivate', function(res) {
 	el = $(this);
 	el.text(res.text);
 	var new_href = el.attr('href');
-- 
cgit v1.2.1


From 2189efadc624deb515df1ba04c232724a2f8eae3 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Fri, 18 Nov 2011 17:31:10 +0000
Subject: [ticket/10270] Moved the AJAX error langyage entries to the footer.

PHPBB3-10270
---
 phpBB/adm/style/overall_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 5daaa4c6db..549b6995af 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -23,7 +23,7 @@
 			<div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
 		</div>
 
-		<div id="phpbb_alert" class="phpbb_alert">
+		<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
 			<a href="#"><img src="images/alert_close.png" class="alert_close" /></a>
 			<h3 class="alert_title"></h3><p class="alert_text"></p>
 		</div>
-- 
cgit v1.2.1


From 81e357beef9e1e82607e59d59deba1cf54af4257 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Fri, 18 Nov 2011 17:33:22 +0000
Subject: [ticket/10272] Removed some duplication calls to $.fn.data.

PHPBB3-10272
---
 phpBB/adm/style/ajax.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 88c28fe071..902e072dda 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -72,10 +72,10 @@ phpbb.add_ajax_callback('row_delete', function() {
 
 
 $('[data-ajax]').each(function() {
-	var $this = $(this);
-	if ($this.data('ajax') !== 'false')
+	var $this = $(this), ajax = $this.data('ajax');
+	if (ajax !== 'false')
 	{
-		var fn = ($this.data('ajax') !== 'true') ? $this.data('ajax') : null;
+		var fn = (ajax !== 'true') ? ajax : null;
 		phpbb.ajaxify({selector: this}, $this.data('refresh') !== undefined, fn);
 	}
 });
-- 
cgit v1.2.1


From 30888ff2a009fe5a001046484d5df4b6e2c67ac8 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 8 Feb 2012 18:42:21 +0100
Subject: [feature/ajax] Use attr('data-foo') instead of data('foo')

data() is slower and does additional unwanted things like
caching and type conversion. Just reading the value is safer.

PHPBB3-10270
---
 phpBB/adm/style/ajax.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 902e072dda..50477eef90 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -12,7 +12,7 @@ phpbb.add_ajax_callback('forum_down', function() {
 	var tr = el.parents('tr');
 	if (tr.is(':first-child'))
 	{
-		el.parents('span').siblings('.up').html('<a href="' + tr.data('up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
+		el.parents('span').siblings('.up').html('<a href="' + tr.attr('data-up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
 		tr.next().find('.up').html('<img src="./images/icon_up_disabled.gif" alt="Move up" title="Move up" />');
 		phpbb.ajaxify({selector: el.parents('span').siblings('.up').children('a')}, false, 'forum_up');
 	}
@@ -20,7 +20,7 @@ phpbb.add_ajax_callback('forum_down', function() {
 	if (tr.is(':last-child'))
 	{
 		el.html('<img src="./images/icon_down_disabled.gif" alt="Move down" title="Move down" />');
-		tr.prev().find('.down').html('<a href="' + tr.data('down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
+		tr.prev().find('.down').html('<a href="' + tr.attr('data-down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
 		phpbb.ajaxify({selector: tr.prev().find('.down').children('a')}, false, 'forum_down');
 	}
 }).add_ajax_callback('forum_up', function() {
@@ -28,7 +28,7 @@ phpbb.add_ajax_callback('forum_down', function() {
 	var tr = el.parents('tr');
 	if (tr.is(':last-child'))
 	{
-		el.parents('span').siblings('.down').html('<a href="' + tr.data('down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
+		el.parents('span').siblings('.down').html('<a href="' + tr.attr('data-down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
 		tr.prev().find('.down').html('<img src="./images/icon_down_disabled.gif" alt="Move down" title="Move down" />');
 		phpbb.ajaxify({selector: el.parents('span').siblings('.down').children('a')}, false, 'forum_down');
 	}
@@ -36,7 +36,7 @@ phpbb.add_ajax_callback('forum_down', function() {
 	if (tr.is(':first-child'))
 	{
 		el.html('<img src="./images/icon_up_disabled.gif" alt="Move up" title="Move up" />');
-		tr.next().find('.up').html('<a href="' + tr.data('up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
+		tr.next().find('.up').html('<a href="' + tr.attr('data-up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
 		phpbb.ajaxify({selector: tr.next().find('.up').children('a')}, false, 'forum_up');
 	}
 });
@@ -72,11 +72,11 @@ phpbb.add_ajax_callback('row_delete', function() {
 
 
 $('[data-ajax]').each(function() {
-	var $this = $(this), ajax = $this.data('ajax');
+	var $this = $(this), ajax = $this.attr('data-ajax');
 	if (ajax !== 'false')
 	{
 		var fn = (ajax !== 'true') ? ajax : null;
-		phpbb.ajaxify({selector: this}, $this.data('refresh') !== undefined, fn);
+		phpbb.ajaxify({selector: this}, $this.attr('data-refresh') !== undefined, fn);
 	}
 });
 
-- 
cgit v1.2.1


From 628074bf7057ad5f9aff929d7c8cd85171ce60b8 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 8 Feb 2012 19:02:16 +0100
Subject: [feature/ajax] Stylistic JavaScript adjustments

PHPBB3-10270
---
 phpBB/adm/style/ajax.js | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 50477eef90..2725d9fa0a 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -8,8 +8,9 @@
  * activates any up / down icons that require it (the ones at the top or bottom).
  */
 phpbb.add_ajax_callback('forum_down', function() {
-	el = $(this);
-	var tr = el.parents('tr');
+	var el = $(this),
+		tr = el.parents('tr');
+
 	if (tr.is(':first-child'))
 	{
 		el.parents('span').siblings('.up').html('<a href="' + tr.attr('data-up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
@@ -23,9 +24,12 @@ phpbb.add_ajax_callback('forum_down', function() {
 		tr.prev().find('.down').html('<a href="' + tr.attr('data-down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
 		phpbb.ajaxify({selector: tr.prev().find('.down').children('a')}, false, 'forum_down');
 	}
-}).add_ajax_callback('forum_up', function() {
-	el = $(this);
-	var tr = el.parents('tr');
+});
+
+phpbb.add_ajax_callback('forum_up', function() {
+	var el = $(this),
+		tr = el.parents('tr');
+
 	if (tr.is(':last-child'))
 	{
 		el.parents('span').siblings('.down').html('<a href="' + tr.attr('data-down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
@@ -47,9 +51,9 @@ phpbb.add_ajax_callback('forum_down', function() {
  * in the href with "deactivate", and vice versa.
  */
 phpbb.add_ajax_callback('activate_deactivate', function(res) {
-	el = $(this);
+	var el = $(this),
+		new_href = el.attr('href');
 	el.text(res.text);
-	var new_href = el.attr('href');
 	if (new_href.indexOf('deactivate') !== -1)
 	{
 		new_href = new_href.replace('deactivate', 'activate')
@@ -72,10 +76,13 @@ phpbb.add_ajax_callback('row_delete', function() {
 
 
 $('[data-ajax]').each(function() {
-	var $this = $(this), ajax = $this.attr('data-ajax');
+	var $this = $(this),
+		ajax = $this.attr('data-ajax'),
+		fn;
+
 	if (ajax !== 'false')
 	{
-		var fn = (ajax !== 'true') ? ajax : null;
+		fn = (ajax !== 'true') ? ajax : null;
 		phpbb.ajaxify({selector: this}, $this.attr('data-refresh') !== undefined, fn);
 	}
 });
-- 
cgit v1.2.1


From d53c36684db5ee592b871f518364ae9de03d3e8b Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 8 Feb 2012 19:03:30 +0100
Subject: [feature/ajax] JavaScript strict mode

PHPBB3-10270
---
 phpBB/adm/style/ajax.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 2725d9fa0a..9b73b618d6 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -1,5 +1,6 @@
 (function($) {  // Avoid conflicts with other libraries
 
+"use strict";
 
 /**
  * The following callbacks are  for reording forums in acp_forums. forum_down
-- 
cgit v1.2.1


From 7ed2cbef75e2e3e561dec00cad26870684968a3a Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 8 Feb 2012 19:56:25 +0100
Subject: [feature/ajax] Make phpbb.ajaxify signature use single object (more
 explicit)

PHPBB3-10270
---
 phpBB/adm/style/ajax.js | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 9b73b618d6..b4385b2740 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -16,14 +16,20 @@ phpbb.add_ajax_callback('forum_down', function() {
 	{
 		el.parents('span').siblings('.up').html('<a href="' + tr.attr('data-up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
 		tr.next().find('.up').html('<img src="./images/icon_up_disabled.gif" alt="Move up" title="Move up" />');
-		phpbb.ajaxify({selector: el.parents('span').siblings('.up').children('a')}, false, 'forum_up');
+		phpbb.ajaxify({
+			selector: el.parents('span').siblings('.up').children('a'),
+			callback: 'forum_up'
+		});
 	}
 	tr.insertAfter(tr.next());
 	if (tr.is(':last-child'))
 	{
 		el.html('<img src="./images/icon_down_disabled.gif" alt="Move down" title="Move down" />');
 		tr.prev().find('.down').html('<a href="' + tr.attr('data-down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
-		phpbb.ajaxify({selector: tr.prev().find('.down').children('a')}, false, 'forum_down');
+		phpbb.ajaxify({
+			selector: tr.prev().find('.down').children('a'),
+			callback: 'forum_down'
+		});
 	}
 });
 
@@ -35,14 +41,20 @@ phpbb.add_ajax_callback('forum_up', function() {
 	{
 		el.parents('span').siblings('.down').html('<a href="' + tr.attr('data-down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
 		tr.prev().find('.down').html('<img src="./images/icon_down_disabled.gif" alt="Move down" title="Move down" />');
-		phpbb.ajaxify({selector: el.parents('span').siblings('.down').children('a')}, false, 'forum_down');
+		phpbb.ajaxify({
+			selector: el.parents('span').siblings('.down').children('a'),
+			callback: 'forum_down'
+		});
 	}
 	tr.insertBefore(tr.prev());
 	if (tr.is(':first-child'))
 	{
 		el.html('<img src="./images/icon_up_disabled.gif" alt="Move up" title="Move up" />');
 		tr.next().find('.up').html('<a href="' + tr.attr('data-up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
-		phpbb.ajaxify({selector: tr.next().find('.up').children('a')}, false, 'forum_up');
+		phpbb.ajaxify({
+			selector: tr.next().find('.up').children('a'),
+			callback: 'forum_up'
+		});
 	}
 });
 
@@ -84,7 +96,11 @@ $('[data-ajax]').each(function() {
 	if (ajax !== 'false')
 	{
 		fn = (ajax !== 'true') ? ajax : null;
-		phpbb.ajaxify({selector: this}, $this.attr('data-refresh') !== undefined, fn);
+		phpbb.ajaxify({
+			selector: this,
+			refresh: $this.attr('data-refresh') !== undefined,
+			callback: fn
+		});
 	}
 });
 
-- 
cgit v1.2.1


From 8a0d8c0a84e119121bc9bd69c757aa4776d42acb Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 8 Feb 2012 20:38:23 +0100
Subject: [feature/ajax] Do not hard-code sorting images of acp_forums ordering

PHPBB3-10270
---
 phpBB/adm/style/acp_forums.html |  8 ++++++++
 phpBB/adm/style/admin.css       |  4 ++++
 phpBB/adm/style/ajax.js         | 39 +++++++++++++++++++++++++++++++--------
 3 files changed, 43 insertions(+), 8 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index b2b3ad6d40..048a24a328 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -500,6 +500,14 @@
 	</fieldset>
 	</form>
 
+	<div class="hidden">
+		<a class="template-up-img" href="#">{ICON_MOVE_UP}</a>
+		<span class="template-up-img-disabled">{ICON_MOVE_UP_DISABLED}</span>
+
+		<a class="template-down-img" href="#">{ICON_MOVE_DOWN}</a>
+		<span class="template-down-img-disabled">{ICON_MOVE_DOWN_DISABLED}</span>
+	</div>
+
 <!-- ENDIF -->
 
 <!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 01af071766..a162d44f9d 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -101,6 +101,10 @@ hr {
 	font-size: 0.85em;
 }
 
+.hidden {
+	display: none;
+}
+
 /* General links  */
 a:link, a:visited {
 	color: #105289;
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index b4385b2740..0c00efee1b 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -2,6 +2,13 @@
 
 "use strict";
 
+var img_templates = {
+	up: $('.template-up-img'),
+	up_disabled: $('.template-up-img-disabled'),
+	down: $('.template-down-img'),
+	down_disabled: $('.template-down-img-disabled')
+};
+
 /**
  * The following callbacks are  for reording forums in acp_forums. forum_down
  * is triggered when a forum is moved down, and forum_up is triggered when
@@ -14,18 +21,26 @@ phpbb.add_ajax_callback('forum_down', function() {
 
 	if (tr.is(':first-child'))
 	{
-		el.parents('span').siblings('.up').html('<a href="' + tr.attr('data-up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
-		tr.next().find('.up').html('<img src="./images/icon_up_disabled.gif" alt="Move up" title="Move up" />');
+		var up_img = img_templates.up.clone().attr('href', tr.attr('data-up'));
+		el.parents('span').siblings('.up').html(up_img);
+
+		tr.next().find('.up').html(img_templates.up_disabled);
+
 		phpbb.ajaxify({
 			selector: el.parents('span').siblings('.up').children('a'),
 			callback: 'forum_up'
 		});
 	}
+
 	tr.insertAfter(tr.next());
+
 	if (tr.is(':last-child'))
 	{
-		el.html('<img src="./images/icon_down_disabled.gif" alt="Move down" title="Move down" />');
-		tr.prev().find('.down').html('<a href="' + tr.attr('data-down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
+		el.replaceWith(img_templates.down_disabled);
+
+		var down_img = img_templates.down.clone().attr('href', tr.attr('data-down'));
+		tr.prev().find('.down').html(down_img);
+
 		phpbb.ajaxify({
 			selector: tr.prev().find('.down').children('a'),
 			callback: 'forum_down'
@@ -39,18 +54,26 @@ phpbb.add_ajax_callback('forum_up', function() {
 
 	if (tr.is(':last-child'))
 	{
-		el.parents('span').siblings('.down').html('<a href="' + tr.attr('data-down') + '"><img src="./images/icon_down.gif" alt="Move down" title="Move down" /></a>');
-		tr.prev().find('.down').html('<img src="./images/icon_down_disabled.gif" alt="Move down" title="Move down" />');
+		var down_img = img_templates.down.clone().attr('href', tr.attr('data-down'));
+		el.parents('span').siblings('.down').html(down_img);
+
+		tr.prev().find('.down').html(img_templates.down_disabled);
+
 		phpbb.ajaxify({
 			selector: el.parents('span').siblings('.down').children('a'),
 			callback: 'forum_down'
 		});
 	}
+
 	tr.insertBefore(tr.prev());
+
 	if (tr.is(':first-child'))
 	{
-		el.html('<img src="./images/icon_up_disabled.gif" alt="Move up" title="Move up" />');
-		tr.next().find('.up').html('<a href="' + tr.attr('data-up') + '"><img src="./images/icon_up.gif" alt="Move up" title="Move up" /></a>');
+		el.replaceWith(img_templates.up_disabled);
+
+		var up_img = img_templates.up.clone().attr('href', tr.attr('data-up'));
+		tr.next().find('.up').html(up_img);
+
 		phpbb.ajaxify({
 			selector: tr.next().find('.up').children('a'),
 			callback: 'forum_up'
-- 
cgit v1.2.1


From 27199bb50954e22416e64154032e08801d0fbb6d Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 15 Feb 2012 20:58:00 +0100
Subject: [feature/ajax] Generic error handling with a phpbb.alert box

PHPBB3-10270
---
 phpBB/adm/style/overall_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 549b6995af..dfe161fd76 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -18,7 +18,7 @@
 			{DEBUG_OUTPUT}
 		<!-- ENDIF -->
 
-		<div id="darkenwrapper">
+		<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}">
 			<div id="darken">&nbsp;</div>
 			<div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
 		</div>
-- 
cgit v1.2.1


From 6145e0ba65978e11249f6eb13d40391f348200ed Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Wed, 22 Feb 2012 14:42:19 +0200
Subject: [ticket/10270] Changing close button for ajax popups

Changed close button for popups to match prosilver style and from img to css, moved color values to colours.css

PHPBB3-10270
---
 phpBB/adm/style/admin.css           | 14 ++++++++++++--
 phpBB/adm/style/overall_footer.html |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index a162d44f9d..d5dc957ac5 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1089,11 +1089,21 @@ input.disabled {
 	padding: 0 25px 20px 25px;
 }
 
-.phpbb_alert img.alert_close {
+.phpbb_alert .alert_close {
+	display: block;
 	float: right;
+	width: 16px;
+	height: 16px;
+	overflow: hidden;
+	text-decoration: none !important;
+	background: transparent url("../images/alert_close.png") 0 0 no-repeat;
 	margin-top: -7px;
-	margin-right: -30px;
+	margin-right: -31px;
 }
+.phpbb_alert .alert_close:hover {
+	background-position: 0 -16px;
+}
+
 
 .phpbb_alert p {
 	margin: 8px 0;
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index dfe161fd76..0337080f3d 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -24,11 +24,11 @@
 		</div>
 
 		<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
-			<a href="#"><img src="images/alert_close.png" class="alert_close" /></a>
+			<a href="#" class="alert_close"></a>
 			<h3 class="alert_title"></h3><p class="alert_text"></p>
 		</div>
 		<div id="phpbb_confirm" class="phpbb_alert">
-			<a href="#"><img src="images/alert_close.png" class="alert_close" /></a>
+			<a href="#" class="alert_close"></a>
 			<p class="alert_text"></p>
 			<input type="button" class="button1" value="{L_YES}" />&nbsp;
 			<input type="button" class="button2" value="{L_NO}" />
-- 
cgit v1.2.1


From d3e7744dd6968b941fb3216ee2a989ed6a0c2ba1 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 00:59:49 +0200
Subject: [feature/ajax] Remove not working module enable/disable ajax code

PHPBB3-10270
---
 phpBB/adm/style/acp_modules.html | 2 +-
 phpBB/adm/style/ajax.js          | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index 380a037977..6c4645e80c 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -148,7 +148,7 @@
 			<tr>
 				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
 				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
-				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}" data-ajax="act-deact">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}" data-ajax="act-deact">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
+				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
 				<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;">
 					<!-- IF modules.S_FIRST_ROW && not modules.S_LAST_ROW -->
 						{ICON_MOVE_UP_DISABLED}
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 0c00efee1b..fd2f7a2122 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -89,7 +89,9 @@ phpbb.add_ajax_callback('forum_up', function() {
 phpbb.add_ajax_callback('activate_deactivate', function(res) {
 	var el = $(this),
 		new_href = el.attr('href');
+
 	el.text(res.text);
+
 	if (new_href.indexOf('deactivate') !== -1)
 	{
 		new_href = new_href.replace('deactivate', 'activate')
@@ -98,6 +100,7 @@ phpbb.add_ajax_callback('activate_deactivate', function(res) {
 	{
 		new_href = new_href.replace('activate', 'deactivate')
 	}
+
 	el.attr('href', new_href);
 });
 
-- 
cgit v1.2.1


From ef03f8d0536033d1ef4739c5884d1a1f919618bd Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 01:15:13 +0200
Subject: [feature/ajax] Fix acp_styles activate_deactivate ajax callback name

PHPBB3-10270
---
 phpBB/adm/style/acp_styles.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index a166623f89..3532e8c7d9 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -288,7 +288,7 @@
 		</td>
 		<td style="text-align: center;">
 			<!-- IF S_STYLE -->
-				<a href="{installed.U_STYLE_ACT_DEACT}" data-ajax="activate_deactive">{installed.L_STYLE_ACT_DEACT}</a> |
+				<a href="{installed.U_STYLE_ACT_DEACT}" data-ajax="activate_deactivate">{installed.L_STYLE_ACT_DEACT}</a> |
 			<!-- ENDIF -->
 			{installed.S_ACTIONS}
 			<!-- IF S_STYLE -->
-- 
cgit v1.2.1


From 37480e5594145bbead07c8f70644d52983f92913 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 20:50:59 +0300
Subject: [ticket/10665] Adding includejs to acp templates

Adding includejs to acp overall_footer.html

PHPBB3-10665
---
 phpBB/adm/style/overall_footer.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 0337080f3d..a486a69514 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -39,7 +39,8 @@
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><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 -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js"></script>
-<script type="text/javascript" src="style/ajax.js"></script>
+<!-- INCLUDEJS ajax.js -->
+{SCRIPTS}
 
 </body>
 </html>
-- 
cgit v1.2.1


From f32547c2150a3e6201edf0f856a93229040c73be Mon Sep 17 00:00:00 2001
From: Rahul <rahulr92@phpbb.com>
Date: Sat, 24 Mar 2012 12:57:28 +0530
Subject: [ticket/10650] Displaying last topic on forum list

The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
---
 phpBB/adm/style/acp_forums.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 048a24a328..ec82947f92 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -237,6 +237,11 @@
 			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
+		<dl>
+			<dt><label for="display_last_subject">{L_DISPLAY_LAST_SUBJECT}:</label><br /><span>{L_DISPLAY_LAST_SUBJECT_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_last_subject" value="1"<!-- IF S_DISPLAY_SUBJECT --> id="display_subject" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_last_subject" value="0"<!-- IF not S_DISPLAY_SUBJECT --> id="display_subject" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
 		<dl>
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
 			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
-- 
cgit v1.2.1


From 98964a913cb22761553d04170aa4830e324f7488 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 4 Apr 2012 18:28:36 -0400
Subject: [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop

The pull request (#654) was merged a little too quickly.

In particular, display_last_subject per-forum option needs consensus.

This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.

PHPBB3-10650
---
 phpBB/adm/style/acp_forums.html | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index ec82947f92..048a24a328 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -237,11 +237,6 @@
 			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
-		<dl>
-			<dt><label for="display_last_subject">{L_DISPLAY_LAST_SUBJECT}:</label><br /><span>{L_DISPLAY_LAST_SUBJECT_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_last_subject" value="1"<!-- IF S_DISPLAY_SUBJECT --> id="display_subject" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_last_subject" value="0"<!-- IF not S_DISPLAY_SUBJECT --> id="display_subject" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
 		<dl>
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
 			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
-- 
cgit v1.2.1


From 7fa2be51ce1a9c3f196c85a450da8f200b95bf84 Mon Sep 17 00:00:00 2001
From: Shibu Lijack <shibulijack@gmail.com>
Date: Wed, 11 Apr 2012 18:01:58 +0530
Subject: [ticket/10688] Changed version 3.0 to 3.1

Replaced phpBB 3.0 to 3.1 in the stylesheets

PHPBB-10688
---
 phpBB/adm/style/admin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index ceda824e5a..7ae4339b49 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1,4 +1,4 @@
-/*  phpBB 3.0 Admin Style Sheet
+/*  phpBB 3.1 Admin Style Sheet
 	------------------------------------------------------------------------
 	Original author:	subBlue ( http://www.subblue.com/ )
 	Copyright 2007 phpBB Group ( http://www.phpbb.com/ )
-- 
cgit v1.2.1


From 6ad58c7e046c9f257ad5441b7a583cddb213ad3f Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 11 Apr 2012 14:37:15 +0100
Subject: [ticket/10783] Added assets_version to ACP and simple_*.html.

PHPBB3-10783
---
 phpBB/adm/style/overall_footer.html | 4 ++--
 phpBB/adm/style/overall_header.html | 2 +-
 phpBB/adm/style/simple_footer.html  | 2 +-
 phpBB/adm/style/simple_header.html  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 0d88c8bcc5..2bc9ee52d7 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -37,8 +37,8 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_JQUERY_FALLBACK --><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 -->
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js"></script>
+<!-- IF S_JQUERY_FALLBACK --><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 -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 {SCRIPTS}
 
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index be5ac29131..f79c0318b5 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -5,7 +5,7 @@
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-<link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
 // <![CDATA[
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index b6d7ee2f5c..1d5c62b0a3 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_JQUERY_FALLBACK --><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_JQUERY_FALLBACK --><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 -->
 
 </body>
 </html>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 84ff665acc..d4cbcb6cbe 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -5,7 +5,7 @@
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-<link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
 // <![CDATA[
-- 
cgit v1.2.1


From 7a9d9f97ef83b61ce155a09c1e75c90f4c533f3f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 11 Apr 2012 23:29:47 +0200
Subject: [ticket/10784] Do not show ajax overlay unless needed

PHPBB3-10784
---
 phpBB/adm/style/ajax.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index fd2f7a2122..12541cb057 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -28,7 +28,8 @@ phpbb.add_ajax_callback('forum_down', function() {
 
 		phpbb.ajaxify({
 			selector: el.parents('span').siblings('.up').children('a'),
-			callback: 'forum_up'
+			callback: 'forum_up',
+			overlay: false
 		});
 	}
 
@@ -43,7 +44,8 @@ phpbb.add_ajax_callback('forum_down', function() {
 
 		phpbb.ajaxify({
 			selector: tr.prev().find('.down').children('a'),
-			callback: 'forum_down'
+			callback: 'forum_down',
+			overlay: false
 		});
 	}
 });
@@ -61,7 +63,8 @@ phpbb.add_ajax_callback('forum_up', function() {
 
 		phpbb.ajaxify({
 			selector: el.parents('span').siblings('.down').children('a'),
-			callback: 'forum_down'
+			callback: 'forum_down',
+			overlay: false
 		});
 	}
 
@@ -76,7 +79,8 @@ phpbb.add_ajax_callback('forum_up', function() {
 
 		phpbb.ajaxify({
 			selector: tr.next().find('.up').children('a'),
-			callback: 'forum_up'
+			callback: 'forum_up',
+			overlay: false
 		});
 	}
 });
-- 
cgit v1.2.1


From 60c5c4de03cd06432a4343c16fe3d733e1989114 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 19 Apr 2012 18:31:18 -0400
Subject: [feature/prune-users] Add spaces inside brackets.

Requested by nickvergessen.

PHPBB3-9622
---
 phpBB/adm/style/confirm_body_prune.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/confirm_body_prune.html b/phpBB/adm/style/confirm_body_prune.html
index 92e0a22e71..4c00ac2c3d 100644
--- a/phpBB/adm/style/confirm_body_prune.html
+++ b/phpBB/adm/style/confirm_body_prune.html
@@ -10,7 +10,7 @@
 	<!-- BEGIN users -->
 	&raquo; <input type="checkbox" name="user_ids[]" value="{users.USER_ID}" checked="checked" />
 	<a href="{users.U_PROFILE}">{users.USERNAME}</a>
-	<!-- IF users.U_USER_ADMIN --> [<a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a>]<!-- ENDIF --><br />
+	<!-- IF users.U_USER_ADMIN --> [ <a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF --><br />
 	<!-- END users -->
 	<br />
 	<span class="small">
-- 
cgit v1.2.1


From 5f96e5d374d1702d3d81591b7c69ede1cafebfa7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 12 Jun 2012 19:54:26 +0200
Subject: [feature/new-tz-handling] Fix timezone option when editing a user in
 the ACP

PHPBB3-9558
---
 phpBB/adm/style/acp_users_prefs.html |  5 +----
 phpBB/adm/style/timezone.js          | 29 +++++++++++++++++++++++++++++
 phpBB/adm/style/timezone_option.html | 20 ++++++++++++++++++++
 3 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 phpBB/adm/style/timezone.js
 create mode 100644 phpBB/adm/style/timezone_option.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
index 90db62984e..9439f0cf03 100644
--- a/phpBB/adm/style/acp_users_prefs.html
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -52,10 +52,7 @@
 		<dt><label for="style">{L_BOARD_STYLE}:</label></dt>
 		<dd><select id="style" name="style">{S_STYLE_OPTIONS}</select></dd>
 	</dl>
-	<dl> 
-		<dt><label for="tz">{L_BOARD_TIMEZONE}:</label></dt>
-		<dd><select id="tz" name="tz" style="width: 100%;">{S_TZ_OPTIONS}</select></dd>
-	</dl>
+	<!-- INCLUDE timezone_option.html -->
 	<dl> 
 		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
 		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
diff --git a/phpBB/adm/style/timezone.js b/phpBB/adm/style/timezone.js
new file mode 100644
index 0000000000..d02c965ab5
--- /dev/null
+++ b/phpBB/adm/style/timezone.js
@@ -0,0 +1,29 @@
+function phpbb_switch_tz_date(keep_selection)
+{
+	var timezone_groups = document.getElementById("timezone");
+	for (var i = 0; i < timezone_groups.childElementCount; i++) {
+		if (timezone_groups.children[i].tagName == "OPTGROUP" &&
+			timezone_groups.children[i].label != document.getElementById("tz_date").value)
+		{
+			timezone_groups.children[i].style.display = "none";
+		}
+		else if (timezone_groups.children[i].tagName == "OPTGROUP")
+		{
+			// Display other options
+			timezone_groups.children[i].style.display = "block";
+		}
+	}
+	if (typeof keep_selection !== 'undefined')
+	{
+		if (!keep_selection)
+		{
+			timezone_groups.children[0].selected = true;
+		}
+	}
+}
+
+function phpbb_enable_tz_dates()
+{
+	var tz_select_date = document.getElementById("tz_select_date");
+	tz_select_date.style.display = "block";
+}
diff --git a/phpBB/adm/style/timezone_option.html b/phpBB/adm/style/timezone_option.html
new file mode 100644
index 0000000000..12e6e3700a
--- /dev/null
+++ b/phpBB/adm/style/timezone_option.html
@@ -0,0 +1,20 @@
+<dl>
+	<dt><label for="timezone">{L_BOARD_TIMEZONE}:</label></dt>
+	<!-- IF S_TZ_DATE_OPTIONS -->
+	<dd id="tz_select_date" style="display: none;">
+		<select name="tz_date" id="tz_date" class="autowidth tz_select" onchange="phpbb_switch_tz_date(false);">
+			<option value="">{L_SELECT_CURRENT_TIME}</option>
+			{S_TZ_DATE_OPTIONS}
+		</select>
+	</dd>
+	<!-- ENDIF -->
+	<dd>
+		<select name="tz" id="timezone" class="autowidth tz_select">
+			<option value="">{L_SELECT_TIMEZONE}</option>
+			{S_TZ_OPTIONS}
+		</select>
+
+		<script type="text/javascript" src="{T_TEMPLATE_PATH}/timezone.js"></script>
+		<script type="text/javascript">phpbb_enable_tz_dates();</script>
+	</dd>
+</dl>
-- 
cgit v1.2.1


From 5441ee1ee489ef9ad1727f110c440dde5417cc1f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 17 Jun 2012 16:54:12 +0200
Subject: [feature/new-tz-handling] Use jQuery and INCLUDEJS for javascript

PHPBB3-9558
---
 phpBB/adm/style/timezone.js          | 28 +++++++++++++---------------
 phpBB/adm/style/timezone_option.html |  3 +--
 2 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/timezone.js b/phpBB/adm/style/timezone.js
index d02c965ab5..a1ffeb17c5 100644
--- a/phpBB/adm/style/timezone.js
+++ b/phpBB/adm/style/timezone.js
@@ -1,29 +1,27 @@
 function phpbb_switch_tz_date(keep_selection)
 {
-	var timezone_groups = document.getElementById("timezone");
-	for (var i = 0; i < timezone_groups.childElementCount; i++) {
-		if (timezone_groups.children[i].tagName == "OPTGROUP" &&
-			timezone_groups.children[i].label != document.getElementById("tz_date").value)
-		{
-			timezone_groups.children[i].style.display = "none";
-		}
-		else if (timezone_groups.children[i].tagName == "OPTGROUP")
-		{
-			// Display other options
-			timezone_groups.children[i].style.display = "block";
-		}
+	$('#timezone > optgroup').css("display", "none");
+	$("#timezone > optgroup[label='" + $('#tz_date').val() + "']").css("display", "block");
+
+	if ($("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option").size() == 1)
+	{
+		// If there is only one timezone for the selected date, we just select that automatically.
+		$("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option:first").attr("selected", true);
+		keep_selection = true;
 	}
+
 	if (typeof keep_selection !== 'undefined')
 	{
 		if (!keep_selection)
 		{
-			timezone_groups.children[0].selected = true;
+			$('#timezone > option:first').attr("selected", true);
 		}
 	}
 }
 
 function phpbb_enable_tz_dates()
 {
-	var tz_select_date = document.getElementById("tz_select_date");
-	tz_select_date.style.display = "block";
+	$('#tz_select_date').css("display", "block");
 }
+
+phpbb_enable_tz_dates();
diff --git a/phpBB/adm/style/timezone_option.html b/phpBB/adm/style/timezone_option.html
index 12e6e3700a..e12219b1c0 100644
--- a/phpBB/adm/style/timezone_option.html
+++ b/phpBB/adm/style/timezone_option.html
@@ -14,7 +14,6 @@
 			{S_TZ_OPTIONS}
 		</select>
 
-		<script type="text/javascript" src="{T_TEMPLATE_PATH}/timezone.js"></script>
-		<script type="text/javascript">phpbb_enable_tz_dates();</script>
+		<!-- INCLUDEJS timezone.js -->
 	</dd>
 </dl>
-- 
cgit v1.2.1


From 8d65f1f7d263d9f6e76cbac2765da02a0877c87f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 18 Jun 2012 10:20:15 +0200
Subject: [feature/new-tz-handling] Add doc blocks to js functions

PHPBB3-9558
---
 phpBB/adm/style/timezone.js | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/timezone.js b/phpBB/adm/style/timezone.js
index a1ffeb17c5..d1667699da 100644
--- a/phpBB/adm/style/timezone.js
+++ b/phpBB/adm/style/timezone.js
@@ -1,3 +1,8 @@
+/**
+* Hide the optgroups that are not the selected timezone
+*
+* @param	bool	keep_selection		Shall we keep the value selected, or shall the user be forced to repick one.
+*/
 function phpbb_switch_tz_date(keep_selection)
 {
 	$('#timezone > optgroup').css("display", "none");
@@ -19,6 +24,9 @@ function phpbb_switch_tz_date(keep_selection)
 	}
 }
 
+/**
+* Display the date/time select
+*/
 function phpbb_enable_tz_dates()
 {
 	$('#tz_select_date').css("display", "block");
-- 
cgit v1.2.1


From dcd7d962960ade175400cbb9b8e00575e8735a22 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 19 Jun 2012 19:08:53 +0200
Subject: [feature/new-tz-handling] Use asset in acp and subsilver2 and remove
 duplicates

PHPBB3-9558
---
 phpBB/adm/style/timezone.js          | 40 ++++++++----------------------------
 phpBB/adm/style/timezone_option.html |  2 +-
 2 files changed, 9 insertions(+), 33 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/timezone.js b/phpBB/adm/style/timezone.js
index d1667699da..4556ea5f94 100644
--- a/phpBB/adm/style/timezone.js
+++ b/phpBB/adm/style/timezone.js
@@ -1,35 +1,11 @@
-/**
-* Hide the optgroups that are not the selected timezone
-*
-* @param	bool	keep_selection		Shall we keep the value selected, or shall the user be forced to repick one.
-*/
-function phpbb_switch_tz_date(keep_selection)
-{
-	$('#timezone > optgroup').css("display", "none");
-	$("#timezone > optgroup[label='" + $('#tz_date').val() + "']").css("display", "block");
+(function($) { // Avoid conflicts with other libraries
 
-	if ($("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option").size() == 1)
-	{
-		// If there is only one timezone for the selected date, we just select that automatically.
-		$("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option:first").attr("selected", true);
-		keep_selection = true;
-	}
+$('#tz_date').change(function() {
+	phpbb.timezone_switch_date(false);
+});
 
-	if (typeof keep_selection !== 'undefined')
-	{
-		if (!keep_selection)
-		{
-			$('#timezone > option:first').attr("selected", true);
-		}
-	}
-}
+$(document).ready(
+	phpbb.timezone_enable_date_selection
+);
 
-/**
-* Display the date/time select
-*/
-function phpbb_enable_tz_dates()
-{
-	$('#tz_select_date').css("display", "block");
-}
-
-phpbb_enable_tz_dates();
+})(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/adm/style/timezone_option.html b/phpBB/adm/style/timezone_option.html
index e12219b1c0..23c0ee19e9 100644
--- a/phpBB/adm/style/timezone_option.html
+++ b/phpBB/adm/style/timezone_option.html
@@ -2,7 +2,7 @@
 	<dt><label for="timezone">{L_BOARD_TIMEZONE}:</label></dt>
 	<!-- IF S_TZ_DATE_OPTIONS -->
 	<dd id="tz_select_date" style="display: none;">
-		<select name="tz_date" id="tz_date" class="autowidth tz_select" onchange="phpbb_switch_tz_date(false);">
+		<select name="tz_date" id="tz_date" class="autowidth tz_select">
 			<option value="">{L_SELECT_CURRENT_TIME}</option>
 			{S_TZ_DATE_OPTIONS}
 		</select>
-- 
cgit v1.2.1


From 21df013210d1de2cffae568c0620a7ccd6d8f426 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 27 Jun 2012 18:23:26 +0200
Subject: [feature/avatars] Move avatars JavaScript code to external JS file

PHPBB3-10018
---
 phpBB/adm/style/acp_groups.html       | 23 ++---------------------
 phpBB/adm/style/acp_users_avatar.html | 23 ++---------------------
 phpBB/adm/style/avatars.js            | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 42 deletions(-)
 create mode 100644 phpBB/adm/style/avatars.js

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 42cb434ad3..167642e5cb 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -123,27 +123,6 @@
 	</div>
 	<!-- END avatar_drivers -->
 	</div>
-	<script type="text/javascript">
-		// <![CDATA[
-			function avatar_simplify() {
-				var node = document.getElementById('av_options');
-				for (var i = 0; i < node.children.length; i++) {
-					child = node.children[i];
-					child.style.display = 'none';
-				}
-
-				var selected = document.getElementById('avatar_driver').value;
-				var id = 'av_option_' + selected;
-				node = document.getElementById(id);
-				if (node != null) {
-					node.style.display = 'block';
-				}
-			}
-
-			avatar_simplify();
-			document.getElementById('avatar_driver').onchange = avatar_simplify;
-		// ]]>
-	</script>
 	</fieldset>
 
 	<fieldset class="submit-buttons">
@@ -154,6 +133,8 @@
 	</fieldset>
 	</form>
 
+	<!-- INCLUDEJS avatars.js -->
+
 <!-- ELSEIF S_LIST -->
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 6316ff4a22..9649fa923e 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -28,30 +28,11 @@
 		<!-- END avatar_drivers -->
 		</div>
 	</fieldset>
-	<script type="text/javascript">
-		// <![CDATA[
-			function avatar_simplify() {
-				var node = document.getElementById('av_options');
-				for (var i = 0; i < node.children.length; i++) {
-					child = node.children[i];
-					child.style.display = 'none';
-				}
-
-				var selected = document.getElementById('avatar_driver').value;
-				var id = 'av_option_' + selected;
-				node = document.getElementById(id);
-				if (node != null) {
-					node.style.display = 'block';
-				}
-			}
-
-			avatar_simplify();
-			document.getElementById('avatar_driver').onchange = avatar_simplify;
-		// ]]>
-	</script>
 
 	<fieldset class="quick">
 		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
 	</fieldset>
 	{S_FORM_TOKEN}
 	</form>
+
+	<!-- INCLUDEJS avatars.js -->
diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
new file mode 100644
index 0000000000..baa2623ac9
--- /dev/null
+++ b/phpBB/adm/style/avatars.js
@@ -0,0 +1,17 @@
+function avatar_simplify() {
+    var node = document.getElementById('av_options');
+    for (var i = 0; i < node.children.length; i++) {
+        child = node.children[i];
+        child.style.display = 'none';
+    }
+
+    var selected = document.getElementById('avatar_driver').value;
+    var id = 'av_option_' + selected;
+    node = document.getElementById(id);
+    if (node != null) {
+        node.style.display = 'block';
+    }
+}
+
+avatar_simplify();
+document.getElementById('avatar_driver').onchange = avatar_simplify;
-- 
cgit v1.2.1


From b060667ac102109c0c8f198925bb81b489a30f34 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 27 Jun 2012 18:26:44 +0200
Subject: [feature/avatars] Rewrite avatars event handler to use jQuery

PHPBB3-10018
---
 phpBB/adm/style/avatars.js | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
index baa2623ac9..252081ee08 100644
--- a/phpBB/adm/style/avatars.js
+++ b/phpBB/adm/style/avatars.js
@@ -1,17 +1,9 @@
 function avatar_simplify() {
-    var node = document.getElementById('av_options');
-    for (var i = 0; i < node.children.length; i++) {
-        child = node.children[i];
-        child.style.display = 'none';
-    }
+    $('#av_options').hide();
 
-    var selected = document.getElementById('avatar_driver').value;
-    var id = 'av_option_' + selected;
-    node = document.getElementById(id);
-    if (node != null) {
-        node.style.display = 'block';
-    }
+    var selected = $('#avatar_driver').val();
+    $('#av_option_' + selected).show();
 }
 
 avatar_simplify();
-document.getElementById('avatar_driver').onchange = avatar_simplify;
+$('#avatar_driver').on('change', avatar_simplify);
-- 
cgit v1.2.1


From 2f3581fe3ef928d91f12c442ab5e4890c6620f58 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 27 Jun 2012 18:37:23 +0200
Subject: [feature/avatars] Add self-invoking closure around avatars.js

PHPBB3-10018
---
 phpBB/adm/style/avatars.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
index 252081ee08..cb19aa9b7a 100644
--- a/phpBB/adm/style/avatars.js
+++ b/phpBB/adm/style/avatars.js
@@ -1,3 +1,7 @@
+(function($) {  // Avoid conflicts with other libraries
+
+"use strict";
+
 function avatar_simplify() {
     $('#av_options').hide();
 
@@ -7,3 +11,5 @@ function avatar_simplify() {
 
 avatar_simplify();
 $('#avatar_driver').on('change', avatar_simplify);
+
+})(jQuery); // Avoid conflicts with other libraries
-- 
cgit v1.2.1


From 13f4bfabbeab77698f06c3431931b73ebedc587c Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 27 Jun 2012 21:00:00 +0200
Subject: [feature/avatars] Fixup avatars.js rewrite

PHPBB3-10018
---
 phpBB/adm/style/avatars.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
index cb19aa9b7a..2068bdbbc4 100644
--- a/phpBB/adm/style/avatars.js
+++ b/phpBB/adm/style/avatars.js
@@ -3,13 +3,13 @@
 "use strict";
 
 function avatar_simplify() {
-    $('#av_options').hide();
+    $('#av_options > div').hide();
 
     var selected = $('#avatar_driver').val();
     $('#av_option_' + selected).show();
 }
 
 avatar_simplify();
-$('#avatar_driver').on('change', avatar_simplify);
+$('#avatar_driver').bind('change', avatar_simplify);
 
 })(jQuery); // Avoid conflicts with other libraries
-- 
cgit v1.2.1


From 4aabe0cd4d2bc4f0c56d40b5a65d5cf2c3187c1d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 11 Jul 2012 14:54:31 +0200
Subject: [ticket/10982] Remove overlay on first up/down move of forums in ACP

PHPBB3-10982
---
 phpBB/adm/style/acp_forums.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 048a24a328..e29cdcf2e9 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -454,12 +454,12 @@
 				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
 						<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="forum_down">{ICON_MOVE_DOWN}</a></span>
+						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
-						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="forum_up">{ICON_MOVE_UP}</a></span>
-						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="forum_down">{ICON_MOVE_DOWN}</a></span>
+						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
-						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="forum_up">{ICON_MOVE_UP}</a></span>
+						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
 						<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 					<!-- ELSE -->
 						<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-- 
cgit v1.2.1


From 922147f05a75d5a0e00b34f0102bc014583df984 Mon Sep 17 00:00:00 2001
From: Drae <paul@starstreak.net>
Date: Wed, 4 Jul 2012 23:19:59 +0100
Subject: [ticket/10968] Render pagination within the template

Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.

Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.

PHPBB3-10968
---
 phpBB/adm/style/acp_attachments.html    | 21 ++++++++++++++++++---
 phpBB/adm/style/acp_groups.html         | 16 +++++++++++++---
 phpBB/adm/style/acp_icons.html          | 15 ++++++++++++++-
 phpBB/adm/style/acp_inactive.html       | 16 +++++++++++++---
 phpBB/adm/style/acp_logs.html           | 16 +++++++++++++---
 phpBB/adm/style/acp_users.html          | 32 ++++++++++++++++++++++++++------
 phpBB/adm/style/acp_users_feedback.html | 32 ++++++++++++++++++++++++++------
 7 files changed, 123 insertions(+), 25 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index c2f8b34792..f3d67d2bfa 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -378,11 +378,26 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<!-- IF PAGINATION  or TOTAL_FILES -->
 	<div class="pagination">
-		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE}<!-- IF S_ON_PAGE --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {S_ON_PAGE}<!-- ENDIF --><!-- ENDIF -->
-	</div>
+	<!-- IF .pagination  or TOTAL_FILES -->
+		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE} &bull;
+		<!-- IF .pagination --> 
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
+			<ul>
+			<!-- BEGIN pagination -->
+				<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
+				<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
+				<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+				<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
+				<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
+				<!-- ENDIF -->
+			<!-- END pagination -->
+			</ul>
+		<!-- ELSE --> 
+			{S_ON_PAGE}
+		<!-- ENDIF -->
 	<!-- ENDIF -->
+	</div>
 
 	<table cellspacing="1">
 	<thead>
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index ed94fa985e..ca68bc7528 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -239,11 +239,21 @@
 	<!-- END member -->
 	</tbody>
 	</table>
-	<!-- IF PAGINATION -->
 	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
+	<!-- IF .pagination -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
+		<ul>
+		<!-- BEGIN pagination -->
+			<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
+			<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
+			<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+			<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
+			<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
+			<!-- ENDIF -->
+		<!-- END pagination -->
+		</ul>
 	<!-- ENDIF -->
+	</div>
 
 	<fieldset class="quick">
 		<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index a8864d42f7..6f42165414 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -255,7 +255,20 @@
 	<!-- END items -->
 	</tbody>
 	</table>
-	<div>{PAGINATION}</div>
+	<div class="pagination">
+	<!-- IF .pagination -->
+		<ul>
+		<!-- BEGIN pagination -->
+			<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
+			<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
+			<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+			<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
+			<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
+			<!-- ENDIF -->
+		<!-- END pagination -->
+		</ul>
+	<!-- ENDIF -->
+	</div>
 	<p class="quick">
 		<input class="button2" name="add" type="submit" value="{L_ICON_ADD}" />&nbsp; &nbsp;<input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" />
 	</p>
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index 0889eaf400..12cc11d742 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -10,11 +10,21 @@
 
 <div class="clearfix"></div>
 
-<!-- IF PAGINATION -->
 <div class="pagination">
-	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-</div>
+<!-- IF .pagination -->
+	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
+	<ul>
+	<!-- BEGIN pagination -->
+		<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
+		<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
+		<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+		<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
+		<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
+		<!-- ENDIF -->
+	<!-- END pagination -->
+	</ul>
 <!-- ENDIF -->
+</div>
 
 <table cellspacing="1">
 <thead>
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index f1c770d33b..3b2d448a44 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -12,11 +12,21 @@
 	{L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
 </fieldset>
 
-<!-- IF PAGINATION -->
 <div class="pagination" style="float: right; margin: 15px 0 2px 0">
-	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-</div>
+<!-- IF .pagination -->
+	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
+	<ul>
+	<!-- BEGIN pagination -->
+		<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
+		<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
+		<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+		<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
+		<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
+		<!-- ENDIF -->
+	<!-- END pagination -->
+	</ul>
 <!-- ENDIF -->
+</div>
 
 <div class="clearfix">&nbsp;</div>
 <div><br style="clear: both;" /></div>
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index a8794176a9..02cdab55b2 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -157,11 +157,21 @@
 	<form id="user_attachments" method="post" action="{U_ACTION}">
 
 
-	<!-- IF PAGINATION -->
 	<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
+	<!-- IF .pagination -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
+		<ul>
+		<!-- BEGIN pagination -->
+			<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
+			<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
+			<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+			<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
+			<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
+			<!-- ENDIF -->
+		<!-- END pagination -->
+		</ul>
 	<!-- ENDIF -->
+	</div>
 
 	<!-- IF .attach -->
 	<table cellspacing="1">
@@ -196,11 +206,21 @@
 		<input class="button2" type="submit" value="{L_GO}" name="sort" />
 	</fieldset>
 	<hr />
-	<!-- IF PAGINATION -->
 	<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
+	<!-- IF .pagination -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
+		<ul>
+		<!-- BEGIN pagination -->
+			<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
+			<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
+			<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+			<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
+			<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
+			<!-- ENDIF -->
+		<!-- END pagination -->
+		</ul>
 	<!-- ENDIF -->
+	</div>
 
 	<fieldset class="quick">
 		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html
index aa92353807..6b7761ed46 100644
--- a/phpBB/adm/style/acp_users_feedback.html
+++ b/phpBB/adm/style/acp_users_feedback.html
@@ -1,10 +1,20 @@
 	<form id="list" method="post" action="{U_ACTION}">
 
-	<!-- IF PAGINATION -->
 	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
+	<!-- IF .pagination -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
+		<ul>
+		<!-- BEGIN pagination -->
+			<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
+			<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
+			<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+			<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
+			<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
+			<!-- ENDIF -->
+		<!-- END pagination -->
+		</ul>
 	<!-- ENDIF -->
+	</div>
 
 	<!-- IF .log -->
 	<table cellspacing="1">
@@ -44,11 +54,21 @@
 		<input class="button2" type="submit" value="{L_GO}" name="sort" />
 	</fieldset>
 	<hr />
-	<!-- IF PAGINATION -->
 	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
+	<!-- IF .pagination -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
+		<ul>
+		<!-- BEGIN pagination -->
+			<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
+			<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
+			<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+			<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
+			<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
+			<!-- ENDIF -->
+		<!-- END pagination -->
+		</ul>
 	<!-- ENDIF -->
+	</div>
 
 	<!-- IF S_CLEARLOGS -->
 		<fieldset class="quick">
-- 
cgit v1.2.1


From dc71c0629e60acccd39b59538f2e7f5b09b32509 Mon Sep 17 00:00:00 2001
From: Drae <paul@starstreak.net>
Date: Thu, 5 Jul 2012 18:56:14 +0100
Subject: [feature/pagination-as-list] Various fixes and improvements

Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.

PHPBB3-10968
---
 phpBB/adm/style/acp_attachments.html    | 17 ++++-------------
 phpBB/adm/style/acp_groups.html         | 12 +-----------
 phpBB/adm/style/acp_icons.html          | 11 +----------
 phpBB/adm/style/acp_inactive.html       | 12 +-----------
 phpBB/adm/style/acp_logs.html           | 12 +-----------
 phpBB/adm/style/acp_users.html          | 24 ++----------------------
 phpBB/adm/style/acp_users_feedback.html | 24 ++----------------------
 phpBB/adm/style/pagination.html         | 12 ++++++++++++
 8 files changed, 24 insertions(+), 100 deletions(-)
 create mode 100644 phpBB/adm/style/pagination.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index f3d67d2bfa..bdec9eb3cb 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -379,20 +379,11 @@
 	<legend>{L_TITLE}</legend>
 
 	<div class="pagination">
-	<!-- IF .pagination  or TOTAL_FILES -->
-		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE} &bull;
+	<!-- IF .pagination or TOTAL_FILES -->
+		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE}
 		<!-- IF .pagination --> 
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
-			<ul>
-			<!-- BEGIN pagination -->
-				<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
-				<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
-				<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
-				<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
-				<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
-				<!-- ENDIF -->
-			<!-- END pagination -->
-			</ul>
+			&bull; 
+			<!-- INCLUDE pagination.html -->
 		<!-- ELSE --> 
 			{S_ON_PAGE}
 		<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index ca68bc7528..6e52880131 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -241,17 +241,7 @@
 	</table>
 	<div class="pagination">
 	<!-- IF .pagination -->
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
-		<ul>
-		<!-- BEGIN pagination -->
-			<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
-			<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
-			<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
-			<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
-			<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
-			<!-- ENDIF -->
-		<!-- END pagination -->
-		</ul>
+		<!-- INCLUDE pagination.html -->
 	<!-- ENDIF -->
 	</div>
 
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index 6f42165414..b9af20d5a2 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -257,16 +257,7 @@
 	</table>
 	<div class="pagination">
 	<!-- IF .pagination -->
-		<ul>
-		<!-- BEGIN pagination -->
-			<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
-			<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
-			<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
-			<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
-			<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
-			<!-- ENDIF -->
-		<!-- END pagination -->
-		</ul>
+		<!-- INCLUDE pagination.html -->	
 	<!-- ENDIF -->
 	</div>
 	<p class="quick">
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index 12cc11d742..ad5871f291 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -12,17 +12,7 @@
 
 <div class="pagination">
 <!-- IF .pagination -->
-	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
-	<ul>
-	<!-- BEGIN pagination -->
-		<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
-		<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
-		<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
-		<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
-		<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
-		<!-- ENDIF -->
-	<!-- END pagination -->
-	</ul>
+	<!-- INCLUDE pagination.html -->
 <!-- ENDIF -->
 </div>
 
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index 3b2d448a44..16638a5a72 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -14,17 +14,7 @@
 
 <div class="pagination" style="float: right; margin: 15px 0 2px 0">
 <!-- IF .pagination -->
-	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
-	<ul>
-	<!-- BEGIN pagination -->
-		<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
-		<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
-		<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
-		<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
-		<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
-		<!-- ENDIF -->
-	<!-- END pagination -->
-	</ul>
+	<!-- INCLUDE pagination.html -->
 <!-- ENDIF -->
 </div>
 
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index 02cdab55b2..837629255b 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -159,17 +159,7 @@
 
 	<div class="pagination">
 	<!-- IF .pagination -->
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
-		<ul>
-		<!-- BEGIN pagination -->
-			<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
-			<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
-			<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
-			<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
-			<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
-			<!-- ENDIF -->
-		<!-- END pagination -->
-		</ul>
+		<!-- INCLUDE pagination.html -->
 	<!-- ENDIF -->
 	</div>
 
@@ -208,17 +198,7 @@
 	<hr />
 	<div class="pagination">
 	<!-- IF .pagination -->
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
-		<ul>
-		<!-- BEGIN pagination -->
-			<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
-			<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
-			<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
-			<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
-			<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
-			<!-- ENDIF -->
-		<!-- END pagination -->
-		</ul>
+		<!-- INCLUDE pagination.html -->
 	<!-- ENDIF -->
 	</div>
 
diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html
index 6b7761ed46..1dad7f1927 100644
--- a/phpBB/adm/style/acp_users_feedback.html
+++ b/phpBB/adm/style/acp_users_feedback.html
@@ -2,17 +2,7 @@
 
 	<div class="pagination">
 	<!-- IF .pagination -->
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
-		<ul>
-		<!-- BEGIN pagination -->
-			<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
-			<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
-			<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
-			<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
-			<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
-			<!-- ENDIF -->
-		<!-- END pagination -->
-		</ul>
+		<!-- INCLUDE pagination.html -->
 	<!-- ENDIF -->
 	</div>
 
@@ -56,17 +46,7 @@
 	<hr />
 	<div class="pagination">
 	<!-- IF .pagination -->
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
-		<ul>
-		<!-- BEGIN pagination -->
-			<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
-			<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
-			<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
-			<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
-			<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
-			<!-- ENDIF -->
-		<!-- END pagination -->
-		</ul>
+		<!-- INCLUDE pagination.html -->
 	<!-- ENDIF -->
 	</div>
 
diff --git a/phpBB/adm/style/pagination.html b/phpBB/adm/style/pagination.html
new file mode 100644
index 0000000000..d62d0b6a81
--- /dev/null
+++ b/phpBB/adm/style/pagination.html
@@ -0,0 +1,12 @@
+
+ 	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
+	<ul>
+	<!-- BEGIN pagination -->
+		<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
+		<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
+		<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+		<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li>
+		<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li>
+		<!-- ENDIF -->
+	<!-- END pagination -->
+	</ul>
-- 
cgit v1.2.1


From ca43a8947a67642f6d1f211f1f5e030b2526ebe2 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 20 Jul 2012 23:53:11 +0200
Subject: [ticket/11008] Remove eval() calls to get document[id]

PHPBB3-11008
---
 phpBB/adm/style/overall_header.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index f79c0318b5..f6d0e1025f 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -62,11 +62,7 @@ function dE(n, s, type)
 */
 function marklist(id, name, state)
 {
-	var parent = document.getElementById(id);
-	if (!parent)
-	{
-		eval('parent = document.' + id);
-	}
+	var parent = document.getElementById(id) || document[id];
 
 	if (!parent)
 	{
-- 
cgit v1.2.1


From 5e6b4c7192a80dc29382ad06976e9ce6d5c16efd Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Wed, 29 Feb 2012 21:23:50 +0000
Subject: [ticket/10631] Adding an extensions admin

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_delete.html  | 27 ++++++++++++++++
 phpBB/adm/style/acp_ext_disable.html | 27 ++++++++++++++++
 phpBB/adm/style/acp_ext_enable.html  | 27 ++++++++++++++++
 phpBB/adm/style/acp_ext_list.html    | 60 ++++++++++++++++++++++++++++++++++++
 phpBB/adm/style/acp_ext_purge.html   | 27 ++++++++++++++++
 5 files changed, 168 insertions(+)
 create mode 100644 phpBB/adm/style/acp_ext_delete.html
 create mode 100644 phpBB/adm/style/acp_ext_disable.html
 create mode 100644 phpBB/adm/style/acp_ext_enable.html
 create mode 100644 phpBB/adm/style/acp_ext_list.html
 create mode 100644 phpBB/adm/style/acp_ext_purge.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_delete.html b/phpBB/adm/style/acp_ext_delete.html
new file mode 100644
index 0000000000..1ce99b8905
--- /dev/null
+++ b/phpBB/adm/style/acp_ext_delete.html
@@ -0,0 +1,27 @@
+<!-- INCLUDE overall_header.html -->
+
+	<a name="maincontent"></a>
+
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
+
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+	<p>{L_ENABLE_EXPLAIN}</p>
+	
+	<!-- IF PRE -->	
+	<p>{L_DELETE_CONFIRM}</p>
+	
+	<form id="acp_extensions" method="post" action="{U_DELETE}">
+	<fieldset class="submit-buttons">
+		<legend>{L_DELETE}</legend>		
+		<input class="button1" type="submit" name="{L_DELETE}" value="{L_DELETE}" />
+	</fieldset>
+	</form>
+	<!-- ELSE IF -->
+		<div class="successbox">
+			<p>{L_DELETE_SUCESS}</p>
+			<br />
+			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+		</div>
+	<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
new file mode 100644
index 0000000000..2198db09a1
--- /dev/null
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -0,0 +1,27 @@
+<!-- INCLUDE overall_header.html -->
+
+	<a name="maincontent"></a>
+
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
+
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+	<p>{L_ENABLE_EXPLAIN}</p>
+	
+	<!-- IF PRE -->	
+	<p>{L_DISABLE_CONFIRM}</p>
+	
+	<form id="acp_extensions" method="post" action="{U_DISABLE}">
+	<fieldset class="submit-buttons">
+		<legend>{L_DISABLE}</legend>		
+		<input class="button1" type="submit" name="{L_DISABLE}" value="{L_DISABLE}" />
+	</fieldset>
+	</form>
+	<!-- ELSE IF -->
+		<div class="successbox">
+			<p>{L_DISABLE_SUCESS}</p>
+			<br />
+			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+		</div>
+	<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
new file mode 100644
index 0000000000..4c94ce7b2b
--- /dev/null
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -0,0 +1,27 @@
+<!-- INCLUDE overall_header.html -->
+
+	<a name="maincontent"></a>
+
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
+
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+	<p>{L_ENABLE_EXPLAIN}</p>
+	
+	<!-- IF PRE -->	
+	<p>{L_ENABLE_CONFIRM}</p>
+	
+	<form id="acp_extensions" method="post" action="{U_ENABLE}">
+	<fieldset class="submit-buttons">
+		<legend>{L_ENABLE}</legend>		
+		<input class="button1" type="submit" name="{L_ENABLE}" value="{L_ENABLE}" />
+	</fieldset>
+	</form>
+	<!-- ELSE IF -->
+		<div class="successbox">
+			<p>{L_ENABLE_SUCESS}</p>
+			<br />
+			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+		</div>
+	<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
new file mode 100644
index 0000000000..7058c9c7f7
--- /dev/null
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -0,0 +1,60 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
+
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+
+	<table cellspacing="1">
+		<col class="row1" /><col class="row2" /><col class="row2" />
+	<thead>
+		<tr>
+			<th>{L_EXTENSION_NAME}</th>
+			<th>{L_EXTENSION_OPTIONS}</th>
+			<th>{L_EXTENSION_ACTIONS}</th>
+		</tr>
+	</thead>
+	<tbody>
+		<!-- IF .enabled -->
+		<tr>
+			<td class="row3" colspan="3">
+				<strong>{L_ENABLED} {L_EXTENSIONS}</strong>
+			</td>
+		</tr>
+		<!-- BEGIN enabled -->
+		<tr>
+			<td><strong>{enabled.EXT_NAME}</strong></a></td>
+			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
+			<td style="text-align: center;"><a href="{enabled.U_DISABLE}">{L_DISABLE}</a>&nbsp;|&nbsp;<a href="{enabled.U_PURGE}">{L_PURGE}</a></td>
+		</tr>
+		<!-- END enabled -->
+		<!-- ENDIF -->
+		<!-- IF .disabled -->
+		<tr>
+			<td class="row3" colspan="3"><strong>{L_DISABLED} {L_EXTENSIONS}</strong></td>
+		</tr>
+		<!-- BEGIN disabled -->
+		<tr>
+			<td><strong>{disabled.EXT_NAME}</strong></a></td>
+			<td style="text-align: center;"><a href="{disabled.U_DETAILS}">{L_DETAILS}</a></td>
+			<td style="text-align: center;"><a href="{disabled.U_ENABLE}">{L_ENABLE}</a>&nbsp;|&nbsp;<a href="{disabled.U_PURGE}">{L_PURGE}</a>&nbsp;|&nbsp;<a href="{disabled.U_DELETE}">{L_DELETE}</a></td>
+		</tr>
+		<!-- END disabled -->
+		<!-- ENDIF -->
+		<!-- IF .avaliable -->
+		<tr>
+			<td class="row3" colspan="3"><strong>{L_AVALIABLE} {L_EXTENSIONS}</strong></td>
+		</tr>
+		<!-- BEGIN avaliable -->
+		<tr>
+			<td><strong>{avaliable.EXT_NAME}</strong></a></td>
+			<td style="text-align: center;"><a href="{avaliable.U_DETAILS}">{L_DETAILS}</a></td>
+			<td style="text-align: center;"><a href="{avaliable.U_ENABLE}">{L_ENABLE}</a>&nbsp;|&nbsp;<a href="{avaliable.U_DELETE}">{L_DELETE}</a></td>
+		</tr>
+		<!-- END avaliable -->
+		<!-- ENDIF -->
+	</tbody>
+	</table>
+	
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html
new file mode 100644
index 0000000000..c73bbe6e00
--- /dev/null
+++ b/phpBB/adm/style/acp_ext_purge.html
@@ -0,0 +1,27 @@
+<!-- INCLUDE overall_header.html -->
+
+	<a name="maincontent"></a>
+
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
+
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+	<p>{L_ENABLE_EXPLAIN}</p>
+	
+	<!-- IF PRE -->	
+	<p>{L_PURGE_CONFIRM}</p>
+	
+	<form id="acp_extensions" method="post" action="{U_PURGE}">
+	<fieldset class="submit-buttons">
+		<legend>{L_PURGE}</legend>		
+		<input class="button1" type="submit" name="{L_PURGE}" value="{L_PURGE}" />
+	</fieldset>
+	</form>
+	<!-- ELSE IF -->
+		<div class="successbox">
+			<p>{L_PURGE_SUCESS}</p>
+			<br />
+			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+		</div>
+	<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
-- 
cgit v1.2.1


From 8824ccb3921345359eec56eabc64d7a7bbf18c52 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 4 Mar 2012 15:40:40 +0000
Subject: [ticket/10631] Add an extension details page

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_details.html | 97 ++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 phpBB/adm/style/acp_ext_details.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
new file mode 100644
index 0000000000..397610d83b
--- /dev/null
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -0,0 +1,97 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
+
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+
+	<fieldset>
+		<legend>{L_EXT_DETAILS}</legend>
+		<dl>
+			<dt><label for="display_name">{L_DISPLAY_NAME}:</label></dt>
+			<dd><strong id="display_name">{DISPLAY_NAME}</strong></dd>
+		</dl>
+		<dl>
+			<dt><label for="name">{L_CLEAN_NAME}:</label></dt>
+			<dd><strong id="name">{NAME}</strong></dd>
+		</dl>
+		<dl>
+			<dt><label for="type">{L_TYPE}:</label></dt>
+			<dd><p id="type">{TYPE}</p></dd>
+		</dl>
+		<dl>
+			<dt><label for="description">{L_DESCRIPTION}:</label></dt>
+			<dd><p id="description">{DESCRIPTION}</p></dd>
+		</dl>
+		<dl>
+			<dt><label for="version">{L_VERSION}:</label></dt>
+			<dd><p id="version">{VERSION}</p></dd>
+		</dl>
+		<dl>
+			<dt><label for="homepage">{L_HOPEPAGE}:</label></dt>
+			<dd><p id="homepage">{HOMEPAGE}</p></dd>
+		</dl>
+<!-- 		<dl>
+			<dt><label for="path">{L_PATH}:</label></dt>
+			<dd><p id="path">{PATH}</p></dd>
+		</dl> -->
+		<dl>
+			<dt><label for="time">{L_TIME}:</label></dt>
+			<dd><p id="time">{TIME}</p></dd>
+		</dl>
+		<dl>
+			<dt><label for="licence">{L_LICENCE}:</label></dt>
+			<dd><p id="licence">{LICENCE}</p></dd>
+		</dl>
+	</fieldset>
+	
+	<fieldset>
+		<legend>{L_REQUIREMENTS}</legend>
+		<!-- IF REQUIRE_PHPBB -->
+		<dl>
+			<dt><label for="require_phpbb">{L_PHPBB_VERSION}:</label></dt>
+			<dd><p id="require_phpbb">{REQUIRE_PHPBB}</p></dd>
+		</dl>
+		<!-- ENDIF -->
+		<!-- IF REQUIRE_PHP -->
+		<dl>
+			<dt><label for="require_php">{L_PHP_VERSION}:</label></dt>
+			<dd><p id="require_php">{REQUIRE_PHP}</p></dd>
+		</dl>
+		<!-- ENDIF -->
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_AUTHOR_INFORMATION}</legend>
+		<!-- BEGIN authors -->
+		<dl>
+			<dt><label for="author_name">{L_AUTHOR_NAME}:</label></dt>
+			<dd><strong id="author_name">{authors.AUTHOR_NAME}</strong></dd>
+		</dl>
+		<dl>
+			<dt><label for="author_email">{L_AUTHOR_USERNAME}:</label></dt>
+			<dd><strong id="author_email">{authors.AUTHOR_USERNAME}</strong></dd>
+		</dl>
+		<!-- IF authors.AUTHOR_EMAIL -->
+		<dl>
+			<dt><label for="author_email">{L_AUTHOR_EMAIL}:</label></dt>
+			<dd><strong id="author_email"><a href="mailto:{authors.AUTHOR_EMAIL}">{authors.AUTHOR_EMAIL}</a></strong></dd>
+		</dl>
+		<!-- ENDIF -->
+		<!-- IF authors.AUTHOR_HOMEPAGE -->
+		<dl>
+			<dt><label for="author_url">{L_AUTHOR_HOMEPAGE}:</label></dt>
+			<dd><strong id="author_url"><a href="{authors.AUTHOR_HOMEPAGE}">{authors.AUTHOR_HOMEPAGE}</a></strong></dd>
+		</dl>
+		<!-- ENDIF -->
+		<!-- IF authors.AUTHOR_ROLE -->
+		<dl>
+			<dt><label for="author_role">{L_AUTHOR_ROLE}:</label></dt>
+			<dd><strong id="author_role">{authors.AUTHOR_ROLE}</strong></dd>
+		</dl>
+		<!-- ENDIF -->
+		<!-- END authors -->
+	</fieldset>
+	
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
-- 
cgit v1.2.1


From 913b3fb0c113b9a9c281ec0f02fc259693c57e0c Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Mon, 5 Mar 2012 22:53:10 +0000
Subject: [ticket/10631] Changing Ext Admin List to conform to standards

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_list.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 7058c9c7f7..f5f5241234 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -7,7 +7,7 @@
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
 	<table cellspacing="1">
-		<col class="row1" /><col class="row2" /><col class="row2" />
+		<col class="row1" ><col class="row2" ><col class="row2" >
 	<thead>
 		<tr>
 			<th>{L_EXTENSION_NAME}</th>
@@ -26,7 +26,8 @@
 		<tr>
 			<td><strong>{enabled.EXT_NAME}</strong></a></td>
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
-			<td style="text-align: center;"><a href="{enabled.U_DISABLE}">{L_DISABLE}</a>&nbsp;|&nbsp;<a href="{enabled.U_PURGE}">{L_PURGE}</a></td>
+			<td style="text-align: center;"><a href="{enabled.U_DISABLE}">{L_DISABLE}</a>&nbsp;
+			|&nbsp;<a href="{enabled.U_PURGE}">{L_PURGE}</a></td>
 		</tr>
 		<!-- END enabled -->
 		<!-- ENDIF -->
@@ -38,7 +39,9 @@
 		<tr>
 			<td><strong>{disabled.EXT_NAME}</strong></a></td>
 			<td style="text-align: center;"><a href="{disabled.U_DETAILS}">{L_DETAILS}</a></td>
-			<td style="text-align: center;"><a href="{disabled.U_ENABLE}">{L_ENABLE}</a>&nbsp;|&nbsp;<a href="{disabled.U_PURGE}">{L_PURGE}</a>&nbsp;|&nbsp;<a href="{disabled.U_DELETE}">{L_DELETE}</a></td>
+			<td style="text-align: center;"><a href="{disabled.U_ENABLE}">{L_ENABLE}</a>&nbsp;
+			|&nbsp;<a href="{disabled.U_PURGE}">{L_PURGE}</a>&nbsp;
+			|&nbsp;<a href="{disabled.U_DELETE}">{L_DELETE}</a></td>
 		</tr>
 		<!-- END disabled -->
 		<!-- ENDIF -->
@@ -50,7 +53,8 @@
 		<tr>
 			<td><strong>{avaliable.EXT_NAME}</strong></a></td>
 			<td style="text-align: center;"><a href="{avaliable.U_DETAILS}">{L_DETAILS}</a></td>
-			<td style="text-align: center;"><a href="{avaliable.U_ENABLE}">{L_ENABLE}</a>&nbsp;|&nbsp;<a href="{avaliable.U_DELETE}">{L_DELETE}</a></td>
+			<td style="text-align: center;"><a href="{avaliable.U_ENABLE}">{L_ENABLE}</a>&nbsp;
+			|&nbsp;<a href="{avaliable.U_DELETE}">{L_DELETE}</a></td>
 		</tr>
 		<!-- END avaliable -->
 		<!-- ENDIF -->
-- 
cgit v1.2.1


From 7a954d352ef1fe84256ad691135b6c6bf0d4bcc5 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sat, 28 Apr 2012 18:13:28 +0100
Subject: [ticket/10631] Fixing some items mentioned in PR

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_delete.html  | 4 ++--
 phpBB/adm/style/acp_ext_details.html | 6 +-----
 phpBB/adm/style/acp_ext_disable.html | 4 ++--
 phpBB/adm/style/acp_ext_enable.html  | 4 ++--
 phpBB/adm/style/acp_ext_purge.html   | 4 ++--
 5 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_delete.html b/phpBB/adm/style/acp_ext_delete.html
index 1ce99b8905..f9a52861e5 100644
--- a/phpBB/adm/style/acp_ext_delete.html
+++ b/phpBB/adm/style/acp_ext_delete.html
@@ -18,10 +18,10 @@
 	</form>
 	<!-- ELSE IF -->
 		<div class="successbox">
-			<p>{L_DELETE_SUCESS}</p>
+			<p>{L_DELETE_SUCCESS}</p>
 			<br />
 			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
 		</div>
 	<!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 397610d83b..bc5fda7cc2 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -69,10 +69,6 @@
 			<dt><label for="author_name">{L_AUTHOR_NAME}:</label></dt>
 			<dd><strong id="author_name">{authors.AUTHOR_NAME}</strong></dd>
 		</dl>
-		<dl>
-			<dt><label for="author_email">{L_AUTHOR_USERNAME}:</label></dt>
-			<dd><strong id="author_email">{authors.AUTHOR_USERNAME}</strong></dd>
-		</dl>
 		<!-- IF authors.AUTHOR_EMAIL -->
 		<dl>
 			<dt><label for="author_email">{L_AUTHOR_EMAIL}:</label></dt>
@@ -94,4 +90,4 @@
 		<!-- END authors -->
 	</fieldset>
 	
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
index 2198db09a1..c7de43a611 100644
--- a/phpBB/adm/style/acp_ext_disable.html
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -18,10 +18,10 @@
 	</form>
 	<!-- ELSE IF -->
 		<div class="successbox">
-			<p>{L_DISABLE_SUCESS}</p>
+			<p>{L_DISABLE_SUCCESS}</p>
 			<br />
 			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
 		</div>
 	<!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 4c94ce7b2b..dd892d3477 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -18,10 +18,10 @@
 	</form>
 	<!-- ELSE IF -->
 		<div class="successbox">
-			<p>{L_ENABLE_SUCESS}</p>
+			<p>{L_ENABLE_SUCCESS}</p>
 			<br />
 			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
 		</div>
 	<!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html
index c73bbe6e00..55a648a3e3 100644
--- a/phpBB/adm/style/acp_ext_purge.html
+++ b/phpBB/adm/style/acp_ext_purge.html
@@ -18,10 +18,10 @@
 	</form>
 	<!-- ELSE IF -->
 		<div class="successbox">
-			<p>{L_PURGE_SUCESS}</p>
+			<p>{L_PURGE_SUCCESS}</p>
 			<br />
 			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
 		</div>
 	<!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 4cbfa6175303d23d35aaa06f8f68d9a3d7d0beb2 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 29 Apr 2012 00:34:50 +0100
Subject: [ticket/10631] A few more extension admin changes

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index f5f5241234..f16d347285 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -61,4 +61,4 @@
 	</tbody>
 	</table>
 	
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 18cd1262b2ee3c5098f0446e4d382844a8fa2acf Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 20 May 2012 14:31:31 +0100
Subject: [ticket/10631] Fixing up the template

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_details.html | 64 ++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index bc5fda7cc2..b8302de329 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -9,85 +9,85 @@
 	<fieldset>
 		<legend>{L_EXT_DETAILS}</legend>
 		<dl>
-			<dt><label for="display_name">{L_DISPLAY_NAME}:</label></dt>
-			<dd><strong id="display_name">{DISPLAY_NAME}</strong></dd>
+			<dt><label for="md_display_name">{L_DISPLAY_NAME}:</label></dt>
+			<dd><strong id="md_display_name">{MD_DISPLAY_NAME}</strong></dd>
 		</dl>
 		<dl>
-			<dt><label for="name">{L_CLEAN_NAME}:</label></dt>
-			<dd><strong id="name">{NAME}</strong></dd>
+			<dt><label for="md_name">{L_CLEAN_NAME}:</label></dt>
+			<dd><strong id="md_name">{MD_NAME}</strong></dd>
 		</dl>
 		<dl>
-			<dt><label for="type">{L_TYPE}:</label></dt>
-			<dd><p id="type">{TYPE}</p></dd>
+			<dt><label for="md_type">{L_TYPE}:</label></dt>
+			<dd><p id="md_type">{MD_TYPE}</p></dd>
 		</dl>
 		<dl>
-			<dt><label for="description">{L_DESCRIPTION}:</label></dt>
-			<dd><p id="description">{DESCRIPTION}</p></dd>
+			<dt><label for="md_description">{L_DESCRIPTION}:</label></dt>
+			<dd><p id="md_description">{MD_DESCRIPTION}</p></dd>
 		</dl>
 		<dl>
-			<dt><label for="version">{L_VERSION}:</label></dt>
-			<dd><p id="version">{VERSION}</p></dd>
+			<dt><label for="md_version">{L_VERSION}:</label></dt>
+			<dd><p id="md_version">{MD_VERSION}</p></dd>
 		</dl>
 		<dl>
-			<dt><label for="homepage">{L_HOPEPAGE}:</label></dt>
-			<dd><p id="homepage">{HOMEPAGE}</p></dd>
+			<dt><label for="md_homepage">{L_HOMEPAGE}:</label></dt>
+			<dd><p id="md_homepage">{MD_HOMEPAGE}</p></dd>
 		</dl>
 <!-- 		<dl>
 			<dt><label for="path">{L_PATH}:</label></dt>
 			<dd><p id="path">{PATH}</p></dd>
 		</dl> -->
 		<dl>
-			<dt><label for="time">{L_TIME}:</label></dt>
-			<dd><p id="time">{TIME}</p></dd>
+			<dt><label for="md_time">{L_TIME}:</label></dt>
+			<dd><p id="md_time">{MD_TIME}</p></dd>
 		</dl>
 		<dl>
-			<dt><label for="licence">{L_LICENCE}:</label></dt>
-			<dd><p id="licence">{LICENCE}</p></dd>
+			<dt><label for="md_license">{L_LICENSE}:</label></dt>
+			<dd><p id="md_license">{MD_LICENSE}</p></dd>
 		</dl>
 	</fieldset>
 	
 	<fieldset>
 		<legend>{L_REQUIREMENTS}</legend>
-		<!-- IF REQUIRE_PHPBB -->
+		<!-- IF MD_REQUIRE_PHPBB -->
 		<dl>
 			<dt><label for="require_phpbb">{L_PHPBB_VERSION}:</label></dt>
-			<dd><p id="require_phpbb">{REQUIRE_PHPBB}</p></dd>
+			<dd><p id="require_phpbb">{MD_REQUIRE_PHPBB}</p></dd>
 		</dl>
 		<!-- ENDIF -->
-		<!-- IF REQUIRE_PHP -->
+		<!-- IF MD_REQUIRE_PHP -->
 		<dl>
 			<dt><label for="require_php">{L_PHP_VERSION}:</label></dt>
-			<dd><p id="require_php">{REQUIRE_PHP}</p></dd>
+			<dd><p id="require_php">{MD_REQUIRE_PHP}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 	</fieldset>
 
 	<fieldset>
 		<legend>{L_AUTHOR_INFORMATION}</legend>
-		<!-- BEGIN authors -->
+		<!-- BEGIN md_authors -->
 		<dl>
-			<dt><label for="author_name">{L_AUTHOR_NAME}:</label></dt>
-			<dd><strong id="author_name">{authors.AUTHOR_NAME}</strong></dd>
+			<dt><label for="md_author_name">{L_AUTHOR_NAME}:</label></dt>
+			<dd><strong id="md_author_name">{md_authors.AUTHOR_NAME}</strong></dd>
 		</dl>
-		<!-- IF authors.AUTHOR_EMAIL -->
+		<!-- IF md_authors.AUTHOR_EMAIL -->
 		<dl>
-			<dt><label for="author_email">{L_AUTHOR_EMAIL}:</label></dt>
-			<dd><strong id="author_email"><a href="mailto:{authors.AUTHOR_EMAIL}">{authors.AUTHOR_EMAIL}</a></strong></dd>
+			<dt><label for="md_author_email">{L_AUTHOR_EMAIL}:</label></dt>
+			<dd><strong id="md_author_email"><a href="mailto:{md_authors.AUTHOR_EMAIL}">{md_authors.AUTHOR_EMAIL}</a></strong></dd>
 		</dl>
 		<!-- ENDIF -->
-		<!-- IF authors.AUTHOR_HOMEPAGE -->
+		<!-- IF md_authors.AUTHOR_HOMEPAGE -->
 		<dl>
-			<dt><label for="author_url">{L_AUTHOR_HOMEPAGE}:</label></dt>
-			<dd><strong id="author_url"><a href="{authors.AUTHOR_HOMEPAGE}">{authors.AUTHOR_HOMEPAGE}</a></strong></dd>
+			<dt><label for="md_author_url">{L_AUTHOR_HOMEPAGE}:</label></dt>
+			<dd><strong id="md_author_url"><a href="{md_authors.AUTHOR_HOMEPAGE}">{md_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
 		</dl>
 		<!-- ENDIF -->
-		<!-- IF authors.AUTHOR_ROLE -->
+		<!-- IF md_authors.AUTHOR_ROLE -->
 		<dl>
 			<dt><label for="author_role">{L_AUTHOR_ROLE}:</label></dt>
-			<dd><strong id="author_role">{authors.AUTHOR_ROLE}</strong></dd>
+			<dd><strong id="md_author_role">{md_authors.AUTHOR_ROLE}</strong></dd>
 		</dl>
 		<!-- ENDIF -->
-		<!-- END authors -->
+		<!-- END md_authors -->
 	</fieldset>
 	
 <!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 3ba59c6362c955d1f9b59278f7dd19cdacecff99 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 22 Jul 2012 18:11:56 -0500
Subject: [ticket/10631] Various tidbits and cleanup on the acp extensions
 manager

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_list.html | 115 +++++++++++++++++---------------------
 1 file changed, 51 insertions(+), 64 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index f16d347285..ef3bbb87cc 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -1,64 +1,51 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-
-	<table cellspacing="1">
-		<col class="row1" ><col class="row2" ><col class="row2" >
-	<thead>
-		<tr>
-			<th>{L_EXTENSION_NAME}</th>
-			<th>{L_EXTENSION_OPTIONS}</th>
-			<th>{L_EXTENSION_ACTIONS}</th>
-		</tr>
-	</thead>
-	<tbody>
-		<!-- IF .enabled -->
-		<tr>
-			<td class="row3" colspan="3">
-				<strong>{L_ENABLED} {L_EXTENSIONS}</strong>
-			</td>
-		</tr>
-		<!-- BEGIN enabled -->
-		<tr>
-			<td><strong>{enabled.EXT_NAME}</strong></a></td>
-			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
-			<td style="text-align: center;"><a href="{enabled.U_DISABLE}">{L_DISABLE}</a>&nbsp;
-			|&nbsp;<a href="{enabled.U_PURGE}">{L_PURGE}</a></td>
-		</tr>
-		<!-- END enabled -->
-		<!-- ENDIF -->
-		<!-- IF .disabled -->
-		<tr>
-			<td class="row3" colspan="3"><strong>{L_DISABLED} {L_EXTENSIONS}</strong></td>
-		</tr>
-		<!-- BEGIN disabled -->
-		<tr>
-			<td><strong>{disabled.EXT_NAME}</strong></a></td>
-			<td style="text-align: center;"><a href="{disabled.U_DETAILS}">{L_DETAILS}</a></td>
-			<td style="text-align: center;"><a href="{disabled.U_ENABLE}">{L_ENABLE}</a>&nbsp;
-			|&nbsp;<a href="{disabled.U_PURGE}">{L_PURGE}</a>&nbsp;
-			|&nbsp;<a href="{disabled.U_DELETE}">{L_DELETE}</a></td>
-		</tr>
-		<!-- END disabled -->
-		<!-- ENDIF -->
-		<!-- IF .avaliable -->
-		<tr>
-			<td class="row3" colspan="3"><strong>{L_AVALIABLE} {L_EXTENSIONS}</strong></td>
-		</tr>
-		<!-- BEGIN avaliable -->
-		<tr>
-			<td><strong>{avaliable.EXT_NAME}</strong></a></td>
-			<td style="text-align: center;"><a href="{avaliable.U_DETAILS}">{L_DETAILS}</a></td>
-			<td style="text-align: center;"><a href="{avaliable.U_ENABLE}">{L_ENABLE}</a>&nbsp;
-			|&nbsp;<a href="{avaliable.U_DELETE}">{L_DELETE}</a></td>
-		</tr>
-		<!-- END avaliable -->
-		<!-- ENDIF -->
-	</tbody>
-	</table>
-	
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
+
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+
+	<table cellspacing="1">
+		<col class="row1" ><col class="row2" ><col class="row2" >
+	<thead>
+		<tr>
+			<th>{L_EXTENSION_NAME}</th>
+			<th>{L_EXTENSION_OPTIONS}</th>
+			<th>{L_EXTENSION_ACTIONS}</th>
+		</tr>
+	</thead>
+	<tbody>
+		<!-- IF .enabled -->
+		<tr>
+			<td class="row3" colspan="3">
+				<strong>{L_ENABLED} {L_EXTENSIONS}</strong>
+			</td>
+		</tr>
+		<!-- BEGIN enabled -->
+		<tr>
+			<td><strong>{enabled.EXT_NAME}</strong></a></td>
+			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
+			<td style="text-align: center;"><a href="{enabled.U_DISABLE}">{L_DISABLE}</a>&nbsp;
+			|&nbsp;<a href="{enabled.U_PURGE}">{L_PURGE}</a></td>
+		</tr>
+		<!-- END enabled -->
+		<!-- ENDIF -->
+		<!-- IF .disabled -->
+		<tr>
+			<td class="row3" colspan="3"><strong>{L_DISABLED} {L_EXTENSIONS}</strong></td>
+		</tr>
+		<!-- BEGIN disabled -->
+		<tr>
+			<td><strong>{disabled.EXT_NAME}</strong></a></td>
+			<td style="text-align: center;"><a href="{disabled.U_DETAILS}">{L_DETAILS}</a></td>
+			<td style="text-align: center;"><a href="{disabled.U_ENABLE}">{L_ENABLE}</a>&nbsp;
+			<!-- IF disabled.U_PURGE -->|&nbsp;<a href="{disabled.U_PURGE}">{L_PURGE}</a>&nbsp;<!-- ENDIF -->
+			<!-- IF disabled.U_DELETE -->|&nbsp;<a href="{disabled.U_DELETE}">{L_DELETE}</a><!-- ENDIF --></td>
+		</tr>
+		<!-- END disabled -->
+		<!-- ENDIF -->
+	</tbody>
+	</table>
+	
+<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From bf6e91b5f3f6d56c1a38cbff0ccf206f13202e50 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 22 Jul 2012 20:24:20 -0500
Subject: [ticket/10631] Fixing some more issues

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_details.html | 186 +++++++++++++++++------------------
 1 file changed, 93 insertions(+), 93 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index b8302de329..776c44711c 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -1,93 +1,93 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-
-	<fieldset>
-		<legend>{L_EXT_DETAILS}</legend>
-		<dl>
-			<dt><label for="md_display_name">{L_DISPLAY_NAME}:</label></dt>
-			<dd><strong id="md_display_name">{MD_DISPLAY_NAME}</strong></dd>
-		</dl>
-		<dl>
-			<dt><label for="md_name">{L_CLEAN_NAME}:</label></dt>
-			<dd><strong id="md_name">{MD_NAME}</strong></dd>
-		</dl>
-		<dl>
-			<dt><label for="md_type">{L_TYPE}:</label></dt>
-			<dd><p id="md_type">{MD_TYPE}</p></dd>
-		</dl>
-		<dl>
-			<dt><label for="md_description">{L_DESCRIPTION}:</label></dt>
-			<dd><p id="md_description">{MD_DESCRIPTION}</p></dd>
-		</dl>
-		<dl>
-			<dt><label for="md_version">{L_VERSION}:</label></dt>
-			<dd><p id="md_version">{MD_VERSION}</p></dd>
-		</dl>
-		<dl>
-			<dt><label for="md_homepage">{L_HOMEPAGE}:</label></dt>
-			<dd><p id="md_homepage">{MD_HOMEPAGE}</p></dd>
-		</dl>
-<!-- 		<dl>
-			<dt><label for="path">{L_PATH}:</label></dt>
-			<dd><p id="path">{PATH}</p></dd>
-		</dl> -->
-		<dl>
-			<dt><label for="md_time">{L_TIME}:</label></dt>
-			<dd><p id="md_time">{MD_TIME}</p></dd>
-		</dl>
-		<dl>
-			<dt><label for="md_license">{L_LICENSE}:</label></dt>
-			<dd><p id="md_license">{MD_LICENSE}</p></dd>
-		</dl>
-	</fieldset>
-	
-	<fieldset>
-		<legend>{L_REQUIREMENTS}</legend>
-		<!-- IF MD_REQUIRE_PHPBB -->
-		<dl>
-			<dt><label for="require_phpbb">{L_PHPBB_VERSION}:</label></dt>
-			<dd><p id="require_phpbb">{MD_REQUIRE_PHPBB}</p></dd>
-		</dl>
-		<!-- ENDIF -->
-		<!-- IF MD_REQUIRE_PHP -->
-		<dl>
-			<dt><label for="require_php">{L_PHP_VERSION}:</label></dt>
-			<dd><p id="require_php">{MD_REQUIRE_PHP}</p></dd>
-		</dl>
-		<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_AUTHOR_INFORMATION}</legend>
-		<!-- BEGIN md_authors -->
-		<dl>
-			<dt><label for="md_author_name">{L_AUTHOR_NAME}:</label></dt>
-			<dd><strong id="md_author_name">{md_authors.AUTHOR_NAME}</strong></dd>
-		</dl>
-		<!-- IF md_authors.AUTHOR_EMAIL -->
-		<dl>
-			<dt><label for="md_author_email">{L_AUTHOR_EMAIL}:</label></dt>
-			<dd><strong id="md_author_email"><a href="mailto:{md_authors.AUTHOR_EMAIL}">{md_authors.AUTHOR_EMAIL}</a></strong></dd>
-		</dl>
-		<!-- ENDIF -->
-		<!-- IF md_authors.AUTHOR_HOMEPAGE -->
-		<dl>
-			<dt><label for="md_author_url">{L_AUTHOR_HOMEPAGE}:</label></dt>
-			<dd><strong id="md_author_url"><a href="{md_authors.AUTHOR_HOMEPAGE}">{md_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
-		</dl>
-		<!-- ENDIF -->
-		<!-- IF md_authors.AUTHOR_ROLE -->
-		<dl>
-			<dt><label for="author_role">{L_AUTHOR_ROLE}:</label></dt>
-			<dd><strong id="md_author_role">{md_authors.AUTHOR_ROLE}</strong></dd>
-		</dl>
-		<!-- ENDIF -->
-		<!-- END md_authors -->
-	</fieldset>
-	
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
+
+	<fieldset>
+		<legend>{L_EXT_DETAILS}</legend>
+		<dl>
+			<dt><label for="md_display_name">{L_DISPLAY_NAME}:</label></dt>
+			<dd><strong id="md_display_name">{MD_DISPLAY_NAME}</strong></dd>
+		</dl>
+		<dl>
+			<dt><label for="md_name">{L_CLEAN_NAME}:</label></dt>
+			<dd><strong id="md_name">{MD_NAME}</strong></dd>
+		</dl>
+		<dl>
+			<dt><label for="md_type">{L_TYPE}:</label></dt>
+			<dd><p id="md_type">{MD_TYPE}</p></dd>
+		</dl>
+		<dl>
+			<dt><label for="md_description">{L_DESCRIPTION}:</label></dt>
+			<dd><p id="md_description">{MD_DESCRIPTION}</p></dd>
+		</dl>
+		<dl>
+			<dt><label for="md_version">{L_VERSION}:</label></dt>
+			<dd><p id="md_version">{MD_VERSION}</p></dd>
+		</dl>
+		<dl>
+			<dt><label for="md_homepage">{L_HOMEPAGE}:</label></dt>
+			<dd><p id="md_homepage">{MD_HOMEPAGE}</p></dd>
+		</dl>
+<!-- 		<dl>
+			<dt><label for="path">{L_PATH}:</label></dt>
+			<dd><p id="path">{PATH}</p></dd>
+		</dl> -->
+		<dl>
+			<dt><label for="md_time">{L_TIME}:</label></dt>
+			<dd><p id="md_time">{MD_TIME}</p></dd>
+		</dl>
+		<dl>
+			<dt><label for="md_license">{L_LICENCE}:</label></dt>
+			<dd><p id="md_license">{MD_LICENCE}</p></dd>
+		</dl>
+	</fieldset>
+	
+	<fieldset>
+		<legend>{L_REQUIREMENTS}</legend>
+		<!-- IF MD_REQUIRE_PHPBB -->
+		<dl>
+			<dt><label for="require_phpbb">{L_PHPBB_VERSION}:</label></dt>
+			<dd><p id="require_phpbb">{MD_REQUIRE_PHPBB}</p></dd>
+		</dl>
+		<!-- ENDIF -->
+		<!-- IF MD_REQUIRE_PHP -->
+		<dl>
+			<dt><label for="require_php">{L_PHP_VERSION}:</label></dt>
+			<dd><p id="require_php">{MD_REQUIRE_PHP}</p></dd>
+		</dl>
+		<!-- ENDIF -->
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_AUTHOR_INFORMATION}</legend>
+		<!-- BEGIN md_authors -->
+		<dl>
+			<dt><label for="md_author_name">{L_AUTHOR_NAME}:</label></dt>
+			<dd><strong id="md_author_name">{md_authors.AUTHOR_NAME}</strong></dd>
+		</dl>
+		<!-- IF md_authors.AUTHOR_EMAIL -->
+		<dl>
+			<dt><label for="md_author_email">{L_AUTHOR_EMAIL}:</label></dt>
+			<dd><strong id="md_author_email"><a href="mailto:{md_authors.AUTHOR_EMAIL}">{md_authors.AUTHOR_EMAIL}</a></strong></dd>
+		</dl>
+		<!-- ENDIF -->
+		<!-- IF md_authors.AUTHOR_HOMEPAGE -->
+		<dl>
+			<dt><label for="md_author_url">{L_AUTHOR_HOMEPAGE}:</label></dt>
+			<dd><strong id="md_author_url"><a href="{md_authors.AUTHOR_HOMEPAGE}">{md_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
+		</dl>
+		<!-- ENDIF -->
+		<!-- IF md_authors.AUTHOR_ROLE -->
+		<dl>
+			<dt><label for="author_role">{L_AUTHOR_ROLE}:</label></dt>
+			<dd><strong id="md_author_role">{md_authors.AUTHOR_ROLE}</strong></dd>
+		</dl>
+		<!-- ENDIF -->
+		
+		<br /><br />
+		<!-- END md_authors -->
+	</fieldset>
+	
+<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 28ca2d6a5fe8f8f1d8733af70951fa1191336eb6 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 22 Jul 2012 22:54:27 -0500
Subject: [ticket/10631] Stagger the enable/disable/purge for extensions

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_disable.html | 58 +++++++++++++++++++-----------------
 phpBB/adm/style/acp_ext_enable.html  | 58 +++++++++++++++++++-----------------
 phpBB/adm/style/acp_ext_purge.html   | 58 +++++++++++++++++++-----------------
 3 files changed, 93 insertions(+), 81 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
index c7de43a611..e47ba2d8b9 100644
--- a/phpBB/adm/style/acp_ext_disable.html
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -1,27 +1,31 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a name="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_ENABLE_EXPLAIN}</p>
-	
-	<!-- IF PRE -->	
-	<p>{L_DISABLE_CONFIRM}</p>
-	
-	<form id="acp_extensions" method="post" action="{U_DISABLE}">
-	<fieldset class="submit-buttons">
-		<legend>{L_DISABLE}</legend>		
-		<input class="button1" type="submit" name="{L_DISABLE}" value="{L_DISABLE}" />
-	</fieldset>
-	</form>
-	<!-- ELSE IF -->
-		<div class="successbox">
-			<p>{L_DISABLE_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_header.html -->
+
+	<a name="maincontent"></a>
+
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
+
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+	<p>{L_ENABLE_EXPLAIN}</p>
+	
+	<!-- IF PRE -->	
+	<p>{L_DISABLE_CONFIRM}</p>
+	
+	<form id="acp_extensions" method="post" action="{U_DISABLE}">
+	<fieldset class="submit-buttons">
+		<legend>{L_DISABLE}</legend>		
+		<input class="button1" type="submit" name="{L_DISABLE}" value="{L_DISABLE}" />
+	</fieldset>
+	</form>
+	<!-- ELSEIF S_NEXT_STEP -->
+		<div class="errorbox">
+			<p>{L_DISABLE_IN_PROGRESS}</p>
+		</div>
+	<!-- ELSE -->
+		<div class="successbox">
+			<p>{L_DISABLE_SUCCESS}</p>
+			<br />
+			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+		</div>
+	<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index dd892d3477..4b0f8bfdd7 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -1,27 +1,31 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a name="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_ENABLE_EXPLAIN}</p>
-	
-	<!-- IF PRE -->	
-	<p>{L_ENABLE_CONFIRM}</p>
-	
-	<form id="acp_extensions" method="post" action="{U_ENABLE}">
-	<fieldset class="submit-buttons">
-		<legend>{L_ENABLE}</legend>		
-		<input class="button1" type="submit" name="{L_ENABLE}" value="{L_ENABLE}" />
-	</fieldset>
-	</form>
-	<!-- ELSE IF -->
-		<div class="successbox">
-			<p>{L_ENABLE_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_header.html -->
+
+	<a name="maincontent"></a>
+
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
+
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+	<p>{L_ENABLE_EXPLAIN}</p>
+	
+	<!-- IF PRE -->	
+	<p>{L_ENABLE_CONFIRM}</p>
+	
+	<form id="acp_extensions" method="post" action="{U_ENABLE}">
+	<fieldset class="submit-buttons">
+		<legend>{L_ENABLE}</legend>		
+		<input class="button1" type="submit" name="{L_ENABLE}" value="{L_ENABLE}" />
+	</fieldset>
+	</form>
+	<!-- ELSEIF S_NEXT_STEP -->
+		<div class="errorbox">
+			<p>{L_ENABLE_IN_PROGRESS}</p>
+		</div>
+	<!-- ELSE -->
+		<div class="successbox">
+			<p>{L_ENABLE_SUCCESS}</p>
+			<br />
+			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+		</div>
+	<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html
index 55a648a3e3..7255057d04 100644
--- a/phpBB/adm/style/acp_ext_purge.html
+++ b/phpBB/adm/style/acp_ext_purge.html
@@ -1,27 +1,31 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a name="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_ENABLE_EXPLAIN}</p>
-	
-	<!-- IF PRE -->	
-	<p>{L_PURGE_CONFIRM}</p>
-	
-	<form id="acp_extensions" method="post" action="{U_PURGE}">
-	<fieldset class="submit-buttons">
-		<legend>{L_PURGE}</legend>		
-		<input class="button1" type="submit" name="{L_PURGE}" value="{L_PURGE}" />
-	</fieldset>
-	</form>
-	<!-- ELSE IF -->
-		<div class="successbox">
-			<p>{L_PURGE_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_header.html -->
+
+	<a name="maincontent"></a>
+
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
+
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+	<p>{L_ENABLE_EXPLAIN}</p>
+	
+	<!-- IF PRE -->	
+	<p>{L_PURGE_CONFIRM}</p>
+	
+	<form id="acp_extensions" method="post" action="{U_PURGE}">
+	<fieldset class="submit-buttons">
+		<legend>{L_PURGE}</legend>		
+		<input class="button1" type="submit" name="{L_PURGE}" value="{L_PURGE}" />
+	</fieldset>
+	</form>
+	<!-- ELSEIF S_NEXT_STEP -->
+		<div class="errorbox">
+			<p>{L_PURGE_IN_PROGRESS}</p>
+		</div>
+	<!-- ELSE -->
+		<div class="successbox">
+			<p>{L_PURGE_SUCCESS}</p>
+			<br />
+			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+		</div>
+	<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 8bbab088dd5830d8dd1151a3684dde5c197ba268 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 23 Jul 2012 15:17:42 -0500
Subject: [ticket/10631] Validation for extensions

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_details.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 776c44711c..5af9603a75 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -6,10 +6,12 @@
 
 	<fieldset>
 		<legend>{L_EXT_DETAILS}</legend>
+		<!-- IF MD_DISPLAY_NAME -->
 		<dl>
 			<dt><label for="md_display_name">{L_DISPLAY_NAME}:</label></dt>
 			<dd><strong id="md_display_name">{MD_DISPLAY_NAME}</strong></dd>
 		</dl>
+		<!-- ENDIF -->
 		<dl>
 			<dt><label for="md_name">{L_CLEAN_NAME}:</label></dt>
 			<dd><strong id="md_name">{MD_NAME}</strong></dd>
@@ -43,7 +45,7 @@
 			<dd><p id="md_license">{MD_LICENCE}</p></dd>
 		</dl>
 	</fieldset>
-	
+
 	<fieldset>
 		<legend>{L_REQUIREMENTS}</legend>
 		<!-- IF MD_REQUIRE_PHPBB -->
@@ -85,9 +87,9 @@
 			<dd><strong id="md_author_role">{md_authors.AUTHOR_ROLE}</strong></dd>
 		</dl>
 		<!-- ENDIF -->
-		
+
 		<br /><br />
 		<!-- END md_authors -->
 	</fieldset>
-	
+
 <!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 9c0cd2693fd61c9528aa5fcbc3dff9de73515ebe Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 23 Jul 2012 16:04:29 -0500
Subject: [ticket/10631] Make the enable/disable/purge notices more visable.

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_disable.html | 12 +++++++-----
 phpBB/adm/style/acp_ext_enable.html  | 12 +++++++-----
 phpBB/adm/style/acp_ext_purge.html   | 12 +++++++-----
 3 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
index e47ba2d8b9..1f0bbe14c8 100644
--- a/phpBB/adm/style/acp_ext_disable.html
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -6,13 +6,15 @@
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 	<p>{L_ENABLE_EXPLAIN}</p>
-	
-	<!-- IF PRE -->	
-	<p>{L_DISABLE_CONFIRM}</p>
-	
+
+	<!-- IF PRE -->
+	<div class="errorbox">
+		<p>{L_DISABLE_CONFIRM}</p>
+	</div>
+
 	<form id="acp_extensions" method="post" action="{U_DISABLE}">
 	<fieldset class="submit-buttons">
-		<legend>{L_DISABLE}</legend>		
+		<legend>{L_DISABLE}</legend>
 		<input class="button1" type="submit" name="{L_DISABLE}" value="{L_DISABLE}" />
 	</fieldset>
 	</form>
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 4b0f8bfdd7..9f278bfbe0 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -6,13 +6,15 @@
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 	<p>{L_ENABLE_EXPLAIN}</p>
-	
-	<!-- IF PRE -->	
-	<p>{L_ENABLE_CONFIRM}</p>
-	
+
+	<!-- IF PRE -->
+	<div class="errorbox">
+		<p>{L_ENABLE_CONFIRM}</p>
+	</div>
+
 	<form id="acp_extensions" method="post" action="{U_ENABLE}">
 	<fieldset class="submit-buttons">
-		<legend>{L_ENABLE}</legend>		
+		<legend>{L_ENABLE}</legend>
 		<input class="button1" type="submit" name="{L_ENABLE}" value="{L_ENABLE}" />
 	</fieldset>
 	</form>
diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html
index 7255057d04..816fd872b9 100644
--- a/phpBB/adm/style/acp_ext_purge.html
+++ b/phpBB/adm/style/acp_ext_purge.html
@@ -6,13 +6,15 @@
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 	<p>{L_ENABLE_EXPLAIN}</p>
-	
-	<!-- IF PRE -->	
-	<p>{L_PURGE_CONFIRM}</p>
-	
+
+	<!-- IF PRE -->
+	<div class="errorbox">
+		<p>{L_PURGE_CONFIRM}</p>
+	</div>
+
 	<form id="acp_extensions" method="post" action="{U_PURGE}">
 	<fieldset class="submit-buttons">
-		<legend>{L_PURGE}</legend>		
+		<legend>{L_PURGE}</legend>
 		<input class="button1" type="submit" name="{L_PURGE}" value="{L_PURGE}" />
 	</fieldset>
 	</form>
-- 
cgit v1.2.1


From 2273ae2b34071160ff930ca8d49326b8dd308899 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 23 Jul 2012 17:05:03 -0500
Subject: [ticket/10631] Remove references to delete extension

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_delete.html | 27 ---------------------------
 phpBB/adm/style/acp_ext_list.html   |  5 ++---
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 phpBB/adm/style/acp_ext_delete.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_delete.html b/phpBB/adm/style/acp_ext_delete.html
deleted file mode 100644
index f9a52861e5..0000000000
--- a/phpBB/adm/style/acp_ext_delete.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a name="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_ENABLE_EXPLAIN}</p>
-	
-	<!-- IF PRE -->	
-	<p>{L_DELETE_CONFIRM}</p>
-	
-	<form id="acp_extensions" method="post" action="{U_DELETE}">
-	<fieldset class="submit-buttons">
-		<legend>{L_DELETE}</legend>		
-		<input class="button1" type="submit" name="{L_DELETE}" value="{L_DELETE}" />
-	</fieldset>
-	</form>
-	<!-- ELSE IF -->
-		<div class="successbox">
-			<p>{L_DELETE_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index ef3bbb87cc..b3b1b84949 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -40,12 +40,11 @@
 			<td><strong>{disabled.EXT_NAME}</strong></a></td>
 			<td style="text-align: center;"><a href="{disabled.U_DETAILS}">{L_DETAILS}</a></td>
 			<td style="text-align: center;"><a href="{disabled.U_ENABLE}">{L_ENABLE}</a>&nbsp;
-			<!-- IF disabled.U_PURGE -->|&nbsp;<a href="{disabled.U_PURGE}">{L_PURGE}</a>&nbsp;<!-- ENDIF -->
-			<!-- IF disabled.U_DELETE -->|&nbsp;<a href="{disabled.U_DELETE}">{L_DELETE}</a><!-- ENDIF --></td>
+			<!-- IF disabled.U_PURGE -->|&nbsp;<a href="{disabled.U_PURGE}">{L_PURGE}</a>&nbsp;<!-- ENDIF --></td>
 		</tr>
 		<!-- END disabled -->
 		<!-- ENDIF -->
 	</tbody>
 	</table>
-	
+
 <!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 106c105113886f9a9e603dbb11549c06049b255f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 23 Jul 2012 18:22:35 -0500
Subject: [ticket/10631] Fix some issues as noted in github comments,
 significantly simplified validation

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_details.html | 64 ++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 5af9603a75..7408e88758 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -16,36 +16,35 @@
 			<dt><label for="md_name">{L_CLEAN_NAME}:</label></dt>
 			<dd><strong id="md_name">{MD_NAME}</strong></dd>
 		</dl>
-		<dl>
-			<dt><label for="md_type">{L_TYPE}:</label></dt>
-			<dd><p id="md_type">{MD_TYPE}</p></dd>
-		</dl>
+		<!-- IF MD_DESCRIPTION -->
 		<dl>
 			<dt><label for="md_description">{L_DESCRIPTION}:</label></dt>
 			<dd><p id="md_description">{MD_DESCRIPTION}</p></dd>
 		</dl>
+		<!-- ENDIF -->
 		<dl>
 			<dt><label for="md_version">{L_VERSION}:</label></dt>
 			<dd><p id="md_version">{MD_VERSION}</p></dd>
 		</dl>
+		<!-- IF MD_HOMEPAGE -->
 		<dl>
 			<dt><label for="md_homepage">{L_HOMEPAGE}:</label></dt>
 			<dd><p id="md_homepage">{MD_HOMEPAGE}</p></dd>
 		</dl>
-<!-- 		<dl>
-			<dt><label for="path">{L_PATH}:</label></dt>
-			<dd><p id="path">{PATH}</p></dd>
-		</dl> -->
+		<!-- ENDIF -->
+		<!-- IF MD_TIME -->
 		<dl>
 			<dt><label for="md_time">{L_TIME}:</label></dt>
 			<dd><p id="md_time">{MD_TIME}</p></dd>
 		</dl>
+		<!-- ENDIF -->
 		<dl>
 			<dt><label for="md_license">{L_LICENCE}:</label></dt>
 			<dd><p id="md_license">{MD_LICENCE}</p></dd>
 		</dl>
 	</fieldset>
 
+	<!-- IF MD_REQUIRE_PHPBB || MD_REQUIRE_PHP -->
 	<fieldset>
 		<legend>{L_REQUIREMENTS}</legend>
 		<!-- IF MD_REQUIRE_PHPBB -->
@@ -61,34 +60,35 @@
 		</dl>
 		<!-- ENDIF -->
 	</fieldset>
+	<!-- ENDIF -->
 
 	<fieldset>
 		<legend>{L_AUTHOR_INFORMATION}</legend>
 		<!-- BEGIN md_authors -->
-		<dl>
-			<dt><label for="md_author_name">{L_AUTHOR_NAME}:</label></dt>
-			<dd><strong id="md_author_name">{md_authors.AUTHOR_NAME}</strong></dd>
-		</dl>
-		<!-- IF md_authors.AUTHOR_EMAIL -->
-		<dl>
-			<dt><label for="md_author_email">{L_AUTHOR_EMAIL}:</label></dt>
-			<dd><strong id="md_author_email"><a href="mailto:{md_authors.AUTHOR_EMAIL}">{md_authors.AUTHOR_EMAIL}</a></strong></dd>
-		</dl>
-		<!-- ENDIF -->
-		<!-- IF md_authors.AUTHOR_HOMEPAGE -->
-		<dl>
-			<dt><label for="md_author_url">{L_AUTHOR_HOMEPAGE}:</label></dt>
-			<dd><strong id="md_author_url"><a href="{md_authors.AUTHOR_HOMEPAGE}">{md_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
-		</dl>
-		<!-- ENDIF -->
-		<!-- IF md_authors.AUTHOR_ROLE -->
-		<dl>
-			<dt><label for="author_role">{L_AUTHOR_ROLE}:</label></dt>
-			<dd><strong id="md_author_role">{md_authors.AUTHOR_ROLE}</strong></dd>
-		</dl>
-		<!-- ENDIF -->
-
-		<br /><br />
+		<fieldset>
+			<dl>
+				<dt><label for="md_author_name">{L_AUTHOR_NAME}:</label></dt>
+				<dd><strong id="md_author_name">{md_authors.AUTHOR_NAME}</strong></dd>
+			</dl>
+			<!-- IF md_authors.AUTHOR_EMAIL -->
+			<dl>
+				<dt><label for="md_author_email">{L_AUTHOR_EMAIL}:</label></dt>
+				<dd><strong id="md_author_email"><a href="mailto:{md_authors.AUTHOR_EMAIL}">{md_authors.AUTHOR_EMAIL}</a></strong></dd>
+			</dl>
+			<!-- ENDIF -->
+			<!-- IF md_authors.AUTHOR_HOMEPAGE -->
+			<dl>
+				<dt><label for="md_author_url">{L_AUTHOR_HOMEPAGE}:</label></dt>
+				<dd><strong id="md_author_url"><a href="{md_authors.AUTHOR_HOMEPAGE}">{md_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
+			</dl>
+			<!-- ENDIF -->
+			<!-- IF md_authors.AUTHOR_ROLE -->
+			<dl>
+				<dt><label for="author_role">{L_AUTHOR_ROLE}:</label></dt>
+				<dd><strong id="md_author_role">{md_authors.AUTHOR_ROLE}</strong></dd>
+			</dl>
+			<!-- ENDIF -->
+		</fieldset>
 		<!-- END md_authors -->
 	</fieldset>
 
-- 
cgit v1.2.1


From 89f4cf6a8c10f9b0875cf7f278016aff67eb38fc Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 23 Jul 2012 19:46:21 -0500
Subject: [ticket/10631] Use exceptions for errors. Build action list
 dynamically.

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_list.html | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index b3b1b84949..65051cbae0 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -26,11 +26,16 @@
 		<tr>
 			<td><strong>{enabled.EXT_NAME}</strong></a></td>
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
-			<td style="text-align: center;"><a href="{enabled.U_DISABLE}">{L_DISABLE}</a>&nbsp;
-			|&nbsp;<a href="{enabled.U_PURGE}">{L_PURGE}</a></td>
+			<td style="text-align: center;">
+				<!-- BEGIN actions -->
+					<a href="{enabled.actions.U_ACTION}" alt="{enabled.actions.L_ACTION}">{enabled.actions.L_ACTION}</a>
+					<!-- IF not enabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
+				<!-- END actions -->
+			</td>
 		</tr>
 		<!-- END enabled -->
 		<!-- ENDIF -->
+
 		<!-- IF .disabled -->
 		<tr>
 			<td class="row3" colspan="3"><strong>{L_DISABLED} {L_EXTENSIONS}</strong></td>
@@ -38,9 +43,15 @@
 		<!-- BEGIN disabled -->
 		<tr>
 			<td><strong>{disabled.EXT_NAME}</strong></a></td>
-			<td style="text-align: center;"><a href="{disabled.U_DETAILS}">{L_DETAILS}</a></td>
-			<td style="text-align: center;"><a href="{disabled.U_ENABLE}">{L_ENABLE}</a>&nbsp;
-			<!-- IF disabled.U_PURGE -->|&nbsp;<a href="{disabled.U_PURGE}">{L_PURGE}</a>&nbsp;<!-- ENDIF --></td>
+			<td style="text-align: center;">
+				<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF -->
+			</td>
+			<td style="text-align: center;">
+				<!-- BEGIN actions -->
+					<a href="{disabled.actions.U_ACTION}" alt="{disabled.actions.L_ACTION}">{disabled.actions.L_ACTION}</a>
+					<!-- IF not disabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
+				<!-- END actions -->
+			</td>
 		</tr>
 		<!-- END disabled -->
 		<!-- ENDIF -->
-- 
cgit v1.2.1


From 36465c9a205c356b0662e45b4fded79c4b476547 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 29 Jul 2012 20:08:30 -0500
Subject: [ticket/10631] Functional acp_extensions test, cleanup

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 65051cbae0..b654a80caa 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -23,7 +23,7 @@
 			</td>
 		</tr>
 		<!-- BEGIN enabled -->
-		<tr>
+		<tr class="ext_enabled">
 			<td><strong>{enabled.EXT_NAME}</strong></a></td>
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
 			<td style="text-align: center;">
@@ -41,7 +41,7 @@
 			<td class="row3" colspan="3"><strong>{L_DISABLED} {L_EXTENSIONS}</strong></td>
 		</tr>
 		<!-- BEGIN disabled -->
-		<tr>
+		<tr class="ext_disabled">
 			<td><strong>{disabled.EXT_NAME}</strong></a></td>
 			<td style="text-align: center;">
 				<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF -->
-- 
cgit v1.2.1


From dce04b2d03f93c9237b743afbcbd89fb6405f836 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 30 Jul 2012 19:30:49 -0500
Subject: [ticket/10631] Various front-end fixes (extensions manager)

Add Back button from details

Add cancel button from actions

Correct language strings

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_details.html | 2 ++
 phpBB/adm/style/acp_ext_disable.html | 5 +++--
 phpBB/adm/style/acp_ext_enable.html  | 3 ++-
 phpBB/adm/style/acp_ext_purge.html   | 5 +++--
 4 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 7408e88758..e927e9de18 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -2,6 +2,8 @@
 
 <a name="maincontent"></a>
 
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<fieldset>
diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
index 1f0bbe14c8..7dc3f6ec97 100644
--- a/phpBB/adm/style/acp_ext_disable.html
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -5,7 +5,7 @@
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_ENABLE_EXPLAIN}</p>
+	<p>{L_DISABLE_EXPLAIN}</p>
 
 	<!-- IF PRE -->
 	<div class="errorbox">
@@ -15,7 +15,8 @@
 	<form id="acp_extensions" method="post" action="{U_DISABLE}">
 	<fieldset class="submit-buttons">
 		<legend>{L_DISABLE}</legend>
-		<input class="button1" type="submit" name="{L_DISABLE}" value="{L_DISABLE}" />
+		<input class="button1" type="submit" name="disable" value="{L_DISABLE}" />
+		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 9f278bfbe0..3f7be2c847 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -15,7 +15,8 @@
 	<form id="acp_extensions" method="post" action="{U_ENABLE}">
 	<fieldset class="submit-buttons">
 		<legend>{L_ENABLE}</legend>
-		<input class="button1" type="submit" name="{L_ENABLE}" value="{L_ENABLE}" />
+		<input class="button1" type="submit" name="enable" value="{L_ENABLE}" />
+		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html
index 816fd872b9..00a58721cb 100644
--- a/phpBB/adm/style/acp_ext_purge.html
+++ b/phpBB/adm/style/acp_ext_purge.html
@@ -5,7 +5,7 @@
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_ENABLE_EXPLAIN}</p>
+	<p>{L_PURGE_EXPLAIN}</p>
 
 	<!-- IF PRE -->
 	<div class="errorbox">
@@ -15,7 +15,8 @@
 	<form id="acp_extensions" method="post" action="{U_PURGE}">
 	<fieldset class="submit-buttons">
 		<legend>{L_PURGE}</legend>
-		<input class="button1" type="submit" name="{L_PURGE}" value="{L_PURGE}" />
+		<input class="button1" type="submit" name="purge" value="{L_PURGE}" />
+		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
-- 
cgit v1.2.1


From 7b643fe8a5fd3b92bb4db9eacb27645417004709 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 5 Aug 2012 19:00:20 -0500
Subject: [ticket/10631] Make failure to meet ext enable requirements clearer

Turn the blocks red on the details page if requirement is not met.

Also changing a how the errors come up when trying to enable/disable
an extension when they cannot be.

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_details.html |  6 +++---
 phpBB/adm/style/admin.css            | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index e927e9de18..f477b452b7 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -3,7 +3,7 @@
 <a name="maincontent"></a>
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	
+
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<fieldset>
@@ -50,13 +50,13 @@
 	<fieldset>
 		<legend>{L_REQUIREMENTS}</legend>
 		<!-- IF MD_REQUIRE_PHPBB -->
-		<dl>
+		<dl<!-- IF MD_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
 			<dt><label for="require_phpbb">{L_PHPBB_VERSION}:</label></dt>
 			<dd><p id="require_phpbb">{MD_REQUIRE_PHPBB}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF MD_REQUIRE_PHP -->
-		<dl>
+		<dl<!-- IF MD_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
 			<dt><label for="require_php">{L_PHP_VERSION}:</label></dt>
 			<dd><p id="require_php">{MD_REQUIRE_PHP}</p></dd>
 		</dl>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 08613de0dd..585707600d 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1718,3 +1718,13 @@ fieldset.permissions .padding {
 .phpinfo td, .phpinfo th, .phpinfo h2, .phpinfo h1 {
 	text-align: left;
 }
+
+.requirements_not_met {
+	padding: 5px;
+	background-color: #BC2A4D;
+}
+
+.requirements_not_met dt label, .requirements_not_met dd p {
+	color: #FFFFFF;
+	font-size: 1.4em;
+}
\ No newline at end of file
-- 
cgit v1.2.1


From 323bbf9b523984a592dc17bf35d2bb91a435be1b Mon Sep 17 00:00:00 2001
From: Unknown Bliss <m@michaelcullum.com>
Date: Fri, 17 Aug 2012 14:06:23 +0100
Subject: [ticket/10631] Adjust prefixes to be easier to understand

PHPBB3-10631
---
 phpBB/adm/style/acp_ext_details.html | 74 ++++++++++++++++++------------------
 phpBB/adm/style/acp_ext_list.html    |  4 +-
 2 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index f477b452b7..e7532691ad 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -8,57 +8,57 @@
 
 	<fieldset>
 		<legend>{L_EXT_DETAILS}</legend>
-		<!-- IF MD_DISPLAY_NAME -->
+		<!-- IF META_DISPLAY_NAME -->
 		<dl>
-			<dt><label for="md_display_name">{L_DISPLAY_NAME}:</label></dt>
-			<dd><strong id="md_display_name">{MD_DISPLAY_NAME}</strong></dd>
+			<dt><label for="meta_display_name">{L_DISPLAY_NAME}:</label></dt>
+			<dd><strong id="meta_display_name">{META_DISPLAY_NAME}</strong></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="md_name">{L_CLEAN_NAME}:</label></dt>
-			<dd><strong id="md_name">{MD_NAME}</strong></dd>
+			<dt><label for="meta_name">{L_CLEAN_NAME}:</label></dt>
+			<dd><strong id="meta_name">{META_NAME}</strong></dd>
 		</dl>
-		<!-- IF MD_DESCRIPTION -->
+		<!-- IF META_DESCRIPTION -->
 		<dl>
-			<dt><label for="md_description">{L_DESCRIPTION}:</label></dt>
-			<dd><p id="md_description">{MD_DESCRIPTION}</p></dd>
+			<dt><label for="meta_description">{L_DESCRIPTION}:</label></dt>
+			<dd><p id="meta_description">{META_DESCRIPTION}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="md_version">{L_VERSION}:</label></dt>
-			<dd><p id="md_version">{MD_VERSION}</p></dd>
+			<dt><label for="meta_version">{L_VERSION}:</label></dt>
+			<dd><p id="meta_version">{META_VERSION}</p></dd>
 		</dl>
-		<!-- IF MD_HOMEPAGE -->
+		<!-- IF META_HOMEPAGE -->
 		<dl>
-			<dt><label for="md_homepage">{L_HOMEPAGE}:</label></dt>
-			<dd><p id="md_homepage">{MD_HOMEPAGE}</p></dd>
+			<dt><label for="meta_homepage">{L_HOMEPAGE}:</label></dt>
+			<dd><p id="meta_homepage">{META_HOMEPAGE}</p></dd>
 		</dl>
 		<!-- ENDIF -->
-		<!-- IF MD_TIME -->
+		<!-- IF META_TIME -->
 		<dl>
-			<dt><label for="md_time">{L_TIME}:</label></dt>
-			<dd><p id="md_time">{MD_TIME}</p></dd>
+			<dt><label for="meta_time">{L_TIME}:</label></dt>
+			<dd><p id="meta_time">{META_TIME}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="md_license">{L_LICENCE}:</label></dt>
-			<dd><p id="md_license">{MD_LICENCE}</p></dd>
+			<dt><label for="meta_license">{L_LICENCE}:</label></dt>
+			<dd><p id="meta_license">{META_LICENCE}</p></dd>
 		</dl>
 	</fieldset>
 
-	<!-- IF MD_REQUIRE_PHPBB || MD_REQUIRE_PHP -->
+	<!-- IF META_REQUIRE_PHPBB || META_REQUIRE_PHP -->
 	<fieldset>
 		<legend>{L_REQUIREMENTS}</legend>
-		<!-- IF MD_REQUIRE_PHPBB -->
-		<dl<!-- IF MD_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
+		<!-- IF META_REQUIRE_PHPBB -->
+		<dl<!-- IF META_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
 			<dt><label for="require_phpbb">{L_PHPBB_VERSION}:</label></dt>
-			<dd><p id="require_phpbb">{MD_REQUIRE_PHPBB}</p></dd>
+			<dd><p id="require_phpbb">{META_REQUIRE_PHPBB}</p></dd>
 		</dl>
 		<!-- ENDIF -->
-		<!-- IF MD_REQUIRE_PHP -->
-		<dl<!-- IF MD_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
+		<!-- IF META_REQUIRE_PHP -->
+		<dl<!-- IF META_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
 			<dt><label for="require_php">{L_PHP_VERSION}:</label></dt>
-			<dd><p id="require_php">{MD_REQUIRE_PHP}</p></dd>
+			<dd><p id="require_php">{META_REQUIRE_PHP}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 	</fieldset>
@@ -66,32 +66,32 @@
 
 	<fieldset>
 		<legend>{L_AUTHOR_INFORMATION}</legend>
-		<!-- BEGIN md_authors -->
+		<!-- BEGIN meta_authors -->
 		<fieldset>
 			<dl>
-				<dt><label for="md_author_name">{L_AUTHOR_NAME}:</label></dt>
-				<dd><strong id="md_author_name">{md_authors.AUTHOR_NAME}</strong></dd>
+				<dt><label for="meta_author_name">{L_AUTHOR_NAME}:</label></dt>
+				<dd><strong id="meta_author_name">{meta_authors.AUTHOR_NAME}</strong></dd>
 			</dl>
-			<!-- IF md_authors.AUTHOR_EMAIL -->
+			<!-- IF meta_authors.AUTHOR_EMAIL -->
 			<dl>
-				<dt><label for="md_author_email">{L_AUTHOR_EMAIL}:</label></dt>
-				<dd><strong id="md_author_email"><a href="mailto:{md_authors.AUTHOR_EMAIL}">{md_authors.AUTHOR_EMAIL}</a></strong></dd>
+				<dt><label for="meta_author_email">{L_AUTHOR_EMAIL}:</label></dt>
+				<dd><strong id="meta_author_email"><a href="mailto:{meta_authors.AUTHOR_EMAIL}">{meta_authors.AUTHOR_EMAIL}</a></strong></dd>
 			</dl>
 			<!-- ENDIF -->
-			<!-- IF md_authors.AUTHOR_HOMEPAGE -->
+			<!-- IF meta_authors.AUTHOR_HOMEPAGE -->
 			<dl>
-				<dt><label for="md_author_url">{L_AUTHOR_HOMEPAGE}:</label></dt>
-				<dd><strong id="md_author_url"><a href="{md_authors.AUTHOR_HOMEPAGE}">{md_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
+				<dt><label for="meta_author_url">{L_AUTHOR_HOMEPAGE}:</label></dt>
+				<dd><strong id="meta_author_url"><a href="{meta_authors.AUTHOR_HOMEPAGE}">{meta_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
 			</dl>
 			<!-- ENDIF -->
-			<!-- IF md_authors.AUTHOR_ROLE -->
+			<!-- IF meta_authors.AUTHOR_ROLE -->
 			<dl>
 				<dt><label for="author_role">{L_AUTHOR_ROLE}:</label></dt>
-				<dd><strong id="md_author_role">{md_authors.AUTHOR_ROLE}</strong></dd>
+				<dd><strong id="meta_author_role">{meta_authors.AUTHOR_ROLE}</strong></dd>
 			</dl>
 			<!-- ENDIF -->
 		</fieldset>
-		<!-- END md_authors -->
+		<!-- END meta_authors -->
 	</fieldset>
 
 <!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index b654a80caa..53de0b4d12 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -24,7 +24,7 @@
 		</tr>
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled">
-			<td><strong>{enabled.EXT_NAME}</strong></a></td>
+			<td><strong>{enabled.META_DISPLAY_NAME}</strong></a></td>
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
 			<td style="text-align: center;">
 				<!-- BEGIN actions -->
@@ -42,7 +42,7 @@
 		</tr>
 		<!-- BEGIN disabled -->
 		<tr class="ext_disabled">
-			<td><strong>{disabled.EXT_NAME}</strong></a></td>
+			<td><strong>{disabled.META_DISPLAY_NAME}</strong></a></td>
 			<td style="text-align: center;">
 				<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF -->
 			</td>
-- 
cgit v1.2.1


From 43a713ea8356221eb199c5aba066efa15013c186 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 25 Aug 2012 13:11:07 +0200
Subject: [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the
 same

PHPBB3-11067
PHPBB3-11018
---
 phpBB/adm/style/admin.css | 80 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 28 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 585707600d..8551c952c7 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1148,55 +1148,79 @@ input.disabled {
 	width: auto;
 	text-align: right;
 	margin-top: 5px;
-	font-size: 0.85em;
-	padding-bottom: 2px;
+	float: right;
 }
 
 .rtl .pagination {
 	text-align: left;
+	float: left;
 }
 
-.pagination strong,
-.pagination b {
-	font-weight: normal;
+li.pagination {
+	margin-top: 0;
 }
 
-.pagination span.page-sep {
-	display:none;
+.pagination img {
+	vertical-align: middle;
 }
 
-.pagination span strong {
-	padding: 0 2px;
-	margin: 0 2px;
-	font-weight: normal;
-	font-size: 0.85em;
-	color: #FFFFFF;
-	background: #4692BF;
-	border: 1px solid #4692BF;
+.pagination ul {
+	display: inline-block;
+	*display: inline; /* IE7 inline-block hack */
+	*zoom: 1;
+	margin-left: 0;
+	margin-bottom: 0;
+}
+
+li.pagination ul {
+	margin-top: -2px;
+	vertical-align: middle;
+}
+
+.pagination ul li, dl .pagination ul li, dl.icon .pagination ul li {
+	display: inline;
+	padding: 0;
+	font-size: 100%;
+	line-height: normal;
 }
 
-.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active {
+.pagination li a, .pagnation li span, li .pagination li a, li .pagnation li span, .pagination li.active span, .pagination li.ellipsis span {
 	font-weight: normal;
-	font-size: 0.85em;
 	text-decoration: none;
-	color: #5C758C;
-	margin: 0 2px;
 	padding: 0 2px;
-	background: #ECEDEE;
-	border: 1px solid #B4BAC0;
+	border: 1px solid transparent;
+	font-size: 0.9em;
+	line-height: 1.5em;
 }
 
-.pagination span a:hover {
-	border-color: #368AD2;
-	background: #368AD2;
+.pagination li a, .pagination li a:link, .pagination li a:visited {
+	color: #5C758C;
+	background-color: #ECEDEE;
+	border-color: #B4BAC0;
+}
+
+.pagination li.ellipsis  span {
+	background-color: transparent;
+	color: #000000;
+}
+
+.pagination li.active span {
 	color: #FFFFFF;
-	text-decoration: none;
+	background-color: #4692BF;
+	border-color: #4692BF;
 }
 
-.pagination img {
-	vertical-align: middle;
+.pagination li a:hover, .pagination .active a:hover {
+	color: #FFFFFF;
+	background-color: #368AD2;
+	border-color: #368AD2;
 }
 
+.pagination li a:active, .pagination li.active a:active {
+	color: #5C758C;
+	background-color: #ECEDEE;
+	border-color: #B4BAC0;
+}
 
 /* Action Highlighting
 ---------------------------------------- */
@@ -1727,4 +1751,4 @@ fieldset.permissions .padding {
 .requirements_not_met dt label, .requirements_not_met dd p {
 	color: #FFFFFF;
 	font-size: 1.4em;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.1


From 99dd73aac720e54af6f18d72ca1d70af9e5e7ab9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 17 Oct 2012 23:03:33 +0200
Subject: [ticket/11018] Fix several paginations in ACP

PHPBB3-11018
---
 phpBB/adm/style/acp_attachments.html | 16 ++++++++++------
 phpBB/adm/style/acp_inactive.html    | 10 +++++-----
 phpBB/adm/style/acp_logs.html        |  8 ++++----
 3 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index bdec9eb3cb..c69dedbcfb 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -381,11 +381,10 @@
 	<div class="pagination">
 	<!-- IF .pagination or TOTAL_FILES -->
 		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE}
-		<!-- IF .pagination --> 
-			&bull; 
-			<!-- INCLUDE pagination.html -->
-		<!-- ELSE --> 
-			{S_ON_PAGE}
+		<!-- IF .pagination -->
+			&bull; <!-- INCLUDE pagination.html -->
+		<!-- ELSE -->
+			&bull; {S_ON_PAGE}
 		<!-- ENDIF -->
 	<!-- ENDIF -->
 	</div>
@@ -427,7 +426,12 @@
 	<hr />
 
 	<div class="pagination">
-		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE}<!-- IF S_ON_PAGE --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {S_ON_PAGE}<!-- ENDIF --><!-- ENDIF -->
+		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE}
+		<!-- IF .pagination -->
+			&bull; <!-- INCLUDE pagination.html -->
+		<!-- ELSE -->
+			&bull; {S_ON_PAGE}
+		<!-- ENDIF -->
 	</div>
 	<!-- ENDIF -->
 
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index ad5871f291..0b3b1b02d1 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -10,11 +10,11 @@
 
 <div class="clearfix"></div>
 
-<div class="pagination">
 <!-- IF .pagination -->
+<div class="pagination">
 	<!-- INCLUDE pagination.html -->
-<!-- ENDIF -->
 </div>
+<!-- ENDIF -->
 
 <table cellspacing="1">
 <thead>
@@ -53,15 +53,15 @@
 </table>
 
 <fieldset class="display-options">
-	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF PAGINATION -->&nbsp;Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
+	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
 	<input class="button2" type="submit" value="{L_GO}" name="sort" />
 </fieldset>
 
 <hr />
 
-<!-- IF PAGINATION -->
+<!-- IF .pagination -->
 	<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+		<!-- INCLUDE pagination.html -->
 	</div>
 <!-- ENDIF -->
 
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index 16638a5a72..1e54f89afe 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -12,11 +12,11 @@
 	{L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
 </fieldset>
 
-<div class="pagination" style="float: right; margin: 15px 0 2px 0">
 <!-- IF .pagination -->
+<div class="pagination" style="float: right; margin: 15px 0 2px 0">
 	<!-- INCLUDE pagination.html -->
-<!-- ENDIF -->
 </div>
+<!-- ENDIF -->
 
 <div class="clearfix">&nbsp;</div>
 <div><br style="clear: both;" /></div>
@@ -54,9 +54,9 @@
 	</tbody>
 	</table>
 
-<!-- IF PAGINATION -->
+<!-- IF .pagination -->
 	<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+		<!-- INCLUDE pagination.html -->
 	</div>
 <!-- ENDIF -->
 
-- 
cgit v1.2.1


From d124cd2d593bf66abf173e1c5b97c7f371a09dc4 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 3 Aug 2012 11:50:59 -0500
Subject: [ticket/10780] Replace colon usage in adm template output with
 {L_COLON}

Same as 46a7940a976ec1f54078f803ec949aa2bfbf6316, but for ACP templates

PHPBB3-10780
---
 phpBB/adm/style/acp_attachments.html          | 38 ++++++-------
 phpBB/adm/style/acp_ban.html                  | 18 +++---
 phpBB/adm/style/acp_board.html                |  2 +-
 phpBB/adm/style/acp_bots.html                 | 12 ++--
 phpBB/adm/style/acp_captcha.html              | 14 ++---
 phpBB/adm/style/acp_database.html             | 10 ++--
 phpBB/adm/style/acp_disallow.html             |  4 +-
 phpBB/adm/style/acp_email.html                | 14 ++---
 phpBB/adm/style/acp_forums.html               | 80 +++++++++++++--------------
 phpBB/adm/style/acp_forums_copy_perm.html     |  2 +-
 phpBB/adm/style/acp_groups.html               | 48 ++++++++--------
 phpBB/adm/style/acp_groups_position.html      |  6 +-
 phpBB/adm/style/acp_inactive.html             |  4 +-
 phpBB/adm/style/acp_jabber.html               | 14 ++---
 phpBB/adm/style/acp_language.html             | 16 +++---
 phpBB/adm/style/acp_logs.html                 |  6 +-
 phpBB/adm/style/acp_main.html                 | 34 ++++++------
 phpBB/adm/style/acp_modules.html              | 16 +++---
 phpBB/adm/style/acp_permission_roles.html     |  6 +-
 phpBB/adm/style/acp_permissions.html          | 16 +++---
 phpBB/adm/style/acp_profile.html              | 34 ++++++------
 phpBB/adm/style/acp_prune_forums.html         | 14 ++---
 phpBB/adm/style/acp_prune_users.html          | 22 ++++----
 phpBB/adm/style/acp_ranks.html                |  8 +--
 phpBB/adm/style/acp_reasons.html              |  4 +-
 phpBB/adm/style/acp_search.html               | 22 ++++----
 phpBB/adm/style/acp_styles.html               | 10 ++--
 phpBB/adm/style/acp_users.html                | 14 ++---
 phpBB/adm/style/acp_users_avatar.html         | 14 ++---
 phpBB/adm/style/acp_users_feedback.html       |  2 +-
 phpBB/adm/style/acp_users_overview.html       | 30 +++++-----
 phpBB/adm/style/acp_users_prefs.html          | 52 ++++++++---------
 phpBB/adm/style/acp_users_profile.html        | 24 ++++----
 phpBB/adm/style/acp_users_signature.html      | 10 ++--
 phpBB/adm/style/captcha_default_acp_demo.html |  2 +-
 phpBB/adm/style/captcha_gd_acp.html           | 12 ++--
 phpBB/adm/style/captcha_qa_acp.html           |  2 +-
 phpBB/adm/style/captcha_qa_acp_demo.html      |  2 +-
 phpBB/adm/style/captcha_recaptcha_acp.html    |  4 +-
 phpBB/adm/style/custom_profile_fields.html    |  6 +-
 phpBB/adm/style/install_convert.html          |  4 +-
 phpBB/adm/style/install_header.html           |  2 +-
 phpBB/adm/style/install_install.html          |  4 +-
 phpBB/adm/style/install_update.html           | 54 +++++++++---------
 phpBB/adm/style/install_update_diff.html      |  4 +-
 phpBB/adm/style/overall_header.html           |  2 +-
 phpBB/adm/style/permission_forum_copy.html    |  4 +-
 phpBB/adm/style/permission_mask.html          |  6 +-
 phpBB/adm/style/permission_roles_mask.html    |  2 +-
 phpBB/adm/style/permission_trace.html         |  2 +-
 phpBB/adm/style/simple_header.html            |  2 +-
 phpBB/adm/style/timezone_option.html          |  2 +-
 52 files changed, 368 insertions(+), 368 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index c69dedbcfb..266b7e48b4 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -54,7 +54,7 @@
 		<!-- ELSE -->
 
 			<dl>
-				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 				<dd>{options.CONTENT}</dd>
 			</dl>
 
@@ -78,11 +78,11 @@
 		<legend>{L_SECURE_TITLE}</legend>
 		<p>{L_DOWNLOAD_ADD_IPS_EXPLAIN}</p>
 	<dl>
-		<dt><label for="ip_hostname">{L_IP_HOSTNAME}:</label></dt>
+		<dt><label for="ip_hostname">{L_IP_HOSTNAME}{L_COLON}</label></dt>
 		<dd><textarea id="ip_hostname" cols="40" rows="3" name="ips"></textarea></dd>
 	</dl>
 	<dl>
-		<dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
+		<dt><label for="exclude">{L_IP_EXCLUDE}{L_COLON}</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
 		<dd><label><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES}</label>
 			<label><input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
 	</dl>
@@ -97,7 +97,7 @@
 	<!-- IF S_DEFINED_IPS -->
 			<p>{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}</p>
 		<dl>
-			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}:</label></dt>
+			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}{L_COLON}</label></dt>
 			<dd><select name="unip[]" id="remove_ip_hostname" multiple="multiple" size="10">{DEFINED_IPS}</select></dd>
 		</dl>
 
@@ -172,39 +172,39 @@
 
 			<legend>{L_LEGEND}</legend>
 		<dl>
-			<dt><label for="group_name">{L_GROUP_NAME}:</label></dt>
+			<dt><label for="group_name">{L_GROUP_NAME}{L_COLON}</label></dt>
 			<dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="category">{L_SPECIAL_CATEGORY}:</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
+			<dt><label for="category">{L_SPECIAL_CATEGORY}{L_COLON}</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
 			<dd>{S_CATEGORY_SELECT}</dd>
 		</dl>
 		<dl>
-			<dt><label for="allowed">{L_ALLOWED}:</label></dt>
+			<dt><label for="allowed">{L_ALLOWED}{L_COLON}</label></dt>
 			<dd><input type="checkbox" class="radio" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt>
+			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}{L_COLON}</label></dt>
 			<dd><input type="checkbox" class="radio" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="upload_icon">{L_UPLOAD_ICON}:</label></dt>
+			<dt><label for="upload_icon">{L_UPLOAD_ICON}{L_COLON}</label></dt>
 			<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">
 					<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}
 			</select></dd>
 			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
 		</dl>
 		<dl>
-			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt>
+			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt>
 			<dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
 		</dl>
 		<dl>
-			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}:</label></dt>
+			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}{L_COLON}</label></dt>
 			<dd><div id="ext">{ASSIGNED_EXTENSIONS}</div> <span>[<a href="{U_EXTENSIONS}">{L_GO_TO_EXTENSIONS}</a> ]</span></dd>
 			<dd><select name="extensions[]" id="assigned_extensions" class="narrow" onchange="show_extensions(this);" multiple="multiple" size="8">{S_EXTENSION_OPTIONS}</select></dd>
 		</dl>
 		<dl>
-			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
+			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}{L_COLON}</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label>
 				<label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
 			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
@@ -254,7 +254,7 @@
 		</tbody>
 		</table>
 		<p class="quick">
-				{L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" />
+				{L_CREATE_GROUP}{L_COLON} <input type="text" name="group_name" maxlength="30" />
 				<input class="button2" name="add" type="submit" value="{L_SUBMIT}" />
 		</p>
 		{S_FORM_TOKEN}
@@ -348,7 +348,7 @@
 			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
 			<td>{orphan.FILETIME}</td>
 			<td>{orphan.FILESIZE}</td>
-			<td><strong>{L_ATTACH_ID}: </strong><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
+			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
 			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
 			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
 		</tr>
@@ -380,7 +380,7 @@
 
 	<div class="pagination">
 	<!-- IF .pagination or TOTAL_FILES -->
-		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE}
+		{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} &bull; {L_TOTAL_SIZE}{L_COLON} {TOTAL_SIZE}
 		<!-- IF .pagination -->
 			&bull; <!-- INCLUDE pagination.html -->
 		<!-- ELSE -->
@@ -402,8 +402,8 @@
 	<!-- BEGIN attachments -->
 		<!-- IF attachments.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td>
-				<!-- IF attachments.S_IN_MESSAGE -->{L_EXTENSION_GROUP}: <strong><!-- IF attachments.EXT_GROUP_NAME -->{attachments.EXT_GROUP_NAME}<!-- ELSE -->{L_NO_EXT_GROUP}<!-- ENDIF --></strong><br />{attachments.L_DOWNLOAD_COUNT}<br />{L_IN} {L_PRIVATE_MESSAGE}
-				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br />{L_TOPIC}: <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF -->
+				<!-- IF attachments.S_IN_MESSAGE -->{L_EXTENSION_GROUP}{L_COLON} <strong><!-- IF attachments.EXT_GROUP_NAME -->{attachments.EXT_GROUP_NAME}<!-- ELSE -->{L_NO_EXT_GROUP}<!-- ENDIF --></strong><br />{attachments.L_DOWNLOAD_COUNT}<br />{L_IN} {L_PRIVATE_MESSAGE}
+				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br />{L_TOPIC}{L_COLON} <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF -->
 			</td>
 			<td>{attachments.FILETIME}<br />{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}</td>
 			<td>{attachments.FILESIZE}</td>
@@ -419,14 +419,14 @@
 
 	<!-- IF TOTAL_FILES -->
 	<fieldset class="display-options">
-		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
+		{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
 		<input class="button2" type="submit" value="{L_GO}" name="sort" />
 	</fieldset>
 
 	<hr />
 
 	<div class="pagination">
-		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE}
+		{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} &bull; {L_TOTAL_SIZE}{L_COLON} {TOTAL_SIZE}
 		<!-- IF .pagination -->
 			&bull; <!-- INCLUDE pagination.html -->
 		<!-- ELSE -->
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
index d564e89312..71c737de70 100644
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -44,26 +44,26 @@
 <fieldset>
 	<legend>{L_TITLE}</legend>
 <dl>
-	<dt><label for="ban">{L_BAN_CELL}:</label></dt>
+	<dt><label for="ban">{L_BAN_CELL}{L_COLON}</label></dt>
 	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
 	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
 </dl>
 <dl>
-	<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
+	<dt><label for="banlength">{L_BAN_LENGTH}{L_COLON}</label></dt>
 	<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>
 	<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>
 </dl>
 <dl>
-	<dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
+	<dt><label for="banexclude">{L_BAN_EXCLUDE}{L_COLON}</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES}</label>
 		<label><input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
 </dl>
 <dl>
-	<dt><label for="banreason">{L_BAN_REASON}:</label></dt>
+	<dt><label for="banreason">{L_BAN_REASON}{L_COLON}</label></dt>
 	<dd><input name="banreason" type="text" class="text medium" maxlength="255" id="banreason" /></dd>
 </dl>
 <dl>
-	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt>
+	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
 	<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>
 </dl>
 
@@ -88,19 +88,19 @@
 
 <!-- IF S_BANNED_OPTIONS -->
 	<dl>
-		<dt><label for="unban">{L_BAN_CELL}:</label></dt>
+		<dt><label for="unban">{L_BAN_CELL}{L_COLON}</label></dt>
 		<dd><select id="unban" name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></dd>
 	</dl>
 	<dl>
-		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
+		<dt><label for="unbanlength">{L_BAN_LENGTH}{L_COLON}</label></dt>
 		<dd><input style="border: 0;" type="text" class="text full" readonly="readonly" name="unbanlength" id="unbanlength" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
+		<dt><label for="unbanreason">{L_BAN_REASON}{L_COLON}</label></dt>
 		<dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbanreason" id="unbanreason" rows="5" cols="80">&nbsp;</textarea></dd>
 	</dl>
 	<dl>
-		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
+		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
 		<dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbangivereason" id="unbangivereason" rows="5" cols="80">&nbsp;</textarea></dd>
 	</dl>
 
diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
index 781f5c6bce..6b8ceb3ef6 100644
--- a/phpBB/adm/style/acp_board.html
+++ b/phpBB/adm/style/acp_board.html
@@ -25,7 +25,7 @@
 	<!-- ELSE -->
 
 		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 			<dd>{options.CONTENT}</dd>
 		</dl>
 
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
index 87679fc33a..cdd0fd4a93 100644
--- a/phpBB/adm/style/acp_bots.html
+++ b/phpBB/adm/style/acp_bots.html
@@ -22,27 +22,27 @@
 	<fieldset>
 		<legend>{L_TITLE}</legend>
 	<dl>
-		<dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>
+		<dt><label for="bot_name">{L_BOT_NAME}{L_COLON}</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>
 		<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
+		<dt><label for="bot_style">{L_BOT_STYLE}{L_COLON}</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
 		<dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_lang">{L_BOT_LANG}:</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>
+		<dt><label for="bot_lang">{L_BOT_LANG}{L_COLON}</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>
 		<dd><select id="bot_lang" name="bot_lang">{S_LANG_OPTIONS}</select></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_active">{L_BOT_ACTIVE}:</label></dt>
+		<dt><label for="bot_active">{L_BOT_ACTIVE}{L_COLON}</label></dt>
 		<dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
+		<dt><label for="bot_agent">{L_BOT_AGENT}{L_COLON}</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
 		<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt>
+		<dt><label for="bot_ip">{L_BOT_IP}{L_COLON}</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt>
 		<dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" maxlength="255" /></dd>
 	</dl>
 
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index 83314ab633..ab5e207e0d 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -13,25 +13,25 @@
 <legend>{L_GENERAL_OPTIONS}</legend>
 
 <dl>
-	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}:</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
+	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
 		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
 </dl>
 <dl>
-	<dt><label for="max_reg_attempts">{L_REG_LIMIT}:</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
+	<dt><label for="max_reg_attempts">{L_REG_LIMIT}{L_COLON}</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
 	<dd><input id="max_reg_attempts" type="text" size="4" maxlength="4" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
 </dl>
 <dl>
-	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}:</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>
+	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}{L_COLON}</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>
 	<dd><input id="max_login_attempts" type="text" size="4" maxlength="4" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
 </dl>
 <dl>
-	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
+	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
 		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
 </dl>
 <dl>
-	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}:</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>
+	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"<!-- IF CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
 		<label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
 </dl>
@@ -40,12 +40,12 @@
 <fieldset>
 <legend>{L_AVAILABLE_CAPTCHAS}</legend>
 <dl>
-	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}:</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
+	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}{L_COLON}</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
 	<dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd>
 </dl>
  <!-- IF S_CAPTCHA_HAS_CONFIG -->
 <dl>
-	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}:</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
+	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}{L_COLON}</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
 	<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd>
 </dl>
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html
index 28ac2db1b9..bf0c80bcd9 100644
--- a/phpBB/adm/style/acp_database.html
+++ b/phpBB/adm/style/acp_database.html
@@ -13,7 +13,7 @@
 	<fieldset>
 		<legend>{L_RESTORE_OPTIONS}</legend>
 	<dl>
-		<dt><label for="file">{L_SELECT_FILE}:</label></dt>
+		<dt><label for="file">{L_SELECT_FILE}{L_COLON}</label></dt>
 		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
 	</dl>
 
@@ -57,26 +57,26 @@
 	<fieldset>
 		<legend>{L_BACKUP_OPTIONS}</legend>
 	<dl>
-		<dt><label for="type">{L_BACKUP_TYPE}:</label></dt>
+		<dt><label for="type">{L_BACKUP_TYPE}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>
 			<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>
 			<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="method">{L_FILE_TYPE}:</label></dt>
+		<dt><label for="method">{L_FILE_TYPE}{L_COLON}</label></dt>
 		<dd><!-- BEGIN methods -->
 		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>
 		<!-- END methods --></dd>
 	</dl>
 	<dl>
-		<dt><label for="where">{L_ACTION}:</label></dt>
+		<dt><label for="where">{L_ACTION}{L_COLON}</label></dt>
 		<dd>
 			<label><input id="where" type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>
 			<label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label>
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="table">{L_TABLE_SELECT}:</label></dt>
+		<dt><label for="table">{L_TABLE_SELECT}{L_COLON}</label></dt>
 		<dd><select id="table" name="table[]" size="10" multiple="multiple">
 		<!-- BEGIN tables -->
 			<option value="{tables.TABLE}">{tables.TABLE}</option>
diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html
index 776f54d66c..0608f29474 100644
--- a/phpBB/adm/style/acp_disallow.html
+++ b/phpBB/adm/style/acp_disallow.html
@@ -11,7 +11,7 @@
 <fieldset>
 	<legend>{L_ADD_DISALLOW_TITLE}</legend>
 <dl>
-	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
+	<dt><label for="user">{L_USERNAME}{L_COLON}</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
 	<dd><input id="user" type="text" class="text medium" maxlength="255" name="disallowed_user" /></dd>
 </dl>
 
@@ -28,7 +28,7 @@
 	<legend>{L_DELETE_DISALLOW_TITLE}</legend>
 <!-- IF S_DISALLOWED_NAMES -->
 	<dl>
-		<dt><label for="disallowed">{L_USERNAME}:</label></dt>
+		<dt><label for="disallowed">{L_USERNAME}{L_COLON}</label></dt>
 		<dd><select name="disallowed_id" id="disallowed">{S_DISALLOWED_NAMES}</select></dd>
 	</dl>
 
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html
index 1339ac6529..950ecb40b0 100644
--- a/phpBB/adm/style/acp_email.html
+++ b/phpBB/adm/style/acp_email.html
@@ -18,32 +18,32 @@
 <fieldset>
 	<legend>{L_COMPOSE}</legend>
 <dl>
-	<dt><label for="group">{L_SEND_TO_GROUP}:</label></dt>
+	<dt><label for="group">{L_SEND_TO_GROUP}{L_COLON}</label></dt>
 	<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
 </dl>
 <dl>
-	<dt><label for="usernames">{L_SEND_TO_USERS}:</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
+	<dt><label for="usernames">{L_SEND_TO_USERS}{L_COLON}</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
 	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
 	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 </dl>
 <dl>
-	<dt><label for="subject">{L_SUBJECT}:</label></dt>
+	<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
 	<dd><input name="subject" type="text" id="subject" value="{SUBJECT}" /></dd>
 </dl>
 <dl>
-	<dt><label for="message">{L_MASS_MESSAGE}:</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt>
+	<dt><label for="message">{L_MASS_MESSAGE}{L_COLON}</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt>
 	<dd><textarea id="message" name="message" rows="10" cols="60">{MESSAGE}</textarea></dd>
 </dl>
 <dl>
-	<dt><label for="priority">{L_MAIL_PRIORITY}:</label></dt>
+	<dt><label for="priority">{L_MAIL_PRIORITY}{L_COLON}</label></dt>
 	<dd><select id="priority" name="mail_priority_flag">{S_PRIORITY_OPTIONS}</select></dd>
 </dl>
 <dl>
-	<dt><label for="banned">{L_MAIL_BANNED}:</label><br /><span>{L_MAIL_BANNED_EXPLAIN}</span></dt>
+	<dt><label for="banned">{L_MAIL_BANNED}{L_COLON}</label><br /><span>{L_MAIL_BANNED_EXPLAIN}</span></dt>
 	<dd><input id="banned" name="mail_banned_flag" type="checkbox" class="radio" /></dd>
 </dl>
 <dl>
-	<dt><label for="send">{L_SEND_IMMEDIATELY}:</label></dt>
+	<dt><label for="send">{L_SEND_IMMEDIATELY}{L_COLON}</label></dt>
 	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>
 </dl>
 
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index e29cdcf2e9..cb9cae6c0d 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -112,13 +112,13 @@
 	<fieldset>
 		<legend>{L_FORUM_SETTINGS}</legend>
 	<dl>
-		<dt><label for="forum_type">{L_FORUM_TYPE}:</label></dt>
+		<dt><label for="forum_type">{L_FORUM_TYPE}{L_COLON}</label></dt>
 		<dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd>
 	</dl>
 	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
 	<div id="type_actions">
 		<dl>
-			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt>
+			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}{L_COLON}</label></dt>
 			<dd><label><input type="radio" class="radio" name="type_action" value="delete"<!-- IF not S_MOVE_FORUM_OPTIONS --> checked="checked" id="type_action"<!-- ENDIF --> /> {L_DELETE_ALL_POSTS}</label></dd>
 			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><label><input type="radio" class="radio" name="type_action" id="type_action" value="move" checked="checked" /> {L_MOVE_POSTS_TO}</label> <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
 		</dl>
@@ -127,7 +127,7 @@
 	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
 	<div id="cat_to_link_actions">
 		<dl>
-			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}:</label></dt>
+			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}{L_COLON}</label></dt>
 			<!-- IF S_FORUMS_LIST -->
 				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
 			<!-- ELSE -->
@@ -137,49 +137,49 @@
 	</div>
 	<!-- ENDIF -->
 	<dl>
-		<dt><label for="parent">{L_FORUM_PARENT}:</label></dt>
+		<dt><label for="parent">{L_FORUM_PARENT}{L_COLON}</label></dt>
 		<dd><select id="parent" name="forum_parent_id"><option value="0"<!-- IF not S_FORUM_PARENT_ID --> selected="selected"<!-- ENDIF -->>{L_NO_PARENT}</option>{S_PARENT_OPTIONS}</select></dd>
 	</dl>
 	<!-- IF S_CAN_COPY_PERMISSIONS -->
 		<dl>
-			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
 			<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
 		</dl>
 	<!-- ENDIF -->
 	<dl>
-		<dt><label for="forum_name">{L_FORUM_NAME}:</label></dt>
+		<dt><label for="forum_name">{L_FORUM_NAME}{L_COLON}</label></dt>
 		<dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="forum_desc">{L_FORUM_DESC}:</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
+		<dt><label for="forum_desc">{L_FORUM_DESC}{L_COLON}</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
 		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd>
 		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
 			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
 			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="forum_image">{L_FORUM_IMAGE}:</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>
+		<dt><label for="forum_image">{L_FORUM_IMAGE}{L_COLON}</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>
 		<dd><input class="text medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255" /></dd>
 		<!-- IF FORUM_IMAGE_SRC -->
 			<dd><img src="{FORUM_IMAGE_SRC}" alt="{L_FORUM_IMAGE}" /></dd>
 		<!-- ENDIF -->
 	</dl>
 	<dl>
-		<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
+		<dt><label for="forum_password">{L_FORUM_PASSWORD}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
 		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" autocomplete="off" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
+		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
 		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" autocomplete="off" /></dd>
 	</dl>
 	<!-- IF S_FORUM_PASSWORD_SET -->
 	<dl>
-		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}:</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt>
+		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt>
 		<dd><input id="forum_password_unset" name="forum_password_unset" type="checkbox" /></dd>
 	</dl>
 	<!-- ENDIF -->
 	<dl>
-		<dt><label for="forum_style">{L_FORUM_STYLE}:</label></dt>
+		<dt><label for="forum_style">{L_FORUM_STYLE}{L_COLON}</label></dt>
 		<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>
 	</dl>
 	</fieldset>
@@ -188,7 +188,7 @@
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
-			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}:</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
+			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}{L_COLON}</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
@@ -199,46 +199,46 @@
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
-			<dt><label for="forum_status">{L_FORUM_STATUS}:</label></dt>
+			<dt><label for="forum_status">{L_FORUM_STATUS}{L_COLON}</label></dt>
 			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
 		</dl>
 		<dl>
-			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}:</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>
+			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}{L_COLON}</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="display_subforum_list" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
+			<dt><label for="display_on_index">{L_LIST_INDEX}{L_COLON}</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}:</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
+			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}{L_COLON}</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="enable_quick_reply">{L_ENABLE_QUICK_REPLY}:</label><br /><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt>
+			<dt><label for="enable_quick_reply">{L_ENABLE_QUICK_REPLY}{L_COLON}</label><br /><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="enable_quick_reply" value="1"<!-- IF S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="enable_quick_reply" value="0"<!-- IF not S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
+			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}{L_COLON}</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt>
+			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}{L_COLON}</label></dt>
 			<dd><label><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
+			<dt><label for="display_recent">{L_ENABLE_RECENT}{L_COLON}</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
+			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
 			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
 		</dl>
 		</fieldset>
@@ -246,34 +246,34 @@
 		<fieldset>
 			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
 		<dl>
-			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
+			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}{L_COLON}</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}:</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
+			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
 			<dd><input type="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}:</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
+			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
 			<dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}:</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
+			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
 			<dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
+			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
+			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}{L_COLON}</label></dt>
 			<dd><label><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt>
+			<dt><label for="prune_sticky">{L_PRUNE_STICKY}{L_COLON}</label></dt>
 			<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
@@ -284,16 +284,16 @@
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
-			<dt><label for="link_display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
+			<dt><label for="link_display_on_index">{L_LIST_INDEX}{L_COLON}</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="forum_link">{L_FORUM_LINK}:</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>
+			<dt><label for="forum_link">{L_FORUM_LINK}{L_COLON}</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>
 			<dd><input class="text medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}:</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
+			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}{L_COLON}</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
@@ -304,17 +304,17 @@
 		<fieldset>
 			<legend>{L_FORUM_RULES}</legend>
 		<dl>
-			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}:</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
+			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}{L_COLON}</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
 			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
 		</dl>
 	<!-- IF FORUM_RULES_PREVIEW -->
 		<dl>
-			<dt><label>{L_FORUM_RULES_PREVIEW}:</label></dt>
+			<dt><label>{L_FORUM_RULES_PREVIEW}{L_COLON}</label></dt>
 			<dd>{FORUM_RULES_PREVIEW}</dd>
 		</dl>
 	<!-- ENDIF -->
 		<dl>
-			<dt><label for="forum_rules">{L_FORUM_RULES}:</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
+			<dt><label for="forum_rules">{L_FORUM_RULES}{L_COLON}</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
 			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd>
 			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
 				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
@@ -351,12 +351,12 @@
 	<fieldset>
 		<legend>{L_FORUM_DELETE}</legend>
 	<dl>
-		<dt><label>{L_FORUM_NAME}:</label></dt>
+		<dt><label>{L_FORUM_NAME}{L_COLON}</label></dt>
 		<dd><strong>{FORUM_NAME}</strong></dd>
 	</dl>
 	<!-- IF S_FORUM_POST -->
 		<dl>
-			<dt><label for="delete_action">{L_ACTION}:</label></dt>
+			<dt><label for="delete_action">{L_ACTION}{L_COLON}</label></dt>
 			<dd><label><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</label></dd>
 			<!-- IF S_MOVE_FORUM_OPTIONS -->
 				<dd><label><input type="radio" class="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO}</label> <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd>
@@ -365,7 +365,7 @@
 	<!-- ENDIF -->
 	<!-- IF S_HAS_SUBFORUMS -->
 		<dl>
-			<dt><label for="sub_delete_action">{L_ACTION}:</label></dt>
+			<dt><label for="sub_delete_action">{L_ACTION}{L_COLON}</label></dt>
 			<dd><label><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
 			<!-- IF S_FORUMS_LIST -->
 				<dd><label><input type="radio" class="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
@@ -449,7 +449,7 @@
 					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
 					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>
 					<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
-					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}: <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
+					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}{L_COLON} <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}{L_COLON} <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
 				</td>
 				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
@@ -482,7 +482,7 @@
 	<form id="fselect" method="post" action="{U_SEL_ACTION}">
 
 	<fieldset class="quick">
-		{L_SELECT_FORUM}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
+		{L_SELECT_FORUM}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
 
 		<input class="button2" type="submit" value="{L_GO}" />
 		{S_FORM_TOKEN}
diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html
index acec3c1967..1fcf2f62a4 100644
--- a/phpBB/adm/style/acp_forums_copy_perm.html
+++ b/phpBB/adm/style/acp_forums_copy_perm.html
@@ -9,7 +9,7 @@
 
 <fieldset>
 	<dl>
-		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
 		<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
 	</dl>
 	<div style="text-align: center;">{S_FORM_TOKEN}{S_HIDDEN_FIELDS}
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 6e52880131..4701bf702f 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -22,11 +22,11 @@
 	<fieldset>
 		<legend>{L_GROUP_DETAILS}</legend>
 	<dl>
-		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt>
+		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}{L_COLON}</label></dt>
 		<dd><!-- IF S_SPECIAL_GROUP --><strong>{GROUP_NAME}</strong><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt>
+		<dt><label for="group_desc">{L_GROUP_DESC}{L_COLON}</label></dt>
 		<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd>
 		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
 			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
@@ -34,7 +34,7 @@
 	</dl>
 	<!-- IF not S_SPECIAL_GROUP -->
 		<dl>
-			<dt><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
+			<dt><label for="group_type">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
 			<dd>
 				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>
 				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>
@@ -48,7 +48,7 @@
 
 	<!-- IF S_ADD_GROUP and S_GROUP_PERM -->
 		<dl>
-			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
 			<dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd>
 		</dl>
 	<!-- ENDIF -->
@@ -58,24 +58,24 @@
 		<legend>{L_GROUP_OPTIONS_SAVE}</legend>
 	<!-- IF S_USER_FOUNDER -->
 	<dl>
-		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}:</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>
+		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}{L_COLON}</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>
 		<dd><input name="group_founder_manage" type="checkbox" value="1" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE} /></dd>
 	</dl>
 	<!-- ENDIF -->
 	<dl>
-		<dt><label for="group_skip_auth">{L_GROUP_SKIP_AUTH}:</label><br /><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt>
+		<dt><label for="group_skip_auth">{L_GROUP_SKIP_AUTH}{L_COLON}</label><br /><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt>
 		<dd><input name="group_skip_auth" type="checkbox" value="1" class="radio" id="group_skip_auth"{GROUP_SKIP_AUTH} /></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt>
+		<dt><label for="group_legend">{L_GROUP_LEGEND}{L_COLON}</label></dt>
 		<dd><input name="group_legend" type="checkbox" value="1" class="radio" id="group_legend"{GROUP_LEGEND} /></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_teampage">{L_GROUP_TEAMPAGE}:</label></dt>
+		<dt><label for="group_teampage">{L_GROUP_TEAMPAGE}{L_COLON}</label></dt>
 		<dd><input name="group_teampage" type="checkbox" value="1" class="radio" id="group_teampage"{GROUP_TEAMPAGE} /></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>
+		<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>
 	</fieldset>
@@ -83,19 +83,19 @@
 	<fieldset>
 		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
 	<dl>
-		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
+		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}{L_COLON}</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
 		<dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}:</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
+		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}{L_COLON}</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
 		<dd><input name="group_max_recipients" type="text" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
+		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
 		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /><!-- IF GROUP_COLOUR -->&nbsp;<span style="background-color: #{GROUP_COLOUR}">&nbsp; &nbsp;</span><!-- ENDIF -->&nbsp;&nbsp;<span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
+		<dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt>
 		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
 	</dl>
 	</fieldset>
@@ -103,32 +103,32 @@
 	<fieldset>
 		<legend>{L_GROUP_AVATAR}</legend>
 	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 		<dd>{AVATAR_IMAGE}</dd>
 		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
 	</dl>
 	<!-- IF not S_IN_AVATAR_GALLERY -->
 		<!-- IF S_CAN_UPLOAD -->
 			<dl>
-				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
 				<dd><input type="file" id="uploadfile" name="uploadfile" /></dd>
 			</dl>
 			<dl>
-				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
 				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
 			</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
 			<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+			<dt><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 			<dd><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>{L_PIXEL} &times; </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>
 		</dl>
 		<!-- IF S_DISPLAY_GALLERY -->
 			<dl>
-				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
+				<dt><label>{L_AVATAR_GALLERY}{L_COLON}</label></dt>
 				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
 			</dl>
 		<!-- ENDIF -->
@@ -138,7 +138,7 @@
 		<fieldset>
 			<legend>{L_AVATAR_GALLERY}</legend>
 		<dl>
-			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
+			<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
 			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
 		</dl>
 		<dl>
@@ -258,17 +258,17 @@
 	<fieldset>
 		<legend>{L_ADD_USERS}</legend>
 	<dl>
-		<dt><label for="leader">{L_USER_GROUP_LEADER}:</label></dt>
+		<dt><label for="leader">{L_USER_GROUP_LEADER}{L_COLON}</label></dt>
 		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>
 			<label><input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
+		<dt><label for="default">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
 		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>
 			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
+		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
 		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 	</dl>
@@ -322,7 +322,7 @@
 
 	<fieldset class="quick">
 		<!-- IF S_GROUP_ADD -->
-			{L_CREATE_GROUP}: <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+			{L_CREATE_GROUP}{L_COLON} <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
 			<input type="hidden" name="add" value="1" />
 		<!-- ENDIF -->
 		{S_FORM_TOKEN}
diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 3a03573756..1e309d4cbc 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -9,7 +9,7 @@
 	<fieldset>
 		<legend>{L_LEGEND_SETTINGS}</legend>
 		<dl>
-			<dt><label for="legend_sort_groupname">{L_LEGEND_SORT_GROUPNAME}:</label><br /><span>{L_LEGEND_SORT_GROUPNAME_EXPLAIN}</span></dt>
+			<dt><label for="legend_sort_groupname">{L_LEGEND_SORT_GROUPNAME}{L_COLON}</label><br /><span>{L_LEGEND_SORT_GROUPNAME_EXPLAIN}</span></dt>
 			<dd>
 				<label><input type="radio" name="legend_sort_groupname" class="radio" value="1"<!-- IF LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
@@ -82,7 +82,7 @@
 	<fieldset>
 		<legend>{L_TEAMPAGE_SETTINGS}</legend>
 		<dl>
-			<dt><label for="teampage_multiple">{L_TEAMPAGE_MEMBERSHIPS}:</label></dt>
+			<dt><label for="teampage_multiple">{L_TEAMPAGE_MEMBERSHIPS}{L_COLON}</label></dt>
 			<dd>
 				<label><input type="radio" name="teampage_memberships" class="radio" value="0"<!-- IF DISPLAY_MEMBERSHIPS == 0 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_FIRST}</label><br />
 				<label><input type="radio" name="teampage_memberships" class="radio" value="1"<!-- IF DISPLAY_MEMBERSHIPS == 1 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_DEFAULT}</label><br />
@@ -90,7 +90,7 @@
 			</dd>
 		</dl>
 		<dl>
-			<dt><label for="teampage_forums">{L_TEAMPAGE_FORUMS}:</label><br /><span>{L_TEAMPAGE_FORUMS_EXPLAIN}</span></dt>
+			<dt><label for="teampage_forums">{L_TEAMPAGE_FORUMS}{L_COLON}</label><br /><span>{L_TEAMPAGE_FORUMS_EXPLAIN}</span></dt>
 			<dd>
 				<label><input type="radio" name="teampage_forums" class="radio" value="1"<!-- IF DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" name="teampage_forums" class="radio" value="0"<!-- IF not DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index 0b3b1b02d1..726c8c8b32 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -33,7 +33,7 @@
 
 		<td style="vertical-align: top;">
 			{inactive.USERNAME_FULL}
-			<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
+			<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
 		</td>
 		<td style="vertical-align: top;">{inactive.JOINED}</td>
 		<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
@@ -53,7 +53,7 @@
 </table>
 
 <fieldset class="display-options">
-	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
+	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;Users per page{L_COLON} <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
 	<input class="button2" type="submit" value="{L_GO}" name="sort" />
 </fieldset>
 
diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html
index 2ba1424bda..639bcd221f 100644
--- a/phpBB/adm/style/acp_jabber.html
+++ b/phpBB/adm/style/acp_jabber.html
@@ -21,35 +21,35 @@
 	<p>{L_JAB_GTALK_NOTE}</p>
 <!-- ENDIF -->
 <dl>
-	<dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
+	<dt><label for="jab_enable">{L_JAB_ENABLE}{L_COLON}</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
 		<label><input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
 </dl>
 <dl>
-	<dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
+	<dt><label for="jab_host">{L_JAB_SERVER}{L_COLON}</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
 	<dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd>
 </dl>
 <dl>
-	<dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
+	<dt><label for="jab_port">{L_JAB_PORT}{L_COLON}</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
 	<dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
 </dl>
 <dl>
-	<dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
+	<dt><label for="jab_username">{L_JAB_USERNAME}{L_COLON}</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
 	<dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd>
 </dl>
 <dl>
-	<dt><label for="jab_password">{L_JAB_PASSWORD}:</label><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt>
+	<dt><label for="jab_password">{L_JAB_PASSWORD}{L_COLON}</label><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt>
 	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
 </dl>
 <!-- IF S_CAN_USE_SSL -->
 <dl>
-	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}:</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>
+	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}{L_COLON}</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
 <!-- ENDIF -->
 <dl>
-	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}{L_COLON}</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
 	<dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" /></dd>
 </dl>
 
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index 81276287c1..c400437049 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -13,7 +13,7 @@
 	<fieldset>
 		<legend>{L_DOWNLOAD_AS}</legend>
 	<dl>
-		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
+		<dt><label for="use_method">{L_DOWNLOAD_AS}{L_COLON}</label></dt>
 		<dd>{RADIO_BUTTONS}</dd>
 	</dl>
 
@@ -35,19 +35,19 @@
 	<fieldset>
 		<legend>{LANG_LOCAL_NAME}</legend>
 	<dl>
-		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}:</label></dt>
+		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}{L_COLON}</label></dt>
 		<dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}:</label></dt>
+		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}{L_COLON}</label></dt>
 		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label>{L_LANG_ISO_CODE}:</label></dt>
+		<dt><label>{L_LANG_ISO_CODE}{L_COLON}</label></dt>
 		<dd><strong>{LANG_ISO}</strong></dd>
 	</dl>
 	<dl>
-		<dt><label for="lang_author">{L_LANG_AUTHOR}:</label></dt>
+		<dt><label for="lang_author">{L_LANG_AUTHOR}{L_COLON}</label></dt>
 		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255" /></dd>
 	</dl>
 
@@ -147,7 +147,7 @@
 	</tr>
 	<tr>
 		<td class="row3" style="text-align: right;">	
-		<!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}:&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>
+		<!-- 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>
@@ -186,12 +186,12 @@
 	<fieldset>
 		<legend>{L_UPLOAD_SETTINGS}</legend>
 	<dl>
-		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
+		<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}:</label><br /><span>{data.EXPLAIN}</span></dt>
+		<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 -->
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index 1e54f89afe..e13196f65d 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -9,7 +9,7 @@
 <form id="list" method="post" action="{U_ACTION}">
 
 <fieldset class="display-options" style="float: left">
-	{L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
+	{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
 </fieldset>
 
 <!-- IF .pagination -->
@@ -67,7 +67,7 @@
 <!-- ENDIF -->
 
 <fieldset class="display-options">
-	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
+	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
 	<input class="button2" type="submit" value="{L_GO}" name="sort" />
 	{S_FORM_TOKEN}
 </fieldset>
@@ -75,7 +75,7 @@
 
 <!-- IF S_SHOW_FORUMS -->
 	<fieldset class="quick">
-		{L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
+		{L_SELECT_FORUM}{L_COLON} <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
 		<input class="button2" type="submit" value="{L_GO}" />
 	</fieldset>
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index d9f833d878..8b591294d4 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -89,56 +89,56 @@
 	</thead>
 	<tbody>
 	<tr>
-		<td>{L_NUMBER_POSTS}: </td>
+		<td>{L_NUMBER_POSTS}{L_COLON} </td>
 		<td><strong>{TOTAL_POSTS}</strong></td>
-		<td>{L_POSTS_PER_DAY}: </td>
+		<td>{L_POSTS_PER_DAY}{L_COLON} </td>
 		<td><strong>{POSTS_PER_DAY}</strong></td>
 	</tr>
 	<tr>
-		<td>{L_NUMBER_TOPICS}: </td>
+		<td>{L_NUMBER_TOPICS}{L_COLON} </td>
 		<td><strong>{TOTAL_TOPICS}</strong></td>
-		<td>{L_TOPICS_PER_DAY}: </td>
+		<td>{L_TOPICS_PER_DAY}{L_COLON} </td>
 		<td><strong>{TOPICS_PER_DAY}</strong></td>
 	</tr>
 	<tr>
-		<td>{L_NUMBER_USERS}: </td>
+		<td>{L_NUMBER_USERS}{L_COLON} </td>
 		<td><strong>{TOTAL_USERS}</strong></td>
-		<td>{L_USERS_PER_DAY}: </td>
+		<td>{L_USERS_PER_DAY}{L_COLON} </td>
 		<td><strong>{USERS_PER_DAY}</strong></td>
 	</tr>
 	<tr>
-		<td>{L_NUMBER_FILES}: </td>
+		<td>{L_NUMBER_FILES}{L_COLON} </td>
 		<td><strong>{TOTAL_FILES}</strong></td>
-		<td>{L_FILES_PER_DAY}: </td>
+		<td>{L_FILES_PER_DAY}{L_COLON} </td>
 		<td><strong>{FILES_PER_DAY}</strong></td>
 	</tr>
 
 
 	<tr>
-		<td>{L_BOARD_STARTED}: </td>
+		<td>{L_BOARD_STARTED}{L_COLON} </td>
 		<td><strong>{START_DATE}</strong></td>
-		<td>{L_AVATAR_DIR_SIZE}: </td>
+		<td>{L_AVATAR_DIR_SIZE}{L_COLON} </td>
 		<td><strong>{AVATAR_DIR_SIZE}</strong></td>
 	</tr>
 	<tr>
-		<td>{L_DATABASE_SIZE}: </td>
+		<td>{L_DATABASE_SIZE}{L_COLON} </td>
 		<td><strong>{DBSIZE}</strong></td>
-		<td>{L_UPLOAD_DIR_SIZE}: </td>
+		<td>{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
 		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
 	</tr>
 	<tr>
-		<td>{L_DATABASE_SERVER_INFO}: </td>
+		<td>{L_DATABASE_SERVER_INFO}{L_COLON} </td>
 		<td><strong>{DATABASE_INFO}</strong></td>
-		<td>{L_GZIP_COMPRESSION}: </td>
+		<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
 		<td><strong>{GZIP_COMPRESSION}</strong></td>
 	</tr>
 	<tr>
-		<td>{L_BOARD_VERSION}: </td>
+		<td>{L_BOARD_VERSION}{L_COLON} </td>
 		<td>
 			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
 		</td>
 	<!-- IF S_TOTAL_ORPHAN -->
-		<td>{L_NUMBER_ORPHAN}: </td>
+		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
 		<td><strong>{TOTAL_ORPHAN}</strong></td>
 	<!-- ELSE -->
 		<td>&nbsp;</td>
@@ -261,7 +261,7 @@
 
 				<td style="vertical-align: top;">
 					{inactive.USERNAME_FULL}
-					<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
+					<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
 				</td>
 				<td style="vertical-align: top;">{inactive.JOINED}</td>
 				<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index 6c4645e80c..1e49198725 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -72,37 +72,37 @@
 	<fieldset>
 		<legend>{L_GENERAL_OPTIONS}</legend>
 	<dl>
-		<dt><label for="module_langname">{L_MODULE_LANGNAME}:</label><br />
+		<dt><label for="module_langname">{L_MODULE_LANGNAME}{L_COLON}</label><br />
 		<span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt>
 		<dd><input name="module_langname" type="text" class="text medium" id="module_langname" value="{MODULE_LANGNAME}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="module_type">{L_MODULE_TYPE}:</label></dt>
+		<dt><label for="module_type">{L_MODULE_TYPE}{L_COLON}</label></dt>
 		<dd><select name="module_type" id="module_type" onchange="display_options(this.value);"><option value="category"<!-- IF S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_CATEGORY}</option><option value="module"<!-- IF not S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_MODULE}</option></select></dd>
 	</dl>
 	<dl>
-		<dt><label for="parent_id">{L_PARENT}:</label></dt>
+		<dt><label for="parent_id">{L_PARENT}{L_COLON}</label></dt>
 		<dd><select name="module_parent_id" id="parent_id">{S_CAT_OPTIONS}</select></dd>
 	</dl>
 	<hr />
 	<dl>
-		<dt><label for="module_enabled">{L_MODULE_ENABLED}:</label></dt>
+		<dt><label for="module_enabled">{L_MODULE_ENABLED}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<div id="modoptions"<!-- IF S_IS_CAT --> style="display: none;"<!-- ENDIF -->>
 		<dl>
-			<dt><label for="module_display">{L_MODULE_DISPLAYED}:</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>
+			<dt><label for="module_display">{L_MODULE_DISPLAYED}{L_COLON}</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_basename">{L_CHOOSE_MODULE}:</label><br />
+			<dt><label for="module_basename">{L_CHOOSE_MODULE}{L_COLON}</label><br />
 			<span>{L_CHOOSE_MODULE_EXPLAIN}</span></dt>
 			<dd><select name="module_basename" id="module_basename" onchange="display_modes(this.value);">{S_MODULE_NAMES}</select></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_mode">{L_CHOOSE_MODE}:</label><br />
+			<dt><label for="module_mode">{L_CHOOSE_MODE}{L_COLON}</label><br />
 			<span>{L_CHOOSE_MODE_EXPLAIN}</span></dt>
 			<dd><select name="module_mode" id="module_mode">{S_MODULE_MODES}</select></dd>
 		</dl>
@@ -201,7 +201,7 @@
 	
 	<form id="mselect" method="post" action="{U_SEL_ACTION}">
 	<fieldset class="quick">
-		{L_SELECT_MODULE}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select> 
+		{L_SELECT_MODULE}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select> 
 
 		<input class="button2" type="submit" value="{L_GO}" />
 	</fieldset>
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index 2ac77af25d..d654c320ca 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -36,11 +36,11 @@
 	<fieldset>
 		<legend>{L_ROLE_DETAILS}</legend>
 	<dl>
-		<dt><label for="role_name">{L_ROLE_NAME}:</label></dt>
+		<dt><label for="role_name">{L_ROLE_NAME}{L_COLON}</label></dt>
 		<dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>
+		<dt><label for="role_description">{L_ROLE_DESCRIPTION}{L_COLON}</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>
 		<dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd>
 	</dl>
 
@@ -182,7 +182,7 @@
 	</table>
 
 	<fieldset class="quick">
-		{L_CREATE_ROLE}: <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br />
+		{L_CREATE_ROLE}{L_COLON} <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br />
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index b44cca782e..88a82532a1 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -19,7 +19,7 @@
 	<p>{L_EXPLAIN}</p>
 
 	<!-- IF S_FORUM_NAMES -->
-		<p><strong>{L_FORUMS}:</strong> {FORUM_NAMES}</p>
+		<p><strong>{L_FORUMS}{L_COLON}</strong> {FORUM_NAMES}</p>
 	<!-- ENDIF -->
 
 	<!-- IF S_SELECT_FORUM -->
@@ -30,7 +30,7 @@
 			<legend>{L_LOOK_UP_FORUM}</legend>
 			<!-- IF S_FORUM_MULTIPLE --><p>{L_LOOK_UP_FORUMS_EXPLAIN}</p><!-- ENDIF -->
 		<dl>
-			<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
+			<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
 			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
 			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
 		</dl>
@@ -52,7 +52,7 @@
 				<legend>{L_LOOK_UP_FORUM}</legend>
 				<p>{L_SELECT_FORUM_SUBFORUM_EXPLAIN}</p>
 			<dl>
-				<dt><label for="sforum">{L_LOOK_UP_FORUM}:</label></dt>
+				<dt><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
 				<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>
 			</dl>
 
@@ -74,7 +74,7 @@
 		<fieldset>
 			<legend>{L_LOOK_UP_USER}</legend>
 		<dl>
-			<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
+			<dt><label for="username">{L_FIND_USERNAME}{L_COLON}</label></dt>
 			<dd><input class="text medium" type="text" id="username" name="username[]" /></dd>
 			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 			<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
@@ -95,7 +95,7 @@
 		<fieldset>
 			<legend>{L_LOOK_UP_GROUP}</legend>
 		<dl>
-			<dt><label for="group">{L_LOOK_UP_GROUP}:</label></dt>
+			<dt><label for="group">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>
 			<dd><select name="group_id[]" id="group">{S_GROUP_OPTIONS}</select></dd>
 		</dl>
 
@@ -225,7 +225,7 @@
 			<fieldset>
 				<legend>{L_LOOK_UP_USER}</legend>
 			<dl>
-				<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
+				<dt><label for="username">{L_FIND_USERNAME}{L_COLON}</label></dt>
 				<dd><input type="text" id="username" name="username[]" /></dd>
 				<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 				<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
@@ -266,7 +266,7 @@
 			<fieldset>
 				<legend>{L_LOOK_UP_GROUP}</legend>
 			<dl>
-				<dt><label for="group_select">{L_LOOK_UP_GROUP}:</label></dt>
+				<dt><label for="group_select">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>
 				<dd><select name="group_id[]" id="group_select">{S_ADD_GROUP_OPTIONS}</select></dd>
 				<dd>&nbsp;</dd>
 			</dl>
@@ -317,7 +317,7 @@
 		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
 			{S_HIDDEN_FIELDS}
 			{S_FORM_TOKEN}
-			{L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select>
+			{L_SELECT_TYPE}{L_COLON} <select name="type">{S_PERMISSION_DROPDOWN}</select>
 
 			<input class="button2" type="submit" name="submit" value="{L_GO}" />
 		</fieldset>
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 5be69aa20b..13be669f70 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -24,22 +24,22 @@
 		<fieldset>
 			<legend>{L_TITLE}</legend>
 		<dl>
-			<dt><label>{L_FIELD_TYPE}:</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
+			<dt><label>{L_FIELD_TYPE}{L_COLON}</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
 			<dd><strong>{FIELD_TYPE}</strong></dd>
 		</dl>
 		<!-- IF S_EDIT_MODE -->
 		<dl>
-			<dt><label>{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
+			<dt><label>{L_FIELD_IDENT}{L_COLON}</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
 			<dd><input type="hidden" name="field_ident" value="{FIELD_IDENT}" /><strong>{FIELD_IDENT}</strong></dd>
 		</dl>
 		<!-- ELSE -->
 		<dl>
-			<dt><label for="field_ident">{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
+			<dt><label for="field_ident">{L_FIELD_IDENT}{L_COLON}</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
 			<dd><input class="text medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}:</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>
+			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
@@ -48,31 +48,31 @@
 		<fieldset>
 			<legend>{L_VISIBILITY_OPTION}</legend>
 		<dl>
-			<dt><label for="field_show_profile">{L_DISPLAY_AT_PROFILE}:</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt>
+			<dt><label for="field_show_profile">{L_DISPLAY_AT_PROFILE}{L_COLON}</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_show_profile" name="field_show_profile" value="1"<!-- IF S_SHOW_PROFILE --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}:</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt>
+			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}{L_COLON}</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_show_on_pm">{L_DISPLAY_ON_PM}:</label><br /><span>{L_DISPLAY_ON_PM_EXPLAIN}</span></dt>
+			<dt><label for="field_show_on_pm">{L_DISPLAY_ON_PM}{L_COLON}</label><br /><span>{L_DISPLAY_ON_PM_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_show_on_pm" name="field_show_on_pm" value="1"<!-- IF S_SHOW_ON_PM --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}:</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>
+			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}{L_COLON}</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
+			<dt><label for="field_required">{L_REQUIRED_FIELD}{L_COLON}</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_required" name="field_required" value="1"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_show_novalue">{L_SHOW_NOVALUE_FIELD}:</label><br /><span>{L_SHOW_NOVALUE_FIELD_EXPLAIN}</span></dt>
+			<dt><label for="field_show_novalue">{L_SHOW_NOVALUE_FIELD}{L_COLON}</label><br /><span>{L_SHOW_NOVALUE_FIELD_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_show_novalue" name="field_show_novalue" value="1"<!-- IF S_FIELD_SHOW_NOVALUE --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}:</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
+			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		</fieldset>
@@ -86,22 +86,22 @@
 		<fieldset>
 			<legend>{L_LANG_SPECIFIC}</legend>
 		<dl>
-			<dt><label for="lang_name">{L_USER_FIELD_NAME}:</label></dt>
+			<dt><label for="lang_name">{L_USER_FIELD_NAME}{L_COLON}</label></dt>
 			<dd><input class="text medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}:</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>
+			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}{L_COLON}</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>
 			<dd><textarea id="lang_explain" name="lang_explain" rows="3" cols="80">{LANG_EXPLAIN}</textarea></dd>
 		</dl>
 		<!-- IF S_TEXT or S_STRING -->
 			<dl>
-				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}:</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>
+				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}{L_COLON}</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>
 				<dd><!-- IF S_STRING --><input class="text medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd>
 			</dl>
 		<!-- ENDIF -->
 		<!-- IF S_BOOL or S_DROPDOWN -->
 			<dl>
-				<dt><label for="lang_options">{L_ENTRIES}:</label>
+				<dt><label for="lang_options">{L_ENTRIES}{L_COLON}</label>
 					<!-- IF S_EDIT_MODE and S_DROPDOWN -->
 						<br /><span>{L_EDIT_DROPDOWN_LANG_EXPLAIN}</span>
 					<!-- ELSE -->
@@ -130,7 +130,7 @@
 			<legend>{L_TITLE}</legend>
 		<!-- BEGIN option -->
 			<dl>
-				<dt><label>{option.TITLE}:</label><!-- IF option.EXPLAIN --><br /><span>{option.EXPLAIN}</span><!-- ENDIF --></dt>
+				<dt><label>{option.TITLE}{L_COLON}</label><!-- IF option.EXPLAIN --><br /><span>{option.EXPLAIN}</span><!-- ENDIF --></dt>
 				<dd>{option.FIELD}</dd>
 			</dl>
 		<!-- END option -->
@@ -153,7 +153,7 @@
 				<legend>{options.LANGUAGE}</legend>
 			<!-- BEGIN field -->
 				<dl>
-					<dt><label>{options.field.L_TITLE}:</label><!-- IF options.field.L_EXPLAIN --><br /><span>{options.field.L_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dt><label>{options.field.L_TITLE}{L_COLON}</label><!-- IF options.field.L_EXPLAIN --><br /><span>{options.field.L_EXPLAIN}</span><!-- ENDIF --></dt>
 					{options.field.FIELD}
 				</dl>
 			<!-- END field -->
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html
index dfc5827117..aede662bcb 100644
--- a/phpBB/adm/style/acp_prune_forums.html
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -43,7 +43,7 @@
 		<legend>{L_SELECT_FORUM}</legend>
 		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
 	<dl>
-		<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
+		<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
 		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
 		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>
 	</dl>
@@ -65,32 +65,32 @@
 
 	<h2>{L_FORUM}</h2>
 
-	<p>{L_SELECTED_FORUMS}: {FORUM_LIST}</p>
+	<p>{L_SELECTED_FORUMS}{L_COLON} {FORUM_LIST}</p>
 
 	<form id="acp_prune" method="post" action="{U_ACTION}">
 
 	<fieldset>
 		<legend>{L_FORUM_PRUNE}</legend>
 	<dl>
-		<dt><label for="prune_days">{L_PRUNE_NOT_POSTED}:</label></dt>
+		<dt><label for="prune_days">{L_PRUNE_NOT_POSTED}{L_COLON}</label></dt>
 		<dd><input type="text" id="prune_days" name="prune_days" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}:</label></dt>
+		<dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}{L_COLON}</label></dt>
 		<dd><input type="text" id="prune_vieweddays" name="prune_vieweddays" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
+		<dt><label for="polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
 		<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1" /> {L_YES}</label>
 			<label><input type="radio" class="radio" id="polls" name="prune_old_polls" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
+		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="prune_announce" value="1" /> {L_YES}</label>
 			<label><input type="radio" class="radio" id="announce" name="prune_announce" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="sticky">{L_PRUNE_STICKY}:</label></dt>
+		<dt><label for="sticky">{L_PRUNE_STICKY}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES}</label>
 			<label><input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index 4ca562fd32..75fa04a157 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -11,39 +11,39 @@
 <fieldset>
 	<legend>{L_CRITERIA}</legend>
 <dl>
-	<dt><label for="username">{L_USERNAME}:</label></dt>
+	<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
 	<dd><input type="text" id="username" name="username" /></dd>
 </dl>
 <dl>
-	<dt><label for="email">{L_EMAIL}:</label></dt>
+	<dt><label for="email">{L_EMAIL}{L_COLON}</label></dt>
 	<dd><input type="text" id="email" name="email" /></dd>
 </dl>
 <dl>
-	<dt><label for="email">{L_WEBSITE}:</label></dt>
+	<dt><label for="email">{L_WEBSITE}{L_COLON}</label></dt>
 	<dd><input type="text" id="website" name="website" /></dd>
 </dl>
 <dl>
-	<dt><label for="joined">{L_JOINED}:</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
+	<dt><label for="joined">{L_JOINED}{L_COLON}</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
 	<dd>
 		<strong>{L_AFTER}</strong> <input type="text" id="joined_after" name="joined_after" />
 		<br /> <br /> <strong>{L_BEFORE}</strong> <input type="text" id="joined_before" name="joined_before" />
 	</dd>
 </dl>
 <dl>
-	<dt><label for="active">{L_LAST_ACTIVE}:</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt>
+	<dt><label for="active">{L_LAST_ACTIVE}{L_COLON}</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt>
 	<dd><select name="active_select">{S_ACTIVE_OPTIONS}</select> <input type="text" id="active" name="active" /></dd>
 </dl>
 <dl>
-	<dt><label for="count">{L_POSTS}:</label></dt>
+	<dt><label for="count">{L_POSTS}{L_COLON}</label></dt>
 	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" id="count" name="count" /></dd>
 </dl>
 <dl>
-	<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}:</label></dt>
+	<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}{L_COLON}</label></dt>
 	<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="text" id="posts_on_queue" name="posts_on_queue" /></select>
 </dl>
 <!-- IF S_GROUP_LIST -->
 <dl>
-	<dt><label for="group_id">{L_GROUP}:</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</dt>
+	<dt><label for="group_id">{L_GROUP}{L_COLON}</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</dt>
 	<dd><select name="group_id">{S_GROUP_LIST}</select></dd>
 </dl>
 <!-- ENDIF -->
@@ -52,7 +52,7 @@
 <fieldset>
 	<legend>{L_USERNAMES}</legend>
 <dl>
-	<dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
+	<dt><label for="users">{L_ACP_PRUNE_USERS}{L_COLON}</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
 	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
 	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 </dl>
@@ -61,12 +61,12 @@
 <fieldset>
 	<legend>{L_OPTIONS}</legend>
 <dl>
-	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
+	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}{L_COLON}</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}</label>
 		<label><input type="radio" class="radio" id="deleteposts" name="deleteposts" value="0" checked="checked" /> {L_NO}</label></dd>
 </dl>
 <dl>
-	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}:</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>
+	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}{L_COLON}</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label>
 		<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd>
 </dl>
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index 7fb7da7095..a475370f73 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -25,22 +25,22 @@
 	<fieldset>
 		<legend>{L_ACP_RANKS}</legend>
 	<dl>
-		<dt><label for="title">{L_RANK_TITLE}:</label></dt>
+		<dt><label for="title">{L_RANK_TITLE}{L_COLON}</label></dt>
 		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="rank_image">{L_RANK_IMAGE}:</label></dt>
+		<dt><label for="rank_image">{L_RANK_IMAGE}{L_COLON}</label></dt>
 		<dd><select name="rank_image" id="rank_image" onchange="update_image(this.options[selectedIndex].value);">{S_FILENAME_LIST}</select></dd>
 		<dd><img src="{RANK_IMAGE}" id="image" alt="" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="special_rank">{L_RANK_SPECIAL}:</label></dt>
+		<dt><label for="special_rank">{L_RANK_SPECIAL}{L_COLON}</label></dt>
 		<dd><label><input onclick="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input onclick="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
 	<dl>
-		<dt><label for="min_posts">{L_RANK_MINIMUM}:</label></dt>
+		<dt><label for="min_posts">{L_RANK_MINIMUM}{L_COLON}</label></dt>
 		<dd><input name="min_posts" type="text" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
 	</dl>
 	</div>
diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html
index 7cf2cce4c9..2f39f64614 100644
--- a/phpBB/adm/style/acp_reasons.html
+++ b/phpBB/adm/style/acp_reasons.html
@@ -29,7 +29,7 @@
 		<legend>{L_TITLE}</legend>
 		<p><!-- IF S_TRANSLATED -->{L_IS_TRANSLATED_EXPLAIN}<!-- ELSE -->{L_IS_NOT_TRANSLATED_EXPLAIN}<!-- ENDIF --></p>
 	<dl>
-		<dt><label for="reason_title">{L_REASON_TITLE}:</label></dt>
+		<dt><label for="reason_title">{L_REASON_TITLE}{L_COLON}</label></dt>
 		<dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" maxlength="255" /></dd>
 	</dl>
 	<!-- IF S_TRANSLATED -->
@@ -39,7 +39,7 @@
 	</dl>
 	<!-- ENDIF -->
 	<dl>
-		<dt><label for="reason_description">{L_REASON_DESCRIPTION}:</label></dt>
+		<dt><label for="reason_description">{L_REASON_DESCRIPTION}{L_COLON}</label></dt>
 		<dd><textarea name="reason_description" id="reason_description" rows="8" cols="80">{REASON_DESCRIPTION}</textarea></dd>
 	</dl>
 	<!-- IF S_TRANSLATED -->
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index ff83f6b792..3da70bc0c8 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -12,32 +12,32 @@
 	<fieldset>
 		<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>
 	<dl>
-		<dt><label for="load_search">{L_YES_SEARCH}:</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
+		<dt><label for="load_search">{L_YES_SEARCH}{L_COLON}</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
 		<dd><label><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="search_interval">{L_SEARCH_INTERVAL}:</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
+		<dt><label for="search_interval">{L_SEARCH_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
 		<dd><input id="search_interval" type="text" size="4" maxlength="4" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
-		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}:</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
+		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
 		<dd><input id="search_anonymous_interval" type="text" size="4" maxlength="4" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
-		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}:</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
+		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}{L_COLON}</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
 		<dd><input id="limit_search_load" type="text" size="4" maxlength="4" name="config[limit_search_load]" value="{LIMIT_SEARCH_LOAD}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}:</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
+		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
 		<dd><input id="min_search_author_chars" type="text" size="4" maxlength="4" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}:</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
+		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
 		<dd><input id="max_num_search_keywords" type="text" size="4" maxlength="4" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}:</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
+		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}{L_COLON}</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
 		<dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
 	</dl>
 	</fieldset>
@@ -45,7 +45,7 @@
 	<fieldset>
 		<legend>{L_SEARCH_TYPE}</legend>
 	<dl>
-		<dt><label for="search_type">{L_SEARCH_TYPE}:</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
+		<dt><label for="search_type">{L_SEARCH_TYPE}{L_COLON}</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
 		<dd><select id="search_type" name="config[search_type]">{S_SEARCH_TYPES}</select></dd>
 	</dl>
 	</fieldset>
@@ -110,7 +110,7 @@
 
 				{backend.S_HIDDEN_FIELDS}
 
-				<legend>{L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>
+				<legend>{L_INDEX_STATS}{L_COLON} {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>
 
 				<table cellspacing="1">
 					<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>
@@ -126,9 +126,9 @@
 				<tbody>
 				<!-- BEGIN data -->
 					<tr>
-						<td>{backend.data.STATISTIC_1}:</td>
+						<td>{backend.data.STATISTIC_1}{L_COLON}</td>
 						<td>{backend.data.VALUE_1}</td>
-						<td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->:<!-- ENDIF --></td>
+						<td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->{L_COLON}<!-- ENDIF --></td>
 						<td>{backend.data.VALUE_2}</td>
 					</tr>
 				<!-- END data -->
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index b09cbafc95..3dc4c2d616 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -36,7 +36,7 @@
 	<input type="hidden" name="id" value="{STYLE_ID}" />
 	<fieldset>
 	<dl>
-		<dt><label for="name">{L_STYLE_NAME}:</label></dt>
+		<dt><label for="name">{L_STYLE_NAME}{L_COLON}</label></dt>
 		<dd><input type="text" id="name" name="style_name" value="{STYLE_NAME}" /></dd>
 	</dl>
 	<dl>
@@ -44,11 +44,11 @@
 		<dd><strong>{STYLE_PATH}</strong></dd>
 	</dl>
 	<dl>
-		<dt><label for="name">{L_COPYRIGHT}:</label></dt>
+		<dt><label for="name">{L_COPYRIGHT}{L_COLON}</label></dt>
 		<dd><strong>{STYLE_COPYRIGHT}</strong></dd>
 	</dl>
 	<dl>
-		<dt><label for="style_parent">{L_INHERITING_FROM}:</label></dt>
+		<dt><label for="style_parent">{L_INHERITING_FROM}{L_COLON}</label></dt>
 		<dd><select id="style_parent" name="style_parent">
 			<option value=""<!-- IF STYLE_PARENT == 0 --> selected="selected"<!-- ENDIF -->> - </option>
 			<!-- BEGIN parent_styles -->
@@ -57,13 +57,13 @@
 		</select></dd>
 	</dl>
 	<dl>
-		<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt>
+		<dt><label for="style_active">{L_STYLE_ACTIVE}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<!-- IF not S_STYLE_DEFAULT -->
 		<dl>
-			<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt>
+			<dt><label for="style_default">{L_STYLE_DEFAULT}{L_COLON}</label></dt>
 			<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label>
 				<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>
 		</dl>
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index 837629255b..96c9de6ebb 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -13,7 +13,7 @@
 	<fieldset>
 		<legend>{L_SELECT_USER}</legend>
 	<dl>
-		<dt><label for="username">{L_ENTER_USERNAME}:</label></dt>
+		<dt><label for="username">{L_ENTER_USERNAME}{L_COLON}</label></dt>
 		<dd><input class="text medium" type="text" id="username" name="username" /></dd>
 		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 		<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
@@ -68,7 +68,7 @@
 	<form id="mode_select" method="post" action="{U_MODE_SELECT}">
 
 	<fieldset class="quick">
-		{L_SELECT_FORM}: <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" />
+		{L_SELECT_FORM}{L_COLON} <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" />
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -106,7 +106,7 @@
 	<fieldset>
 		<legend>{L_ACP_USER_RANK}</legend>
 	<dl>
-		<dt><label for="user_rank">{L_USER_RANK}:</label></dt>
+		<dt><label for="user_rank">{L_USER_RANK}{L_COLON}</label></dt>
 		<dd><select name="user_rank" id="user_rank">{S_RANK_OPTIONS}</select></dd>
 	</dl>
 	</fieldset>
@@ -146,7 +146,7 @@
 
 	<!-- IF S_GROUP_OPTIONS -->
 		<fieldset class="quick">
-			{L_USER_GROUP_ADD}: <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+			{L_USER_GROUP_ADD}{L_COLON} <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 			{S_FORM_TOKEN}
 		</fieldset>
 	<!-- ENDIF -->
@@ -177,7 +177,7 @@
 	<tbody>
 	<!-- BEGIN attach -->
 		<!-- IF attach.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}: </strong><!-- ELSE --><strong>{L_POST}: </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>
+		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}{L_COLON} </strong><!-- ELSE --><strong>{L_POST}{L_COLON} </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>
 		<td style="text-align: center">{attach.POST_TIME}</td>
 		<td style="text-align: center">{attach.SIZE}</td>
 		<td style="text-align: center">{attach.DOWNLOAD_COUNT}</td>
@@ -192,7 +192,7 @@
 	</div>
 	<!-- ENDIF -->
 	<fieldset class="display-options">
-		{L_SORT_BY}: <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select>
+		{L_SORT_BY}{L_COLON} <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select>
 		<input class="button2" type="submit" value="{L_GO}" name="sort" />
 	</fieldset>
 	<hr />
@@ -219,7 +219,7 @@
 	<form id="select_forum" method="post" action="{U_ACTION}">
 
 		<fieldset class="quick" style="text-align: left;">
-			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select>
+			{L_SELECT_FORUM}{L_COLON} <select name="f">{S_FORUM_OPTIONS}</select>
 			<input class="button2" type="submit" value="{L_GO}" name="select" />
 			{S_FORM_TOKEN}
 		</fieldset>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 35d8374237..2135b52fb9 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -3,36 +3,36 @@
 	<fieldset>
 		<legend>{L_ACP_USER_AVATAR}</legend>
 	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 		<dd>{AVATAR_IMAGE}</dd>
 		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
 	</dl>
 	<!-- IF not S_IN_AVATAR_GALLERY -->
 		<!-- IF S_UPLOAD_FILE -->
 			<dl> 
-				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
 				<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd>
 			</dl>
 		<!-- ENDIF -->
 		<!-- IF S_REMOTE_UPLOAD -->
 			<dl>
-				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
 				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
 			</dl>
 		<!-- ENDIF -->
 		<!-- IF S_ALLOW_REMOTE -->
 			<dl>
-				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
 				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
 			</dl>
 			<dl>
-				<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+				<dt><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 				<dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>{L_PIXEL} &times; </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>
 			</dl>
 		<!-- ENDIF -->
 		<!-- IF S_DISPLAY_GALLERY -->
 			<dl> 
-				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
+				<dt><label>{L_AVATAR_GALLERY}{L_COLON}</label></dt>
 				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
 			</dl>
 		<!-- ENDIF -->
@@ -42,7 +42,7 @@
 		<fieldset>
 			<legend>{L_AVATAR_GALLERY}</legend>
 		<dl>
-			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
+			<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
 			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
 		</dl>
 		<dl>
diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html
index 1dad7f1927..d1a4f59445 100644
--- a/phpBB/adm/style/acp_users_feedback.html
+++ b/phpBB/adm/style/acp_users_feedback.html
@@ -40,7 +40,7 @@
 	<!-- ENDIF -->
 	
 	<fieldset class="display-options">
-		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
+		{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
 		<input class="button2" type="submit" value="{L_GO}" name="sort" />
 	</fieldset>
 	<hr />
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 5c5fa010f4..b7e3a9822e 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -3,54 +3,54 @@
 <fieldset>
 	<legend>{L_ACP_USER_OVERVIEW}</legend>
 <dl>
-	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
+	<dt><label for="user">{L_USERNAME}{L_COLON}</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
 	<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
 	<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
 </dl>
 <!-- IF S_USER_INACTIVE -->
 <dl>
-	<dt><label>{L_USER_IS_INACTIVE}:</label></dt>
+	<dt><label>{L_USER_IS_INACTIVE}{L_COLON}</label></dt>
 	<dd><strong>{USER_INACTIVE_REASON}</strong></dd>
 </dl>
 <!-- ENDIF -->
 <dl>
-	<dt><label>{L_REGISTERED}:</label></dt>
+	<dt><label>{L_REGISTERED}{L_COLON}</label></dt>
 	<dd><strong>{USER_REGISTERED}</strong></dd>
 </dl>
 <!-- IF S_USER_IP -->
 <dl>
-	<dt><label>{L_REGISTERED_IP}:</label></dt>
+	<dt><label>{L_REGISTERED_IP}{L_COLON}</label></dt>
 	<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>
 	<dd>[ <a href="{U_WHOIS}" onclick="popup(this.href, 700, 500, '_whois'); return false;">{L_WHOIS}</a> ]</dd>
 </dl>
 <!-- ENDIF -->
 <dl>
-	<dt><label>{L_LAST_ACTIVE}:</label></dt>
+	<dt><label>{L_LAST_ACTIVE}{L_COLON}</label></dt>
 	<dd><strong>{USER_LASTACTIVE}</strong></dd>
 </dl>
 <dl>
-	<dt><label>{L_POSTS}:</label></dt>
+	<dt><label>{L_POSTS}{L_COLON}</label></dt>
 	<dd><strong>{USER_POSTS}</strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd>
 </dl>
 <dl>
-	<dt><label>{L_WARNINGS}:</label></dt>
+	<dt><label>{L_WARNINGS}{L_COLON}</label></dt>
 	<dd><strong>{USER_WARNINGS}</strong></dd>
 </dl>
 <dl>
-	<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
+	<dt><label for="user_founder">{L_FOUNDER}{L_COLON}</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
 <dl>
-	<dt><label for="user_email">{L_EMAIL}:</label></dt>
+	<dt><label for="user_email">{L_EMAIL}{L_COLON}</label></dt>
 	<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd>
 </dl>
 <dl>
-	<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
+	<dt><label for="new_password">{L_NEW_PASSWORD}{L_COLON}</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
 	<dd><input type="password" id="new_password" name="new_password" value="" autocomplete="off" /></dd>
 </dl>
 <dl>
-	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
+	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
 	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>
 </dl>
 
@@ -107,16 +107,16 @@
 	<fieldset>
 		<legend>{L_USER_TOOLS}</legend>
 	<dl>
-		<dt><label for="quicktools">{L_QUICK_TOOLS}:</label></dt>
+		<dt><label for="quicktools">{L_QUICK_TOOLS}{L_COLON}</label></dt>
 		<dd><select id="quicktools" name="action" onchange="display_reason(this.options[this.selectedIndex].value);">{S_ACTION_OPTIONS}</select></dd>
 	</dl>
 	<div style="display: none;" id="reasons">
 		<dl>
-			<dt><label for="ban_reason">{L_BAN_REASON}:</label></dt>
+			<dt><label for="ban_reason">{L_BAN_REASON}{L_COLON}</label></dt>
 			<dd><input name="ban_reason" type="text" class="text medium" maxlength="3000" id="ban_reason" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}:</label></dt>
+			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
 			<dd><input name="ban_give_reason" type="text" class="text medium" maxlength="3000" id="ban_give_reason" /></dd>
 		</dl>
 	</div>
@@ -135,7 +135,7 @@
 			<fieldset>
 				<legend>{L_DELETE_USER}</legend>
 				<dl>
-					<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
+					<dt><label for="delete_type">{L_DELETE_USER}{L_COLON}</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
 					<dd>
 					<!-- IF USER_HAS_POSTS -->
 						<select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select>
diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
index 9439f0cf03..f1b9e28a66 100644
--- a/phpBB/adm/style/acp_users_prefs.html
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -9,52 +9,52 @@
 	<fieldset>
 		<legend>{L_UCP_PREFS_PERSONAL}</legend>
 	<dl> 
-		<dt><label for="viewemail">{L_SHOW_EMAIL}:</label></dt>
+		<dt><label for="viewemail">{L_SHOW_EMAIL}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="viewemail" value="0"<!-- IF not VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="massemail">{L_ADMIN_EMAIL}:</label></dt>
+		<dt><label for="massemail">{L_ADMIN_EMAIL}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="massemail" value="1"<!-- IF MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="massemail" value="0"<!-- IF not MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="allowpm">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
+		<dt><label for="allowpm">{L_ALLOW_PM}{L_COLON}</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
 		<dd><label><input type="radio" class="radio" name="allowpm" value="1"<!-- IF ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="allowpm" value="0"<!-- IF not ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="hideonline">{L_HIDE_ONLINE}:</label></dt>
+		<dt><label for="hideonline">{L_HIDE_ONLINE}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="notifymethod">{L_NOTIFY_METHOD}:</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
+		<dt><label for="notifymethod">{L_NOTIFY_METHOD}{L_COLON}</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
 		<dd><label><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
 			<label><input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
 			<label><input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="notifypm">{L_NOTIFY_ON_PM}:</label></dt>
+		<dt><label for="notifypm">{L_NOTIFY_ON_PM}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="popuppm">{L_POPUP_ON_PM}:</label></dt>
+		<dt><label for="popuppm">{L_POPUP_ON_PM}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
+		<dt><label for="lang">{L_BOARD_LANGUAGE}{L_COLON}</label></dt>
 		<dd><select id="lang" name="lang">{S_LANG_OPTIONS}</select></dd>
 	</dl>
 	<dl> 
-		<dt><label for="style">{L_BOARD_STYLE}:</label></dt>
+		<dt><label for="style">{L_BOARD_STYLE}{L_COLON}</label></dt>
 		<dd><select id="style" name="style">{S_STYLE_OPTIONS}</select></dd>
 	</dl>
 	<!-- INCLUDE timezone_option.html -->
 	<dl> 
-		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
+		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
 		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
 		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
 	</dl>
@@ -63,22 +63,22 @@
 	<fieldset>
 		<legend>{L_UCP_PREFS_POST}</legend>
 	<dl> 
-		<dt><label for="bbcode">{L_DEFAULT_BBCODE}:</label></dt>
+		<dt><label for="bbcode">{L_DEFAULT_BBCODE}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="smilies">{L_DEFAULT_SMILIES}:</label></dt>
+		<dt><label for="smilies">{L_DEFAULT_SMILIES}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="sig">{L_DEFAULT_ADD_SIG}:</label></dt>
+		<dt><label for="sig">{L_DEFAULT_ADD_SIG}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="sig" value="1"<!-- IF ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="sig" value="0"<!-- IF not ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="notify">{L_DEFAULT_NOTIFY}:</label></dt>
+		<dt><label for="notify">{L_DEFAULT_NOTIFY}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
@@ -87,57 +87,57 @@
 	<fieldset>
 		<legend>{L_UCP_PREFS_VIEW}</legend>
 	<dl> 
-		<dt><label for="view_images">{L_VIEW_IMAGES}:</label></dt>
+		<dt><label for="view_images">{L_VIEW_IMAGES}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="view_images" value="0"<!-- IF not VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="view_flash">{L_VIEW_FLASH}:</label></dt>
+		<dt><label for="view_flash">{L_VIEW_FLASH}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="view_flash" value="1"<!-- IF VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="view_flash" value="0"<!-- IF not VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="view_smilies">{L_VIEW_SMILIES}:</label></dt>
+		<dt><label for="view_smilies">{L_VIEW_SMILIES}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="view_smilies" value="1"<!-- IF VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="view_smilies" value="0"<!-- IF not VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="view_sigs">{L_VIEW_SIGS}:</label></dt>
+		<dt><label for="view_sigs">{L_VIEW_SIGS}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="view_sigs" value="1"<!-- IF VIEW_SIGS --> id="view_sigs" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="view_sigs" value="0"<!-- IF not VIEW_SIGS --> id="view_sigss" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="view_avatars">{L_VIEW_AVATARS}:</label></dt>
+		<dt><label for="view_avatars">{L_VIEW_AVATARS}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="view_avatars" value="1"<!-- IF VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="view_avatars" value="0"<!-- IF not VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}:</label></dt>
+		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="view_wordcensor" value="1"<!-- IF VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="view_wordcensor" value="0"<!-- IF not VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt>
+		<dt><label>{L_VIEW_TOPICS_DAYS}{L_COLON}</label></dt>
 		<dd>{S_TOPIC_SORT_DAYS}</dd>
 	</dl>
 	<dl> 
-		<dt><label>{L_VIEW_TOPICS_KEY}:</label></dt>
+		<dt><label>{L_VIEW_TOPICS_KEY}{L_COLON}</label></dt>
 		<dd>{S_TOPIC_SORT_KEY}</dd>
 	</dl>
 	<dl> 
-		<dt><label>{L_VIEW_TOPICS_DIR}:</label></dt>
+		<dt><label>{L_VIEW_TOPICS_DIR}{L_COLON}</label></dt>
 		<dd>{S_TOPIC_SORT_DIR}</dd>
 	</dl>
 	<dl> 
-		<dt><label>{L_VIEW_POSTS_DAYS}:</label></dt>
+		<dt><label>{L_VIEW_POSTS_DAYS}{L_COLON}</label></dt>
 		<dd>{S_POST_SORT_DAYS}</dd>
 	</dl>
 	<dl> 
-		<dt><label>{L_VIEW_POSTS_KEY}:</label></dt>
+		<dt><label>{L_VIEW_POSTS_KEY}{L_COLON}</label></dt>
 		<dd>{S_POST_SORT_KEY}</dd>
 	</dl>
 	<dl> 
-		<dt><label>{L_VIEW_POSTS_DIR}:</label></dt>
+		<dt><label>{L_VIEW_POSTS_DIR}{L_COLON}</label></dt>
 		<dd>{S_POST_SORT_DIR}</dd>
 	</dl>
 	</fieldset>
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index ea7204e2e4..3232e8d1f5 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -3,44 +3,44 @@
 	<fieldset>
 		<legend>{L_USER_PROFILE}</legend>
 	<dl>
-		<dt><label for="icq">{L_UCP_ICQ}:</label></dt>
+		<dt><label for="icq">{L_UCP_ICQ}{L_COLON}</label></dt>
 		<dd><input type="text" id="icq" name="icq" value="{ICQ}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="aim">{L_UCP_AIM}:</label></dt>
+		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="msn">{L_UCP_MSNM}:</label></dt>
+		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
 		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="yim">{L_UCP_YIM}:</label></dt>
+		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="jabber">{L_UCP_JABBER}:</label></dt>
+		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
 		<dd><input type="text" id="jabber" name="jabber" value="{JABBER}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="website">{L_WEBSITE}:</label></dt>
+		<dt><label for="website">{L_WEBSITE}{L_COLON}</label></dt>
 		<dd><input type="text" id="website" name="website" value="{WEBSITE}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="location">{L_LOCATION}:</label></dt>
+		<dt><label for="location">{L_LOCATION}{L_COLON}</label></dt>
 		<dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="occupation">{L_OCCUPATION}:</label></dt>
+		<dt><label for="occupation">{L_OCCUPATION}{L_COLON}</label></dt>
 		<dd><textarea id="occupation" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></dd>
 	</dl>
 	<dl>
-		<dt><label for="interests">{L_INTERESTS}:</label></dt>
+		<dt><label for="interests">{L_INTERESTS}{L_COLON}</label></dt>
 		<dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>
 	</dl>
 	<dl> 
-		<dt><label for="birthday">{L_BIRTHDAY}:</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
-		<dd>{L_DAY}: <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}: <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}: <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
+		<dt><label for="birthday">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
+		<dd>{L_DAY}{L_COLON} <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}{L_COLON} <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}{L_COLON} <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
 	</dl>
 	</fieldset>
 
@@ -49,7 +49,7 @@
 			<legend>{L_USER_CUSTOM_PROFILE_FIELDS}</legend>
 		<!-- BEGIN profile_fields -->
 		<dl> 
-			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
 			<dd>{profile_fields.FIELD}</dd>
 			<!-- IF profile_fields.ERROR -->
 				<dd><span class="small" style="color: red;">{profile_fields.ERROR}</span></dd>
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index d55deac808..c9cc053eec 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -26,7 +26,7 @@
 		d: '{LA_BBCODE_D_HELP}',
 		tip: '{L_STYLES_TIP}'
 		<!-- BEGIN custom_tags -->
-			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
+			,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
 		<!-- END custom_tags -->
 	}
 
@@ -66,7 +66,7 @@
 				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
 			<!-- ENDIF -->
 
-			{L_FONT_SIZE}: <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}" onmouseover="helpline('f')" onmouseout="helpline('tip')">
+			{L_FONT_SIZE}{L_COLON} <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}" onmouseover="helpline('f')" onmouseout="helpline('tip')">
 				<option value="50">{L_FONT_TINY}</option>
 				<option value="85">{L_FONT_SMALL}</option>
 				<option value="100" selected="selected">{L_FONT_NORMAL}</option>
@@ -92,8 +92,8 @@
 				// ]]>
 				</script>
 			</dt>
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{SIGNATURE}</textarea></dd>
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{SIGNATURE}</textarea></dd>
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px; margin-top: 5px;">
 			<!-- IF S_BBCODE_ALLOWED -->
 				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
 			<!-- ENDIF -->
@@ -104,7 +104,7 @@
 				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
 			<!-- ENDIF -->
 			</dd>
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
 		</dl>
 	</fieldset>
 
diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html
index 0b1434f7e0..0f137f28df 100644
--- a/phpBB/adm/style/captcha_default_acp_demo.html
+++ b/phpBB/adm/style/captcha_default_acp_demo.html
@@ -1,4 +1,4 @@
 <dl>
-	<dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
+	<dt><label for="captcha_preview">{L_PREVIEW}{L_COLON}</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
 	<dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd>
 </dl>
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html
index e2804bbc7d..b333d9205c 100644
--- a/phpBB/adm/style/captcha_gd_acp.html
+++ b/phpBB/adm/style/captcha_gd_acp.html
@@ -14,32 +14,32 @@
 <legend>{L_GENERAL_OPTIONS}</legend>
 
 <dl>
-	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}:</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>
+	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>
 	<dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
+	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
 	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
+	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
 	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}:</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>
+	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>
 	<dd><label><input id="captcha_gd_wave" name="captcha_gd_wave" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input name="captcha_gd_wave" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 </dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}:</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt>
+	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt>
 	<dd><label><input id="captcha_gd_3d_noise" name="captcha_gd_3d_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input name="captcha_gd_3d_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 </dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}:</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt>
+	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt>
 	<dd><label><input id="captcha_gd_fonts" name="captcha_gd_fonts" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 1 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_DEFAULT}</label>
 		<label><input name="captcha_gd_fonts" value="2" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 2 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_NEW}</label>
 		<label><input name="captcha_gd_fonts" value="3" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 3 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_LOWER}</label>
diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html
index 4eb46d2d3c..99f3f24f70 100644
--- a/phpBB/adm/style/captcha_qa_acp.html
+++ b/phpBB/adm/style/captcha_qa_acp.html
@@ -59,7 +59,7 @@
 	<fieldset>
 		<legend>{L_EDIT_QUESTION}</legend>
 	<dl>
-		<dt><label for="strict">{L_QUESTION_STRICT}:</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt>
+		<dt><label for="strict">{L_QUESTION_STRICT}{L_COLON}</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt>
 		<dd><label><input type="radio" class="radio" name="strict" value="1"<!-- IF STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="strict" value="0"<!-- IF not STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
diff --git a/phpBB/adm/style/captcha_qa_acp_demo.html b/phpBB/adm/style/captcha_qa_acp_demo.html
index 0ea2d6a024..79170e27c6 100644
--- a/phpBB/adm/style/captcha_qa_acp_demo.html
+++ b/phpBB/adm/style/captcha_qa_acp_demo.html
@@ -1,5 +1,5 @@
 <dl>
-	<dt><label for="answer"><!-- IF QA_CONFIRM_QUESTION --> {QA_CONFIRM_QUESTION} <!-- ELSE --> {L_CONFIRM_QUESTION} <!-- ENDIF -->:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
+	<dt><label for="answer"><!-- IF QA_CONFIRM_QUESTION --> {QA_CONFIRM_QUESTION} <!-- ELSE --> {L_CONFIRM_QUESTION} <!-- ENDIF -->{L_COLON}</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
 
 	<dd>
 		<input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}"  />
diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html
index 34912c7955..67176ebd07 100644
--- a/phpBB/adm/style/captcha_recaptcha_acp.html
+++ b/phpBB/adm/style/captcha_recaptcha_acp.html
@@ -13,11 +13,11 @@
 <legend>{L_GENERAL_OPTIONS}</legend>
 
 <dl>
-	<dt><label for="recaptcha_pubkey">{L_RECAPTCHA_PUBLIC}:</label><br /><span>{L_RECAPTCHA_PUBLIC_EXPLAIN}</span></dt>
+	<dt><label for="recaptcha_pubkey">{L_RECAPTCHA_PUBLIC}{L_COLON}</label><br /><span>{L_RECAPTCHA_PUBLIC_EXPLAIN}</span></dt>
 	<dd><input id="recaptcha_pubkey" name="recaptcha_pubkey" value="{RECAPTCHA_PUBKEY}" size="50" type="text" /></dd>
 </dl>
 <dl>
-	<dt><label for="recaptcha_privkey">{L_RECAPTCHA_PRIVATE}:</label><br /><span>{L_RECAPTCHA_PRIVATE_EXPLAIN}</span></dt>
+	<dt><label for="recaptcha_privkey">{L_RECAPTCHA_PRIVATE}{L_COLON}</label><br /><span>{L_RECAPTCHA_PRIVATE_EXPLAIN}</span></dt>
 	<dd><input id="recaptcha_privkey" name="recaptcha_privkey" value="{RECAPTCHA_PRIVKEY}" size="50" type="text" /></dd>
 </dl>
 
diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html
index 351397d3c7..982356bfa7 100644
--- a/phpBB/adm/style/custom_profile_fields.html
+++ b/phpBB/adm/style/custom_profile_fields.html
@@ -26,7 +26,7 @@
 <!-- END int -->
 
 <!-- BEGIN date -->
-	<span>{L_DAY}:</span> <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select>
-	<span>{L_MONTH}:</span> <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select>
-	<span>{L_YEAR}:</span> <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select>
+	<span>{L_DAY}{L_COLON}</span> <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select>
+	<span>{L_MONTH}{L_COLON}</span> <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select>
+	<span>{L_YEAR}{L_COLON}</span> <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select>
 <!-- END date -->
diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html
index cf78f30b50..5fec8c4789 100644
--- a/phpBB/adm/style/install_convert.html
+++ b/phpBB/adm/style/install_convert.html
@@ -86,7 +86,7 @@
 			<!-- ELSE -->
 
 				<dl>
-					<dt><label>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 					<dd>{checks.RESULT}</dd>
 				</dl>
 			<!-- ENDIF -->
@@ -109,7 +109,7 @@
 			<!-- ELSE -->
 
 				<dl>
-					<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 					<dd>{options.CONTENT}</dd>
 				</dl>
 
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index e306d8f6bf..6826654ded 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -42,7 +42,7 @@ function dE(n, s, type)
 		<!-- IF S_LANG_SELECT -->
 		<form method="post" action="">
 			<fieldset class="nobg">
-				<label for="language">{L_SELECT_LANG}:</label>
+				<label for="language">{L_SELECT_LANG}{L_COLON}</label>
 				{S_LANG_SELECT}
 				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
 			</fieldset>
diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html
index 79006fba69..1a809a3588 100644
--- a/phpBB/adm/style/install_install.html
+++ b/phpBB/adm/style/install_install.html
@@ -20,7 +20,7 @@
 		<!-- ELSE -->
 
 			<dl>
-				<dt>{checks.TITLE}:<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dt>{checks.TITLE}{L_COLON}<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 				<dd>{checks.RESULT}</dd>
 			</dl>
 		<!-- ENDIF -->
@@ -43,7 +43,7 @@
 		<!-- ELSE -->
 
 			<dl>
-				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 				<dd>{options.CONTENT}</dd>
 			</dl>
 
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index 818889c89b..b5fa46dbf6 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -221,13 +221,13 @@
 			<!-- BEGIN new -->
 				<dl>
 					<dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br /><!-- ENDIF -->{new.FILE_PART}</strong>
-					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
 				</dt>
-				<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">
+				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
 					<!-- IF not new.S_BINARY -->[<a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
 				</dd>
 				<!-- IF new.S_CUSTOM -->
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
 				<!-- ENDIF -->
 				</dl>
 			<!-- END new -->
@@ -245,11 +245,11 @@
 			<!-- BEGIN not_modified -->
 				<dl>
 					<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong>
-						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
 					</dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
 					<!-- IF not_modified.S_CUSTOM -->
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
 					<!-- ENDIF -->
 				</dl>
 			<!-- END not_modified -->
@@ -266,24 +266,24 @@
 				<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
 				<dl>
 					<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong>
-					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
 				</dt>
-				<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">&nbsp;</dd>
+				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
 				<!-- IF modified.S_CUSTOM -->
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
 				<!-- ENDIF -->
 				</dl>
 				<dl>
 					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
 				</dl>
 				<dl>
 					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
 				</dl>
 				<dl>
 					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
 				</dl>
 			</fieldset>
 			<!-- END modified -->
@@ -299,13 +299,13 @@
 			<!-- BEGIN new_conflict -->
 				<dl>
 					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong>
-					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
 				</dt>
-				<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">
+				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
 					<!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
 				</dd>
 				<!-- IF new_conflict.S_CUSTOM -->
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
 				<!-- ENDIF -->
 				</dl>
 			<!-- END new_conflict -->
@@ -322,38 +322,38 @@
 				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
 				<dl>
 					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong>
-						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}: {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
+						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
 					</dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
 						<!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
 						<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
 					</dd>
 					<!-- IF conflict.S_CUSTOM -->
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
 					<!-- ENDIF -->
 				</dl>
 				<!-- IF conflict.S_BINARY -->
 					<dl>
 						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">&nbsp;</dd>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
 					</dl>
 				<!-- ELSE -->
 					<dl>
 						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
 					</dl>
 					<dl>
 						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
 					</dl>
 					<dl>
 						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
 					</dl>
 					<dl>
 						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
 					</dl>
 				<!-- ENDIF -->
 			</fieldset>
@@ -392,7 +392,7 @@
 	<fieldset>
 		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
 	<dl>
-		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
+		<dt><label for="use_method">{L_DOWNLOAD_AS}{L_COLON}</label></dt>
 		<dd>{RADIO_BUTTONS}</dd>
 	</dl>
 	</fieldset>
@@ -455,12 +455,12 @@
 	<fieldset>
 		<legend>{L_FTP_SETTINGS}</legend>
 	<dl>
-		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
+		<dt><label>{L_UPLOAD_METHOD}{L_COLON}</label></dt>
 		<dd><strong>{UPLOAD_METHOD}</strong></dd>
 	</dl>
 	<!-- BEGIN data -->
 	<dl>
-		<dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt>
+		<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 -->
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index b5d25e82f2..ecdc40e157 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -223,7 +223,7 @@ table.hrdiff caption span {
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 		<form method="post" action="">
 		<fieldset class="quick">
-			<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
+			<label for="diff_mode">{L_SELECT_DIFF_MODE}{L_COLON}</label>
 			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
 
 			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
@@ -231,7 +231,7 @@ table.hrdiff caption span {
 		</form>
 <!-- ENDIF -->
 <!-- IF S_DIFF_CONFLICT_FILE -->
-		<div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
+		<div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}{L_COLON} {NUM_CONFLICTS}</strong></div>
 		<br style="clear: both;" />
 <!-- ENDIF -->
 	</div>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index f6d0e1025f..f7902e6d2e 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -9,7 +9,7 @@
 
 <script type="text/javascript">
 // <![CDATA[
-var jump_page = '{LA_JUMP_PAGE}:';
+var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
 var base_url = '{A_BASE_URL}';
diff --git a/phpBB/adm/style/permission_forum_copy.html b/phpBB/adm/style/permission_forum_copy.html
index a4c00c12ae..1e012a9347 100644
--- a/phpBB/adm/style/permission_forum_copy.html
+++ b/phpBB/adm/style/permission_forum_copy.html
@@ -12,7 +12,7 @@
 		<legend>{L_LOOK_UP_FORUM}</legend>
 
 		<dl>
-			<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
+			<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
 			<dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>
 		</dl>
 	</fieldset>
@@ -22,7 +22,7 @@
 		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
 
 		<dl>
-			<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
+			<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
 			<dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
 		</dl>
 	</fieldset>
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index e29609b8b6..4d52b901c3 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -38,9 +38,9 @@
 			<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0', true); return false;">{L_ADVANCED_PERMISSIONS}</a><!-- IF not p_mask.S_VIEW and p_mask.f_mask.S_CUSTOM --> *<!-- ENDIF -->
 		</div>
 		<dl class="permissions-simple">
-			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}:</label></dt>
+			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt>
 			<!-- IF p_mask.f_mask.S_ROLE_OPTIONS -->
-				<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd>
+				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd>
 			<!-- ELSE -->
 				<dd>{L_NO_ROLE_AVAILABLE}</dd>
 			<!-- ENDIF -->
@@ -118,7 +118,7 @@
 			</div>
 			
 			<!-- IF not p_mask.S_VIEW -->
-			<fieldset class="quick" style="margin-{S_CONTENT_FLOW_END}: 11px;">
+			<fieldset class="quick" style="margin-{S_CONTENT_FLOW_END}{L_COLON} 11px;">
 				<p class="small">{L_APPLY_PERMISSIONS_EXPLAIN}</p>
 				<input class="button1" type="submit" name="psubmit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" value="{L_APPLY_PERMISSIONS}" />
 				<!-- IF .p_mask.f_mask gt 1 or .p_mask gt 1 -->
diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html
index 485858da74..277310edbf 100644
--- a/phpBB/adm/style/permission_roles_mask.html
+++ b/phpBB/adm/style/permission_roles_mask.html
@@ -2,7 +2,7 @@
 <!-- BEGIN role_mask -->
 
 	<table cellspacing="1">
-		<caption><!-- IF role_mask.FORUM_ID -->{L_FORUM}: <!-- ENDIF -->{role_mask.NAME}</caption>
+		<caption><!-- IF role_mask.FORUM_ID -->{L_FORUM}{L_COLON} <!-- ENDIF -->{role_mask.NAME}</caption>
 	<tbody>
 	<tr>
 		<th>{L_USERS}</th>
diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html
index 186bb28b67..744ad3293e 100644
--- a/phpBB/adm/style/permission_trace.html
+++ b/phpBB/adm/style/permission_trace.html
@@ -4,7 +4,7 @@
 
 	<!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a><!-- ENDIF -->
 
-	<h3>{L_TRACE_FOR}: {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3>
+	<h3>{L_TRACE_FOR}{L_COLON} {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3>
 
 	<br />
 
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index d4cbcb6cbe..0ba445ca2a 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -9,7 +9,7 @@
 
 <script type="text/javascript">
 // <![CDATA[
-var jump_page = '{LA_JUMP_PAGE}:';
+var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
 var base_url = '{A_BASE_URL}';
diff --git a/phpBB/adm/style/timezone_option.html b/phpBB/adm/style/timezone_option.html
index 23c0ee19e9..7a799b69c6 100644
--- a/phpBB/adm/style/timezone_option.html
+++ b/phpBB/adm/style/timezone_option.html
@@ -1,5 +1,5 @@
 <dl>
-	<dt><label for="timezone">{L_BOARD_TIMEZONE}:</label></dt>
+	<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt>
 	<!-- IF S_TZ_DATE_OPTIONS -->
 	<dd id="tz_select_date" style="display: none;">
 		<select name="tz_date" id="tz_date" class="autowidth tz_select">
-- 
cgit v1.2.1


From b4f7f97a2c78baf98b01a1ea333d4299a627c160 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 9 Nov 2012 15:58:56 +0100
Subject: [ticket/10780] Replace colons in
 phpBB/adm/style/acp_ext_details.html.

PHPBB3-10780
---
 phpBB/adm/style/acp_ext_details.html | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index e7532691ad..18786d80f9 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -10,38 +10,38 @@
 		<legend>{L_EXT_DETAILS}</legend>
 		<!-- IF META_DISPLAY_NAME -->
 		<dl>
-			<dt><label for="meta_display_name">{L_DISPLAY_NAME}:</label></dt>
+			<dt><label for="meta_display_name">{L_DISPLAY_NAME}{L_COLON}</label></dt>
 			<dd><strong id="meta_display_name">{META_DISPLAY_NAME}</strong></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="meta_name">{L_CLEAN_NAME}:</label></dt>
+			<dt><label for="meta_name">{L_CLEAN_NAME}{L_COLON}</label></dt>
 			<dd><strong id="meta_name">{META_NAME}</strong></dd>
 		</dl>
 		<!-- IF META_DESCRIPTION -->
 		<dl>
-			<dt><label for="meta_description">{L_DESCRIPTION}:</label></dt>
+			<dt><label for="meta_description">{L_DESCRIPTION}{L_COLON}</label></dt>
 			<dd><p id="meta_description">{META_DESCRIPTION}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="meta_version">{L_VERSION}:</label></dt>
+			<dt><label for="meta_version">{L_VERSION}{L_COLON}</label></dt>
 			<dd><p id="meta_version">{META_VERSION}</p></dd>
 		</dl>
 		<!-- IF META_HOMEPAGE -->
 		<dl>
-			<dt><label for="meta_homepage">{L_HOMEPAGE}:</label></dt>
+			<dt><label for="meta_homepage">{L_HOMEPAGE}{L_COLON}</label></dt>
 			<dd><p id="meta_homepage">{META_HOMEPAGE}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF META_TIME -->
 		<dl>
-			<dt><label for="meta_time">{L_TIME}:</label></dt>
+			<dt><label for="meta_time">{L_TIME}{L_COLON}</label></dt>
 			<dd><p id="meta_time">{META_TIME}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="meta_license">{L_LICENCE}:</label></dt>
+			<dt><label for="meta_license">{L_LICENCE}{L_COLON}</label></dt>
 			<dd><p id="meta_license">{META_LICENCE}</p></dd>
 		</dl>
 	</fieldset>
@@ -51,13 +51,13 @@
 		<legend>{L_REQUIREMENTS}</legend>
 		<!-- IF META_REQUIRE_PHPBB -->
 		<dl<!-- IF META_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
-			<dt><label for="require_phpbb">{L_PHPBB_VERSION}:</label></dt>
+			<dt><label for="require_phpbb">{L_PHPBB_VERSION}{L_COLON}</label></dt>
 			<dd><p id="require_phpbb">{META_REQUIRE_PHPBB}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF META_REQUIRE_PHP -->
 		<dl<!-- IF META_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
-			<dt><label for="require_php">{L_PHP_VERSION}:</label></dt>
+			<dt><label for="require_php">{L_PHP_VERSION}{L_COLON}</label></dt>
 			<dd><p id="require_php">{META_REQUIRE_PHP}</p></dd>
 		</dl>
 		<!-- ENDIF -->
@@ -69,24 +69,24 @@
 		<!-- BEGIN meta_authors -->
 		<fieldset>
 			<dl>
-				<dt><label for="meta_author_name">{L_AUTHOR_NAME}:</label></dt>
+				<dt><label for="meta_author_name">{L_AUTHOR_NAME}{L_COLON}</label></dt>
 				<dd><strong id="meta_author_name">{meta_authors.AUTHOR_NAME}</strong></dd>
 			</dl>
 			<!-- IF meta_authors.AUTHOR_EMAIL -->
 			<dl>
-				<dt><label for="meta_author_email">{L_AUTHOR_EMAIL}:</label></dt>
+				<dt><label for="meta_author_email">{L_AUTHOR_EMAIL}{L_COLON}</label></dt>
 				<dd><strong id="meta_author_email"><a href="mailto:{meta_authors.AUTHOR_EMAIL}">{meta_authors.AUTHOR_EMAIL}</a></strong></dd>
 			</dl>
 			<!-- ENDIF -->
 			<!-- IF meta_authors.AUTHOR_HOMEPAGE -->
 			<dl>
-				<dt><label for="meta_author_url">{L_AUTHOR_HOMEPAGE}:</label></dt>
+				<dt><label for="meta_author_url">{L_AUTHOR_HOMEPAGE}{L_COLON}</label></dt>
 				<dd><strong id="meta_author_url"><a href="{meta_authors.AUTHOR_HOMEPAGE}">{meta_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
 			</dl>
 			<!-- ENDIF -->
 			<!-- IF meta_authors.AUTHOR_ROLE -->
 			<dl>
-				<dt><label for="author_role">{L_AUTHOR_ROLE}:</label></dt>
+				<dt><label for="author_role">{L_AUTHOR_ROLE}{L_COLON}</label></dt>
 				<dd><strong id="meta_author_role">{meta_authors.AUTHOR_ROLE}</strong></dd>
 			</dl>
 			<!-- ENDIF -->
-- 
cgit v1.2.1


From 4c9820d1ca47d088146f3f52fb1126821efe3646 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 12 Nov 2012 15:01:25 +0100
Subject: [feature/avatars] add missing html closing tags and fix tabbing

PHPBB3-10018
---
 phpBB/adm/style/acp_users_avatar.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 93a7b38390..62c80f14c1 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -37,14 +37,15 @@
 			</dl>
 		<!-- ENDIF -->
 	<!-- ELSE -->
-		</fieldset>
+	</fieldset>
 
-		<fieldset>
-			<legend>{L_AVATAR_GALLERY}</legend>
+	<fieldset>
+		<legend>{L_AVATAR_GALLERY}</legend>
 		<dl>
 			<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
 			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+		</dl>
+		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
-- 
cgit v1.2.1


From 4c4b82416b8c7b3a8f97b12ca96699bea0bde91d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 12 Nov 2012 15:06:44 +0100
Subject: [feature/avatars] Replace colon usage with {L_COLON}

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_local.html  | 2 +-
 phpBB/adm/style/acp_avatar_options_remote.html | 4 ++--
 phpBB/adm/style/acp_avatar_options_upload.html | 4 ++--
 phpBB/adm/style/acp_groups.html                | 2 +-
 phpBB/adm/style/acp_users_avatar.html          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index d762fa9008..02ff58fe15 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -1,5 +1,5 @@
 <dl>
-	<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
+	<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
 	<dd><select name="av_local_cat" id="category">
 		<option value="">{L_NO_AVATAR_CATEGORY}</option>
 		<!-- BEGIN av_local_cats -->
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
index 02704c5be8..ec5a22b691 100644
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -1,9 +1,9 @@
 <dl>
-	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
 	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd>
 </dl>
 <dl>
-	<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
 		<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
 		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html
index 9c8dd9af01..d0a4f516e1 100644
--- a/phpBB/adm/style/acp_avatar_options_upload.html
+++ b/phpBB/adm/style/acp_avatar_options_upload.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
 	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AV_UPLOAD_SIZE}" /><input type="file" name="av_upload_file" id="av_upload_file" class="inputbox autowidth" /></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->
 	<dl>
-		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
 		<dd><input type="text" name="av_upload_url" id="av_upload_url" value="" class="inputbox" /></dd>
 	</dl>
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 3a551adca7..6fb2908b0a 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -103,7 +103,7 @@
 	<fieldset>
 		<legend>{L_GROUP_AVATAR}</legend>
 	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 		<dd>{AVATAR}</dd>
 	</dl>
 	<dl>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 62c80f14c1..c179e1958d 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -47,7 +47,7 @@
 		</dl>
 		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
-			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
 		</dl>
 	</fieldset>
-- 
cgit v1.2.1


From 8ee908d32e898c31fb1b76c8c42c34a7e7dcf8c3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 13 Nov 2012 12:14:39 +0100
Subject: [ticket/10411] Remove duplicated ids from the template

PHPBB3-10411
---
 phpBB/adm/style/acp_groups_position.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 1e309d4cbc..5ee63093bd 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -17,8 +17,8 @@
 		</dl>
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" name="reset" value="{L_RESET}" />
 		<input type="hidden" name="action" value="set_config_legend" />
 		{S_FORM_TOKEN}
 	</p>
@@ -66,7 +66,7 @@
 	</tbody>
 	</table>
 
-	<form id="acp_groups" method="post" action="{U_ACTION_LEGEND}">
+	<form id="legend_add_group" method="post" action="{U_ACTION_LEGEND}">
 		<fieldset class="quick">
 			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_LEGEND}</select>
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
@@ -82,7 +82,7 @@
 	<fieldset>
 		<legend>{L_TEAMPAGE_SETTINGS}</legend>
 		<dl>
-			<dt><label for="teampage_multiple">{L_TEAMPAGE_MEMBERSHIPS}{L_COLON}</label></dt>
+			<dt><label for="teampage_memberships">{L_TEAMPAGE_MEMBERSHIPS}{L_COLON}</label></dt>
 			<dd>
 				<label><input type="radio" name="teampage_memberships" class="radio" value="0"<!-- IF DISPLAY_MEMBERSHIPS == 0 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_FIRST}</label><br />
 				<label><input type="radio" name="teampage_memberships" class="radio" value="1"<!-- IF DISPLAY_MEMBERSHIPS == 1 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_DEFAULT}</label><br />
@@ -98,8 +98,8 @@
 		</dl>
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" name="reset" value="{L_RESET}" />
 		<input type="hidden" name="action" value="set_config_teampage" />
 		{S_FORM_TOKEN}
 	</p>
@@ -147,7 +147,7 @@
 	</tbody>
 	</table>
 
-	<form id="acp_groups" method="post" action="{U_ACTION_TEAMPAGE}">
+	<form id="teampage_add_group" method="post" action="{U_ACTION_TEAMPAGE}">
 		<fieldset class="quick">
 			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_TEAMPAGE}</select>
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
-- 
cgit v1.2.1


From 6a27a95f30f7dafffe994aceb75a3cf769d13221 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 13 Nov 2012 15:32:35 +0100
Subject: [ticket/10411] Use new teampage and legend class in ACP and
 memberlist

PHPBB3-10411
---
 phpBB/adm/style/acp_groups_position.html | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 5ee63093bd..ade3cf3e57 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -108,6 +108,8 @@
 
 	<p>{L_TEAMPAGE_EXPLAIN}</p>
 
+	<!-- IF S_TEAMPAGE_CATEGORY and CUR_CATEGORY_NAME --><p><strong><a href="{U_ACTION}">{L_TEAMPAGE}</a> &raquo; {CUR_CATEGORY_NAME}</strong></p><!-- ENDIF -->
+
 	<table cellspacing="1">
 		<col class="col1" /><col class="col2" /><col class="col2" />
 	<thead>
@@ -120,8 +122,15 @@
 	<tbody>
 	<!-- BEGIN teampage -->
 		<tr>
-			<td><strong{teampage.GROUP_COLOUR}>{teampage.GROUP_NAME}</strong></td>
-			<td style="text-align: center;">{teampage.GROUP_TYPE}</td>
+			<td>
+				<!-- IF teampage.U_CATEGORY -->
+					<a href="{teampage.U_CATEGORY}">{teampage.GROUP_NAME}</a>
+				<!-- ELSE -->
+					<strong{teampage.GROUP_COLOUR}>{teampage.GROUP_NAME}</strong>
+				<!-- ENDIF -->
+			</td>
+			<td style="text-align: center;"><!-- IF teampage.GROUP_TYPE -->{teampage.GROUP_TYPE}<!-- ELSE -->-<!-- ENDIF -->
+			</td></td>
 			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 				<!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
 					{ICON_MOVE_UP_DISABLED}
@@ -147,6 +156,17 @@
 	</tbody>
 	</table>
 
+	<!-- IF not S_TEAMPAGE_CATEGORY -->
+	<form id="teampage_add_category" method="post" action="{U_ACTION_TEAMPAGE}">
+		<fieldset class="quick">
+			<input class="inputbox autowidth" type="text" name="category_name" placeholder="{L_CATEGORY_NAME}" />
+			<input class="button2" type="submit" name="submit" value="{L_ADD_CATEGORY}" />
+			<input type="hidden" name="action" value="add_category" />
+			{S_FORM_TOKEN}
+		</fieldset>
+	</form>
+	<!-- ENDIF -->
+
 	<form id="teampage_add_group" method="post" action="{U_ACTION_TEAMPAGE}">
 		<fieldset class="quick">
 			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_TEAMPAGE}</select>
-- 
cgit v1.2.1


From a9ed479e148fe801df6c928a34d84438d9b68cf2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 14 Nov 2012 15:55:51 +0100
Subject: [ticket/10411] Use AJAX to move items up/down and delete them

PHPBB3-10411
---
 phpBB/adm/style/acp_groups_position.html | 48 +++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 20 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index ade3cf3e57..5532b9ea21 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -38,24 +38,24 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN legend -->
-		<tr>
+		<tr data-down="{legend.U_MOVE_DOWN}" data-up="{legend.U_MOVE_UP}">
 			<td><strong{legend.GROUP_COLOUR}>{legend.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{legend.GROUP_TYPE}</td>
 			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 				<!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
-					{ICON_MOVE_UP_DISABLED}
-					<a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
+					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF not legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
-					<a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-					<a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF legend.S_LAST_ROW && not legend.S_FIRST_ROW -->
-					<a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-					{ICON_MOVE_DOWN_DISABLED}
+					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ELSE -->
-					{ICON_MOVE_UP_DISABLED}
-					{ICON_MOVE_DOWN_DISABLED}
+					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
+					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ENDIF -->
-				<a href="{legend.U_DELETE}">{ICON_DELETE}</a>
+				<a href="{legend.U_DELETE}" data-ajax="row_delete" data-overlay="false">{ICON_DELETE}</a>
 			</td>
 		</tr>
 	<!-- BEGINELSE -->
@@ -121,7 +121,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN teampage -->
-		<tr>
+		<tr data-down="{teampage.U_MOVE_DOWN}" data-up="{teampage.U_MOVE_UP}">
 			<td>
 				<!-- IF teampage.U_CATEGORY -->
 					<a href="{teampage.U_CATEGORY}">{teampage.GROUP_NAME}</a>
@@ -133,19 +133,19 @@
 			</td></td>
 			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 				<!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
-					{ICON_MOVE_UP_DISABLED}
-					<a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
+					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF not teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
-					<a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-					<a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF teampage.S_LAST_ROW && not teampage.S_FIRST_ROW -->
-					<a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-					{ICON_MOVE_DOWN_DISABLED}
+					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ELSE -->
-					{ICON_MOVE_UP_DISABLED}
-					{ICON_MOVE_DOWN_DISABLED}
+					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
+					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ENDIF -->
-				<a href="{teampage.U_DELETE}">{ICON_DELETE}</a>
+				<a href="{teampage.U_DELETE}" data-ajax="row_delete" data-overlay="false">{ICON_DELETE}</a>
 			</td>
 		</tr>
 	<!-- BEGINELSE -->
@@ -176,4 +176,12 @@
 		</fieldset>
 	</form>
 
+	<div class="hidden">
+		<a class="template-up-img" href="#">{ICON_MOVE_UP}</a>
+		<span class="template-up-img-disabled">{ICON_MOVE_UP_DISABLED}</span>
+
+		<a class="template-down-img" href="#">{ICON_MOVE_DOWN}</a>
+		<span class="template-down-img-disabled">{ICON_MOVE_DOWN_DISABLED}</span>
+	</div>
+
 <!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 857298e748685a6796a2ad1be4727098651c2688 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 14 Nov 2012 16:31:46 +0100
Subject: [ticket/11198] Correctly set links after an item is moved up/down
 with AJAX

PHPBB3-11198
---
 phpBB/adm/style/acp_forums.html |  8 ++++----
 phpBB/adm/style/ajax.js         | 36 +++++++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 15 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index cb9cae6c0d..9a3706c2f0 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -454,12 +454,12 @@
 				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
 						<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
-						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
-						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
-						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
 						<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 					<!-- ELSE -->
 						<span class="up">{ICON_MOVE_UP_DISABLED}</span>
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 12541cb057..4dfe00c5dd 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -10,12 +10,12 @@ var img_templates = {
 };
 
 /**
- * The following callbacks are  for reording forums in acp_forums. forum_down
- * is triggered when a forum is moved down, and forum_up is triggered when
- * a forum is moved up. It moves the row up or down, and deactivates /
+ * The following callbacks are for reording items. row_down
+ * is triggered when a forum is moved down, and row_up is triggered when
+ * an item is moved up. It moves the row up or down, and deactivates /
  * activates any up / down icons that require it (the ones at the top or bottom).
  */
-phpbb.add_ajax_callback('forum_down', function() {
+phpbb.add_ajax_callback('row_down', function() {
 	var el = $(this),
 		tr = el.parents('tr');
 
@@ -26,16 +26,19 @@ phpbb.add_ajax_callback('forum_down', function() {
 
 		tr.next().find('.up').html(img_templates.up_disabled);
 
+		var down_img = img_templates.down.clone().attr('href', tr.next().attr('data-down'));
+		tr.next().find('.down').html(down_img);
+
 		phpbb.ajaxify({
 			selector: el.parents('span').siblings('.up').children('a'),
-			callback: 'forum_up',
+			callback: 'row_up',
 			overlay: false
 		});
 	}
 
 	tr.insertAfter(tr.next());
 
-	if (tr.is(':last-child'))
+	if (!tr.prev().is(':first-child') && tr.is(':last-child'))
 	{
 		el.replaceWith(img_templates.down_disabled);
 
@@ -44,13 +47,17 @@ phpbb.add_ajax_callback('forum_down', function() {
 
 		phpbb.ajaxify({
 			selector: tr.prev().find('.down').children('a'),
-			callback: 'forum_down',
+			callback: 'row_down',
 			overlay: false
 		});
 	}
+	else if (tr.is(':last-child'))
+	{
+		el.replaceWith(img_templates.down_disabled);
+	}
 });
 
-phpbb.add_ajax_callback('forum_up', function() {
+phpbb.add_ajax_callback('row_up', function() {
 	var el = $(this),
 		tr = el.parents('tr');
 
@@ -61,16 +68,19 @@ phpbb.add_ajax_callback('forum_up', function() {
 
 		tr.prev().find('.down').html(img_templates.down_disabled);
 
+		var up_img = img_templates.down.clone().attr('href', tr.prev().attr('data-up'));
+		tr.prev().find('.up').html(up_img);
+
 		phpbb.ajaxify({
 			selector: el.parents('span').siblings('.down').children('a'),
-			callback: 'forum_down',
+			callback: 'row_down',
 			overlay: false
 		});
 	}
 
 	tr.insertBefore(tr.prev());
 
-	if (tr.is(':first-child'))
+	if (!tr.next().is(':last-child') && tr.is(':first-child'))
 	{
 		el.replaceWith(img_templates.up_disabled);
 
@@ -79,10 +89,14 @@ phpbb.add_ajax_callback('forum_up', function() {
 
 		phpbb.ajaxify({
 			selector: tr.next().find('.up').children('a'),
-			callback: 'forum_up',
+			callback: 'row_up',
 			overlay: false
 		});
 	}
+	else if (tr.is(':first-child'))
+	{
+		el.replaceWith(img_templates.up_disabled);
+	}
 });
 
 /**
-- 
cgit v1.2.1


From e39947e57e8b39319bb34597d2fb0a706bd1bc44 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 14 Nov 2012 23:30:29 +0100
Subject: [ticket/11198] Store the swapping partners in vars and simplify the
 logic

PHPBB3-11198
---
 phpBB/adm/style/ajax.js | 86 +++++++++++++++++++++++++++----------------------
 1 file changed, 47 insertions(+), 39 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 4dfe00c5dd..d780196173 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -11,92 +11,100 @@ var img_templates = {
 
 /**
  * The following callbacks are for reording items. row_down
- * is triggered when a forum is moved down, and row_up is triggered when
+ * is triggered when an item is moved down, and row_up is triggered when
  * an item is moved up. It moves the row up or down, and deactivates /
  * activates any up / down icons that require it (the ones at the top or bottom).
  */
 phpbb.add_ajax_callback('row_down', function() {
 	var el = $(this),
-		tr = el.parents('tr');
-
+		tr = el.parents('tr'),
+		tr_swap = tr.next();
+
+	/**
+	* If the element was the first one, we have to:
+	* - Add the up-link to the row we moved
+	* - Remove the up-link on the next row
+	*/
 	if (tr.is(':first-child'))
 	{
 		var up_img = img_templates.up.clone().attr('href', tr.attr('data-up'));
-		el.parents('span').siblings('.up').html(up_img);
-
-		tr.next().find('.up').html(img_templates.up_disabled);
-
-		var down_img = img_templates.down.clone().attr('href', tr.next().attr('data-down'));
-		tr.next().find('.down').html(down_img);
+		tr.find('.up').html(up_img);
 
 		phpbb.ajaxify({
-			selector: el.parents('span').siblings('.up').children('a'),
+			selector: tr.find('.up').children('a'),
 			callback: 'row_up',
 			overlay: false
 		});
+
+		tr_swap.find('.up').html(img_templates.up_disabled);
 	}
 
-	tr.insertAfter(tr.next());
+	tr.insertAfter(tr_swap);
 
-	if (!tr.prev().is(':first-child') && tr.is(':last-child'))
+	/**
+	* As well as:
+	* - Remove the down-link on the moved row, if it is now the last row
+	* - Add the down-link to the next row, if it was the last row
+	*/
+	if (tr.is(':last-child'))
 	{
-		el.replaceWith(img_templates.down_disabled);
+		tr.find('.down').html(img_templates.down_disabled);
 
-		var down_img = img_templates.down.clone().attr('href', tr.attr('data-down'));
-		tr.prev().find('.down').html(down_img);
+		var down_img = img_templates.down.clone().attr('href', tr_swap.attr('data-down'));
+		tr_swap.find('.down').html(down_img);
 
 		phpbb.ajaxify({
-			selector: tr.prev().find('.down').children('a'),
+			selector: tr_swap.find('.down').children('a'),
 			callback: 'row_down',
 			overlay: false
 		});
 	}
-	else if (tr.is(':last-child'))
-	{
-		el.replaceWith(img_templates.down_disabled);
-	}
 });
 
 phpbb.add_ajax_callback('row_up', function() {
 	var el = $(this),
-		tr = el.parents('tr');
-
+		tr = el.parents('tr'),
+		tr_swap = tr.prev();
+
+	/**
+	* If the element was the last one, we have to:
+	* - Add the down-link to the row we moved
+	* - Remove the down-link on the next row
+	*/
 	if (tr.is(':last-child'))
 	{
 		var down_img = img_templates.down.clone().attr('href', tr.attr('data-down'));
-		el.parents('span').siblings('.down').html(down_img);
-
-		tr.prev().find('.down').html(img_templates.down_disabled);
-
-		var up_img = img_templates.down.clone().attr('href', tr.prev().attr('data-up'));
-		tr.prev().find('.up').html(up_img);
+		tr.find('.down').html(down_img);
 
 		phpbb.ajaxify({
-			selector: el.parents('span').siblings('.down').children('a'),
+			selector: tr.find('.down').children('a'),
 			callback: 'row_down',
 			overlay: false
 		});
+
+		tr_swap.find('.down').html(img_templates.down_disabled);
 	}
 
-	tr.insertBefore(tr.prev());
+	tr.insertBefore(tr_swap);
 
-	if (!tr.next().is(':last-child') && tr.is(':first-child'))
+	/**
+	* As well as:
+	* - Remove the up-link on the moved row, if it is now the first row
+	* - Add the up-link to the previous row, if it was the first row
+	*/
+	if (tr.is(':first-child'))
 	{
-		el.replaceWith(img_templates.up_disabled);
+		tr.find('.up').html(img_templates.up_disabled);
 
-		var up_img = img_templates.up.clone().attr('href', tr.attr('data-up'));
-		tr.next().find('.up').html(up_img);
+		var up_img = img_templates.up.clone().attr('href', tr_swap.attr('data-up'));
+		tr_swap.find('.up').html(up_img);
 
 		phpbb.ajaxify({
-			selector: tr.next().find('.up').children('a'),
+			selector: tr_swap.find('.up').children('a'),
 			callback: 'row_up',
 			overlay: false
 		});
 	}
-	else if (tr.is(':first-child'))
-	{
-		el.replaceWith(img_templates.up_disabled);
-	}
 });
 
 /**
-- 
cgit v1.2.1


From 132163d4ec2c7758afb82071af2b3c68965e2c4d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 15 Nov 2012 16:26:36 +0100
Subject: [ticket/11198] Remove additional asterix as /** is doc-block only

PHPBB3-11198
---
 phpBB/adm/style/ajax.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index d780196173..a3a77df89b 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -20,7 +20,7 @@ phpbb.add_ajax_callback('row_down', function() {
 		tr = el.parents('tr'),
 		tr_swap = tr.next();
 
-	/**
+	/*
 	* If the element was the first one, we have to:
 	* - Add the up-link to the row we moved
 	* - Remove the up-link on the next row
@@ -41,7 +41,7 @@ phpbb.add_ajax_callback('row_down', function() {
 
 	tr.insertAfter(tr_swap);
 
-	/**
+	/*
 	* As well as:
 	* - Remove the down-link on the moved row, if it is now the last row
 	* - Add the down-link to the next row, if it was the last row
@@ -66,7 +66,7 @@ phpbb.add_ajax_callback('row_up', function() {
 		tr = el.parents('tr'),
 		tr_swap = tr.prev();
 
-	/**
+	/*
 	* If the element was the last one, we have to:
 	* - Add the down-link to the row we moved
 	* - Remove the down-link on the next row
@@ -87,7 +87,7 @@ phpbb.add_ajax_callback('row_up', function() {
 
 	tr.insertBefore(tr_swap);
 
-	/**
+	/*
 	* As well as:
 	* - Remove the up-link on the moved row, if it is now the first row
 	* - Add the up-link to the previous row, if it was the first row
-- 
cgit v1.2.1


From a05a73e04716dbe424daf6efae6e6c9b28a3a7fd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 15 Nov 2012 21:53:55 +0100
Subject: [ticket/10411] Use new ajax callback name row_up/row_down

PHPBB3-10411
---
 phpBB/adm/style/acp_groups_position.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 5532b9ea21..99864f75ce 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -44,12 +44,12 @@
 			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 				<!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF not legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
-					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
-					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF legend.S_LAST_ROW && not legend.S_FIRST_ROW -->
-					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
 					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ELSE -->
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
@@ -134,12 +134,12 @@
 			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 				<!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF not teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
-					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
-					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="forum_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<!-- ELSEIF teampage.S_LAST_ROW && not teampage.S_FIRST_ROW -->
-					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="forum_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
 					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ELSE -->
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-- 
cgit v1.2.1


From c7f701c1e71caa416217b5438274785f3ab0c2af Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 16 Nov 2012 11:41:39 +0100
Subject: [ticket/11209] Clone disable moving images to allow multiple per page

The disable images need to be clone rather then moved, in order to allow
multiple disable images per page. We do not have such a case at the moment
but it will be required for the new teampage/legend ACP section.

PHPBB3-11209
---
 phpBB/adm/style/ajax.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index a3a77df89b..3ccb368665 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -36,7 +36,7 @@ phpbb.add_ajax_callback('row_down', function() {
 			overlay: false
 		});
 
-		tr_swap.find('.up').html(img_templates.up_disabled);
+		tr_swap.find('.up').html(img_templates.up_disabled.clone());
 	}
 
 	tr.insertAfter(tr_swap);
@@ -48,7 +48,7 @@ phpbb.add_ajax_callback('row_down', function() {
 	*/
 	if (tr.is(':last-child'))
 	{
-		tr.find('.down').html(img_templates.down_disabled);
+		tr.find('.down').html(img_templates.down_disabled.clone());
 
 		var down_img = img_templates.down.clone().attr('href', tr_swap.attr('data-down'));
 		tr_swap.find('.down').html(down_img);
@@ -82,7 +82,7 @@ phpbb.add_ajax_callback('row_up', function() {
 			overlay: false
 		});
 
-		tr_swap.find('.down').html(img_templates.down_disabled);
+		tr_swap.find('.down').html(img_templates.down_disabled.clone());
 	}
 
 	tr.insertBefore(tr_swap);
@@ -94,7 +94,7 @@ phpbb.add_ajax_callback('row_up', function() {
 	*/
 	if (tr.is(':first-child'))
 	{
-		tr.find('.up').html(img_templates.up_disabled);
+		tr.find('.up').html(img_templates.up_disabled.clone());
 
 		var up_img = img_templates.up.clone().attr('href', tr_swap.attr('data-up'));
 		tr_swap.find('.up').html(up_img);
-- 
cgit v1.2.1


From c70cbfac4339529e196934405d0eb2f9672121d5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 17 Nov 2012 00:50:23 +0100
Subject: [feature/avatars] Fix acp front-end of user and group avatars

Due to the changes to the avatar manager etc. these had to be updated.

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_gravatar.html | 11 ++++++
 phpBB/adm/style/acp_avatar_options_remote.html   |  2 +-
 phpBB/adm/style/acp_groups.html                  |  4 +-
 phpBB/adm/style/acp_users_avatar.html            | 49 ++----------------------
 4 files changed, 17 insertions(+), 49 deletions(-)
 create mode 100644 phpBB/adm/style/acp_avatar_options_gravatar.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_gravatar.html b/phpBB/adm/style/acp_avatar_options_gravatar.html
new file mode 100644
index 0000000000..5629e873cf
--- /dev/null
+++ b/phpBB/adm/style/acp_avatar_options_gravatar.html
@@ -0,0 +1,11 @@
+<dl>
+	<dt><label for="av_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
+	<dd><input type="text" name="av_gravatar_email" id="av_gravatar_email" value="{AV_GRAVATAR_EMAIL}" class="inputbox" /></dd>
+</dl>
+<dl>
+	<dt><label for="av_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
+	<dd>
+		<label for="av_gravatar_width"><input type="text" name="av_gravatar_width" id="av_gravatar_width" size="3" value="{AV_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="av_gravatar_height"><input type="text" name="av_gravatar_height" id="av_gravatar_height" size="3" value="{AV_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+	</dd>
+</dl>
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
index ec5a22b691..cf3eb20a39 100644
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -3,7 +3,7 @@
 	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd>
 </dl>
 <dl>
-	<dt><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="av_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
 		<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
 		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 6fb2908b0a..d062064fe9 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -107,9 +107,9 @@
 		<dd>{AVATAR}</dd>
 	</dl>
 	<dl>
-		<dt><label>{L_AVATAR_TYPE}</label></dt>
+		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
 		<dd><select name="avatar_driver" id="avatar_driver">
-			<option value="">{L_NO_AVATAR}</option>
+			<option value="">{L_NO_AVATAR_CATEGORY}</option>
 			<!-- BEGIN avatar_drivers -->
 			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
 			<!-- END avatar_drivers -->
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index c179e1958d..069f7f6e50 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -2,61 +2,18 @@
 
 	<fieldset>
 		<legend>{L_ACP_USER_AVATAR}</legend>
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd>{AVATAR_IMAGE}</dd>
-		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
-	</dl>
-	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_UPLOAD_FILE -->
-			<dl> 
-				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
-				<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_REMOTE_UPLOAD -->
-			<dl>
-				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_ALLOW_REMOTE -->
-			<dl>
-				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-				<dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>{L_PIXEL} &times; </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_GALLERY -->
-			<dl> 
-				<dt><label>{L_AVATAR_GALLERY}{L_COLON}</label></dt>
-				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_AVATAR_GALLERY}</legend>
-		<dl>
-			<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
-			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-		</dl>
-		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
 		</dl>
 	</fieldset>
 	<fieldset>
-		<legend>{L_AVATAR_SELECT_NEW}</legend>
+		<legend>{L_AVATAR_SELECT}</legend>
 		<dl>
 			<dt><label>{L_AVATAR_TYPE}</label></dt>
 			<dd><select name="avatar_driver" id="avatar_driver">
-				<option value="">{L_NO_AVATAR}</option>
+				<option value="">{L_NO_AVATAR_CATEGORY}</option>
 				<!-- BEGIN avatar_drivers -->
 				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
-- 
cgit v1.2.1


From 959bc183bf21e77c694ac0b68cbda5b93ae79cd0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 18 Nov 2012 23:09:09 +0100
Subject: [feature/avatars] Handle deletion of avatars

Previously this wasn't handled correctly if at all.

PHPBB3-10018
---
 phpBB/adm/style/acp_groups.html       | 1 +
 phpBB/adm/style/acp_users_avatar.html | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index d062064fe9..b38d61bef3 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -105,6 +105,7 @@
 	<dl>
 		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 		<dd>{AVATAR}</dd>
+		<dd><label for="av_delete"><input type="checkbox" name="av_delete" id="av_delete" /> {L_DELETE_AVATAR}</label></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 069f7f6e50..e32d8f379b 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -6,6 +6,7 @@
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
+			<dd><label for="av_delete"><input type="checkbox" name="av_delete" id="av_delete" /> {L_DELETE_AVATAR}</label></dd>
 		</dl>
 	</fieldset>
 	<fieldset>
-- 
cgit v1.2.1


From c2ba24558ff79174af9aaf2bee274529c794cac8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 18 Nov 2012 23:11:40 +0100
Subject: [feature/avatars] Fix local and upload avatar in the ACP

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_local.html | 7 +++----
 phpBB/adm/style/acp_groups.html               | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 02ff58fe15..b317cd2aa5 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -17,11 +17,10 @@
 		<!-- END av_local_col -->
 	</tr>
 	<tr>
-		<!-- BEGIN av_local_col -->
-			<td class="row2" style="text-align: center;"><input type="radio" name="av_local_file" id="av-{av_local_row.av_local_col.S_ROW_COUNT}" value="{av_local_row.av_local_col.AVATAR_FILE}" /></td>
-		<!-- END av_local_col -->
+		<!-- BEGIN av_local_option -->
+			<td class="row2" style="text-align: center;"><input type="radio" name="av_local_file" id="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_option.S_ROW_COUNT}" value="{av_local_row.av_local_option.AVATAR_FILE}" /></td>
+		<!-- END av_local_option -->
 	</tr>
 	<!-- END av_local_row -->
 	</table>
 	<!-- ENDIF -->
-</dl>
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index b38d61bef3..e96adcee90 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -17,7 +17,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
+	<form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF --> enctype="multipart/form-data">
 
 	<fieldset>
 		<legend>{L_GROUP_DETAILS}</legend>
-- 
cgit v1.2.1


From 7521c077a9c0b3201dffcbe33114d9da715eb9e0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 18 Nov 2012 23:16:37 +0100
Subject: [feature/avatars] Miscellaenous template fixes

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_local.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index b317cd2aa5..08ec170195 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -7,9 +7,8 @@
 		<!-- END av_local_cats -->
 	</select>&nbsp;<input type="submit" value="{L_GO}" name="av_local_go" class="button2" /></dd>
 </dl>
-<dl>
 	<!-- IF AV_LOCAL_SHOW -->
-	<table cellspacing="1">
+	<table style="border-spacing: 1px;">
 	<!-- BEGIN av_local_row -->
 	<tr>
 		<!-- BEGIN av_local_col -->
-- 
cgit v1.2.1


From 5ff343f1e6714fd88d64cb17884f88ceee681cb6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 22 Nov 2012 11:58:45 +0100
Subject: [feature/avatars] Remove duplicate form enctype

PHPBB3-10018
---
 phpBB/adm/style/acp_groups.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index e96adcee90..a4699571d6 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -17,7 +17,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF --> enctype="multipart/form-data">
+	<form id="settings" method="post" action="{U_ACTION}" enctype="multipart/form-data">
 
 	<fieldset>
 		<legend>{L_GROUP_DETAILS}</legend>
-- 
cgit v1.2.1


From ce44e3908eef5166e5e3e43d2642c5372379b6a6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Nov 2012 00:54:34 +0100
Subject: [feature/avatars] Remove unnecessary abbreviations

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_gravatar.html | 10 ++++-----
 phpBB/adm/style/acp_avatar_options_local.html    | 28 ++++++++++++------------
 phpBB/adm/style/acp_avatar_options_remote.html   | 10 ++++-----
 phpBB/adm/style/acp_avatar_options_upload.html   |  8 +++----
 phpBB/adm/style/acp_groups.html                  |  6 ++---
 phpBB/adm/style/acp_users_avatar.html            |  6 ++---
 phpBB/adm/style/avatars.js                       |  4 ++--
 7 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_gravatar.html b/phpBB/adm/style/acp_avatar_options_gravatar.html
index 5629e873cf..04fd5c459d 100644
--- a/phpBB/adm/style/acp_avatar_options_gravatar.html
+++ b/phpBB/adm/style/acp_avatar_options_gravatar.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
-	<dd><input type="text" name="av_gravatar_email" id="av_gravatar_email" value="{AV_GRAVATAR_EMAIL}" class="inputbox" /></dd>
+	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
+	<dd><input type="text" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
 </dl>
 <dl>
-	<dt><label for="av_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="av_gravatar_width"><input type="text" name="av_gravatar_width" id="av_gravatar_width" size="3" value="{AV_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="av_gravatar_height"><input type="text" name="av_gravatar_height" id="av_gravatar_height" size="3" value="{AV_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<label for="avatar_gravatar_width"><input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="avatar_gravatar_height"><input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
 	</dd>
 </dl>
diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 08ec170195..927c4821f7 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -1,25 +1,25 @@
 <dl>
 	<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
-	<dd><select name="av_local_cat" id="category">
+	<dd><select name="avatar_local_cat" id="category">
 		<option value="">{L_NO_AVATAR_CATEGORY}</option>
-		<!-- BEGIN av_local_cats -->
-		<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
-		<!-- END av_local_cats -->
-	</select>&nbsp;<input type="submit" value="{L_GO}" name="av_local_go" class="button2" /></dd>
+		<!-- BEGIN avatar_local_cats -->
+		<option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
+		<!-- END avatar_local_cats -->
+	</select>&nbsp;<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" /></dd>
 </dl>
-	<!-- IF AV_LOCAL_SHOW -->
+	<!-- IF AVATAR_LOCAL_SHOW -->
 	<table style="border-spacing: 1px;">
-	<!-- BEGIN av_local_row -->
+	<!-- BEGIN avatar_local_row -->
 	<tr>
-		<!-- BEGIN av_local_col -->
-			<td class="row1" style="text-align: center;"><img src="{av_local_row.av_local_col.AVATAR_IMAGE}" alt="{av_local_row.av_local_col.AVATAR_NAME}" title="{av_local_row.av_local_col.AVATAR_NAME}"/></td>
-		<!-- END av_local_col -->
+		<!-- BEGIN avatar_local_col -->
+			<td class="row1" style="text-align: center;"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="{avatar_local_row.avatar_local_col.AVATAR_NAME}" title="{avatar_local_row.avatar_local_col.AVATAR_NAME}"/></td>
+		<!-- END avatar_local_col -->
 	</tr>
 	<tr>
-		<!-- BEGIN av_local_option -->
-			<td class="row2" style="text-align: center;"><input type="radio" name="av_local_file" id="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_option.S_ROW_COUNT}" value="{av_local_row.av_local_option.AVATAR_FILE}" /></td>
-		<!-- END av_local_option -->
+		<!-- BEGIN avatar_local_option -->
+			<td class="row2" style="text-align: center;"><input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_option.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_option.AVATAR_FILE}" /></td>
+		<!-- END avatar_local_option -->
 	</tr>
-	<!-- END av_local_row -->
+	<!-- END avatar_local_row -->
 	</table>
 	<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
index cf3eb20a39..ab91e90c27 100644
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd>
+	<dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dd><input type="text" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" /></dd>
 </dl>
 <dl>
-	<dt><label for="av_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<label for="avatar_remote_width"><input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="avatar_remote_height"><input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
 	</dd>
 </dl>
diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html
index d0a4f516e1..9d3efbd018 100644
--- a/phpBB/adm/style/acp_avatar_options_upload.html
+++ b/phpBB/adm/style/acp_avatar_options_upload.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
-	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AV_UPLOAD_SIZE}" /><input type="file" name="av_upload_file" id="av_upload_file" class="inputbox autowidth" /></dd>
+	<dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
+	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->
 	<dl>
-		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-		<dd><input type="text" name="av_upload_url" id="av_upload_url" value="" class="inputbox" /></dd>
+		<dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dd><input type="text" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox" /></dd>
 	</dl>
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index a4699571d6..bab30a7b6f 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -105,7 +105,7 @@
 	<dl>
 		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 		<dd>{AVATAR}</dd>
-		<dd><label for="av_delete"><input type="checkbox" name="av_delete" id="av_delete" /> {L_DELETE_AVATAR}</label></dd>
+		<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
@@ -116,9 +116,9 @@
 			<!-- END avatar_drivers -->
 		</select></dd>
 	</dl>
-	<div id="av_options">
+	<div id="avatar_options">
 	<!-- BEGIN avatar_drivers -->
-	<div id="av_option_{avatar_drivers.DRIVER}">
+	<div id="avatar_option_{avatar_drivers.DRIVER}">
 		<p>{avatar_drivers.L_EXPLAIN}</p>
 		{avatar_drivers.OUTPUT}
 	</div>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index e32d8f379b..bc3a19a25e 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -6,7 +6,7 @@
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
-			<dd><label for="av_delete"><input type="checkbox" name="av_delete" id="av_delete" /> {L_DELETE_AVATAR}</label></dd>
+			<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
 		</dl>
 	</fieldset>
 	<fieldset>
@@ -20,9 +20,9 @@
 				<!-- END avatar_drivers -->
 			</select></dd>
 		</dl>
-		<div id="av_options">
+		<div id="avatar_options">
 		<!-- BEGIN avatar_drivers -->
-			<div id="av_option_{avatar_drivers.DRIVER}">
+			<div id="avatar_option_{avatar_drivers.DRIVER}">
 				<p>{avatar_drivers.L_EXPLAIN}</p>
 				{avatar_drivers.OUTPUT}
 			</div>
diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
index 2068bdbbc4..882bcfe36d 100644
--- a/phpBB/adm/style/avatars.js
+++ b/phpBB/adm/style/avatars.js
@@ -3,10 +3,10 @@
 "use strict";
 
 function avatar_simplify() {
-    $('#av_options > div').hide();
+    $('#avatar_options > div').hide();
 
     var selected = $('#avatar_driver').val();
-    $('#av_option_' + selected).show();
+    $('#avatar_option_' + selected).show();
 }
 
 avatar_simplify();
-- 
cgit v1.2.1


From b42ca792fd7765eb415536c49b77c53c0897367e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 4 Dec 2012 00:49:37 +0100
Subject: [feature/avatars] Minor variable naming fixes

PHPBB3-10018
---
 phpBB/adm/style/acp_users_avatar.html | 2 +-
 phpBB/adm/style/avatars.js            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index bc3a19a25e..0a72bb0b62 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -32,8 +32,8 @@
 
 	<fieldset class="quick">
 		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
-	</fieldset>
 	{S_FORM_TOKEN}
+	</fieldset>
 	</form>
 
 	<!-- INCLUDEJS avatars.js -->
diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
index 882bcfe36d..a53814c15f 100644
--- a/phpBB/adm/style/avatars.js
+++ b/phpBB/adm/style/avatars.js
@@ -2,14 +2,14 @@
 
 "use strict";
 
-function avatar_simplify() {
+function avatar_hide() {
     $('#avatar_options > div').hide();
 
     var selected = $('#avatar_driver').val();
     $('#avatar_option_' + selected).show();
 }
 
-avatar_simplify();
-$('#avatar_driver').bind('change', avatar_simplify);
+avatar_hide();
+$('#avatar_driver').bind('change', avatar_hide);
 
 })(jQuery); // Avoid conflicts with other libraries
-- 
cgit v1.2.1


From 780a8c98aca5dc54e1b85a79f8ff0f04ce49c5e4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Dec 2012 14:28:52 +0100
Subject: [ticket/10411] Rename template variable CUR_ to CURRENT_

PHPBB3-10411
---
 phpBB/adm/style/acp_groups_position.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 99864f75ce..eb4c3d8819 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -108,7 +108,7 @@
 
 	<p>{L_TEAMPAGE_EXPLAIN}</p>
 
-	<!-- IF S_TEAMPAGE_CATEGORY and CUR_CATEGORY_NAME --><p><strong><a href="{U_ACTION}">{L_TEAMPAGE}</a> &raquo; {CUR_CATEGORY_NAME}</strong></p><!-- ENDIF -->
+	<!-- IF S_TEAMPAGE_CATEGORY and CURRENT_CATEGORY_NAME --><p><strong><a href="{U_ACTION}">{L_TEAMPAGE}</a> &raquo; {CURRENT_CATEGORY_NAME}</strong></p><!-- ENDIF -->
 
 	<table cellspacing="1">
 		<col class="col1" /><col class="col2" /><col class="col2" />
-- 
cgit v1.2.1


From 6dee2539419ba2c050830b7677294603a63b559a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Dec 2012 17:01:08 -0600
Subject: [ticket/11259] Make phpbb_admin_path available everywhere

PHPBB3-11259
---
 phpBB/adm/style/install_header.html      | 6 +++---
 phpBB/adm/style/install_update_diff.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 6826654ded..5631b83e17 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -5,7 +5,7 @@
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
 // <![CDATA[
@@ -49,7 +49,7 @@ function dE(n, s, type)
 		</form>
 		<!-- ENDIF -->
 	</div>
-	
+
 	<div id="page-body">
 		<div id="tabs">
 			<ul>
@@ -73,5 +73,5 @@ function dE(n, s, type)
 						<!-- END l_block2 -->
 						</ul>
 					</div>
-	
+
 					<div id="main" class="install-body">
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index ecdc40e157..1f30fe4d13 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -5,7 +5,7 @@
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
 // <![CDATA[
-- 
cgit v1.2.1


From 2f47c99432c604a2adaad73821602a4b1763caa8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 11 Dec 2012 21:02:37 +0100
Subject: [feature/avatars] Add more consistency to codebase

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_gravatar.html | 4 ++--
 phpBB/adm/style/acp_avatar_options_remote.html   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_gravatar.html b/phpBB/adm/style/acp_avatar_options_gravatar.html
index 04fd5c459d..47422a6ecd 100644
--- a/phpBB/adm/style/acp_avatar_options_gravatar.html
+++ b/phpBB/adm/style/acp_avatar_options_gravatar.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="avatar_gravatar_width"><input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="avatar_gravatar_height"><input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
+		<input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
index ab91e90c27..1dc4b05992 100644
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="avatar_remote_width"><input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="avatar_remote_height"><input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
+		<input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>
-- 
cgit v1.2.1


From bc99e69f776061bc98b398e824293ed0cc8dc7e6 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:12:17 +0100
Subject: [feature/events] Add main_notice ACP template event

PHPBB3-9550
---
 phpBB/adm/style/acp_main.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 8b591294d4..ced4cd9b90 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -76,6 +76,8 @@
 		</div>
 	<!-- ENDIF -->
 
+	<!-- EVENT main_notice -->
+
 	<table cellspacing="1">
 		<caption>{L_FORUM_STATS}</caption>
 		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-- 
cgit v1.2.1


From e6d1b07e2b842226a025241b19ede77eb1b3ef24 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:14:25 +0100
Subject: [feature/events] Add main_actions acp template event

PHPBB3-9550
---
 phpBB/adm/style/acp_main.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index ced4cd9b90..83731c6b26 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -204,6 +204,8 @@
 					<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
+
+			<!-- EVENT main_actions -->
   		</fieldset>
 	<!-- ENDIF -->
 
-- 
cgit v1.2.1


From 44afff6b746d4070c2100cc186f5347ab7b80a70 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:16:30 +0100
Subject: [feature/events] Adding overall_header_head acp template event

PHPBB3-9550
---
 phpBB/adm/style/overall_header.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index f7902e6d2e..fce560e62e 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -155,6 +155,7 @@ function switch_menu()
 
 // ]]>
 </script>
+<!-- EVENT overall_header_head -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From 9ba18a21f007fd5a625ac0c2dec60185e8c86994 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:18:20 +0100
Subject: [feature/events] Add overall_footer_end acp template event

PHPBB3-9550
---
 phpBB/adm/style/overall_footer.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 2bc9ee52d7..a2bebb3d85 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -42,5 +42,7 @@
 <!-- INCLUDEJS ajax.js -->
 {SCRIPTS}
 
+<!-- EVENT overall_footer_end -->
+
 </body>
 </html>
-- 
cgit v1.2.1


From c7b2665160ef5e160ed03b9fb45b01f774e19193 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:21:13 +0100
Subject: [feature/events] Add users_overview_options acp template event

PHPBB3-9550
---
 phpBB/adm/style/acp_users_overview.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index b7e3a9822e..f6ad8f3313 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -53,6 +53,7 @@
 	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
 	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>
 </dl>
+<!-- EVENT users_overview_options -->
 
 <p class="quick">
 	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-- 
cgit v1.2.1


From 6a29de3f1ba39c6080088198bb63c39b9470fe65 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:23:48 +0100
Subject: [feature/events] Adding simple_header_head acp template event

PHPBB3-9550
---
 phpBB/adm/style/simple_header.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 0ba445ca2a..9c2e11e718 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -101,6 +101,7 @@ function find_username(url)
 
 // ]]>
 </script>
+<!-- EVENT simple_header_head -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From 1f9b6629643840ae99ba13b06c2d44368c1d0810 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 12:24:50 +0100
Subject: [feature/events] Adding simple_footer_end acp template event

PHPBB3-9550
---
 phpBB/adm/style/simple_footer.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 1d5c62b0a3..8c6ace203e 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -18,6 +18,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><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 -->
+<!-- EVENT simple_footer_end -->
 
 </body>
 </html>
-- 
cgit v1.2.1


From d913a508a29ee642b13054748dd630de506184a0 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Apr 2012 20:09:56 +0100
Subject: [feature/events] Adding forums_normal_settings acp template ledge

PHPBB3-9550
---
 phpBB/adm/style/acp_forums.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 9a3706c2f0..1df3839467 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -241,6 +241,7 @@
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
 			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
 		</dl>
+		<!-- EVENT forums_normal_settings  -->
 		</fieldset>
 
 		<fieldset>
-- 
cgit v1.2.1


From 3c8fb03785d14785ab2ddeb2da0aeae48ced1e16 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 22 Jul 2012 21:25:57 +0100
Subject: [feature/events] Adding acp prefix to acp event names

PHPBB3-9550
---
 phpBB/adm/style/acp_forums.html         | 2 +-
 phpBB/adm/style/acp_main.html           | 4 ++--
 phpBB/adm/style/acp_users_overview.html | 2 +-
 phpBB/adm/style/overall_footer.html     | 2 +-
 phpBB/adm/style/overall_header.html     | 2 +-
 phpBB/adm/style/simple_footer.html      | 2 +-
 phpBB/adm/style/simple_header.html      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 1df3839467..9b29ba0afc 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -241,7 +241,7 @@
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
 			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
 		</dl>
-		<!-- EVENT forums_normal_settings  -->
+		<!-- EVENT acp_forums_normal_settings  -->
 		</fieldset>
 
 		<fieldset>
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 83731c6b26..d4a4444fef 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -76,7 +76,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<!-- EVENT main_notice -->
+	<!-- EVENT acp_main_notice -->
 
 	<table cellspacing="1">
 		<caption>{L_FORUM_STATS}</caption>
@@ -205,7 +205,7 @@
 				</dl>
 			</form>
 
-			<!-- EVENT main_actions -->
+			<!-- EVENT event_main_actions -->
   		</fieldset>
 	<!-- ENDIF -->
 
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index f6ad8f3313..9c06ac3c76 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -53,7 +53,7 @@
 	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
 	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>
 </dl>
-<!-- EVENT users_overview_options -->
+<!-- EVENT acp_users_overview_options -->
 
 <p class="quick">
 	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index a2bebb3d85..f76ad698d3 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -42,7 +42,7 @@
 <!-- INCLUDEJS ajax.js -->
 {SCRIPTS}
 
-<!-- EVENT overall_footer_end -->
+<!-- EVENT acp_overall_footer_end -->
 
 </body>
 </html>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index fce560e62e..74b8fe5fb8 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -155,7 +155,7 @@ function switch_menu()
 
 // ]]>
 </script>
-<!-- EVENT overall_header_head -->
+<!-- EVENT acp_overall_header_head -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 8c6ace203e..a7d006d15d 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -18,7 +18,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><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 -->
-<!-- EVENT simple_footer_end -->
+<!-- EVENT acp_simple_footer_end -->
 
 </body>
 </html>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 9c2e11e718..21532f1425 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -101,7 +101,7 @@ function find_username(url)
 
 // ]]>
 </script>
-<!-- EVENT simple_header_head -->
+<!-- EVENT acp_simple_header_head -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From b20e91b87722107f268bca76471d589048e6a524 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 31 Jul 2012 21:29:54 +0200
Subject: [feature/events] Rename event_main_actions to acp_main_actions

PHPBB3-9550
---
 phpBB/adm/style/acp_main.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index d4a4444fef..619908242c 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -205,7 +205,7 @@
 				</dl>
 			</form>
 
-			<!-- EVENT event_main_actions -->
+			<!-- EVENT acp_main_actions -->
   		</fieldset>
 	<!-- ENDIF -->
 
-- 
cgit v1.2.1


From ae93bd4e80d918a6db33110f075ad9f1bda0b7bd Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:17:11 -0500
Subject: [feature/events] Append "_append" to acp_forums_normal_settings

PHPBB3-9550
---
 phpBB/adm/style/acp_forums.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 9b29ba0afc..4b21cde418 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -241,7 +241,7 @@
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
 			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
 		</dl>
-		<!-- EVENT acp_forums_normal_settings  -->
+		<!-- EVENT acp_forums_normal_settings_append  -->
 		</fieldset>
 
 		<fieldset>
-- 
cgit v1.2.1


From 530be9106c8133f0cd326e240cd7d88757ce88ab Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:18:36 -0500
Subject: [feature/events] Fix names of events in adm/style/acp_main.html

PHPBB3-9550
---
 phpBB/adm/style/acp_main.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 619908242c..b644862ce1 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -76,7 +76,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<!-- EVENT acp_main_notice -->
+	<!-- EVENT acp_main_notice_after -->
 
 	<table cellspacing="1">
 		<caption>{L_FORUM_STATS}</caption>
@@ -205,7 +205,7 @@
 				</dl>
 			</form>
 
-			<!-- EVENT acp_main_actions -->
+			<!-- EVENT acp_main_actions_append -->
   		</fieldset>
 	<!-- ENDIF -->
 
-- 
cgit v1.2.1


From cdfac59944bc312cfb64bbe1a39090f57851ff8f Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:19:27 -0500
Subject: [feature/events] Append "_append" to acp_users_overview_options

PHPBB3-9550
---
 phpBB/adm/style/acp_users_overview.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 9c06ac3c76..a8e862c141 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -53,7 +53,7 @@
 	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
 	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>
 </dl>
-<!-- EVENT acp_users_overview_options -->
+<!-- EVENT acp_users_overview_options_append -->
 
 <p class="quick">
 	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-- 
cgit v1.2.1


From c0652a72361a21289125f1c5e894d35d1c19e835 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:21:49 -0500
Subject: [feature/events] Change _end suffix to _after in
 acp_overall_footer_end

PHPBB3-9550
---
 phpBB/adm/style/overall_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index f76ad698d3..2a8b46d458 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -42,7 +42,7 @@
 <!-- INCLUDEJS ajax.js -->
 {SCRIPTS}
 
-<!-- EVENT acp_overall_footer_end -->
+<!-- EVENT acp_overall_footer_after -->
 
 </body>
 </html>
-- 
cgit v1.2.1


From 79ea26409b638d858ca1f75282cc8b741261c80a Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:22:41 -0500
Subject: [feature/events] Append "_append" to acp_overall_header_head

PHPBB3-9550
---
 phpBB/adm/style/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 74b8fe5fb8..8170931221 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -155,7 +155,7 @@ function switch_menu()
 
 // ]]>
 </script>
-<!-- EVENT acp_overall_header_head -->
+<!-- EVENT acp_overall_header_head_append -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From 4e8ee1e6b9c6cd254457a45333920607dd488436 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:23:22 -0500
Subject: [feature/events] acp_simple_footer_end -> acp_simple_footer_after

PHPBB3-9550
---
 phpBB/adm/style/simple_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index a7d006d15d..906a9bebed 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -18,7 +18,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><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 -->
-<!-- EVENT acp_simple_footer_end -->
+<!-- EVENT acp_simple_footer_after -->
 
 </body>
 </html>
-- 
cgit v1.2.1


From 11035eb4c4fa778bffda277a3a6b10fff4b99e17 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:23:58 -0500
Subject: [feature/events] Append "_append" to acp_simple_header_head

 PHPBB3-9550
---
 phpBB/adm/style/simple_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 21532f1425..6e0c360600 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -101,7 +101,7 @@ function find_username(url)
 
 // ]]>
 </script>
-<!-- EVENT acp_simple_header_head -->
+<!-- EVENT acp_simple_header_head_append -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From a686e66c85836c192887a625e6e337cab4b35c3b Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 18:16:39 -0500
Subject: [feature/events] Remove extraneous space

PHPBB3-9550
---
 phpBB/adm/style/acp_forums.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 4b21cde418..d6c06bf6d8 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -241,7 +241,7 @@
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
 			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
 		</dl>
-		<!-- EVENT acp_forums_normal_settings_append  -->
+		<!-- EVENT acp_forums_normal_settings_append -->
 		</fieldset>
 
 		<fieldset>
-- 
cgit v1.2.1


From a342e47038dc62cc824efe688e574a1a7dbb0ac8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Jan 2013 18:13:49 +0100
Subject: [feature/avatars] Change avatar javascript to conform to new coding
 guidelines

PHPBB3-10018
---
 phpBB/adm/style/avatars.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
index a53814c15f..26ea24c0db 100644
--- a/phpBB/adm/style/avatars.js
+++ b/phpBB/adm/style/avatars.js
@@ -2,14 +2,14 @@
 
 "use strict";
 
-function avatar_hide() {
+function avatarHide() {
     $('#avatar_options > div').hide();
 
     var selected = $('#avatar_driver').val();
     $('#avatar_option_' + selected).show();
 }
 
-avatar_hide();
-$('#avatar_driver').bind('change', avatar_hide);
+avatarHide();
+$('#avatar_driver').bind('change', avatarHide);
 
 })(jQuery); // Avoid conflicts with other libraries
-- 
cgit v1.2.1


From b5cc1ed683c1e8ca2e189e75e0e3302cc37c5fbf Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Jan 2013 22:46:12 +0100
Subject: [ticket/10949] Converted missing code to new JS coding guidelines

A few missing semi-colons were also added where needed.

PHPBB3-10949
---
 phpBB/adm/style/ajax.js     | 80 ++++++++++++++++++++-------------------------
 phpBB/adm/style/timezone.js |  4 +--
 2 files changed, 38 insertions(+), 46 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 3ccb368665..294a35b615 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -2,11 +2,11 @@
 
 "use strict";
 
-var img_templates = {
+var imgTemplates = {
 	up: $('.template-up-img'),
-	up_disabled: $('.template-up-img-disabled'),
+	upDisabled: $('.template-up-img-disabled'),
 	down: $('.template-down-img'),
-	down_disabled: $('.template-down-img-disabled')
+	downDisabled: $('.template-down-img-disabled')
 };
 
 /**
@@ -15,20 +15,19 @@ var img_templates = {
  * an item is moved up. It moves the row up or down, and deactivates /
  * activates any up / down icons that require it (the ones at the top or bottom).
  */
-phpbb.add_ajax_callback('row_down', function() {
+phpbb.addAjaxCallback('row_down', function() {
 	var el = $(this),
 		tr = el.parents('tr'),
-		tr_swap = tr.next();
+		trSwap = tr.next();
 
 	/*
 	* If the element was the first one, we have to:
 	* - Add the up-link to the row we moved
 	* - Remove the up-link on the next row
 	*/
-	if (tr.is(':first-child'))
-	{
-		var up_img = img_templates.up.clone().attr('href', tr.attr('data-up'));
-		tr.find('.up').html(up_img);
+	if (tr.is(':first-child')) {
+		var upImg = imgTemplates.up.clone().attr('href', tr.attr('data-up'));
+		tr.find('.up').html(upImg);
 
 		phpbb.ajaxify({
 			selector: tr.find('.up').children('a'),
@@ -36,45 +35,43 @@ phpbb.add_ajax_callback('row_down', function() {
 			overlay: false
 		});
 
-		tr_swap.find('.up').html(img_templates.up_disabled.clone());
+		trSwap.find('.up').html(imgTemplates.upDisabled.clone());
 	}
 
-	tr.insertAfter(tr_swap);
+	tr.insertAfter(trSwap);
 
 	/*
 	* As well as:
 	* - Remove the down-link on the moved row, if it is now the last row
 	* - Add the down-link to the next row, if it was the last row
 	*/
-	if (tr.is(':last-child'))
-	{
-		tr.find('.down').html(img_templates.down_disabled.clone());
+	if (tr.is(':last-child')) {
+		tr.find('.down').html(imgTemplates.downDisabled.clone());
 
-		var down_img = img_templates.down.clone().attr('href', tr_swap.attr('data-down'));
-		tr_swap.find('.down').html(down_img);
+		var downImg = imgTemplates.down.clone().attr('href', trSwap.attr('data-down'));
+		trSwap.find('.down').html(downImg);
 
 		phpbb.ajaxify({
-			selector: tr_swap.find('.down').children('a'),
+			selector: trSwap.find('.down').children('a'),
 			callback: 'row_down',
 			overlay: false
 		});
 	}
 });
 
-phpbb.add_ajax_callback('row_up', function() {
+phpbb.addAjaxCallback('row_up', function() {
 	var el = $(this),
 		tr = el.parents('tr'),
-		tr_swap = tr.prev();
+		trSwap = tr.prev();
 
 	/*
 	* If the element was the last one, we have to:
 	* - Add the down-link to the row we moved
 	* - Remove the down-link on the next row
 	*/
-	if (tr.is(':last-child'))
-	{
-		var down_img = img_templates.down.clone().attr('href', tr.attr('data-down'));
-		tr.find('.down').html(down_img);
+	if (tr.is(':last-child')) {
+		var downImg = imgTemplates.down.clone().attr('href', tr.attr('data-down'));
+		tr.find('.down').html(downImg);
 
 		phpbb.ajaxify({
 			selector: tr.find('.down').children('a'),
@@ -82,25 +79,24 @@ phpbb.add_ajax_callback('row_up', function() {
 			overlay: false
 		});
 
-		tr_swap.find('.down').html(img_templates.down_disabled.clone());
+		trSwap.find('.down').html(imgTemplates.downDisabled.clone());
 	}
 
-	tr.insertBefore(tr_swap);
+	tr.insertBefore(trSwap);
 
 	/*
 	* As well as:
 	* - Remove the up-link on the moved row, if it is now the first row
 	* - Add the up-link to the previous row, if it was the first row
 	*/
-	if (tr.is(':first-child'))
-	{
-		tr.find('.up').html(img_templates.up_disabled.clone());
+	if (tr.is(':first-child')) {
+		tr.find('.up').html(imgTemplates.upDisabled.clone());
 
-		var up_img = img_templates.up.clone().attr('href', tr_swap.attr('data-up'));
-		tr_swap.find('.up').html(up_img);
+		var upImg = imgTemplates.up.clone().attr('href', trSwap.attr('data-up'));
+		trSwap.find('.up').html(upImg);
 
 		phpbb.ajaxify({
-			selector: tr_swap.find('.up').children('a'),
+			selector: trSwap.find('.up').children('a'),
 			callback: 'row_up',
 			overlay: false
 		});
@@ -112,29 +108,26 @@ phpbb.add_ajax_callback('row_up', function() {
  * It does this by replacing the text, and replacing all instances of "activate"
  * in the href with "deactivate", and vice versa.
  */
-phpbb.add_ajax_callback('activate_deactivate', function(res) {
+phpbb.addAjaxCallback('activate_deactivate', function(res) {
 	var el = $(this),
-		new_href = el.attr('href');
+		newHref = el.attr('href');
 
 	el.text(res.text);
 
-	if (new_href.indexOf('deactivate') !== -1)
-	{
-		new_href = new_href.replace('deactivate', 'activate')
-	}
-	else
-	{
-		new_href = new_href.replace('activate', 'deactivate')
+	if (newHref.indexOf('deactivate') !== -1) {
+		newHref = newHref.replace('deactivate', 'activate')
+	} else {
+		newHref = newHref.replace('activate', 'deactivate')
 	}
 
-	el.attr('href', new_href);
+	el.attr('href', newHref);
 });
 
 /**
  * The removes the parent row of the link or form that triggered the callback,
  * and is good for stuff like the removal of forums.
  */
-phpbb.add_ajax_callback('row_delete', function() {
+phpbb.addAjaxCallback('row_delete', function() {
 	$(this).parents('tr').remove();
 });
 
@@ -145,8 +138,7 @@ $('[data-ajax]').each(function() {
 		ajax = $this.attr('data-ajax'),
 		fn;
 
-	if (ajax !== 'false')
-	{
+	if (ajax !== 'false') {
 		fn = (ajax !== 'true') ? ajax : null;
 		phpbb.ajaxify({
 			selector: this,
diff --git a/phpBB/adm/style/timezone.js b/phpBB/adm/style/timezone.js
index 4556ea5f94..419d37c34f 100644
--- a/phpBB/adm/style/timezone.js
+++ b/phpBB/adm/style/timezone.js
@@ -1,11 +1,11 @@
 (function($) { // Avoid conflicts with other libraries
 
 $('#tz_date').change(function() {
-	phpbb.timezone_switch_date(false);
+	phpbb.timezoneSwitchDate(false);
 });
 
 $(document).ready(
-	phpbb.timezone_enable_date_selection
+	phpbb.timezoneEnableDateSelection
 );
 
 })(jQuery); // Avoid conflicts with other libraries
-- 
cgit v1.2.1


From 7ea0376958f917c3c62dff7814daaa2fcf330dca Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 8 Jan 2013 22:47:05 +0100
Subject: [feature/avatars] Remove not needed inline style

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_local.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 927c4821f7..148efd051b 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -8,7 +8,7 @@
 	</select>&nbsp;<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" /></dd>
 </dl>
 	<!-- IF AVATAR_LOCAL_SHOW -->
-	<table style="border-spacing: 1px;">
+	<table>
 	<!-- BEGIN avatar_local_row -->
 	<tr>
 		<!-- BEGIN avatar_local_col -->
-- 
cgit v1.2.1


From 0fc863c68a6832fe6589b14b2ca9107f7b570621 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 10 Jan 2013 11:06:05 +0100
Subject: [ticket/11314] Add missing semi-colons

Omitting the semi-colon is not legal behavior for JavaScript.

PHPBB3-11314
---
 phpBB/adm/style/ajax.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 294a35b615..8f7c210e00 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -115,9 +115,9 @@ phpbb.addAjaxCallback('activate_deactivate', function(res) {
 	el.text(res.text);
 
 	if (newHref.indexOf('deactivate') !== -1) {
-		newHref = newHref.replace('deactivate', 'activate')
+		newHref = newHref.replace('deactivate', 'activate');
 	} else {
-		newHref = newHref.replace('activate', 'deactivate')
+		newHref = newHref.replace('activate', 'deactivate');
 	}
 
 	el.attr('href', newHref);
-- 
cgit v1.2.1


From c31f489cce8fd5d60eb484928221bef0666f3c06 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 10 Jan 2013 11:14:07 +0100
Subject: [ticket/11314] Add missing "use strict" to timezone.js files

PHPBB3-11314
---
 phpBB/adm/style/timezone.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/timezone.js b/phpBB/adm/style/timezone.js
index 419d37c34f..b5e27c907c 100644
--- a/phpBB/adm/style/timezone.js
+++ b/phpBB/adm/style/timezone.js
@@ -1,5 +1,7 @@
 (function($) { // Avoid conflicts with other libraries
 
+"use strict";
+
 $('#tz_date').change(function() {
 	phpbb.timezoneSwitchDate(false);
 });
-- 
cgit v1.2.1


From 9affd6f7e7b95442f1ef14894858d8213f3fbd2a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 11 Jan 2013 00:41:03 +0100
Subject: [ticket/11201] Remove MSN/WLM fields

WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype
uses a different login ID and service, the values in this field are useless.
So we can safely remove the field and the links/functions we create.

PHPBB3-11201
---
 phpBB/adm/style/acp_users_profile.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 3232e8d1f5..36e9f340d4 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -10,10 +10,6 @@
 		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
-		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
-	</dl>
 	<dl>
 		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
-- 
cgit v1.2.1


From 2f6b072bb13ce9d7c7784136bedec651b73ae11b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 13 Jan 2013 23:00:48 +0100
Subject: [ticket/11314] Add missing radix parameters

PHPBB3-11314
---
 phpBB/adm/style/editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index c9e8afe08e..2b814a10c6 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -10,7 +10,7 @@ var theSelection = false;
 // Check for Browser & Platform for PC & IE specific bits
 // More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
 var clientPC = navigator.userAgent.toLowerCase(); // Get client info
-var clientVer = parseInt(navigator.appVersion); // Get browser version
+var clientVer = parseInt(navigator.appVersion, 10); // Get browser version
 
 var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
 var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
-- 
cgit v1.2.1


From 336187151a2010197ddda1bcdabc311fd10c1c87 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 4 Feb 2013 01:30:04 +0100
Subject: [ticket/11201] Revert WLM dropping because it is still used in China.

Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.

This commit reverts commits
 - 460470229d972b93ef5a98b0d1d97a2a970d684f
 - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.

PHPBB3-11201
---
 phpBB/adm/style/acp_users_profile.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 36e9f340d4..3232e8d1f5 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -10,6 +10,10 @@
 		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
 	</dl>
+	<dl>
+		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
+		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
+	</dl>
 	<dl>
 		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
-- 
cgit v1.2.1


From b398fa2050ab720d9a3ae2b809bb3cdf4f153dc6 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 9 Feb 2013 21:09:29 -0600
Subject: [feature/migrations] Catch and display errors from the migrator

PHPBB3-11318
---
 phpBB/adm/style/acp_ext_enable.html | 8 +++++++-
 phpBB/adm/style/acp_ext_purge.html  | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 3f7be2c847..35585207eb 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -7,7 +7,13 @@
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 	<p>{L_ENABLE_EXPLAIN}</p>
 
-	<!-- IF PRE -->
+	<!-- IF MIGRATOR_ERROR -->
+	<div class="errorbox">
+		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
+		<p>{MIGRATOR_ERROR}</p>
+		<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+	</div>
+	<!-- ELSEIF PRE -->
 	<div class="errorbox">
 		<p>{L_ENABLE_CONFIRM}</p>
 	</div>
diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html
index 00a58721cb..94bef82ca5 100644
--- a/phpBB/adm/style/acp_ext_purge.html
+++ b/phpBB/adm/style/acp_ext_purge.html
@@ -7,7 +7,13 @@
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 	<p>{L_PURGE_EXPLAIN}</p>
 
-	<!-- IF PRE -->
+	<!-- IF MIGRATOR_ERROR -->
+	<div class="errorbox">
+		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
+		<p>{MIGRATOR_ERROR}</p>
+		<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+	</div>
+	<!-- ELSEIF PRE -->
 	<div class="errorbox">
 		<p>{L_PURGE_CONFIRM}</p>
 	</div>
-- 
cgit v1.2.1


From 9ea48dbd45aaa7d239998910feddcc827aaaafe9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 25 Feb 2013 20:24:11 +0100
Subject: [ticket/10411] Use template loops instead of defining the html in php
 files

PHPBB3-10411
---
 phpBB/adm/style/acp_groups_position.html | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index eb4c3d8819..55bc1b2323 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -39,7 +39,7 @@
 	<tbody>
 	<!-- BEGIN legend -->
 		<tr data-down="{legend.U_MOVE_DOWN}" data-up="{legend.U_MOVE_UP}">
-			<td><strong{legend.GROUP_COLOUR}>{legend.GROUP_NAME}</strong></td>
+			<td><strong<!-- IF legend.GROUP_COLOUR --> style="color: {legend.GROUP_COLOUR}"<!-- ENDIF -->>{legend.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{legend.GROUP_TYPE}</td>
 			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 				<!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
@@ -68,7 +68,12 @@
 
 	<form id="legend_add_group" method="post" action="{U_ACTION_LEGEND}">
 		<fieldset class="quick">
-			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_LEGEND}</select>
+			<select name="g">
+				<option value="0">{L_SELECT_GROUP}</option>
+				<!-- BEGIN add_legend -->
+					<option<!-- IF add_legend.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_legend.GROUP_ID}">{add_legend.GROUP_NAME}</option>
+				<!-- END add_legend -->
+			</select>
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
 			<input type="hidden" name="action" value="add" />
 			{S_FORM_TOKEN}
@@ -126,7 +131,7 @@
 				<!-- IF teampage.U_CATEGORY -->
 					<a href="{teampage.U_CATEGORY}">{teampage.GROUP_NAME}</a>
 				<!-- ELSE -->
-					<strong{teampage.GROUP_COLOUR}>{teampage.GROUP_NAME}</strong>
+					<strong<!-- IF teampage.GROUP_COLOUR --> style="color: {teampage.GROUP_COLOUR}"<!-- ENDIF -->>{teampage.GROUP_NAME}</strong>
 				<!-- ENDIF -->
 			</td>
 			<td style="text-align: center;"><!-- IF teampage.GROUP_TYPE -->{teampage.GROUP_TYPE}<!-- ELSE -->-<!-- ENDIF -->
@@ -159,8 +164,8 @@
 	<!-- IF not S_TEAMPAGE_CATEGORY -->
 	<form id="teampage_add_category" method="post" action="{U_ACTION_TEAMPAGE}">
 		<fieldset class="quick">
-			<input class="inputbox autowidth" type="text" name="category_name" placeholder="{L_CATEGORY_NAME}" />
-			<input class="button2" type="submit" name="submit" value="{L_ADD_CATEGORY}" />
+			<input class="inputbox autowidth" type="text" name="category_name" placeholder="{L_GROUP_CATEGORY_NAME}" />
+			<input class="button2" type="submit" name="submit" value="{L_ADD_GROUP_CATEGORY}" />
 			<input type="hidden" name="action" value="add_category" />
 			{S_FORM_TOKEN}
 		</fieldset>
@@ -169,7 +174,12 @@
 
 	<form id="teampage_add_group" method="post" action="{U_ACTION_TEAMPAGE}">
 		<fieldset class="quick">
-			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_TEAMPAGE}</select>
+			<select name="g">
+				<option value="0">{L_SELECT_GROUP}</option>
+				<!-- BEGIN add_teampage -->
+					<option<!-- IF add_teampage.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_teampage.GROUP_ID}">{add_teampage.GROUP_NAME}</option>
+				<!-- END add_teampage -->
+			</select>
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
 			<input type="hidden" name="action" value="add" />
 			{S_FORM_TOKEN}
-- 
cgit v1.2.1


From ba97303a60342bdb54979223cc6d18e815a70d90 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 26 Feb 2013 17:17:31 +0100
Subject: [ticket/10411] Add maxlength to category name input field

PHPBB3-10411
---
 phpBB/adm/style/acp_groups_position.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 55bc1b2323..47ff792b54 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -164,7 +164,7 @@
 	<!-- IF not S_TEAMPAGE_CATEGORY -->
 	<form id="teampage_add_category" method="post" action="{U_ACTION_TEAMPAGE}">
 		<fieldset class="quick">
-			<input class="inputbox autowidth" type="text" name="category_name" placeholder="{L_GROUP_CATEGORY_NAME}" />
+			<input class="inputbox autowidth" type="text" maxlength="255" name="category_name" placeholder="{L_GROUP_CATEGORY_NAME}" />
 			<input class="button2" type="submit" name="submit" value="{L_ADD_GROUP_CATEGORY}" />
 			<input type="hidden" name="action" value="add_category" />
 			{S_FORM_TOKEN}
-- 
cgit v1.2.1


From b8b2ede35db3d562ca6ed3087ad99933e05c4b67 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 1 Mar 2013 12:45:49 +0100
Subject: [ticket/10411] Remove ajax delete, so the page is refreshed

Otherwise if you delete a group, you can not readd it to the page.

PHPBB3-10411
---
 phpBB/adm/style/acp_groups_position.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 47ff792b54..cf1a7be427 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -55,7 +55,7 @@
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
 					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ENDIF -->
-				<a href="{legend.U_DELETE}" data-ajax="row_delete" data-overlay="false">{ICON_DELETE}</a>
+				<a href="{legend.U_DELETE}">{ICON_DELETE}</a>
 			</td>
 		</tr>
 	<!-- BEGINELSE -->
@@ -150,7 +150,7 @@
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
 					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
 				<!-- ENDIF -->
-				<a href="{teampage.U_DELETE}" data-ajax="row_delete" data-overlay="false">{ICON_DELETE}</a>
+				<a href="{teampage.U_DELETE}">{ICON_DELETE}</a>
 			</td>
 		</tr>
 	<!-- BEGINELSE -->
-- 
cgit v1.2.1


From 001572f76425a1fdb6621d26dae875438152cc97 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 3 Mar 2013 17:34:01 +0100
Subject: [ticket/11166] Add ajaxify support to normal ACP confirm_box()

Currently no custom template from the ACP uses AJAX support.

PHPBB3-11166
---
 phpBB/adm/style/admin.css           | 21 ++++++++++++++++++---
 phpBB/adm/style/confirm_body.html   | 14 +++++++++++++-
 phpBB/adm/style/overall_footer.html |  4 +---
 3 files changed, 32 insertions(+), 7 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 8551c952c7..f7a7f9f9bf 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1098,12 +1098,13 @@ input.disabled {
 	border: 1px solid #999999;
 	position: fixed;
 	display: none;
-	top: 100px;
-	left: 35%;
-	width: 30%;
+	top: 150px;
+	left: 25%;
+	width: 50%;
 	z-index: 50;
 	padding: 25px;
 	padding: 0 25px 20px 25px;
+	text-align: left;
 }
 
 .phpbb_alert .alert_close {
@@ -1127,6 +1128,20 @@ input.disabled {
 	padding-bottom: 8px;
 }
 
+.phpbb_alert label {
+	display: block;
+	margin: 8px 0;
+	padding-bottom: 8px;
+}
+
+.phpbb_alert div.alert_text > p,
+.phpbb_alert div.alert_text > label,
+.phpbb_alert div.alert_text > select,
+.phpbb_alert div.alert_text > textarea,
+.phpbb_alert div.alert_text > input {
+	font-size: 0.9em;
+}
+
 #darkenwrapper {
 	display: none;
 }
diff --git a/phpBB/adm/style/confirm_body.html b/phpBB/adm/style/confirm_body.html
index 2fbb1a60d7..d0360d1b3a 100644
--- a/phpBB/adm/style/confirm_body.html
+++ b/phpBB/adm/style/confirm_body.html
@@ -1,3 +1,15 @@
+<!-- IF S_AJAX_REQUEST -->
+
+	<h3>{MESSAGE_TITLE}</h3>
+	<p>{MESSAGE_TEXT}</p>
+
+	<fieldset class="submit-buttons">
+		<input type="button" name="confirm" value="{L_YES}" class="button2" />&nbsp;
+		<input type="button" name="cancel" value="{L_NO}" class="button2" />
+	</fieldset>
+
+<!-- ELSE -->
+
 <!-- INCLUDE overall_header.html -->
 
 <form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
@@ -14,7 +26,7 @@
 	</div>
 
 </fieldset>
-		
 </form>
 
 <!-- INCLUDE overall_footer.html -->
+<!-- ENDIF -->
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 2bc9ee52d7..bac0cd6625 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -29,9 +29,7 @@
 		</div>
 		<div id="phpbb_confirm" class="phpbb_alert">
 			<a href="#" class="alert_close"></a>
-			<p class="alert_text"></p>
-			<input type="button" class="button1" value="{L_YES}" />&nbsp;
-			<input type="button" class="button2" value="{L_NO}" />
+			<div class="alert_text"></div>
 		</div>
 	</div>
 </div>
-- 
cgit v1.2.1


From 36168b311e5f12937977ffd1040ca4a39f70a0e8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 27 Feb 2013 23:12:34 +0100
Subject: [ticket/11314] Fix issues mentioned in jshint report

Additionally, the editor.js files are now the same file in both
subsilver2, prosilver, and the acp.

PHPBB3-11314
---
 phpBB/adm/style/permissions.js | 46 +++++++++++++++++++++---------------------
 phpBB/adm/style/tooltip.js     | 16 +++++++--------
 2 files changed, 31 insertions(+), 31 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/permissions.js b/phpBB/adm/style/permissions.js
index adc8995c23..9210f864b2 100644
--- a/phpBB/adm/style/permissions.js
+++ b/phpBB/adm/style/permissions.js
@@ -2,7 +2,7 @@
 * Hide and show all checkboxes
 * status = true (show boxes), false (hide boxes)
 */
-function display_checkboxes(status) 
+function display_checkboxes(status)
 {
 	var form = document.getElementById('set-permissions');
 	var cb = document.getElementsByTagName('input');
@@ -21,7 +21,7 @@ function display_checkboxes(status)
 	
 	for (var i = 0; i < cb.length; i++ )
 	{
-		if (cb[i].className == 'permissions-checkbox')
+		if (cb[i].className === 'permissions-checkbox')
 		{
 			cb[i].style.display = display;
 		}
@@ -51,7 +51,7 @@ function toggle_opacity(block_id) {
 	var cb = document.getElementById('checkbox' + block_id);
 	var fs = document.getElementById('perm' + block_id);
 	
-	if (cb.checked) 
+	if (cb.checked)
 	{
 		set_opacity(fs, 5);
 	} 
@@ -78,13 +78,13 @@ function reset_opacity(status, except_id) {
 	
 	for (var i = 0; i < fs.length; i++ )
 	{
-		if (fs[i].className != 'quick')
+		if (fs[i].className !== 'quick')
 		{
 			set_opacity(fs[i], opacity);
 		}
 	}
 
-	if (typeof(except_id) != 'undefined')
+	if (typeof(except_id) !== 'undefined')
 	{
 		set_opacity(document.getElementById('perm' + except_id), 10);
 	}
@@ -99,11 +99,11 @@ function reset_opacity(status, except_id) {
 * index = offset for the row of inputs (0 == first row, 1 == second, 2 == third),
 * rb = array of radiobuttons
 */
-function get_radio_status(index, rb) 
+function get_radio_status(index, rb)
 {
 	for (var i = index; i < rb.length; i = i + 3 )
 	{
-		if (rb[i].checked != true)
+		if (rb[i].checked !== true)
 		{
 			if (i > index)
 			{
@@ -130,7 +130,7 @@ function set_colours(id, init, quick)
 	var table = document.getElementById('table' + id);
 	var tab = document.getElementById('tab' + id);
 
-	if (typeof(quick) != 'undefined') 
+	if (typeof(quick) !== 'undefined')
 	{
 		tab.className = 'permissions-preset-' + quick + ' activetab';
 		return;
@@ -141,25 +141,25 @@ function set_colours(id, init, quick)
 
 	var status = get_radio_status(0, rb);
 
-	if (status == 1)
+	if (status === 1)
 	{
 		colour = 'yes';
 	}
-	else if (status == 0) 
+	else if (status === 0)
 	{
 		// We move on to No
 		status = get_radio_status(1, rb);
 
-		if (status == 1)
+		if (status === 1)
 		{
 			colour = 'no';
 		}
-		else if (status == 0) 
+		else if (status === 0)
 		{
 			// We move on to Never
 			status = get_radio_status(2, rb);
 
-			if (status == 1)
+			if (status === 1)
 			{
 				colour = 'never';
 			}
@@ -188,7 +188,7 @@ function init_colours(block_id)
 
 	for (var i = 0; i < panels.length; i++)
 	{
-		if(panels[i].className == 'permissions-panel')
+		if(panels[i].className === 'permissions-panel')
 		{
 			set_colours(panels[i].id.replace(/options/, ''), true);
 		}
@@ -212,7 +212,7 @@ function swap_options(pmask, fmask, cat, adv, view)
 	var new_tab = document.getElementById('tab' + id);
 	var adv_block = document.getElementById('advanced' + pmask + fmask);
 
-	if (adv_block.style.display == 'block' && adv == true)
+	if (adv_block.style.display === 'block' && adv === true)
 	{
 		dE('advanced' + pmask + fmask, -1);
 		reset_opacity(1);
@@ -221,19 +221,19 @@ function swap_options(pmask, fmask, cat, adv, view)
 	}
 
 	// no need to set anything if we are clicking on the same tab again
-	if (new_tab == old_tab && !adv)
+	if (new_tab === old_tab && !adv)
 	{
 		return;
 	}
 
 	// init colours
-	if (adv && (pmask + fmask) != (active_pmask + active_fmask))
+	if (adv && (pmask + fmask) !== (active_pmask + active_fmask))
 	{
 		init_colours(pmask + fmask);
 		display_checkboxes(true);
 		reset_opacity(1);
 	} 
-	else if (adv) 
+	else if (adv)
 	{
 		//Checkbox might have been clicked, but we need full visibility
 		display_checkboxes(true);
@@ -244,7 +244,7 @@ function swap_options(pmask, fmask, cat, adv, view)
 	old_tab.className = old_tab.className.replace(/\ activetab/g, '');
 	new_tab.className = new_tab.className + ' activetab';
 
-	if (id == active_option && adv != true)
+	if (id === active_option && adv !== true)
 	{
 		return;
 	}
@@ -256,7 +256,7 @@ function swap_options(pmask, fmask, cat, adv, view)
 	{
 		dE('checkbox' + pmask + fmask, -1);	
 		
-		if ((pmask + fmask) != (active_pmask + active_fmask))
+		if ((pmask + fmask) !== (active_pmask + active_fmask))
 		{
 			document.getElementById('checkbox' + active_pmask + active_fmask).style.display = 'inline';
 		}
@@ -295,7 +295,7 @@ function mark_options(id, s)
 
 	for (var r = 0; r < rb.length; r++)
 	{
-		if (rb[r].id.substr(rb[r].id.length-1) == s)
+		if (rb[r].id.substr(rb[r].id.length-1) === s)
 		{
 			rb[r].checked = true;
 		}
@@ -315,7 +315,7 @@ function mark_one_option(id, field_name, s)
 
 	for (var r = 0; r < rb.length; r++)
 	{
-		if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) == field_name && rb[r].id.substr(rb[r].id.length-1) == s)
+		if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) === field_name && rb[r].id.substr(rb[r].id.length-1) === s)
 		{
 			rb[r].checked = true;
 		}
@@ -354,6 +354,6 @@ function set_role_settings(role_id, target_id)
 
 	for (var r in settings)
 	{
-		mark_one_option(target_id, r, (settings[r] == 1) ? 'y' : 'n');
+		mark_one_option(target_id, r, (settings[r] === 1) ? 'y' : 'n');
 	}
 }
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 20610b52fe..14f4772efa 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -33,7 +33,7 @@ function enable_tooltips_link(id, headline, sub_id)
 
 	document.getElementsByTagName('body')[0].appendChild(hold);
 
-	if (id == null)
+	if (id === null)
 	{
 		links = document.getElementsByTagName('a');
 	}
@@ -46,7 +46,7 @@ function enable_tooltips_link(id, headline, sub_id)
 	{
 		if (sub_id)
 		{
-			if (links[i].id.substr(0, sub_id.length) == sub_id)
+			if (links[i].id.substr(0, sub_id.length) === sub_id)
 			{
 				prepare(links[i]);
 			}
@@ -81,7 +81,7 @@ function enable_tooltips_select(id, headline, sub_id)
 
 	document.getElementsByTagName('body')[0].appendChild(hold);
 
-	if (id == null)
+	if (id === null)
 	{
 		links = document.getElementsByTagName('option');
 	}
@@ -94,7 +94,7 @@ function enable_tooltips_select(id, headline, sub_id)
 	{
 		if (sub_id)
 		{
-			if (links[i].parentNode.id.substr(0, sub_id.length) == sub_id)
+			if (links[i].parentNode.id.substr(0, sub_id.length) === sub_id)
 			{
 				prepare(links[i]);
 			}
@@ -117,7 +117,7 @@ function prepare(element)
 
 	text = element.getAttribute('title');
 
-	if (text == null || text.length == 0)
+	if (text === null || text.length === 0)
 	{
 		return;
 	}
@@ -139,7 +139,7 @@ function prepare(element)
 	element.onmouseover = show_tooltip;
 	element.onmouseout = hide_tooltip;
 
-	if (tooltip_mode == 'link')
+	if (tooltip_mode === 'link')
 	{
 		element.onmousemove = locate;
 	}
@@ -200,7 +200,7 @@ function locate(e)
 
 	if (e.offsetParent)
 	{
-		for (var posx = 0, posy = 0; e.offsetParent; e = e.offsetParent)
+		for (posx = 0, posy = 0; e.offsetParent; e = e.offsetParent)
 		{
 			posx += e.offsetLeft;
 			posy += e.offsetTop;
@@ -212,7 +212,7 @@ function locate(e)
 		posy = e.offsetTop;
 	}
 
-	if (tooltip_mode == 'link')
+	if (tooltip_mode === 'link')
 	{
 		document.getElementById('_tooltip_container').style.top=(posy+20) + 'px';
 		document.getElementById('_tooltip_container').style.left=(posx-20) + 'px';
-- 
cgit v1.2.1


From 4870387f3a63531a4921de37d24e6a5cc867da21 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 26 Mar 2013 11:19:03 +0100
Subject: [ticket/11314] Fix JSHint issues in adm editor.js

This time without changing the behavior.

PHPBB3-11314
---
 phpBB/adm/style/editor.js | 69 +++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 36 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index 2b814a10c6..a1c47c72ef 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -12,9 +12,8 @@ var theSelection = false;
 var clientPC = navigator.userAgent.toLowerCase(); // Get client info
 var clientVer = parseInt(navigator.appVersion, 10); // Get browser version
 
-var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
-var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
-
+var is_ie = ((clientPC.indexOf('msie') !== -1) && (clientPC.indexOf('opera') === -1));
+var is_win = ((clientPC.indexOf('win') !== -1) || (clientPC.indexOf('16bit') !== -1));
 var baseHeight;
 
 /**
@@ -29,10 +28,11 @@ function helpline(help)
 * Fix a bug involving the TextRange object. From
 * http://www.frostjedi.com/terra/scripts/demo/caretBug.html
 */ 
-function initInsertions() 
+function initInsertions()
 {
 	var doc;
-	if(document.forms[form_name])
+
+	if (document.forms[form_name])
 	{
 		doc = document;
 	}
@@ -42,7 +42,8 @@ function initInsertions()
 	}
 
 	var textarea = doc.forms[form_name].elements[text_name];
-	if (is_ie && typeof(baseHeight) != 'number')
+
+	if (is_ie && typeof(baseHeight) !== 'number')
 	{
 		textarea.focus();
 		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
@@ -59,14 +60,14 @@ function initInsertions()
 */
 function bbstyle(bbnumber)
 {
-	if (bbnumber != -1)
+	if (bbnumber !== -1)
 	{
 		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
 	}
 	else
 	{
 		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();		
+		document.forms[form_name].elements[text_name].focus();
 	}
 }
 
@@ -76,7 +77,7 @@ function bbstyle(bbnumber)
 function bbfontstyle(bbopen, bbclose)
 {
 	theSelection = false;
-		
+
 	var textarea = document.forms[form_name].elements[text_name];
 
 	textarea.focus();
@@ -102,10 +103,10 @@ function bbfontstyle(bbopen, bbclose)
 		theSelection = '';
 		return;
 	}
-	
+
 	//The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;		
+	var new_pos = caret_pos + bbopen.length;
 
 	// Open tag
 	insert_text(bbopen + bbclose);
@@ -116,7 +117,7 @@ function bbfontstyle(bbopen, bbclose)
 	{
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
-	}	
+	}
 	// IE
 	else if (document.selection)
 	{
@@ -136,7 +137,7 @@ function bbfontstyle(bbopen, bbclose)
 function insert_text(text, spaces, popup)
 {
 	var textarea;
-	
+
 	if (!popup)
 	{
 		textarea = document.forms[form_name].elements[text_name];
@@ -159,18 +160,17 @@ function insert_text(text, spaces, popup)
 		mozWrap(textarea, text, '');
 		textarea.selectionStart = sel_start + text.length;
 		textarea.selectionEnd = sel_end + text.length;
-	}	
-	
+	}
 	else if (textarea.createTextRange && textarea.caretPos)
 	{
-		if (baseHeight != textarea.caretPos.boundingHeight) 
+		if (baseHeight !== textarea.caretPos.boundingHeight)
 		{
 			textarea.focus();
 			storeCaret(textarea);
 		}
+
 		var caret_pos = textarea.caretPos;
-		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-		
+		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) === ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
 	}
 	else
 	{
@@ -181,7 +181,6 @@ function insert_text(text, spaces, popup)
 	{
 		textarea.focus();
 	}
-
 }
 
 /**
@@ -225,7 +224,7 @@ function addquote(post_id, username)
 		theSelection = document.selection.createRange().text;
 	}
 
-	if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
+	if (theSelection === '' || typeof theSelection === 'undefined' || theSelection === null)
 	{
 		if (divarea.innerHTML)
 		{
@@ -233,7 +232,7 @@ function addquote(post_id, username)
 			theSelection = theSelection.replace(/<br\/>/ig, '\n');
 			theSelection = theSelection.replace(/&lt\;/ig, '<');
 			theSelection = theSelection.replace(/&gt\;/ig, '>');
-			theSelection = theSelection.replace(/&amp\;/ig, '&');			
+			theSelection = theSelection.replace(/&amp\;/ig, '&');
 			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
 		}
 		else if (document.all)
@@ -263,12 +262,12 @@ function addquote(post_id, username)
 */
 function mozWrap(txtarea, open, close)
 {
-	var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength;
+	var selLength = (typeof(txtarea.textLength) === 'undefined') ? txtarea.value.length : txtarea.textLength;
 	var selStart = txtarea.selectionStart;
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd == 1 || selEnd == 2) 
+	if (selEnd === 1 || selEnd === 2)
 	{
 		selEnd = selLength;
 	}
@@ -317,18 +316,18 @@ function colorPalette(dir, width, height)
 
 	for (r = 0; r < 5; r++)
 	{
-		if (dir == 'h')
+		if (dir === 'h')
 		{
 			document.writeln('<tr>');
 		}
 
 		for (g = 0; g < 5; g++)
 		{
-			if (dir == 'v')
+			if (dir === 'v')
 			{
 				document.writeln('<tr>');
 			}
-			
+
 			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
@@ -337,13 +336,13 @@ function colorPalette(dir, width, height)
 				document.writeln('</td>');
 			}
 
-			if (dir == 'v')
+			if (dir === 'v')
 			{
 				document.writeln('</tr>');
 			}
 		}
 
-		if (dir == 'h')
+		if (dir === 'h')
 		{
 			document.writeln('</tr>');
 		}
@@ -351,7 +350,6 @@ function colorPalette(dir, width, height)
 	document.writeln('</table>');
 }
 
-
 /**
 * Caret Position object
 */
@@ -361,16 +359,15 @@ function caretPosition()
 	var end = null;
 }
 
-
 /**
 * Get the caret position in an textarea
 */
 function getCaretPosition(txtarea)
 {
 	var caretPos = new caretPosition();
-	
+
 	// simple Gecko/Opera way
-	if (txtarea.selectionStart || txtarea.selectionStart == 0)
+	if (txtarea.selectionStart || txtarea.selectionStart === 0)
 	{
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
@@ -384,19 +381,19 @@ function getCaretPosition(txtarea)
 		// a new selection of the whole textarea
 		var range_all = document.body.createTextRange();
 		range_all.moveToElementText(txtarea);
-		
+
 		// calculate selection start point by moving beginning of range_all to beginning of range
 		var sel_start;
 		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
 		{
 			range_all.moveStart('character', 1);
 		}
-	
+
 		txtarea.sel_start = sel_start;
-	
+
 		// we ignore the end value for IE, this is already dirty enough and we don't need it
 		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;			
+		caretPos.end = txtarea.sel_start;
 	}
 
 	return caretPos;
-- 
cgit v1.2.1


From f0b0978538a1b1e25b688cce1794c764f2d363f0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 26 Mar 2013 13:13:33 +0100
Subject: [ticket/11314] Modify files to comply with coding standards

PHPBB3-11314
---
 phpBB/adm/style/editor.js      | 172 ++++++++++++--------------------------
 phpBB/adm/style/permissions.js | 183 ++++++++++++++---------------------------
 phpBB/adm/style/tooltip.js     | 102 ++++++++---------------
 3 files changed, 149 insertions(+), 308 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index a1c47c72ef..9938ff5d0b 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -19,8 +19,7 @@ var baseHeight;
 /**
 * Shows the help messages in the helpline window
 */
-function helpline(help)
-{
+function helpline(help) {
 	document.forms[form_name].helpbox.value = help_line[help];
 }
 
@@ -28,28 +27,22 @@ function helpline(help)
 * Fix a bug involving the TextRange object. From
 * http://www.frostjedi.com/terra/scripts/demo/caretBug.html
 */ 
-function initInsertions()
-{
+function initInsertions() {
 	var doc;
 
-	if (document.forms[form_name])
-	{
+	if (document.forms[form_name]) {
 		doc = document;
-	}
-	else
-	{
+	} else {
 		doc = opener.document;
 	}
 
 	var textarea = doc.forms[form_name].elements[text_name];
 
-	if (is_ie && typeof(baseHeight) !== 'number')
-	{
+	if (is_ie && typeof(baseHeight) !== 'number') {
 		textarea.focus();
 		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
 
-		if (!document.forms[form_name])
-		{
+		if (!document.forms[form_name]) {
 			document.body.focus();
 		}
 	}
@@ -58,14 +51,10 @@ function initInsertions()
 /**
 * bbstyle
 */
-function bbstyle(bbnumber)
-{
-	if (bbnumber !== -1)
-	{
+function bbstyle(bbnumber) {
+	if (bbnumber !== -1) {
 		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	}
-	else
-	{
+	} else {
 		insert_text('[*]');
 		document.forms[form_name].elements[text_name].focus();
 	}
@@ -74,30 +63,26 @@ function bbstyle(bbnumber)
 /**
 * Apply bbcodes
 */
-function bbfontstyle(bbopen, bbclose)
-{
+function bbfontstyle(bbopen, bbclose) {
 	theSelection = false;
 
 	var textarea = document.forms[form_name].elements[text_name];
 
 	textarea.focus();
 
-	if ((clientVer >= 4) && is_ie && is_win)
-	{
+	if ((clientVer >= 4) && is_ie && is_win) {
 		// Get text selection
 		theSelection = document.selection.createRange().text;
 
-		if (theSelection)
-		{
+		if (theSelection) {
 			// Add tags around selection
 			document.selection.createRange().text = bbopen + theSelection + bbclose;
 			document.forms[form_name].elements[text_name].focus();
 			theSelection = '';
 			return;
 		}
-	}
-	else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0))
-	{
+	} else if (document.forms[form_name].elements[text_name].selectionEnd
+			&& (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) {
 		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);
 		document.forms[form_name].elements[text_name].focus();
 		theSelection = '';
@@ -113,14 +98,12 @@ function bbfontstyle(bbopen, bbclose)
 
 	// Center the cursor when we don't have a selection
 	// Gecko and proper browsers
-	if (!isNaN(textarea.selectionStart))
-	{
+	if (!isNaN(textarea.selectionStart)) {
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
 	}
 	// IE
-	else if (document.selection)
-	{
+	else if (document.selection) {
 		var range = textarea.createTextRange(); 
 		range.move("character", new_pos); 
 		range.select();
@@ -134,51 +117,39 @@ function bbfontstyle(bbopen, bbclose)
 /**
 * Insert text at position
 */
-function insert_text(text, spaces, popup)
-{
+function insert_text(text, spaces, popup) {
 	var textarea;
 
-	if (!popup)
-	{
+	if (!popup) {
 		textarea = document.forms[form_name].elements[text_name];
-	}
-	else
-	{
+	} else {
 		textarea = opener.document.forms[form_name].elements[text_name];
 	}
 
-	if (spaces)
-	{
+	if (spaces) {
 		text = ' ' + text + ' ';
 	}
 
-	if (!isNaN(textarea.selectionStart))
-	{
+	if (!isNaN(textarea.selectionStart)) {
 		var sel_start = textarea.selectionStart;
 		var sel_end = textarea.selectionEnd;
 
 		mozWrap(textarea, text, '');
 		textarea.selectionStart = sel_start + text.length;
 		textarea.selectionEnd = sel_end + text.length;
-	}
-	else if (textarea.createTextRange && textarea.caretPos)
-	{
-		if (baseHeight !== textarea.caretPos.boundingHeight)
-		{
+	} else if (textarea.createTextRange && textarea.caretPos) {
+		if (baseHeight !== textarea.caretPos.boundingHeight) {
 			textarea.focus();
 			storeCaret(textarea);
 		}
 
 		var caret_pos = textarea.caretPos;
 		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) === ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-	}
-	else
-	{
+	} else {
 		textarea.value = textarea.value + text;
 	}
 
-	if (!popup)
-	{
+	if (!popup) {
 		textarea.focus();
 	}
 }
@@ -186,8 +157,7 @@ function insert_text(text, spaces, popup)
 /**
 * Add inline attachment at position
 */
-function attach_inline(index, filename)
-{
+function attach_inline(index, filename) {
 	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
 	document.forms[form_name].elements[text_name].focus();
 }
@@ -201,56 +171,39 @@ function addquote(post_id, username)
 	var theSelection = '';
 	var divarea = false;
 
-	if (document.all)
-	{
+	if (document.all) {
 		divarea = document.all[message_name];
-	}
-	else
-	{
+	} else {
 		divarea = document.getElementById(message_name);
 	}
 
 	// Get text selection - not only the post content :(
-	if (window.getSelection)
-	{
+	if (window.getSelection) {
 		theSelection = window.getSelection().toString();
-	}
-	else if (document.getSelection)
-	{
+	} else if (document.getSelection) {
 		theSelection = document.getSelection();
-	}
-	else if (document.selection)
-	{
+	} else if (document.selection) {
 		theSelection = document.selection.createRange().text;
 	}
 
-	if (theSelection === '' || typeof theSelection === 'undefined' || theSelection === null)
-	{
-		if (divarea.innerHTML)
-		{
+	if (theSelection === '' || typeof theSelection === 'undefined' || theSelection === null) {
+		if (divarea.innerHTML) {
 			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
 			theSelection = theSelection.replace(/<br\/>/ig, '\n');
 			theSelection = theSelection.replace(/&lt\;/ig, '<');
 			theSelection = theSelection.replace(/&gt\;/ig, '>');
 			theSelection = theSelection.replace(/&amp\;/ig, '&');
 			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
-		}
-		else if (document.all)
-		{
+		} else if (document.all) {
 			theSelection = divarea.innerText;
-		}
-		else if (divarea.textContent)
-		{
+		} else if (divarea.textContent) {
 			theSelection = divarea.textContent;
-		}
-		else if (divarea.firstChild.nodeValue)
-		{
+		} else if (divarea.firstChild.nodeValue) {
 			theSelection = divarea.firstChild.nodeValue;
 		}
 	}
 
-	if (theSelection)
-	{
+	if (theSelection) {
 		insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
 	}
 
@@ -260,15 +213,13 @@ function addquote(post_id, username)
 /**
 * From http://www.massless.org/mozedit/
 */
-function mozWrap(txtarea, open, close)
-{
+function mozWrap(txtarea, open, close) {
 	var selLength = (typeof(txtarea.textLength) === 'undefined') ? txtarea.value.length : txtarea.textLength;
 	var selStart = txtarea.selectionStart;
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd === 1 || selEnd === 2)
-	{
+	if (selEnd === 1 || selEnd === 2) {
 		selEnd = selLength;
 	}
 
@@ -289,10 +240,8 @@ function mozWrap(txtarea, open, close)
 * Insert at Caret position. Code from
 * http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
 */
-function storeCaret(textEl)
-{
-	if (textEl.createTextRange)
-	{
+function storeCaret(textEl) {
+	if (textEl.createTextRange) {
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
 }
@@ -300,8 +249,7 @@ function storeCaret(textEl)
 /**
 * Color pallette
 */
-function colorPalette(dir, width, height)
-{
+function colorPalette(dir, width, height) {
 	var r = 0, g = 0, b = 0;
 	var numberList = new Array(6);
 	var color = '';
@@ -314,36 +262,29 @@ function colorPalette(dir, width, height)
 
 	document.writeln('<table class="type2">');
 
-	for (r = 0; r < 5; r++)
-	{
-		if (dir === 'h')
-		{
+	for (r = 0; r < 5; r++) {
+		if (dir === 'h') {
 			document.writeln('<tr>');
 		}
 
-		for (g = 0; g < 5; g++)
-		{
-			if (dir === 'v')
-			{
+		for (g = 0; g < 5; g++) {
+			if (dir === 'v') {
 				document.writeln('<tr>');
 			}
 
-			for (b = 0; b < 5; b++)
-			{
+			for (b = 0; b < 5; b++) {
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
 				document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">');
 				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
 				document.writeln('</td>');
 			}
 
-			if (dir === 'v')
-			{
+			if (dir === 'v') {
 				document.writeln('</tr>');
 			}
 		}
 
-		if (dir === 'h')
-		{
+		if (dir === 'h') {
 			document.writeln('</tr>');
 		}
 	}
@@ -353,8 +294,7 @@ function colorPalette(dir, width, height)
 /**
 * Caret Position object
 */
-function caretPosition()
-{
+function caretPosition() {
 	var start = null;
 	var end = null;
 }
@@ -362,19 +302,16 @@ function caretPosition()
 /**
 * Get the caret position in an textarea
 */
-function getCaretPosition(txtarea)
-{
+function getCaretPosition(txtarea) {
 	var caretPos = new caretPosition();
 
 	// simple Gecko/Opera way
-	if (txtarea.selectionStart || txtarea.selectionStart === 0)
-	{
+	if (txtarea.selectionStart || txtarea.selectionStart === 0) {
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
 	}
 	// dirty and slow IE way
-	else if (document.selection)
-	{
+	else if (document.selection) {
 		// get current selection
 		var range = document.selection.createRange();
 
@@ -384,8 +321,7 @@ function getCaretPosition(txtarea)
 
 		// calculate selection start point by moving beginning of range_all to beginning of range
 		var sel_start;
-		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
-		{
+		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++) {
 			range_all.moveStart('character', 1);
 		}
 
diff --git a/phpBB/adm/style/permissions.js b/phpBB/adm/style/permissions.js
index 9210f864b2..1c85fbd9ef 100644
--- a/phpBB/adm/style/permissions.js
+++ b/phpBB/adm/style/permissions.js
@@ -2,35 +2,27 @@
 * Hide and show all checkboxes
 * status = true (show boxes), false (hide boxes)
 */
-function display_checkboxes(status)
-{
+function display_checkboxes(status) {
 	var form = document.getElementById('set-permissions');
 	var cb = document.getElementsByTagName('input');
 	var display;
 
 	//show
-	if (status)
-	{
+	if (status) {
 		display = 'inline';
 	}
 	//hide
-	else
-	{
+	else {
 		display = 'none';
 	}
-	
-	for (var i = 0; i < cb.length; i++ )
-	{
-		if (cb[i].className === 'permissions-checkbox')
-		{
+
+	for (var i = 0; i < cb.length; i++ ) {
+		if (cb[i].className === 'permissions-checkbox') {
 			cb[i].style.display = display;
 		}
-		
-	}	
-	
+	}
 }
 
-
 /**
 * Change opacity of element
 * e = element
@@ -38,7 +30,7 @@ function display_checkboxes(status)
 */
 function set_opacity(e, value) {
 	e.style.opacity = value/10;
-	
+
 	//IE opacity currently turned off, because of its astronomical stupidity
 	//e.style.filter = 'alpha(opacity=' + value*10 + ')';
 }
@@ -50,13 +42,10 @@ function set_opacity(e, value) {
 function toggle_opacity(block_id) {
 	var cb = document.getElementById('checkbox' + block_id);
 	var fs = document.getElementById('perm' + block_id);
-	
-	if (cb.checked)
-	{
+
+	if (cb.checked) {
 		set_opacity(fs, 5);
-	} 
-	else 
-	{
+	} else {
 		set_opacity(fs, 10);
 	}
 }
@@ -71,21 +60,17 @@ function reset_opacity(status, except_id) {
 	var fs = perm.getElementsByTagName('fieldset');
 	var opacity = 5;
 
-	if (status)
-	{
-		opacity = 10;	
+	if (status) {
+		opacity = 10;
 	}
-	
-	for (var i = 0; i < fs.length; i++ )
-	{
-		if (fs[i].className !== 'quick')
-		{
+
+	for (var i = 0; i < fs.length; i++ ) {
+		if (fs[i].className !== 'quick') {
 			set_opacity(fs[i], opacity);
 		}
 	}
 
-	if (typeof(except_id) !== 'undefined')
-	{
+	if (typeof(except_id) !== 'undefined') {
 		set_opacity(document.getElementById('perm' + except_id), 10);
 	}
 
@@ -93,20 +78,15 @@ function reset_opacity(status, except_id) {
 	marklist('set-permissions', 'inherit', !status);
 }
 
-
 /**
 * Check whether we have a full radiobutton row of true
 * index = offset for the row of inputs (0 == first row, 1 == second, 2 == third),
 * rb = array of radiobuttons
 */
-function get_radio_status(index, rb)
-{
-	for (var i = index; i < rb.length; i = i + 3 )
-	{
-		if (rb[i].checked !== true)
-		{
-			if (i > index)
-			{
+function get_radio_status(index, rb) {
+	for (var i = index; i < rb.length; i = i + 3 ) {
+		if (rb[i].checked !== true) {
+			if (i > index) {
 				//at least one is true, but not all (custom)
 				return 2;
 			}
@@ -121,17 +101,15 @@ function get_radio_status(index, rb)
 
 /**
 * Set tab colours
-* id = panel the tab needs to be set for, 
-* init = initialising on open, 
+* id = panel the tab needs to be set for,
+* init = initialising on open,
 * quick = If no calculation needed, this contains the colour
 */
-function set_colours(id, init, quick)
-{
+function set_colours(id, init, quick) {
 	var table = document.getElementById('table' + id);
 	var tab = document.getElementById('tab' + id);
 
-	if (typeof(quick) !== 'undefined')
-	{
+	if (typeof(quick) !== 'undefined') {
 		tab.className = 'permissions-preset-' + quick + ' activetab';
 		return;
 	}
@@ -141,37 +119,27 @@ function set_colours(id, init, quick)
 
 	var status = get_radio_status(0, rb);
 
-	if (status === 1)
-	{
+	if (status === 1) {
 		colour = 'yes';
-	}
-	else if (status === 0)
-	{
+	} else if (status === 0) {
 		// We move on to No
 		status = get_radio_status(1, rb);
 
-		if (status === 1)
-		{
+		if (status === 1) {
 			colour = 'no';
-		}
-		else if (status === 0)
-		{
+		} else if (status === 0) {
 			// We move on to Never
 			status = get_radio_status(2, rb);
 
-			if (status === 1)
-			{
+			if (status === 1) {
 				colour = 'never';
 			}
 		}
 	}
 
-	if (init)
-	{
+	if (init) {
 		tab.className = 'permissions-preset-' + colour;
-	}
-	else
-	{
+	} else {
 		tab.className = 'permissions-preset-' + colour + ' activetab';
 	}
 }
@@ -180,16 +148,13 @@ function set_colours(id, init, quick)
 * Initialise advanced tab colours on first load
 * block_id = block that is opened
 */
-function init_colours(block_id)
-{	
+function init_colours(block_id) {
 	var block = document.getElementById('advanced' + block_id);
 	var panels = block.getElementsByTagName('div');
 	var tab = document.getElementById('tab' + id);
 
-	for (var i = 0; i < panels.length; i++)
-	{
-		if(panels[i].className === 'permissions-panel')
-		{
+	for (var i = 0; i < panels.length; i++) {
+		if (panels[i].className === 'permissions-panel') {
 			set_colours(panels[i].id.replace(/options/, ''), true);
 		}
 	}
@@ -203,17 +168,15 @@ function init_colours(block_id)
 * adv = we are opening advanced permissions
 * view = called from view permissions
 */
-function swap_options(pmask, fmask, cat, adv, view)
-{
+function swap_options(pmask, fmask, cat, adv, view) {
 	id = pmask + fmask + cat;
 	active_option = active_pmask + active_fmask + active_cat;
 
-	var	old_tab = document.getElementById('tab' + active_option);	
+	var	old_tab = document.getElementById('tab' + active_option);
 	var new_tab = document.getElementById('tab' + id);
 	var adv_block = document.getElementById('advanced' + pmask + fmask);
 
-	if (adv_block.style.display === 'block' && adv === true)
-	{
+	if (adv_block.style.display === 'block' && adv === true) {
 		dE('advanced' + pmask + fmask, -1);
 		reset_opacity(1);
 		display_checkboxes(false);
@@ -221,20 +184,16 @@ function swap_options(pmask, fmask, cat, adv, view)
 	}
 
 	// no need to set anything if we are clicking on the same tab again
-	if (new_tab === old_tab && !adv)
-	{
+	if (new_tab === old_tab && !adv) {
 		return;
 	}
 
 	// init colours
-	if (adv && (pmask + fmask) !== (active_pmask + active_fmask))
-	{
+	if (adv && (pmask + fmask) !== (active_pmask + active_fmask)) {
 		init_colours(pmask + fmask);
 		display_checkboxes(true);
 		reset_opacity(1);
-	} 
-	else if (adv)
-	{
+	} else if (adv) {
 		//Checkbox might have been clicked, but we need full visibility
 		display_checkboxes(true);
 		reset_opacity(1);
@@ -244,31 +203,26 @@ function swap_options(pmask, fmask, cat, adv, view)
 	old_tab.className = old_tab.className.replace(/\ activetab/g, '');
 	new_tab.className = new_tab.className + ' activetab';
 
-	if (id === active_option && adv !== true)
-	{
+	if (id === active_option && adv !== true) {
 		return;
 	}
 
 	dE('options' + active_option, -1);
-	
+
 	//hiding and showing the checkbox
-	if (document.getElementById('checkbox' + active_pmask + active_fmask))
-	{
-		dE('checkbox' + pmask + fmask, -1);	
-		
-		if ((pmask + fmask) !== (active_pmask + active_fmask))
-		{
+	if (document.getElementById('checkbox' + active_pmask + active_fmask)) {
+		dE('checkbox' + pmask + fmask, -1);
+
+		if ((pmask + fmask) !== (active_pmask + active_fmask)) {
 			document.getElementById('checkbox' + active_pmask + active_fmask).style.display = 'inline';
 		}
 	}
 
-	if (!view)
-	{
+	if (!view) {
 		dE('advanced' + active_pmask + active_fmask, -1);
 	}
 
-	if (!view)
-	{
+	if (!view) {
 		dE('advanced' + pmask + fmask, 1);
 	}
 	dE('options' + id, 1);
@@ -282,41 +236,33 @@ function swap_options(pmask, fmask, cat, adv, view)
 * Mark all radio buttons in one panel
 * id = table ID container, s = status ['y'/'u'/'n']
 */
-function mark_options(id, s)
-{
+function mark_options(id, s) {
 	var t = document.getElementById(id);
 
-	if (!t)
-	{
+	if (!t) {
 		return;
 	}
 
 	var rb = t.getElementsByTagName('input');
 
-	for (var r = 0; r < rb.length; r++)
-	{
-		if (rb[r].id.substr(rb[r].id.length-1) === s)
-		{
+	for (var r = 0; r < rb.length; r++) {
+		if (rb[r].id.substr(rb[r].id.length-1) === s) {
 			rb[r].checked = true;
 		}
 	}
 }
 
-function mark_one_option(id, field_name, s)
-{
+function mark_one_option(id, field_name, s) {
 	var t = document.getElementById(id);
 
-	if (!t)
-	{
+	if (!t) {
 		return;
 	}
 
 	var rb = t.getElementsByTagName('input');
 
-	for (var r = 0; r < rb.length; r++)
-	{
-		if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) === field_name && rb[r].id.substr(rb[r].id.length-1) === s)
-		{
+	for (var r = 0; r < rb.length; r++) {
+		if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) === field_name && rb[r].id.substr(rb[r].id.length-1) === s) {
 			rb[r].checked = true;
 		}
 	}
@@ -325,12 +271,10 @@ function mark_one_option(id, field_name, s)
 /**
 * Reset role dropdown field to Select role... if an option gets changed
 */
-function reset_role(id)
-{
+function reset_role(id) {
 	var t = document.getElementById(id);
 
-	if (!t)
-	{
+	if (!t) {
 		return;
 	}
 
@@ -340,20 +284,17 @@ function reset_role(id)
 /**
 * Load role and set options accordingly
 */
-function set_role_settings(role_id, target_id)
-{
+function set_role_settings(role_id, target_id) {
 	settings = role_options[role_id];
 
-	if (!settings)
-	{
+	if (!settings) {
 		return;
 	}
 
 	// Mark all options to no (unset) first...
 	mark_options(target_id, 'u');
 
-	for (var r in settings)
-	{
+	for (var r in settings) {
 		mark_one_option(target_id, r, (settings[r] === 1) ? 'y' : 'n');
 	}
 }
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 14f4772efa..3a89008706 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -1,6 +1,6 @@
 /*
 javascript for Bubble Tooltips by Alessandro Fulciniti
-- http://pro.html.it - http://web-graphics.com 
+- http://pro.html.it - http://web-graphics.com
 obtained from: http://web-graphics.com/mtarchive/001717.php
 
 phpBB Development Team:
@@ -15,14 +15,12 @@ var head_text, tooltip_mode;
 /**
 * Enable tooltip replacements for links
 */
-function enable_tooltips_link(id, headline, sub_id)
-{
+function enable_tooltips_link(id, headline, sub_id) {
 	var links, i, hold;
-	
+
 	head_text = headline;
 
-	if (!document.getElementById || !document.getElementsByTagName)
-	{
+	if (!document.getElementById || !document.getElementsByTagName) {
 		return;
 	}
 
@@ -33,26 +31,18 @@ function enable_tooltips_link(id, headline, sub_id)
 
 	document.getElementsByTagName('body')[0].appendChild(hold);
 
-	if (id === null)
-	{
+	if (id === null) {
 		links = document.getElementsByTagName('a');
-	}
-	else
-	{
+	} else {
 		links = document.getElementById(id).getElementsByTagName('a');
 	}
 
-	for (i = 0; i < links.length; i++)
-	{
-		if (sub_id)
-		{
-			if (links[i].id.substr(0, sub_id.length) === sub_id)
-			{
+	for (i = 0; i < links.length; i++) {
+		if (sub_id) {
+			if (links[i].id.substr(0, sub_id.length) === sub_id) {
 				prepare(links[i]);
 			}
-		}
-		else
-		{
+		} else {
 			prepare(links[i]);
 		}
 	}
@@ -63,14 +53,12 @@ function enable_tooltips_link(id, headline, sub_id)
 /**
 * Enable tooltip replacements for selects
 */
-function enable_tooltips_select(id, headline, sub_id)
-{
+function enable_tooltips_select(id, headline, sub_id) {
 	var links, i, hold;
-	
+
 	head_text = headline;
 
-	if (!document.getElementById || !document.getElementsByTagName)
-	{
+	if (!document.getElementById || !document.getElementsByTagName) {
 		return;
 	}
 
@@ -81,26 +69,18 @@ function enable_tooltips_select(id, headline, sub_id)
 
 	document.getElementsByTagName('body')[0].appendChild(hold);
 
-	if (id === null)
-	{
+	if (id === null) {
 		links = document.getElementsByTagName('option');
-	}
-	else
-	{
+	} else {
 		links = document.getElementById(id).getElementsByTagName('option');
 	}
 
-	for (i = 0; i < links.length; i++)
-	{
-		if (sub_id)
-		{
-			if (links[i].parentNode.id.substr(0, sub_id.length) === sub_id)
-			{
+	for (i = 0; i < links.length; i++) {
+		if (sub_id) {
+			if (links[i].parentNode.id.substr(0, sub_id.length) === sub_id) {
 				prepare(links[i]);
 			}
-		}
-		else
-		{
+		} else {
 			prepare(links[i]);
 		}
 	}
@@ -111,14 +91,12 @@ function enable_tooltips_select(id, headline, sub_id)
 /**
 * Prepare elements to replace
 */
-function prepare(element)
-{
+function prepare(element) {
 	var tooltip, text, desc, title;
 
 	text = element.getAttribute('title');
 
-	if (text === null || text.length === 0)
-	{
+	if (text === null || text.length === 0) {
 		return;
 	}
 
@@ -139,8 +117,7 @@ function prepare(element)
 	element.onmouseover = show_tooltip;
 	element.onmouseout = hide_tooltip;
 
-	if (tooltip_mode === 'link')
-	{
+	if (tooltip_mode === 'link') {
 		element.onmousemove = locate;
 	}
 }
@@ -148,8 +125,7 @@ function prepare(element)
 /**
 * Show tooltip
 */
-function show_tooltip(e)
-{
+function show_tooltip(e) {
 	document.getElementById('_tooltip_container').appendChild(this.tooltip);
 	locate(this);
 }
@@ -157,11 +133,9 @@ function show_tooltip(e)
 /**
 * Hide tooltip
 */
-function hide_tooltip(e)
-{
+function hide_tooltip(e) {
 	var d = document.getElementById('_tooltip_container');
-	if (d.childNodes.length > 0)
-	{
+	if (d.childNodes.length > 0) {
 		d.removeChild(d.firstChild);
 	}
 }
@@ -169,8 +143,7 @@ function hide_tooltip(e)
 /**
 * Set opacity on tooltip element
 */
-function set_opacity(element)
-{
+function set_opacity(element) {
 	element.style.filter = 'alpha(opacity:95)';
 	element.style.KHTMLOpacity = '0.95';
 	element.style.MozOpacity = '0.95';
@@ -180,8 +153,7 @@ function set_opacity(element)
 /**
 * Create new element
 */
-function create_element(tag, c)
-{
+function create_element(tag, c) {
 	var x = document.createElement(tag);
 	x.className = c;
 	x.style.display = 'block';
@@ -191,34 +163,26 @@ function create_element(tag, c)
 /**
 * Correct positioning of tooltip container
 */
-function locate(e)
-{
+function locate(e) {
 	var posx = 0;
 	var posy = 0;
 
 	e = e.parentNode;
 
-	if (e.offsetParent)
-	{
-		for (posx = 0, posy = 0; e.offsetParent; e = e.offsetParent)
-		{
+	if (e.offsetParent) {
+		for (posx = 0, posy = 0; e.offsetParent; e = e.offsetParent) {
 			posx += e.offsetLeft;
 			posy += e.offsetTop;
 		}
-	}
-	else
-	{
+	} else {
 		posx = e.offsetLeft;
 		posy = e.offsetTop;
 	}
 
-	if (tooltip_mode === 'link')
-	{
+	if (tooltip_mode === 'link') {
 		document.getElementById('_tooltip_container').style.top=(posy+20) + 'px';
 		document.getElementById('_tooltip_container').style.left=(posx-20) + 'px';
-	}
-	else
-	{
+	} else {
 		document.getElementById('_tooltip_container').style.top=(posy+30) + 'px';
 		document.getElementById('_tooltip_container').style.left=(posx-205) + 'px';
 	}
-- 
cgit v1.2.1


From 316efcbbbb72058bb9986be08af3d11173817386 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 9 Apr 2013 18:39:47 +0300
Subject: [ticket/10741] Automatically resize textareas in prosilver and ACP

Automatically resize textareas in prosilver and ACP.

PHPBB3-10741
---
 phpBB/adm/style/ajax.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 8f7c210e00..8211bdd014 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -148,6 +148,12 @@ $('[data-ajax]').each(function() {
 	}
 });
 
+/**
+* Automatically resize textarea
+*/
+$(document).ready(function() {
+	phpbb.resizeTextArea($('textarea'), {minHeight: 75});
+});
 
 
 })(jQuery); // Avoid conflicts with other libraries
-- 
cgit v1.2.1


From 67f0e19128415210f0ece4a8cd3df12e4b35eaf6 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 9 Apr 2013 18:47:08 +0300
Subject: [ticket/10741] Do not resize textarea.no-auto-resize

Do not auto-resize textareas with class .no-auto-resize

PHPBB3-10741
---
 phpBB/adm/style/ajax.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 8211bdd014..6f21dfa6ac 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -152,7 +152,7 @@ $('[data-ajax]').each(function() {
 * Automatically resize textarea
 */
 $(document).ready(function() {
-	phpbb.resizeTextArea($('textarea'), {minHeight: 75});
+	phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), {minHeight: 75});
 });
 
 
-- 
cgit v1.2.1


From 05ebbbcd6acf3d9e808734ff0ded6a94bd64a9dc Mon Sep 17 00:00:00 2001
From: Vinny <vinny@suportephpbb.com.br>
Date: Fri, 10 Aug 2012 21:39:17 -0300
Subject: [ticket/11010] Changing email and url types in adm templates

PHPBB3-11010
---
 phpBB/adm/style/acp_users_overview.html | 2 +-
 phpBB/adm/style/acp_users_profile.html  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index a8e862c141..1caa6e5e13 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -43,7 +43,7 @@
 </dl>
 <dl>
 	<dt><label for="user_email">{L_EMAIL}{L_COLON}</label></dt>
-	<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd>
+	<dd><input class="text medium" type="email" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd>
 </dl>
 <dl>
 	<dt><label for="new_password">{L_NEW_PASSWORD}{L_COLON}</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 3232e8d1f5..856f5fc9a8 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -12,11 +12,11 @@
 	</dl>
 	<dl>
 		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
-		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
+		<dd><input type="email" id="msn" name="msn" value="{MSN}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
-		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
+		<dd><input type="email" id="yim" name="yim" value="{YIM}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
@@ -24,7 +24,7 @@
 	</dl>
 	<dl>
 		<dt><label for="website">{L_WEBSITE}{L_COLON}</label></dt>
-		<dd><input type="text" id="website" name="website" value="{WEBSITE}" /></dd>
+		<dd><input type="url" id="website" name="website" value="{WEBSITE}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="location">{L_LOCATION}{L_COLON}</label></dt>
-- 
cgit v1.2.1


From cf9d407493d76cee76987edf38ae0191360bb661 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Sun, 27 Jan 2013 22:45:45 +0100
Subject: [ticket/11010] applying some of EXreaction notes

PHPBB3-11010
---
 phpBB/adm/style/acp_users_profile.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 856f5fc9a8..9b98efd283 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -12,11 +12,11 @@
 	</dl>
 	<dl>
 		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
-		<dd><input type="email" id="msn" name="msn" value="{MSN}" /></dd>
+		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
-		<dd><input type="email" id="yim" name="yim" value="{YIM}" /></dd>
+		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
@@ -38,7 +38,7 @@
 		<dt><label for="interests">{L_INTERESTS}{L_COLON}</label></dt>
 		<dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>
 	</dl>
-	<dl> 
+	<dl>
 		<dt><label for="birthday">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
 		<dd>{L_DAY}{L_COLON} <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}{L_COLON} <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}{L_COLON} <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
 	</dl>
@@ -48,7 +48,7 @@
 		<fieldset>
 			<legend>{L_USER_CUSTOM_PROFILE_FIELDS}</legend>
 		<!-- BEGIN profile_fields -->
-		<dl> 
+		<dl>
 			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
 			<dd>{profile_fields.FIELD}</dd>
 			<!-- IF profile_fields.ERROR -->
-- 
cgit v1.2.1


From 504038d230bad8d3de142b488a52695134902a8d Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 12 May 2013 18:30:08 +0300
Subject: [ticket/11010] Fix email inputs

Add type="email" to fields that should be email fields
Change back to type="text" fields that might have wildcards or not necessary email

PHPBB3-11010
---
 phpBB/adm/style/acp_avatar_options_gravatar.html | 2 +-
 phpBB/adm/style/acp_users_profile.html           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_gravatar.html b/phpBB/adm/style/acp_avatar_options_gravatar.html
index 47422a6ecd..ad3891f0a4 100644
--- a/phpBB/adm/style/acp_avatar_options_gravatar.html
+++ b/phpBB/adm/style/acp_avatar_options_gravatar.html
@@ -1,6 +1,6 @@
 <dl>
 	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
-	<dd><input type="text" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
+	<dd><input type="email" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
 </dl>
 <dl>
 	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 9b98efd283..cad1dca9d8 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -12,7 +12,7 @@
 	</dl>
 	<dl>
 		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
-		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
+		<dd><input type="email" id="msn" name="msn" value="{MSN}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
@@ -20,7 +20,7 @@
 	</dl>
 	<dl>
 		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
-		<dd><input type="text" id="jabber" name="jabber" value="{JABBER}" /></dd>
+		<dd><input type="email" id="jabber" name="jabber" value="{JABBER}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="website">{L_WEBSITE}{L_COLON}</label></dt>
-- 
cgit v1.2.1


From cfa23c11029e1aad2cd14948b7b673db7b50575f Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 12 May 2013 18:49:04 +0300
Subject: [ticket/11010] Fix input type for urls

PHPBB3-11010
---
 phpBB/adm/style/acp_avatar_options_remote.html | 2 +-
 phpBB/adm/style/acp_avatar_options_upload.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
index 1dc4b05992..490f9ec91f 100644
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -1,6 +1,6 @@
 <dl>
 	<dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-	<dd><input type="text" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" /></dd>
+	<dd><input type="url" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" /></dd>
 </dl>
 <dl>
 	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html
index 9d3efbd018..63a734ea7d 100644
--- a/phpBB/adm/style/acp_avatar_options_upload.html
+++ b/phpBB/adm/style/acp_avatar_options_upload.html
@@ -6,6 +6,6 @@
 <!-- IF S_UPLOAD_AVATAR_URL -->
 	<dl>
 		<dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-		<dd><input type="text" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox" /></dd>
+		<dd><input type="url" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox" /></dd>
 	</dl>
 <!-- ENDIF -->
-- 
cgit v1.2.1


From 3e64c1b5d77dd4333c94c3688e0ba47ca7dcf328 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 13 May 2013 23:20:34 +0300
Subject: [ticket/11010] Fixes for number input in acp

PHPBB3-11010
---
 phpBB/adm/style/acp_attachments.html             |  4 ++--
 phpBB/adm/style/acp_avatar_options_gravatar.html |  4 ++--
 phpBB/adm/style/acp_avatar_options_remote.html   |  4 ++--
 phpBB/adm/style/acp_captcha.html                 |  4 ++--
 phpBB/adm/style/acp_forums.html                  |  8 ++++----
 phpBB/adm/style/acp_groups.html                  |  4 ++--
 phpBB/adm/style/acp_icons.html                   |  8 ++++----
 phpBB/adm/style/acp_inactive.html                |  2 +-
 phpBB/adm/style/acp_jabber.html                  |  4 ++--
 phpBB/adm/style/acp_prune_forums.html            |  4 ++--
 phpBB/adm/style/acp_prune_users.html             |  4 ++--
 phpBB/adm/style/acp_ranks.html                   |  2 +-
 phpBB/adm/style/acp_search.html                  | 10 +++++-----
 phpBB/adm/style/captcha_gd_acp.html              |  4 ++--
 14 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 266b7e48b4..c7b451e68b 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -196,7 +196,7 @@
 		</dl>
 		<dl>
 			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt>
-			<dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
+			<dd><input type="number" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
 		</dl>
 		<dl>
 			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}{L_COLON}</label></dt>
@@ -348,7 +348,7 @@
 			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
 			<td>{orphan.FILETIME}</td>
 			<td>{orphan.FILESIZE}</td>
-			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
+			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
 			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
 			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
 		</tr>
diff --git a/phpBB/adm/style/acp_avatar_options_gravatar.html b/phpBB/adm/style/acp_avatar_options_gravatar.html
index ad3891f0a4..0c2e8cc984 100644
--- a/phpBB/adm/style/acp_avatar_options_gravatar.html
+++ b/phpBB/adm/style/acp_avatar_options_gravatar.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
-		<input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+		<input type="number" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
+		<input type="number" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
index 490f9ec91f..1c0e3db599 100644
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
-		<input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+		<input type="number" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
+		<input type="number" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index ab5e207e0d..df4c675209 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -19,11 +19,11 @@
 </dl>
 <dl>
 	<dt><label for="max_reg_attempts">{L_REG_LIMIT}{L_COLON}</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
-	<dd><input id="max_reg_attempts" type="text" size="4" maxlength="4" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
+	<dd><input id="max_reg_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
 </dl>
 <dl>
 	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}{L_COLON}</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>
-	<dd><input id="max_login_attempts" type="text" size="4" maxlength="4" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
+	<dd><input id="max_login_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
 </dl>
 <dl>
 	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index d6c06bf6d8..c3772a22e3 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -239,7 +239,7 @@
 		</dl>
 		<dl>
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
-			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
+			<dd><input type="number" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" min="0" max="9999" /></dd>
 		</dl>
 		<!-- EVENT acp_forums_normal_settings_append -->
 		</fieldset>
@@ -253,15 +253,15 @@
 		</dl>
 		<dl>
 			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index bab30a7b6f..2953e85bd9 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -84,11 +84,11 @@
 		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
 	<dl>
 		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}{L_COLON}</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
-		<dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd>
+		<dd><input name="group_message_limit" type="number" id="group_message_limit" maxlength="4" size="4" min="0" max="9999" value="{GROUP_MESSAGE_LIMIT}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}{L_COLON}</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
-		<dd><input name="group_max_recipients" type="text" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
+		<dd><input name="group_max_recipients" type="number" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index b9af20d5a2..373a7b890c 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -108,8 +108,8 @@
 			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
 			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
 		<!-- ENDIF -->
-		<td><input class="text post" type="text" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
-		<td><input class="text post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
+		<td><input class="text post" type="number" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
+		<td><input class="text post" type="number" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
 		<td>
 			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>
 			<!-- IF items.S_ID -->
@@ -136,8 +136,8 @@
 		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>
 		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>
 		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td>
-		<td><input class="text post" type="text" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
-		<td><input class="text post" type="text" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
+		<td><input class="text post" type="number" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
+		<td><input class="text post" type="number" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
 		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>
  		<td><select id="order_add_order" name="add_order">
 				<optgroup id="order_disp_add_order" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index 726c8c8b32..68a168a5d6 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -53,7 +53,7 @@
 </table>
 
 <fieldset class="display-options">
-	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;Users per page{L_COLON} <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
+	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;Users per page{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
 	<input class="button2" type="submit" value="{L_GO}" name="sort" />
 </fieldset>
 
diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html
index 639bcd221f..4d0b1b0d97 100644
--- a/phpBB/adm/style/acp_jabber.html
+++ b/phpBB/adm/style/acp_jabber.html
@@ -31,7 +31,7 @@
 </dl>
 <dl>
 	<dt><label for="jab_port">{L_JAB_PORT}{L_COLON}</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
+	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
 </dl>
 <dl>
 	<dt><label for="jab_username">{L_JAB_USERNAME}{L_COLON}</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
@@ -50,7 +50,7 @@
 <!-- ENDIF -->
 <dl>
 	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}{L_COLON}</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" /></dd>
+	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" min="0" max="99999" /></dd>
 </dl>
 
 </fieldset>
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html
index aede662bcb..67cdaa784a 100644
--- a/phpBB/adm/style/acp_prune_forums.html
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -73,11 +73,11 @@
 		<legend>{L_FORUM_PRUNE}</legend>
 	<dl>
 		<dt><label for="prune_days">{L_PRUNE_NOT_POSTED}{L_COLON}</label></dt>
-		<dd><input type="text" id="prune_days" name="prune_days" /></dd>
+		<dd><input type="number" id="prune_days" name="prune_days" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}{L_COLON}</label></dt>
-		<dd><input type="text" id="prune_vieweddays" name="prune_vieweddays" /></dd>
+		<dd><input type="number" id="prune_vieweddays" name="prune_vieweddays" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index 75fa04a157..1257f3fb3d 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -35,11 +35,11 @@
 </dl>
 <dl>
 	<dt><label for="count">{L_POSTS}{L_COLON}</label></dt>
-	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" id="count" name="count" /></dd>
+	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="number" id="count" name="count" /></dd>
 </dl>
 <dl>
 	<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}{L_COLON}</label></dt>
-	<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="text" id="posts_on_queue" name="posts_on_queue" /></select>
+	<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="number" id="posts_on_queue" name="posts_on_queue" /></select>
 </dl>
 <!-- IF S_GROUP_LIST -->
 <dl>
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index a475370f73..4b2e52536f 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -41,7 +41,7 @@
 	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
 	<dl>
 		<dt><label for="min_posts">{L_RANK_MINIMUM}{L_COLON}</label></dt>
-		<dd><input name="min_posts" type="text" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
+		<dd><input name="min_posts" type="number" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
 	</dl>
 	</div>
 
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index 3da70bc0c8..bf353d62f2 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -18,11 +18,11 @@
 	</dl>
 	<dl>
 		<dt><label for="search_interval">{L_SEARCH_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_interval" type="text" size="4" maxlength="4" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
+		<dd><input id="search_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
 		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_anonymous_interval" type="text" size="4" maxlength="4" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
+		<dd><input id="search_anonymous_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
 		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}{L_COLON}</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
@@ -30,15 +30,15 @@
 	</dl>
 	<dl>
 		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
-		<dd><input id="min_search_author_chars" type="text" size="4" maxlength="4" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
+		<dd><input id="min_search_author_chars" type="number" size="4" maxlength="4" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-		<dd><input id="max_num_search_keywords" type="text" size="4" maxlength="4" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
+		<dd><input id="max_num_search_keywords" type="number" size="4" maxlength="4" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}{L_COLON}</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
-		<dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
+		<dd><input id="search_store_results" type="number" size="4" maxlength="6" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
 	</dl>
 	</fieldset>
 
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html
index b333d9205c..43d54adc0b 100644
--- a/phpBB/adm/style/captcha_gd_acp.html
+++ b/phpBB/adm/style/captcha_gd_acp.html
@@ -20,11 +20,11 @@
 </dl>
 <dl>
 	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd>
+	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="number" /></dd>
 </dl>
 <dl>
 	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd>
+	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="number" /></dd>
 </dl>
 <dl>
 	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>
-- 
cgit v1.2.1


From b2e5cc89344d641394e5c15575379de3c86c0806 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 20 May 2013 20:29:37 +0300
Subject: [feature/editor-code-tabs] Apply code editor to everything

Move code editor from prosilver to assets
Apply code editor to subsilver2
Apply code editor to ACP elements where bbcode is allowed

PHPBB3-11557
---
 phpBB/adm/style/acp_forums.html          | 4 ++--
 phpBB/adm/style/acp_users_signature.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index d6c06bf6d8..77fc9b2cb9 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -152,7 +152,7 @@
 	</dl>
 	<dl>
 		<dt><label for="forum_desc">{L_FORUM_DESC}{L_COLON}</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
-		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd>
+		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45" data-bbcode="true">{FORUM_DESC}</textarea></dd>
 		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
 			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
 			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
@@ -316,7 +316,7 @@
 	<!-- ENDIF -->
 		<dl>
 			<dt><label for="forum_rules">{L_FORUM_RULES}{L_COLON}</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
-			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd>
+			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70" data-bbcode="true">{FORUM_RULES_PLAIN}</textarea></dd>
 			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
 				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
 				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index c9cc053eec..2b4964803e 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -92,7 +92,7 @@
 				// ]]>
 				</script>
 			</dt>
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{SIGNATURE}</textarea></dd>
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px; margin-top: 5px;">
 			<!-- IF S_BBCODE_ALLOWED -->
 				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
-- 
cgit v1.2.1


From a9c9448ebbaaeef9c120bdf2eaf7360380eabe03 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 20 May 2013 21:35:51 +0300
Subject: [ticket/11279] Clearer AJAX errors

Display clearer AJAX errors rather than generic error

PHPBB3-11279
---
 phpBB/adm/style/overall_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 72908e4b9d..54ed4dcc9e 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -18,7 +18,7 @@
 			{DEBUG_OUTPUT}
 		<!-- ENDIF -->
 
-		<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}">
+		<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
 			<div id="darken">&nbsp;</div>
 			<div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
 		</div>
-- 
cgit v1.2.1


From 1ad10a77999048c8a2a48ff82d79d18c0401b2dd Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Jun 2013 09:35:36 -0500
Subject: [feature/twig] Fix improper template syntax in acp_forums.html

PHPBB3-11598
---
 phpBB/adm/style/acp_forums.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 38369ee207..7b1466cfbd 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -437,7 +437,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF --->]<!-- ENDIF --></strong></p>
+	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF -->]<!-- ENDIF --></strong></p>
 
 	<!-- IF .forums -->
 		<table cellspacing="1">
-- 
cgit v1.2.1


From fdd60548bf7427471fa5585ec10f643c370bb829 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Thu, 20 Jun 2013 22:32:37 +0530
Subject: [ticket/9341] Use U_PREVIOUS and U_NEXT in template files

PHPBB3-9341
---
 phpBB/adm/style/acp_icons.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index 373a7b890c..eca02d2798 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -243,8 +243,8 @@
 				<td style="text-align: center;">{items.EMOTION}</td>
 			<!-- ENDIF -->
 			<td style="text-align: right; white-space: nowrap;">
-				<!-- IF items.S_FIRST_ROW and not PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
-				<!-- IF items.S_LAST_ROW and not NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
+				<!-- IF items.S_FIRST_ROW and not U_PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
+				<!-- IF items.S_LAST_ROW and not U_NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
 				&nbsp;<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
 			</td>
 		</tr>
-- 
cgit v1.2.1


From 80eb95bbb7685995ccc2cfa46280aef6e8ef024a Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 8 Jul 2013 13:51:00 -0400
Subject: [ticket/11626] LDAP Auth ACP Template File

PHPBB3-11626
---
 phpBB/adm/style/auth_provider_ldap.html | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 phpBB/adm/style/auth_provider_ldap.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/auth_provider_ldap.html b/phpBB/adm/style/auth_provider_ldap.html
new file mode 100644
index 0000000000..81afa44373
--- /dev/null
+++ b/phpBB/adm/style/auth_provider_ldap.html
@@ -0,0 +1,32 @@
+<dl>
+	<dt><label for="ldap_server">{L_LDAP_SERVER}{L_COLON}</label><br /><span>{L_LDAP_SERVER_EXPLAIN}</span></dt>
+	<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="{AUTH_LDAP_SERVER}" /></dd>
+</dl>
+<dl>
+	<dt><label for="ldap_port">{L_LDAP_PORT}{L_COLON}</label><br /><span>{L_LDAP_PORT_EXPLAIN}</span></dt>
+	<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="{AUTH_LDAP_PORT}" /></dd>
+</dl>
+<dl>
+	<dt><label for="ldap_dn">{L_LDAP_DN}{L_COLON}</label><br /><span>{L_LDAP_DN_EXPLAIN}</span></dt>
+	<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="{AUTH_LDAP_BASE_DN}" /></dd>
+</dl>
+<dl>
+	<dt><label for="ldap_uid">{L_LDAP_UID}{L_COLON}</label><br /><span>{L_LDAP_UID_EXPLAIN}</span></dt>
+	<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="{AUTH_LDAP_UID}" /></dd>
+</dl>
+<dl>
+	<dt><label for="ldap_user_filter">{L_LDAP_USER_FILTER}{L_COLON}</label><br /><span>{L_LDAP_USER_FILTER_EXPLAIN}</span></dt>
+	<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="{AUTH_LDAP_USER_FILTER}" /></dd>
+</dl>
+<dl>
+	<dt><label for="ldap_email">{L_LDAP_EMAIL}{L_COLON}</label><br /><span>{L_LDAP_EMAIL_EXPLAIN}</span></dt>
+	<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="{AUTH_LDAP_EMAIL}" /></dd>
+</dl>
+<dl>
+	<dt><label for="ldap_user">{L_LDAP_USER}{L_COLON}</label><br /><span>{L_LDAP_USER_EXPLAIN}</span></dt>
+	<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="{AUTH_LDAP_USER}" /></dd>
+</dl>
+<dl>
+	<dt><label for="ldap_password">{L_LDAP_PASSWORD}{L_COLON}</label><br /><span>{L_LDAP_PASSWORD_EXPLAIN}</span></dt>
+	<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="{AUTH_LDAP_PASSWORD}" autocomplete="off" /></dd>
+</dl>
-- 
cgit v1.2.1


From 29b472c2e5c8a878b592c53733cc57961d60a0af Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 8 Jul 2013 13:59:24 -0400
Subject: [ticket/11626] Include the template file in acp_board

PHPBB3-11626
---
 phpBB/adm/style/acp_board.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
index 6b8ceb3ef6..df7f5e537b 100644
--- a/phpBB/adm/style/acp_board.html
+++ b/phpBB/adm/style/acp_board.html
@@ -34,7 +34,7 @@
 
 <!-- IF S_AUTH -->
 	<!-- BEGIN auth_tpl -->
-		{auth_tpl.TPL}
+		<!-- INCLUDE {auth_tpl.TPL} -->
 	<!-- END auth_tpl -->
 <!-- ENDIF -->
 
-- 
cgit v1.2.1


From 3465867a4eee21b62707e9a28ad7831f8677363f Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 8 Jul 2013 14:57:25 -0400
Subject: [ticket/11626] Change the identifier template file in the template

PHPBB3-11626
---
 phpBB/adm/style/acp_board.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
index df7f5e537b..cd4c25a756 100644
--- a/phpBB/adm/style/acp_board.html
+++ b/phpBB/adm/style/acp_board.html
@@ -34,7 +34,7 @@
 
 <!-- IF S_AUTH -->
 	<!-- BEGIN auth_tpl -->
-		<!-- INCLUDE {auth_tpl.TPL} -->
+		<!-- INCLUDE {auth_tpl.template_file} -->
 	<!-- END auth_tpl -->
 <!-- ENDIF -->
 
-- 
cgit v1.2.1


From f24a8e5b8150bcd892585531585ef46f49db0ef7 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 8 Jul 2013 15:24:23 -0400
Subject: [ticket/11626] Make identifier uppercase per style requirements

PHPBB3-11626
---
 phpBB/adm/style/acp_board.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
index cd4c25a756..1a09c4eee6 100644
--- a/phpBB/adm/style/acp_board.html
+++ b/phpBB/adm/style/acp_board.html
@@ -34,7 +34,7 @@
 
 <!-- IF S_AUTH -->
 	<!-- BEGIN auth_tpl -->
-		<!-- INCLUDE {auth_tpl.template_file} -->
+		<!-- INCLUDE {auth_tpl.TEMPLATE_FILE} -->
 	<!-- END auth_tpl -->
 <!-- ENDIF -->
 
-- 
cgit v1.2.1


From c1bb179914e4f47876d87aba21ab65e01f79d69c Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 13 Jul 2013 13:30:33 -0400
Subject: [ticket/10999] Fix assets_version in ACP

PHPBB3-10999
---
 phpBB/adm/style/overall_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 54ed4dcc9e..9202cec06b 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -38,7 +38,7 @@
 <!-- IF S_JQUERY_FALLBACK --><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 -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
-{SCRIPTS}
+{$SCRIPTS}
 
 <!-- EVENT acp_overall_footer_after -->
 
-- 
cgit v1.2.1


From e9cc1e9cd276fa6222e52c7c41feb6ef4829f6e3 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Jul 2013 16:25:08 -0500
Subject: [ticket/11675] Fix template loop

PHPBB3-11675
---
 phpBB/adm/style/permission_roles_mask.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html
index 277310edbf..42a7fc3e4e 100644
--- a/phpBB/adm/style/permission_roles_mask.html
+++ b/phpBB/adm/style/permission_roles_mask.html
@@ -25,7 +25,7 @@
 				<a href="{role_mask.groups.U_PROFILE}">{role_mask.groups.GROUP_NAME}</a><!-- IF not role_mask.groups.S_LAST_ROW --> :: <!-- ENDIF -->
 			<!-- BEGINELSE -->
 				{L_GROUPS_NOT_ASSIGNED}
-			<!-- END users -->
+			<!-- END groups -->
 		</td>
 	</tr>
 	</tbody>
-- 
cgit v1.2.1


From f421c082f73b26f5578d14af7cdbfefd013f554a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 18 Jul 2013 22:41:23 +0200
Subject: [ticket/11713] Do not remove module if it couldn't be deleted

Up to now, the module or module category was always removed with jQuery,
even if there was an error. With this change, the modules will not be deleted
by jQuery if the return JSON array will have SUCCESS set to false.

PHPBB3-11713
---
 phpBB/adm/style/ajax.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 6f21dfa6ac..efb0639f1b 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -127,8 +127,10 @@ phpbb.addAjaxCallback('activate_deactivate', function(res) {
  * The removes the parent row of the link or form that triggered the callback,
  * and is good for stuff like the removal of forums.
  */
-phpbb.addAjaxCallback('row_delete', function() {
-	$(this).parents('tr').remove();
+phpbb.addAjaxCallback('row_delete', function(res) {
+	if (res.SUCCESS !== false) {
+		$(this).parents('tr').remove();
+	}
 });
 
 
-- 
cgit v1.2.1


From 93cbdc37b51edf14cb2dbebb1ccb71a612f7fd94 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 23 Jul 2013 14:06:01 -0400
Subject: [feature/oauth] ACP options for OAuth, needs some work

PHPBB3-11673
---
 phpBB/adm/style/auth_provider_oauth.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 phpBB/adm/style/auth_provider_oauth.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/auth_provider_oauth.html b/phpBB/adm/style/auth_provider_oauth.html
new file mode 100644
index 0000000000..e3e246d727
--- /dev/null
+++ b/phpBB/adm/style/auth_provider_oauth.html
@@ -0,0 +1,15 @@
+<h2>{L_AUTH_PROVIDER_OAUTH_TITLE}</h2>
+
+<!-- BEGIN oauth_services -->
+<fieldset>
+	<legend>{oauth_services.ACTUAL_NAME}</legend>
+	<dl>
+		<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label><br /><span>{L_AUTH_PROVIDER_OAUTH_KEY_EXPLAIN}</span></dt>
+		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{AUTH_LDAP_SERVER}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label><br /><span>{L_AUTH_PROVIDER_OAUTH_SECRET_EXPLAIN}</span></dt>
+		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{AUTH_LDAP_SERVER}" /></dd>
+	</dl>
+</fieldset>
+<!-- END oauth_services -->
-- 
cgit v1.2.1


From 32678f63ed04a8770720da4d94d01648dc595e82 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 23 Jul 2013 14:13:51 -0400
Subject: [feature/oauth] Finish the template so it "works"

PHPBB3-11673
---
 phpBB/adm/style/auth_provider_oauth.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/auth_provider_oauth.html b/phpBB/adm/style/auth_provider_oauth.html
index e3e246d727..87f8716c5e 100644
--- a/phpBB/adm/style/auth_provider_oauth.html
+++ b/phpBB/adm/style/auth_provider_oauth.html
@@ -5,11 +5,11 @@
 	<legend>{oauth_services.ACTUAL_NAME}</legend>
 	<dl>
 		<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label><br /><span>{L_AUTH_PROVIDER_OAUTH_KEY_EXPLAIN}</span></dt>
-		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{AUTH_LDAP_SERVER}" /></dd>
+		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label><br /><span>{L_AUTH_PROVIDER_OAUTH_SECRET_EXPLAIN}</span></dt>
-		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{AUTH_LDAP_SERVER}" /></dd>
+		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}" /></dd>
 	</dl>
 </fieldset>
 <!-- END oauth_services -->
-- 
cgit v1.2.1


From af6a4b21614c602ae8fe5323fab2b384c6ad5393 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 23 Jul 2013 14:29:38 -0400
Subject: [feature/oauth] Clean up the OAuth ACP template

PHPBB3-11673
---
 phpBB/adm/style/auth_provider_oauth.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/auth_provider_oauth.html b/phpBB/adm/style/auth_provider_oauth.html
index 87f8716c5e..25e40ff596 100644
--- a/phpBB/adm/style/auth_provider_oauth.html
+++ b/phpBB/adm/style/auth_provider_oauth.html
@@ -1,14 +1,16 @@
 <h2>{L_AUTH_PROVIDER_OAUTH_TITLE}</h2>
 
+<p>{L_AUTH_PROVIDER_OAUTH_EXPLAIN}</p>
+
 <!-- BEGIN oauth_services -->
 <fieldset>
 	<legend>{oauth_services.ACTUAL_NAME}</legend>
 	<dl>
-		<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label><br /><span>{L_AUTH_PROVIDER_OAUTH_KEY_EXPLAIN}</span></dt>
+		<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label></dt>
 		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label><br /><span>{L_AUTH_PROVIDER_OAUTH_SECRET_EXPLAIN}</span></dt>
+		<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label></dt>
 		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}" /></dd>
 	</dl>
 </fieldset>
-- 
cgit v1.2.1


From 5bb08a1ab973ee13237876d11b001c4ed6658892 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 29 Jul 2013 21:30:01 +0200
Subject: [ticket/11574] Change order of files and database update

PHPBB3-11574
---
 phpBB/adm/style/install_update.html | 46 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index b5fa46dbf6..bd46f7877e 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -109,27 +109,14 @@
 	<!-- ENDIF -->
 	</fieldset>
 
-	<!-- IF not S_UP_TO_DATE -->
-
-		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<p>{L_UPDATE_DATABASE_EXPLAIN}</p>
-			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-		<form id="install_update" method="post" action="{U_ACTION}">
+	<form id="install_update" method="post" action="{U_ACTION}">
 
-		<fieldset class="submit-buttons">
-			<p>{L_CHECK_FILES_UP_TO_DATE}</p>
-			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
-		</fieldset>
+	<fieldset class="submit-buttons">
+		<p>{L_CHECK_FILES_EXPLAIN}</p>
+		<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
+	</fieldset>
 
-		</form>
-	<!-- ENDIF -->
+	</form>
 
 <!-- ELSEIF S_DB_UPDATE -->
 
@@ -155,6 +142,11 @@
 
 	<!-- ELSE -->
 
+		<div class="successbox">
+			<h3>{L_UPDATE_DB_SUCCESS}</h3>
+			<p>{L_EVERYTHING_UP_TO_DATE}</p>
+		</div>
+
 		<h1>{L_UPDATE_DB_SUCCESS}</h1>
 
 		<br /><br />
@@ -174,10 +166,18 @@
 
 	<!-- IF S_ALL_UP_TO_DATE -->
 
-		<div class="successbox">
-			<h3>{L_UPDATE_SUCCESS}</h3>
-			<p>{L_ALL_FILES_UP_TO_DATE}</p>
-		</div>
+		<h1>{L_UPDATE_FILE_SUCCESS}</h1>
+		<p>{L_ALL_FILES_UP_TO_DATE}</p>
+
+		<p>{L_UPDATE_DATABASE_EXPLAIN}</p>
+
+		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
+		</fieldset>
+
+		</form>
 
 	<!-- ELSE -->
 		<h1>{L_COLLECTED_INFORMATION}</h1>
-- 
cgit v1.2.1


From 5f3f41d6d6fb5c997ab7b70482fef542a5534b6a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 29 Jul 2013 23:47:31 +0200
Subject: [ticket/11574] Remove old "continue step"-message

PHPBB3-11574
---
 phpBB/adm/style/install_update.html | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index bd46f7877e..57e2c8ffea 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -143,23 +143,10 @@
 	<!-- ELSE -->
 
 		<div class="successbox">
-			<h3>{L_UPDATE_DB_SUCCESS}</h3>
+			<h3>{L_UPDATE_SUCCESS}</h3>
 			<p>{L_EVERYTHING_UP_TO_DATE}</p>
 		</div>
 
-		<h1>{L_UPDATE_DB_SUCCESS}</h1>
-
-		<br /><br />
-
-		<form id="install_update" method="post" action="{U_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<p>{L_CHECK_FILES_EXPLAIN}</p>
-			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
-		</fieldset>
-
-		</form>
-
 	<!-- ENDIF -->
 
 <!-- ELSEIF S_FILE_CHECK -->
-- 
cgit v1.2.1


From 4c2aad4ca959d1806c1833a3d4dd141b5c9f50ba Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 16 Aug 2013 19:20:55 +0300
Subject: [ticket/11795] Get rid of pagination JS variables

Move pagination variables to data attributes
Replace A_BASE_URL with BASE_URL and use TWIG to escape it

PHPBB3-11795
---
 phpBB/adm/style/overall_header.html | 2 +-
 phpBB/adm/style/simple_header.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 8170931221..f76b4c14af 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -12,7 +12,7 @@
 var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
-var base_url = '{A_BASE_URL}';
+var base_url = '{{ BASE_URL|e('js') }}';
 
 var menu_state = 'shown';
 
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 6e0c360600..00ad8f677f 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -12,7 +12,7 @@
 var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
-var base_url = '{A_BASE_URL}';
+var base_url = '{{ BASE_URL|e('js') }}';
 
 /**
 * Window popup
-- 
cgit v1.2.1


From 0a9ba5415c6ce1f69e50f9a7a77929d7ca0b06b8 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 27 Aug 2013 12:50:45 +0300
Subject: [ticket/11795] Replace TWIG with phpBB syntax in ACP

PHPBB3-11795
---
 phpBB/adm/style/overall_header.html | 2 +-
 phpBB/adm/style/simple_header.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index f76b4c14af..3a9b6db2a3 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -12,7 +12,7 @@
 var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
-var base_url = '{{ BASE_URL|e('js') }}';
+var base_url = '{BASE_URL|e('js')}';
 
 var menu_state = 'shown';
 
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 00ad8f677f..9c4c8a2960 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -12,7 +12,7 @@
 var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
-var base_url = '{{ BASE_URL|e('js') }}';
+var base_url = '{BASE_URL|e('js')}';
 
 /**
 * Window popup
-- 
cgit v1.2.1


From 94b49d8a925e4bc7f10cbcf117ba81b071019b73 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 14 Jul 2013 20:44:00 +0200
Subject: [ticket/11703] Make jQuery CDN switch more generic.

Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN

PHPBB3-11703
---
 phpBB/adm/style/install_footer.html | 2 +-
 phpBB/adm/style/overall_footer.html | 2 +-
 phpBB/adm/style/simple_footer.html  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index 73c3f5a6b9..f7d62d7c7e 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -13,7 +13,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_JQUERY_FALLBACK --><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.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 
 </body>
 </html>
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 9202cec06b..145ad18709 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -35,7 +35,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_JQUERY_FALLBACK --><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.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 -->
 {$SCRIPTS}
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 906a9bebed..a559b25b72 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_JQUERY_FALLBACK --><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.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <!-- EVENT acp_simple_footer_after -->
 
 </body>
-- 
cgit v1.2.1


From 2b7120508b81300134557bfc2cba39a4bc160055 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 19 Oct 2013 08:48:41 -0700
Subject: [ticket/11935] Fix incorrect alt tags that should be title tags

PHPBB3-11935
---
 phpBB/adm/style/acp_ext_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 53de0b4d12..4e13b1974a 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -28,7 +28,7 @@
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
 			<td style="text-align: center;">
 				<!-- BEGIN actions -->
-					<a href="{enabled.actions.U_ACTION}" alt="{enabled.actions.L_ACTION}">{enabled.actions.L_ACTION}</a>
+					<a href="{enabled.actions.U_ACTION}" title="{enabled.actions.L_ACTION}">{enabled.actions.L_ACTION}</a>
 					<!-- IF not enabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
 				<!-- END actions -->
 			</td>
@@ -48,7 +48,7 @@
 			</td>
 			<td style="text-align: center;">
 				<!-- BEGIN actions -->
-					<a href="{disabled.actions.U_ACTION}" alt="{disabled.actions.L_ACTION}">{disabled.actions.L_ACTION}</a>
+					<a href="{disabled.actions.U_ACTION}" title="{disabled.actions.L_ACTION}">{disabled.actions.L_ACTION}</a>
 					<!-- IF not disabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
 				<!-- END actions -->
 			</td>
-- 
cgit v1.2.1


From 8816664d8abbcf319e9bdfd5e3c1618131a419cf Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 19 Oct 2013 08:49:18 -0700
Subject: [ticket/11935] Fix stray </a> tags

PHPBB3-11935
---
 phpBB/adm/style/acp_ext_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 4e13b1974a..bb50f922f7 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -24,7 +24,7 @@
 		</tr>
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled">
-			<td><strong>{enabled.META_DISPLAY_NAME}</strong></a></td>
+			<td><strong>{enabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
 			<td style="text-align: center;">
 				<!-- BEGIN actions -->
@@ -42,7 +42,7 @@
 		</tr>
 		<!-- BEGIN disabled -->
 		<tr class="ext_disabled">
-			<td><strong>{disabled.META_DISPLAY_NAME}</strong></a></td>
+			<td><strong>{disabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;">
 				<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF -->
 			</td>
-- 
cgit v1.2.1


From f003c35fdcdee1d31326520544620d6ce0af27aa Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 19 Oct 2013 08:59:08 -0700
Subject: [ticket/11935] Replace obsolete table attributes in Admin with CSS

PHPBB3-11935
---
 phpBB/adm/style/acp_attachments.html       | 8 ++++----
 phpBB/adm/style/acp_bbcodes.html           | 4 ++--
 phpBB/adm/style/acp_bots.html              | 2 +-
 phpBB/adm/style/acp_ext_list.html          | 2 +-
 phpBB/adm/style/acp_forums.html            | 2 +-
 phpBB/adm/style/acp_groups.html            | 6 +++---
 phpBB/adm/style/acp_groups_position.html   | 4 ++--
 phpBB/adm/style/acp_icons.html             | 4 ++--
 phpBB/adm/style/acp_inactive.html          | 2 +-
 phpBB/adm/style/acp_language.html          | 6 +++---
 phpBB/adm/style/acp_logs.html              | 2 +-
 phpBB/adm/style/acp_main.html              | 6 +++---
 phpBB/adm/style/acp_modules.html           | 4 ++--
 phpBB/adm/style/acp_permission_roles.html  | 4 ++--
 phpBB/adm/style/acp_profile.html           | 2 +-
 phpBB/adm/style/acp_prune_forums.html      | 2 +-
 phpBB/adm/style/acp_ranks.html             | 2 +-
 phpBB/adm/style/acp_reasons.html           | 2 +-
 phpBB/adm/style/acp_search.html            | 2 +-
 phpBB/adm/style/acp_styles.html            | 2 +-
 phpBB/adm/style/acp_users.html             | 4 ++--
 phpBB/adm/style/acp_users_feedback.html    | 2 +-
 phpBB/adm/style/acp_users_warnings.html    | 2 +-
 phpBB/adm/style/acp_words.html             | 2 +-
 phpBB/adm/style/admin.css                  | 5 +++++
 phpBB/adm/style/captcha_qa_acp.html        | 2 +-
 phpBB/adm/style/colour_swatch.html         | 2 +-
 phpBB/adm/style/install_convert.html       | 2 +-
 phpBB/adm/style/install_update.html        | 2 +-
 phpBB/adm/style/permission_mask.html       | 2 +-
 phpBB/adm/style/permission_roles_mask.html | 2 +-
 phpBB/adm/style/permission_trace.html      | 2 +-
 32 files changed, 51 insertions(+), 46 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index c7b451e68b..7e9df737d3 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -224,7 +224,7 @@
 		<fieldset class="tabulated">
 		<legend>{L_TITLE}</legend>
 
-		<table cellspacing="1">
+		<table class="table1">
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<thead>
 		<tr>
@@ -291,7 +291,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="row1" /><col class="row1" /><col class="row2" />
 	<thead>
 	<tr>
@@ -331,7 +331,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
@@ -389,7 +389,7 @@
 	<!-- ENDIF -->
 	</div>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index 5939af24ae..c22ed395e7 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -56,7 +56,7 @@
 	
 	<br />
 
-	<table cellspacing="1" id="down">
+	<table class="table1" id="down">
 	<thead>
 	<tr>
 		<th colspan="2">{L_TOKENS}</th>
@@ -90,7 +90,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_ACP_BBCODES}</legend>
 
-	<table cellspacing="1" id="down">
+	<table class="table1" id="down">
 	<thead>
 	<tr>
 		<th>{L_BBCODE_TAG}</th>
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
index cdd0fd4a93..eeda13303d 100644
--- a/phpBB/adm/style/acp_bots.html
+++ b/phpBB/adm/style/acp_bots.html
@@ -62,7 +62,7 @@
 
 	<form id="acp_bots" method="post" action="{U_ACTION}">
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_BOT_NAME}</th>
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index bb50f922f7..390b3e79f0 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -6,7 +6,7 @@
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="row1" ><col class="row2" ><col class="row2" >
 	<thead>
 		<tr>
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 7b1466cfbd..8e451c9fe3 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -440,7 +440,7 @@
 	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF -->]<!-- ENDIF --></strong></p>
 
 	<!-- IF .forums -->
-		<table cellspacing="1">
+		<table class="table1">
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<tbody>
 		<!-- BEGIN forums -->
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 2953e85bd9..a77010b636 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -150,7 +150,7 @@
 		<a href="{U_DEFAULT_ALL}">&raquo; {L_MAKE_DEFAULT_FOR_ALL}</a>
 	</fieldset>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_USERNAME}</th>
@@ -261,7 +261,7 @@
 
 	<form id="acp_groups" method="post" action="{U_ACTION}">
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
@@ -295,7 +295,7 @@
 
 	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index cf1a7be427..399dc422cd 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -27,7 +27,7 @@
 
 	<p>{L_LEGEND_EXPLAIN}</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="col1" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
@@ -115,7 +115,7 @@
 
 	<!-- IF S_TEAMPAGE_CATEGORY and CURRENT_CATEGORY_NAME --><p><strong><a href="{U_ACTION}">{L_TEAMPAGE}</a> &raquo; {CURRENT_CATEGORY_NAME}</strong></p><!-- ENDIF -->
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="col1" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index eca02d2798..faeb4c010e 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -74,7 +74,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<table cellspacing="1" id="smilies">
+	<table class="table1" id="smilies">
 	<thead>
 	<tr>
 		<th colspan="{COLSPAN}">{L_CONFIG}</th>
@@ -218,7 +218,7 @@
 
 	<legend>{L_TITLE}</legend>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_TITLE}</th>
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index 68a168a5d6..0302007861 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -16,7 +16,7 @@
 </div>
 <!-- ENDIF -->
 
-<table cellspacing="1">
+<table class="table1">
 <thead>
 <tr>
 	<th>{L_USERNAME}</th>
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index c400437049..d4fd572376 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -75,7 +75,7 @@
 
 		<form id="missing" method="post" action="{U_MISSING_ACTION}">
 
-		<table cellspacing="1">
+		<table class="table1">
 		<thead>
 		<tr>
 			<th>{L_LANGUAGE_KEY}</th>
@@ -129,7 +129,7 @@
 	</style>
 	<![endif]-->
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<!-- IF S_EMAIL_FILE -->
 		<tr>
@@ -211,7 +211,7 @@
 
 	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_LANGUAGE_PACK_NAME}</th>
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index e13196f65d..f22eb67a72 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -22,7 +22,7 @@
 <div><br style="clear: both;" /></div>
 
 <!-- IF .log -->
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_USERNAME}</th>
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index b644862ce1..2e84ce5658 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -78,7 +78,7 @@
 
 	<!-- EVENT acp_main_notice_after -->
 
-	<table cellspacing="1">
+	<table class="table1">
 		<caption>{L_FORUM_STATS}</caption>
 		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 	<thead>
@@ -216,7 +216,7 @@
 
 		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
 
-		<table cellspacing="1">
+		<table class="table1">
 		<thead>
 		<tr>
 			<th>{L_USERNAME}</th>
@@ -249,7 +249,7 @@
 
 		<div style="text-align: right;"><a href="{U_INACTIVE_USERS}">&raquo; {L_VIEW_INACTIVE_USERS}</a></div>
 
-		<table cellspacing="1">
+		<table class="table1">
 		<thead>
 		<tr>
 			<th>{L_USERNAME}</th>
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index 1e49198725..c543cf51d4 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -132,7 +132,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<table cellspacing="1">
+	<table class="table1">
 	<tbody>
 	<tr>
 		<td class="row3">{NAVIGATION}<!-- IF S_NO_MODULES --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a> | <!-- IF MODULE_ENABLED --><a href="{U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->]<!-- ENDIF --></td>
@@ -141,7 +141,7 @@
 	</table>
 
 	<!-- IF .modules -->
-		<table cellspacing="1">
+		<table class="table1">
 			<col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" />
 		<tbody>
 		<!-- BEGIN modules -->
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index d654c320ca..a246d6dc9a 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -92,7 +92,7 @@
 			<div class="permissions-panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
 				<span class="corners-top"><span></span></span>
 				<div class="tablewrap">
-					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1">
+					<table id="table00{auth.S_ROW_COUNT}" class="table1">
 					<colgroup>
 						<col class="permissions-name" />
 						<col class="permissions-yes" />
@@ -144,7 +144,7 @@
 
 	<form id="acp_roles" method="post" action="{U_ACTION}">
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="col2" /><col class="col2" /><col class="col1" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 13be669f70..3546873f6c 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -185,7 +185,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_FIELD_IDENT}</th>
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html
index 67cdaa784a..1be9689cc7 100644
--- a/phpBB/adm/style/acp_prune_forums.html
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -8,7 +8,7 @@
 
 	<p>{L_PRUNE_SUCCESS}</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_FORUM}</th>
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index 4b2e52536f..a1409b15ef 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -65,7 +65,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_ACP_MANAGE_RANKS}</legend>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_RANK_IMAGE}</th>
diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html
index 2f39f64614..ca3aebb338 100644
--- a/phpBB/adm/style/acp_reasons.html
+++ b/phpBB/adm/style/acp_reasons.html
@@ -68,7 +68,7 @@
 	<legend>{L_ACP_REASONS}</legend>
 
 	<!-- IF .reasons -->
-		<table cellspacing="1">
+		<table class="table1">
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<thead>
 		<tr>
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index bf353d62f2..496a8b2675 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -112,7 +112,7 @@
 
 				<legend>{L_INDEX_STATS}{L_COLON} {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>
 
-				<table cellspacing="1">
+				<table class="table1">
 					<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>
 					<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 				<thead>
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 3dc4c2d616..49efcf9ac0 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -79,7 +79,7 @@
 <!-- ENDIF -->
 
 <!-- IF .styles_list -->
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_STYLE_NAME}</th>
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index 96c9de6ebb..b213587def 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -125,7 +125,7 @@
 
 	<form id="user_groups" method="post" action="{U_ACTION}">
 
-	<table cellspacing="1">
+	<table class="table1">
 	<tbody>
 	<!-- BEGIN group -->
 		<!-- IF group.S_NEW_GROUP_TYPE -->
@@ -164,7 +164,7 @@
 	</div>
 
 	<!-- IF .attach -->
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html
index d1a4f59445..95892f2822 100644
--- a/phpBB/adm/style/acp_users_feedback.html
+++ b/phpBB/adm/style/acp_users_feedback.html
@@ -7,7 +7,7 @@
 	</div>
 
 	<!-- IF .log -->
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_REPORT_BY}</th>
diff --git a/phpBB/adm/style/acp_users_warnings.html b/phpBB/adm/style/acp_users_warnings.html
index d27f3800fc..9d082eda6d 100644
--- a/phpBB/adm/style/acp_users_warnings.html
+++ b/phpBB/adm/style/acp_users_warnings.html
@@ -1,7 +1,7 @@
 	<form id="list" method="post" action="{U_ACTION}">
 
 	<!-- IF .warn -->
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_REPORT_BY}</th>
diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html
index 4acd75f933..7e91bc4367 100644
--- a/phpBB/adm/style/acp_words.html
+++ b/phpBB/adm/style/acp_words.html
@@ -47,7 +47,7 @@
 		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}" />
 	</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_WORD}</th>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index ca15338133..4e63052960 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -529,6 +529,11 @@ td {
 	text-align: right;
 }
 
+.table1 {
+	border-collapse: separate;
+	border-spacing: 1px;
+}
+
 table.type2 {
 	border: none;
 	background: none;
diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html
index 99f3f24f70..4ff7c328fc 100644
--- a/phpBB/adm/style/captcha_qa_acp.html
+++ b/phpBB/adm/style/captcha_qa_acp.html
@@ -14,7 +14,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_QUESTIONS}</legend>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th colspan="3">{L_QUESTIONS}</th>
diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
index e731620bd3..b968bdb625 100644
--- a/phpBB/adm/style/colour_swatch.html
+++ b/phpBB/adm/style/colour_swatch.html
@@ -44,7 +44,7 @@
 	numberList[4] = 'CC';
 	numberList[5] = 'FF';
 
-	document.writeln('<table cellspacing="0" cellpadding="0" border="0">');
+	document.writeln('<table>');
 
 	for (r = 0; r < 6; r++)
 	{
diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html
index 5fec8c4789..7e22404f56 100644
--- a/phpBB/adm/style/install_convert.html
+++ b/phpBB/adm/style/install_convert.html
@@ -22,7 +22,7 @@
 	<!-- ENDIF -->
 
 	<!-- IF S_LIST -->
-		<table cellspacing="1">
+		<table class="table1">
 			<caption>{L_AVAILABLE_CONVERTORS}</caption>
 			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 		<thead>
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index 57e2c8ffea..d746226753 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -395,7 +395,7 @@
 
 	<p>{L_MAPPING_FILE_STRUCTURE}</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="row1" /><col class="row2" /><col class="row1" />
 	<thead>
 	<tr>
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 4d52b901c3..d26cd5d8a6 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -77,7 +77,7 @@
 		<div class="permissions-panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
 			<span class="corners-top"><span></span></span>
 			<div class="tablewrap">
-				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1">
+				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" class="table1">
 				<colgroup>
 					<col class="permissions-name" />
 					<col class="permissions-yes" />
diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html
index 42a7fc3e4e..3a14e65004 100644
--- a/phpBB/adm/style/permission_roles_mask.html
+++ b/phpBB/adm/style/permission_roles_mask.html
@@ -1,7 +1,7 @@
 
 <!-- BEGIN role_mask -->
 
-	<table cellspacing="1">
+	<table class="table1">
 		<caption><!-- IF role_mask.FORUM_ID -->{L_FORUM}{L_COLON} <!-- ENDIF -->{role_mask.NAME}</caption>
 	<tbody>
 	<tr>
diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html
index 744ad3293e..7330ffee41 100644
--- a/phpBB/adm/style/permission_trace.html
+++ b/phpBB/adm/style/permission_trace.html
@@ -8,7 +8,7 @@
 
 	<br />
 
-	<table cellspacing="1" class="type1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_TRACE_WHO}</th>
-- 
cgit v1.2.1


From dd25b83ee409bda5c142ff28c2c65e6a5a9eb333 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 19 Oct 2013 10:14:46 -0700
Subject: [ticket/11935] Tweak colour swatch table

PHPBB3-11935
---
 phpBB/adm/style/colour_swatch.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
index b968bdb625..e692a8bd91 100644
--- a/phpBB/adm/style/colour_swatch.html
+++ b/phpBB/adm/style/colour_swatch.html
@@ -11,8 +11,15 @@
 		color: #fff;
 	}
 
+	table {
+		border-collapse: separate;
+		border-spacing: 0;
+		border: 0;
+	}
+
 	td {
-		border: solid 1px #333; 
+		border: solid 1px #333;
+		padding: 1px;
 	}
 
 	.over { 
@@ -56,7 +63,7 @@
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
 				document.write('<td style="background-color: #' + color + ';" onmouseover="this.className=\'over\'" onmouseout="this.className=\'out\'">');
-				document.write('<a href="#" onclick="cell(\'' + color + '\'); return false;"><img src="{T_IMAGES_PATH}spacer.gif" width="15" height="12" alt="#' + color + '" title="#' + color + '" \/><\/a>');
+				document.write('<a href="#" onclick="cell(\'' + color + '\'); return false;"><img src="{T_IMAGES_PATH}spacer.gif" width="13" height="10" alt="#' + color + '" title="#' + color + '" \/><\/a>');
 				document.writeln('<\/td>');
 			}
 		}
-- 
cgit v1.2.1


From 963dbed106bf4662fe5317baf1c56e901a3d7ba6 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 23 Oct 2013 22:47:44 -0700
Subject: [ticket/11138] Do not use AJAX for ACP resync features.

PHPBB3-11138
---
 phpBB/adm/style/acp_main.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index b644862ce1..d9e7fb7eeb 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -168,21 +168,21 @@
 				</dl>
 			</form>
 
-			<form id="action_stats_form" method="post" action="{U_ACTION}" data-ajax="true">
+			<form id="action_stats_form" method="post" action="{U_ACTION}">
 				<dl>
 					<dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_STATS_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
 
-			<form id="action_user_form" method="post" action="{U_ACTION}" data-ajax="true">
+			<form id="action_user_form" method="post" action="{U_ACTION}">
 				<dl>
 					<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
 
-			<form id="action_db_track_form" method="post" action="{U_ACTION}" data-ajax="true">
+			<form id="action_db_track_form" method="post" action="{U_ACTION}">
 				<dl>
 					<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="db_track" /><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd>
-- 
cgit v1.2.1


From afa71cc15b4cb2190f2dbb642a5aae070dba5954 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 24 Oct 2013 18:40:22 +0300
Subject: [ticket/11957] Viewport meta

PHPBB3-11957
---
 phpBB/adm/style/install_header.html | 1 +
 phpBB/adm/style/overall_header.html | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 5631b83e17..2db1b02c57 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -2,6 +2,7 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
+<meta name="viewport" content="width=device-width" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 3a9b6db2a3..b411671d59 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -2,6 +2,7 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
+<meta name="viewport" content="width=device-width" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-- 
cgit v1.2.1


From b3140f58a00c9e955f0080dfc1da61296348235d Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 24 Oct 2013 19:26:49 +0300
Subject: [ticket/11957] Viewport meta for install_update_diff

PHPBB3-11957
---
 phpBB/adm/style/install_update_diff.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index 1f30fe4d13..1c7ebdc33f 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -2,6 +2,7 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
+<meta name="viewport" content="width=device-width" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-- 
cgit v1.2.1


From 12c5997471ffbc6a94c6f6efcf42a6d047c054a5 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 24 Oct 2013 21:10:22 +0300
Subject: [ticket/11957] Replace corner images with CSS3 corners

PHPBB3-11957
---
 phpBB/adm/style/acp_permission_roles.html |  2 -
 phpBB/adm/style/admin.css                 | 96 +++----------------------------
 phpBB/adm/style/install_footer.html       |  3 -
 phpBB/adm/style/install_header.html       |  2 -
 phpBB/adm/style/install_update_diff.html  |  7 +--
 phpBB/adm/style/overall_footer.html       |  3 -
 phpBB/adm/style/overall_header.html       |  2 -
 phpBB/adm/style/permission_mask.html      |  2 -
 8 files changed, 12 insertions(+), 105 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index d654c320ca..22272d806c 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -90,7 +90,6 @@
 			</div>
 			<!-- BEGIN auth -->
 			<div class="permissions-panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
-				<span class="corners-top"><span></span></span>
 				<div class="tablewrap">
 					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1">
 					<colgroup>
@@ -120,7 +119,6 @@
 					</tbody>
 					</table>
 				</div>
-				<span class="corners-bottom"><span></span></span>
 			</div>
 			<!-- END auth -->
 		</div>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index ca15338133..bbd2844689 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -310,52 +310,19 @@ li {
 	margin: 4px 0;
 	padding: 3px 1px;
 	min-width: 550px;
-	background-color: #FFFFFF;
+	background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top;
 	border: 1px #999999 solid;
+	border-radius: 5px;
+	box-shadow: #FFF 0 0 0 1px inset;
 }
 
 .panel {
 	background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top;
-	padding: 0;
-}
-
-span.corners-top, span.corners-bottom,
-span.corners-top span, span.corners-bottom span {
-	font-size: 1px;
-	line-height: 1px;
-	display: block;
-	height: 5px;
-	background-repeat: no-repeat;
-}
-
-span.corners-top {
-	background-image: url("../images/corners_left.gif");
-	background-position: 0 0;
-	margin: -4px -2px 0;
-}
-
-span.corners-top span {
-	background-image: url("../images/corners_right.gif");
-	background-position: 100% 0;
-}
-
-span.corners-bottom {
-	background-image: url("../images/corners_left.gif");
-	background-position: 0 100%;
-	margin: 0 -2px -4px;
-	clear: both;
-}
-
-span.corners-bottom span {
-	background-image: url("../images/corners_right.gif");
-	background-position: 100% 100%;
+	padding: 5px 0;
+	border-radius: 5px;
+	overflow: hidden;
 }
 
-/* WinIE tweaks \*/
-* html span.corners-top, * html span.corners-bottom { background-image: url("../images/corners_left.gif"); }
-* html span.corners-top span, * html span.corners-bottom span { background-image: url("../images/corners_right.gif"); }
-/* End tweaks */
-
 /* Sub-navigation Menu
 ---------------------------------------- */
 
@@ -1619,60 +1586,15 @@ fieldset.permissions .padding {
 	float: left;
 	background-color: #CADCEB;
 	width: 100%;
+	border-radius: 5px;
+	overflow: hidden;
+	padding: 5px 0;
 }
 
 .rtl .permissions-panel {
 	float: right;
 }
 
-.permissions-panel span.corners-top {
-	background-image: url("../images/corners_left2.gif");
-}
-
-.permissions-panel span.corners-top span {
-	background-image: url("../images/corners_right2.gif");
-}
-
-.permissions-panel span.corners-bottom {
-	background-image: url("../images/corners_left2.gif");
-}
-
-.permissions-panel span.corners-bottom span {
-	background-image: url("../images/corners_right2.gif");
-}
-
-.permissions-panel span.corners-top, .permissions-panel span.corners-bottom,
-.permissions-panel span.corners-top span, .permissions-panel span.corners-bottom span {
-	font-size: 1px;
-	line-height: 1px;
-	display: block;
-	height: 5px;
-	background-repeat: no-repeat;
-}
-
-.permissions-panel span.corners-top {
-	background-image: url("../images/corners_left2.gif");
-	background-position: 0 0;
-	margin: 0 0;
-}
-
-.permissions-panel span.corners-top span {
-	background-image: url("../images/corners_right2.gif");
-	background-position: 100% 0;
-}
-
-.permissions-panel span.corners-bottom {
-	background-image: url("../images/corners_left2.gif");
-	background-position: 0 100%;
-	margin: 0 0;
-	clear: both;
-}
-
-.permissions-panel span.corners-bottom span {
-	background-image: url("../images/corners_right2.gif");
-	background-position: 100% 100%;
-}
-
 /* Permission table
 ---------------------------------------- */
 .permissions-panel .tablewrap {
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index f7d62d7c7e..cbb28407c1 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -1,9 +1,6 @@
 
 					</div>
 				</div>
-			<span class="corners-bottom"><span></span></span>
-			<div class="clear"></div>
-		</div>
 		</div>
 	</div>
 
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 2db1b02c57..8b2f006508 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -61,8 +61,6 @@ function dE(n, s, type)
 		</div>
 
 		<div id="acp">
-		<div class="panel">
-			<span class="corners-top"><span></span></span>
 				<div id="content">
 					<div id="menu">
 						<ul>
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index 1c7ebdc33f..3f2d1b71f4 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -44,6 +44,7 @@ window.onresize = resize_panel;
 
 #diff_content {
 	padding: 30px 10px 10px;
+	overflow: hidden;
 }
 
 <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
@@ -239,15 +240,13 @@ table.hrdiff caption span {
 
 	<div id="page-body">
 		<div id="acp">
-		<div class="panel" id="codepanel">
-			<span class="corners-top"><span></span></span>
+			<div id="codepanel">
 				<div id="diff_content">
 					<div id="main">
 						{DIFF_CONTENT}
 					</div>
 				</div>
-			<span class="corners-bottom"><span></span></span>
-		</div>
+			</div>
 		</div>
 	</div>
 
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 145ad18709..6d54ee266d 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -1,9 +1,6 @@
 
 					</div>
 				</div>
-			<span class="corners-bottom"><span></span></span>
-			<div class="clear"></div>
-		</div>
 		</div>
 	</div>
 
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index b411671d59..d091e6ad07 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -178,8 +178,6 @@ function switch_menu()
 		</div>
 
 		<div id="acp">
-		<div class="panel">
-			<span class="corners-top"><span></span></span>
 				<div id="content">
 					<!-- IF not S_USER_NOTICE --> 
 					<div id="toggle">
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 4d52b901c3..ac65754a14 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -75,7 +75,6 @@
 
 	<!-- BEGIN category -->
 		<div class="permissions-panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
-			<span class="corners-top"><span></span></span>
 			<div class="tablewrap">
 				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1">
 				<colgroup>
@@ -128,7 +127,6 @@
 		
 			<!-- ENDIF -->
 
-			<span class="corners-bottom"><span></span></span>
 		</div>
 	<!-- END category -->
 			<div class="clearfix"></div>
-- 
cgit v1.2.1


From 64e26e8c71c4f5d59e421c293f1bd6a17d13e341 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 24 Oct 2013 22:53:57 +0300
Subject: [ticket/11957] Remove menu toggle

PHPBB3-11957
---
 phpBB/adm/style/admin.css           | 30 -------------------
 phpBB/adm/style/overall_header.html | 57 -------------------------------------
 2 files changed, 87 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index bbd2844689..87f430c077 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -326,36 +326,6 @@ li {
 /* Sub-navigation Menu
 ---------------------------------------- */
 
-/* Toggle */
-#toggle {
-	padding: 5px;
-	width: 5%;
-	height: 100px;
-	position: absolute;
-	left: 15%;
-	top: 28px;
-	margin-left: 2px;
-}
-
-.rtl #toggle {
-	left: 75%;
-	margin-right: 0;
-	margin-left: 6px;
-}
-
-#toggle-handle {
-	display: block;
-	width: 18px;
-	height: 19px;
-	float: right;
-	background-image: url(../images/toggle.gif);
-}
-
-.rtl #toggle-handle {
-	background-image: url(../images/toggle.gif);
-	background-position: 100% 50%;
-}
-
 /* Menu */
 #menu {
 	float: left;
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index d091e6ad07..0636f9bb26 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -15,9 +15,6 @@ var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
 var base_url = '{BASE_URL|e('js')}';
 
-var menu_state = 'shown';
-
-
 /**
 * Jump to page
 */
@@ -104,56 +101,6 @@ function popup(url, width, height, name)
 	return false;
 }
 
-/**
-* Hiding/Showing the side menu
-*/
-function switch_menu()
-{
-	var menu = document.getElementById('menu');
-	var main = document.getElementById('main');
-	var toggle = document.getElementById('toggle');
-	var handle = document.getElementById('toggle-handle');
-
-	switch (menu_state)
-	{
-		// hide
-		case 'shown':
-			main.style.width = '93%';
-			menu_state = 'hidden';
-			menu.style.display = 'none';
-			toggle.style.width = '20px';
-			handle.style.backgroundImage = 'url(images/toggle.gif)';
-			handle.style.backgroundRepeat = 'no-repeat';
-
-			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-				handle.style.backgroundPosition = '0% 50%';
-				toggle.style.left = '96%';
-			<!-- ELSE -->
-				handle.style.backgroundPosition = '100% 50%';
-				toggle.style.left = '0';
-			<!-- ENDIF -->
-		break;
-
-		// show
-		case 'hidden':
-			main.style.width = '76%';
-			menu_state = 'shown';
-			menu.style.display = 'block';
-			toggle.style.width = '5%';
-			handle.style.backgroundImage = 'url(images/toggle.gif)';
-			handle.style.backgroundRepeat = 'no-repeat';
-
-			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-				handle.style.backgroundPosition = '100% 50%';
-				toggle.style.left = '75%';
-			<!-- ELSE -->
-				handle.style.backgroundPosition = '0% 50%';
-				toggle.style.left = '15%';
-			<!-- ENDIF -->
-		break;
-	}
-}
-
 // ]]>
 </script>
 <!-- EVENT acp_overall_header_head_append -->
@@ -179,10 +126,6 @@ function switch_menu()
 
 		<div id="acp">
 				<div id="content">
-					<!-- IF not S_USER_NOTICE --> 
-					<div id="toggle">
-						<a id="toggle-handle" accesskey="m" title="{L_MENU_TOGGLE}" onclick="switch_menu(); return false;" href="#"></a></div>
-					<!-- ENDIF -->
 					<div id="menu">
 						<p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;][&nbsp;<a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a>&nbsp;]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
 						<ul>
-- 
cgit v1.2.1


From 5779c300e47cec9533d95ad8691f362032d6f485 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 25 Oct 2013 18:22:39 +0300
Subject: [ticket/11957] Responsive layout and menu

PHPBB3-11957
---
 phpBB/adm/style/admin.css           | 102 ++++++++++++++++++++++++++++++++++--
 phpBB/adm/style/install_header.html |   2 +
 phpBB/adm/style/overall_header.html |  11 ++--
 3 files changed, 106 insertions(+), 9 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 87f430c077..b70b98c9a5 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -18,11 +18,11 @@ body, div, p, th, td, li, dd {
 	font-size: x-small;
 	voice-family: "\"}\"";
 	voice-family: inherit;
-	font-size: small
+	font-size: small;
 }
 
 html>body, html>div, html>p, html>th, html>td, html>li, html>dd {
-	font-size: small
+	font-size: small;
 }
 
 html {
@@ -31,6 +31,7 @@ html {
 	/* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-ie browsers */
 	height: 100%;
 	margin-bottom: 1px;
+	word-wrap: break-word;
 }
 
 body {
@@ -105,6 +106,16 @@ hr {
 	display: none;
 }
 
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	html, body {
+		height: auto;
+		margin: 0;
+		padding: 0;
+	}
+}
+
+
 /* General links  */
 a:link, a:visited {
 	color: #105289;
@@ -136,6 +147,7 @@ li {
 	list-style-type: inherit;
 }
 
+
 /* Main blocks
 ---------------------------------------- */
 #wrap {
@@ -216,6 +228,41 @@ li {
 	min-width: 0;
 }
 
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	#wrap, #page-body, #page-body.simple-page-body {
+		padding: 0;
+		min-width: 300px;
+	}
+
+	#page-header {
+		margin: 5px;
+		padding-left: 160px;
+		height: auto;
+		min-height: 54px;
+		overflow: hidden;
+	}
+
+	.rtl #page-header {
+		padding-right: 160px;
+		padding-left: 0;
+	}
+
+	#page-header h1 {
+		font-size: 1.2em;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	#main, .rtl #main {
+		float: none;
+		width: auto;
+		margin: 0;
+	}
+}
+
+
 /* Tabbed menu
 	Based on: http://www.alistapart.com/articles/slidingdoors2/
 ----------------------------------------*/
@@ -323,6 +370,15 @@ li {
 	overflow: hidden;
 }
 
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	#acp {
+		min-width: 0;
+		min-height: 0;
+	}
+}
+
+
 /* Sub-navigation Menu
 ---------------------------------------- */
 
@@ -352,12 +408,12 @@ li {
 }
 
 /* Default list state */
-#menu li {
+#menu li, #menu .header {
 	padding: 0;
 	margin: 0;
 	font-size: 0.85em;
 	font-weight: bold;
-	display: inline;
+	display: block;
 }
 
 /* Link styles for the sub-section links */
@@ -422,7 +478,7 @@ li {
 	background: url("../images/arrow_down.gif") 99% 50% no-repeat;
 }
 
-#menu li.header {
+#menu .header {
 	font-family: Tahoma, Helvetica, sans-serif;
 	display: block;
 	font-weight: bold;
@@ -432,8 +488,44 @@ li {
 	margin-top: 15px;
 	text-transform: uppercase;
 	font-size: 0.75em;
+	text-decoration: none;
+	cursor: inherit;
+}
+
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	#menu {
+		float: none;
+		width: auto;
+		border-width: 0;
+		max-width: 200px;
+		margin: 0 auto 10px;
+	}
+
+	#menu .menu-block .header {
+		margin-top: 0;
+		cursor: pointer;
+		border-bottom-width: 0;
+	}
+
+	#menu .menu-block .header:focus {
+		color: #D31141;
+	}
+
+	#menu .menu-block ul {
+		display: none;
+	}
+
+	#menu .menu-block:hover ul, #menu .menu-block.active ul, #menu .menu-block.no-header ul {
+		display: block;
+	}
+
+	#menu .menu-block li:last-child {
+		border-bottom: 1px solid #327AA5;
+	}
 }
 
+
 /* Table styles
 ---------------------------------------- */
 
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 8b2f006508..13f4a6dbf4 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -63,6 +63,7 @@ function dE(n, s, type)
 		<div id="acp">
 				<div id="content">
 					<div id="menu">
+						<div class="menu-block no-header">
 						<ul>
 						<!-- BEGIN l_block1 -->
 							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
@@ -71,6 +72,7 @@ function dE(n, s, type)
 							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>
 						<!-- END l_block2 -->
 						</ul>
+						</div>
 					</div>
 
 					<div id="main" class="install-body">
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 0636f9bb26..80e254227b 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -128,14 +128,16 @@ function popup(url, width, height, name)
 				<div id="content">
 					<div id="menu">
 						<p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;][&nbsp;<a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a>&nbsp;]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-						<ul>
 						<!-- DEFINE $LI_USED = 0 -->
 						<!-- BEGIN l_block1 -->
 							<!-- IF l_block1.S_SELECTED -->
 	
 						<!-- BEGIN l_block2 -->
 							<!-- IF .l_block1.l_block2.l_block3 -->
-							<li class="header">{l_block1.l_block2.L_TITLE}</li>
+							<!-- IF $LI_USED --></ul></div><!-- ENDIF -->
+							<div class="menu-block">
+								<a class="header" href="javascript:void(0);">{l_block1.l_block2.L_TITLE}</a>
+								<ul>
 							<!-- DEFINE $LI_USED = 1 -->
 							<!-- ENDIF -->
 	
@@ -147,8 +149,9 @@ function popup(url, width, height, name)
 						
 							<!-- ENDIF -->
 						<!-- END l_block1 -->
-						<!-- IF not $LI_USED -->
-							<li></li>
+						<!-- IF $LI_USED -->
+								</ul>
+							</div>
 						<!-- ENDIF -->
 						</ul>
 					</div>
-- 
cgit v1.2.1


From 8567adf5dbfc1d6363deb78b6ebf25a76857c9ac Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 25 Oct 2013 18:32:31 +0300
Subject: [ticket/11957] Include admin.js in footer

Include admin.js in footer, swap .hasjs and .nojs

PHPBB3-11957
---
 phpBB/adm/style/admin.js            | 18 ++++++++++++++++++
 phpBB/adm/style/install_footer.html |  2 ++
 phpBB/adm/style/install_header.html |  2 +-
 phpBB/adm/style/overall_footer.html |  1 +
 phpBB/adm/style/overall_header.html |  2 +-
 5 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 phpBB/adm/style/admin.js

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
new file mode 100644
index 0000000000..9b2c9313ac
--- /dev/null
+++ b/phpBB/adm/style/admin.js
@@ -0,0 +1,18 @@
+/**
+* phpBB3 ACP functions
+*/
+
+/**
+* Run onload functions
+*/
+(function($) {
+	$(document).ready(function() {
+		// Swap .nojs and .hasjs
+		$('body.nojs').toggleClass('nojs hasjs');
+
+		// Focus forms
+		$('form[data-focus]:first').each(function() {
+			$('#' + this.getAttribute('data-focus')).focus();
+		});
+	});
+})(jQuery);
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index cbb28407c1..7a5fc666f8 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -11,6 +11,8 @@
 
 <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 -->
+<!-- INCLUDEJS admin.js -->
+{$SCRIPTS}
 
 </body>
 </html>
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 13f4a6dbf4..182abe8875 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -35,7 +35,7 @@ function dE(n, s, type)
 
 </head>
 
-<body class="{S_CONTENT_DIRECTION}">
+<body class="{S_CONTENT_DIRECTION} nojs">
 <div id="wrap">
 	<div id="page-header">
 		<h1>{L_INSTALL_PANEL}</h1>
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 6d54ee266d..98a3a598e4 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -35,6 +35,7 @@
 <!-- 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 -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
+<!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
 
 <!-- EVENT acp_overall_footer_after -->
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 80e254227b..658f1c49b0 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -106,7 +106,7 @@ function popup(url, width, height, name)
 <!-- EVENT acp_overall_header_head_append -->
 </head>
 
-<body class="{S_CONTENT_DIRECTION}">
+<body class="{S_CONTENT_DIRECTION} nojs">
 
 <div id="wrap">
 	<div id="page-header">
-- 
cgit v1.2.1


From 43b9314390db962aaef2411e22642f86730a6eb6 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 25 Oct 2013 19:59:45 +0300
Subject: [ticket/11957] Enhance responsive nav with JS

PHPBB3-11957
---
 phpBB/adm/style/admin.css | 22 ++++++++++++++++++----
 phpBB/adm/style/admin.js  | 22 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index b70b98c9a5..eceea8fe03 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -494,7 +494,7 @@ li {
 
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
 {
-	#menu {
+	#menu, .rtl #menu {
 		float: none;
 		width: auto;
 		border-width: 0;
@@ -502,27 +502,41 @@ li {
 		margin: 0 auto 10px;
 	}
 
+	#menu .menu-block.active {
+		margin: 0 -10px;
+		padding: 0 10px;
+		background: rgba(255, 255, 255, .5);
+		border-radius: 5px;
+	}
+
 	#menu .menu-block .header {
-		margin-top: 0;
+		margin-top: 5px;
 		cursor: pointer;
 		border-bottom-width: 0;
+		position: relative;
+		text-decoration: underline;
 	}
 
-	#menu .menu-block .header:focus {
+	#menu .menu-block .header:focus, #menu .menu-block.active .header {
 		color: #D31141;
+		text-decoration: none;
 	}
 
 	#menu .menu-block ul {
 		display: none;
 	}
 
-	#menu .menu-block:hover ul, #menu .menu-block.active ul, #menu .menu-block.no-header ul {
+	.nojs #menu .menu-block:hover ul, #menu .menu-block.active ul, #menu .menu-block.no-header ul {
 		display: block;
 	}
 
 	#menu .menu-block li:last-child {
 		border-bottom: 1px solid #327AA5;
 	}
+
+	#menu .menu-block:last-child li:last-child, #menu .menu-block.active li:last-child {
+		border-bottom-width: 0;
+	}
 }
 
 
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index 9b2c9313ac..208afedce8 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -2,6 +2,26 @@
 * phpBB3 ACP functions
 */
 
+/**
+* Parse document block
+*/
+function parse_document(container) 
+{
+	var test = document.createElement('div'),
+		oldBrowser = (typeof test.style.borderRadius == 'undefined');
+
+	delete test;
+
+	/**
+	* Navigation
+	*/
+	container.find('#menu .menu-block > a.header').click(function() {
+		$(this).parent().toggleClass('active');
+	});
+
+	container.find('#activemenu').parents('.menu-block').addClass('active');
+}
+
 /**
 * Run onload functions
 */
@@ -14,5 +34,7 @@
 		$('form[data-focus]:first').each(function() {
 			$('#' + this.getAttribute('data-focus')).focus();
 		});
+
+		parse_document($('body'));
 	});
 })(jQuery);
-- 
cgit v1.2.1


From 1b3daa1ad876e9b3adf87bca754ee313a0cdaa13 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 25 Oct 2013 21:40:39 +0300
Subject: [ticket/11957] Adjustments to ACP layout, menu and some elements

PHPBB3-11957
---
 phpBB/adm/style/admin.css | 51 ++++++++++++++++++++++++++++++++++++++++++++---
 phpBB/adm/style/admin.js  | 24 ++++++++++++++++++----
 2 files changed, 68 insertions(+), 7 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index eceea8fe03..40224be021 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -260,6 +260,33 @@ li {
 		width: auto;
 		margin: 0;
 	}
+
+	#content {
+		background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top;
+		padding: 5px;
+	}
+
+	#page-footer {
+		padding: 0 5px 5px;
+	}
+}
+
+@media only screen and (max-width: 400px), only screen and (max-device-width: 400px)
+{
+	#page-header {
+		background-size: 76px 26.5px;
+		padding-left: 80px;
+		min-height: 30px;
+	}
+
+	.rtl #page-header {
+		padding-right: 80px;
+	}
+
+	#page-header h1 {
+		padding-top: 0;
+		font-size: 1.1em;
+	}
 }
 
 
@@ -375,10 +402,14 @@ li {
 	#acp {
 		min-width: 0;
 		min-height: 0;
+		border-radius: 0;
+		border-width: 1px 0;
+		background: #fff;
+		padding: 1px 0;
+		box-shadow: none;
 	}
 }
 
-
 /* Sub-navigation Menu
 ---------------------------------------- */
 
@@ -490,6 +521,7 @@ li {
 	font-size: 0.75em;
 	text-decoration: none;
 	cursor: inherit;
+	outline-style: none;
 }
 
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
@@ -502,13 +534,21 @@ li {
 		margin: 0 auto 10px;
 	}
 
+	#menu p {
+		text-align: center;
+	}
+
 	#menu .menu-block.active {
-		margin: 0 -10px;
-		padding: 0 10px;
+		margin: 0 -5px;
+		padding: 0 5px 3px;
 		background: rgba(255, 255, 255, .5);
 		border-radius: 5px;
 	}
 
+	#menu .menu-block.no-header.active {
+		padding-top: 3px;
+	}
+
 	#menu .menu-block .header {
 		margin-top: 5px;
 		cursor: pointer;
@@ -537,6 +577,10 @@ li {
 	#menu .menu-block:last-child li:last-child, #menu .menu-block.active li:last-child {
 		border-bottom-width: 0;
 	}
+
+	#menu .menu-block li a span {
+		border-radius: 2px;
+	}
 }
 
 
@@ -707,6 +751,7 @@ fieldset {
 	border-left: 1px solid #D7D7D7;
 	background-color: #FFFFFF;
 	position: relative;
+	border-radius: 3px;
 }
 
 .rtl fieldset {
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index 208afedce8..a9e00ab9d7 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -15,11 +15,27 @@ function parse_document(container)
 	/**
 	* Navigation
 	*/
-	container.find('#menu .menu-block > a.header').click(function() {
-		$(this).parent().toggleClass('active');
-	});
+	container.find('#menu').each(function() {
+		var menu = $(this),
+			blocks = menu.children('.menu-block');
+
+		if (!blocks.length) {
+			return;
+		}
+
+		// Set onclick event
+		blocks.children('a.header').click(function() {
+			$(this).parent().toggleClass('active');
+		});
+
+		// Set active menu
+		menu.find('#activemenu').parents('.menu-block').addClass('active');
 
-	container.find('#activemenu').parents('.menu-block').addClass('active');
+		// Check if there is active menu
+		if (!blocks.filter('.active').length) {
+			blocks.filter(':first').addClass('active');
+		}
+	});
 }
 
 /**
-- 
cgit v1.2.1


From 5f39fd470c7c2742e852e8b24de88de02a544250 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 25 Oct 2013 23:29:47 +0300
Subject: [ticket/11957] Use fixed width for sidebar

Use fixed width for sidebar and few minor fixes for other items

PHPBB3-11957
---
 phpBB/adm/style/admin.css | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 40224be021..79b88cf52f 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -106,6 +106,13 @@ hr {
 	display: none;
 }
 
+@media only screen and (max-width: 800px), only screen and (max-device-width: 800px)
+{
+	body {
+		margin: 5px 5px 0;
+	}
+}
+
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
 {
 	html, body {
@@ -186,7 +193,7 @@ li {
 
 #page-body {
 	clear: both;
-	min-width: 700px;
+	min-width: 650px;
 }
 
 #page-footer {
@@ -207,15 +214,11 @@ li {
 }
 
 #main {
-	float: left;
-	width: 76%;
-	margin: 0 0 0 3%;
-	min-height: 350px;
+	margin: 0 0 0 210px;
 }
 
 .rtl #main {
-	float: right;
-	margin: 0 3% 0 0;
+	margin: 0 210px 0 0;
 }
 
 * html #main {
@@ -255,6 +258,10 @@ li {
 		text-overflow: ellipsis;
 	}
 
+	#page-header fieldset {
+		margin-top: 5px;
+	}
+
 	#main, .rtl #main {
 		float: none;
 		width: auto;
@@ -416,7 +423,7 @@ li {
 /* Menu */
 #menu {
 	float: left;
-	width: 20%;
+	width: 200px;
 	font-size: 1.00em;
 	padding: 0;
 	border-right: 1px solid #CCCFD3;
@@ -436,6 +443,7 @@ li {
 	list-style: none;
 	margin: 0;
 	padding: 0;
+	word-wrap: normal;
 }
 
 /* Default list state */
@@ -461,6 +469,12 @@ li {
 	padding: 3px 8px 3px 3px;
 }
 
+#menu li span, #menu .header {
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
 #menu li a:hover, #menu li a:hover span {
 	text-decoration: none;
 	background-color: #FFFFFF;
-- 
cgit v1.2.1


From b80f213995df6456cf35897a7a35d7943baa5ebb Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 00:46:20 +0300
Subject: [ticket/11957] Responsive ACP tables

PHPBB3-11957
---
 phpBB/adm/style/acp_main.html |  2 +-
 phpBB/adm/style/admin.css     | 98 +++++++++++++++++++++++++++++++++++++++++++
 phpBB/adm/style/admin.js      | 97 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 196 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index d9e7fb7eeb..b6d520130a 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -78,7 +78,7 @@
 
 	<!-- EVENT acp_main_notice_after -->
 
-	<table cellspacing="1">
+	<table cellspacing="1" class="two-columns no-header" data-no-responsive-header="true">
 		<caption>{L_FORUM_STATS}</caption>
 		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 	<thead>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 79b88cf52f..2cd8d0005c 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -754,6 +754,104 @@ td.name {
 	color: #BC2A4D;
 }
 
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	table.responsive, table.responsive tbody, table.responsive tr, table.responsive td {
+		display: block;
+	}
+
+	table.responsive thead, table.responsive th, table.responsive colgroup {
+		display: none;
+	}
+
+	table.responsive.show-header thead, table.responsive.show-header th:first-child, table.responsive caption {
+		display: block;
+		width: auto !important;
+		text-align: left !important;
+		margin: 0;
+	}
+
+	table.responsive {
+		background: transparent none;
+		border-width: 0;
+	}
+
+	table.responsive caption {
+		padding: 3px 4px;
+		color: #FFFFFF;
+		background: #70AED3 url("../images/gradient2b.gif") bottom left repeat-x;
+		border-top: 1px solid #6DACD2;
+		border-bottom: 1px solid #327AA5;
+		text-align: left;
+		font-size: 0.75em;
+		font-weight: bold;
+		text-transform: uppercase;
+	}
+
+	table.responsive.show-header th:first-child span.rank-img, table.responsive.no-caption caption, table.responsive.no-header thead {
+		display: none;
+	}
+
+	table.responsive tr {
+		margin: 2px 0;
+		border: 1px solid #CCCFD3;
+		background-color: #FFFFFF;
+		padding: 1px 1px 0;
+		overflow: hidden;
+	}
+
+	table.responsive tr.row1 td { background-color: #F9F9F9; }
+	table.responsive tr.row2 td { background-color: #DCEBFE; }
+	table.responsive tr.row3 td { background-color: #DBDFE2; }
+	table.responsive tr.row4 td { background-color: #E4E8EB; }
+	table.responsive tr.col1 td { background-color: #DCEBFE; }
+	table.responsive tr.col2 td { background-color: #F9F9F9; }
+	table.responsive tr.row1a td { background-color: #F9F9F9; }
+	table.responsive tr.row1b td { background-color: #F6F6F6; }
+	table.responsive tr.row2a td { background-color: #E7EEF4; }
+	table.responsive tr.row2b td { background-color: #E3EBF2; }
+
+	table.responsive td {
+		width: auto !important;
+		text-align: left !important;
+		padding: 4px;
+		margin-bottom: 1px;
+	}
+
+	table.responsive td.empty {
+		display: none !important;
+	}
+
+	table.responsive td > dfn {
+		display: inline-block !important;
+	}
+
+	table.responsive td > dfn:after {
+		content: ':';
+		padding-right: 5px;
+	}
+
+	table.responsive.two-columns td {
+		width: 50% !important;
+		float: left;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+
+	table.responsive.two-columns td:nth-child(2n+1) {
+		clear: left;
+	}
+
+	table.responsive span.rank-img {
+		float: none;
+		padding-right: 5px;
+	}
+
+	table.responsive#memberlist td:first-child input[type="checkbox"] {
+		float: right;
+	}
+}
+
 /* General form styles
 ----------------------------------------*/
 fieldset {
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index a9e00ab9d7..385e49dc87 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -36,6 +36,103 @@ function parse_document(container)
 			blocks.filter(':first').addClass('active');
 		}
 	});
+
+	/**
+	* Responsive tables
+	*/
+	container.find('table').not('.not-responsive').each(function() {
+		var $this = $(this),
+			th = $this.find('thead > tr > th'),
+			columns = th.length,
+			headers = [],
+			totalHeaders = 0,
+			i, headersLength;
+
+		// Find columns
+		$this.find('colgroup:first').children().each(function(i) {
+			var column = $(this);
+			if (column.hasClass('col1')) {
+				$this.find('td:nth-child(' + (i + 1) + ')').addClass('col1');
+			}
+			if (column.hasClass('col2')) {
+				$this.find('td:nth-child(' + (i + 1) + ')').addClass('col2');
+			}
+		});
+
+		// Find each header
+		if (!$this.data('no-responsive-header'))
+		{
+			th.each(function(column) {
+				var cell = $(this),
+					colspan = parseInt(cell.attr('colspan')),
+					dfn = cell.attr('data-dfn'),
+					text = dfn ? dfn : cell.text();
+
+				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
+
+				for (i=0; i<colspan; i++) {
+					headers.push(text);
+				}
+				totalHeaders ++;
+
+				if (dfn && !column) {
+					$this.addClass('show-header');
+				}
+			});
+		}
+		
+		headersLength = headers.length;
+
+		// Add header text to each cell as <dfn>
+		$this.addClass('responsive');
+
+		if (totalHeaders < 2) {
+			$this.addClass('show-header');
+			return;
+		}
+
+		$this.find('tbody > tr').each(function() {
+			var row = $(this),
+				cells = row.children('td'),
+				column = 0;
+
+			if (cells.length == 1) {
+				row.addClass('big-column');
+				return;
+			}
+
+			cells.each(function() {
+				var cell = $(this),
+					colspan = parseInt(cell.attr('colspan')),
+					text = cell.text().trim();
+
+				if (headersLength <= column) {
+					return;
+				}
+
+				if (text.length && text !== '-') {
+					cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
+				}
+				else {
+					cell.addClass('empty');
+				}
+
+				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
+				column += colspan;
+			});
+		});
+	});
+
+	/**
+	* Hide empty responsive tables
+	*/
+	container.find('table.responsive > tbody').each(function() {
+		var items = $(this).children('tr');
+		if (items.length == 0)
+		{
+			$(this).parent('table:first').addClass('responsive-hide');
+		}
+	});
 }
 
 /**
-- 
cgit v1.2.1


From 9a8b463c334c27ca958ab4de8e660fd591bf4e95 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 00:58:36 +0300
Subject: [ticket/11957] Remove IE6 hacks

PHPBB3-11957
---
 phpBB/adm/style/admin.css | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 2cd8d0005c..68c5645d9c 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -221,10 +221,6 @@ li {
 	margin: 0 210px 0 0;
 }
 
-* html #main {
-	height: 350px;
-}
-
 #page-body.simple-page-body {
 	padding: 0;
 	padding-right: 10px;
@@ -873,10 +869,6 @@ fieldset {
 	border-left: 1px solid #CCCCCC;
 }
 
-* html fieldset {
-	padding: 0 10px 5px 10px;
-}
-
 fieldset p {
 	font-size: 0.85em;
 }
@@ -895,18 +887,6 @@ legend {
 	vertical-align: middle;
 }
 
-* html legend {
-	margin: 0 0 -10px -7px;
-	line-height: 1em;
-	font-size: .85em;
-}
-
-/* Holly hack, .rtl comes after html */
-* html .rtl legend {
-	margin: 0;
-	margin-right: -7px;
-}
-
 input, textarea {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
 	font-size: 0.90em;
@@ -1245,7 +1225,6 @@ textarea.full {
 	width: 99%;
 }
 
-* html input.full, * html textarea.full { width: 95%;}
 input.medium { width: 50%;}
 input.narrow { width: 25%;}
 input.tiny { width: 10%;}
@@ -1472,8 +1451,6 @@ li.pagination ul {
 	background-color: #BC2A4D;
 }
 
-* html .errorbox, * html .successbox { height: 1%; } /* Pixel shift fix for IE */
-
 .successbox h3, .errorbox h3 {
 	color: #FFFFFF;
 	margin: 0 0 0.5em;
-- 
cgit v1.2.1


From c23c64cb6d848382542fc5d50899f9a921ffe805 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 01:07:04 +0300
Subject: [ticket/11957] Responsive jQuery popups

PHPBB3-11957
---
 phpBB/adm/style/admin.css | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 68c5645d9c..f644adb0d4 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1288,8 +1288,10 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 	position: fixed;
 	display: none;
 	top: 150px;
-	left: 25%;
-	width: 50%;
+	left: 0;
+	right: 0;
+	max-width: 600px;
+	margin: 0 auto;
 	z-index: 50;
 	padding: 25px;
 	padding: 0 25px 20px 25px;
@@ -1345,6 +1347,21 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 	opacity: 0.5;
 }
 
+@media only screen and (max-height: 500px), only screen and (max-device-width: 500px)
+{
+	.phpbb_alert {
+		top: 25px;
+	}
+}
+
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	.phpbb_alert {
+		max-width: none;
+		margin: 0 25px;
+	}
+}
+
 /* Pagination
 ---------------------------------------- */
 .pagination {
-- 
cgit v1.2.1


From 365d07ff6c481e604cd83425abe128eff3af70f0 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 09:51:07 +0300
Subject: [ticket/11957] Responsive forms

PHPBB3-11957
---
 phpBB/adm/style/admin.css | 60 +++++++++++++++++++++++++++++++++++++++++++++++
 phpBB/adm/style/admin.js  | 11 +++++++++
 2 files changed, 71 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index f644adb0d4..a98bcffe3b 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1053,6 +1053,13 @@ select#full_folder_action {
 	width: 95%;
 }
 
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	fieldset {
+		padding: 5px;
+	}
+}
+
 /* Definition list layout for forms
 	Other general def. list properties defined in prosilver_main.css
 ---------------------------------------- */
@@ -1184,6 +1191,51 @@ input:focus, textarea:focus {
 	outline-style: none;
 }
 
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	fieldset dl {
+		margin-bottom: 5px;
+		padding-bottom: 5px;
+		border-bottom: 1px solid #e8e8e8;
+	}
+
+	fieldset > dl:last-child, fieldset > form:last-child > dl:last-child {
+		border-bottom-width: 0;
+		margin-bottom: 0;
+	}
+
+	fieldset dt, .rtl fieldset dt, fieldset dd, .rtl fieldset dd {
+		border-width: 0;
+		margin-left: 0;
+		margin-right: 0;
+		float: none;
+		width: auto;
+	}
+
+	.ltr fieldset dd {
+		padding-left: 20px;
+	}
+
+	.rtl fieldset dd {
+		padding-right: 20px;
+	}
+
+	dd select, dd input {
+		max-width: 300px;
+	}
+
+	dd input[type="number"] {
+		max-width: 70px;
+	}
+}
+
+@media only screen and (max-width: 400px), only screen and (max-device-width: 400px)
+{
+	dd select, dd input {
+		max-width: 240px;
+	}	
+}
+
 /* Submit button fieldset or paragraph
 ---------------------------------------- */
 fieldset.submit-buttons {
@@ -1926,3 +1978,11 @@ fieldset.permissions .padding {
 	color: #FFFFFF;
 	font-size: 1.4em;
 }
+
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	.responsive-hide { display: none !important; }
+	.responsive-show { display: block !important; }
+	.responsive-show-inline { display: inline !important; }
+	.responsive-show-inline-block { display: inline-block !important; }
+}
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index 385e49dc87..342859ce54 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -133,6 +133,17 @@ function parse_document(container)
 			$(this).parent('table:first').addClass('responsive-hide');
 		}
 	});
+
+	/**
+	* Fieldsets with empty <span>
+	*/
+	container.find('fieldset dt > span:last-child').each(function() {
+		var $this = $(this);
+		if ($this.html() == '&nbsp;') {
+			$this.addClass('responsive-hide');
+		}
+		
+	});
 }
 
 /**
-- 
cgit v1.2.1


From 10f0c8b3337001743fc310539da43363873dcf0a Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 10:12:12 +0300
Subject: [ticket/11957] Change avatars gallery from table to list

PHPBB3-11957
---
 phpBB/adm/style/acp_avatar_options_local.html | 20 ++++++++----------
 phpBB/adm/style/admin.css                     | 29 +++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 12 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 148efd051b..0cdb3644d7 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -8,18 +8,14 @@
 	</select>&nbsp;<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" /></dd>
 </dl>
 	<!-- IF AVATAR_LOCAL_SHOW -->
-	<table>
+	<ul id="gallery">
 	<!-- BEGIN avatar_local_row -->
-	<tr>
-		<!-- BEGIN avatar_local_col -->
-			<td class="row1" style="text-align: center;"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="{avatar_local_row.avatar_local_col.AVATAR_NAME}" title="{avatar_local_row.avatar_local_col.AVATAR_NAME}"/></td>
-		<!-- END avatar_local_col -->
-	</tr>
-	<tr>
-		<!-- BEGIN avatar_local_option -->
-			<td class="row2" style="text-align: center;"><input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_option.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_option.AVATAR_FILE}" /></td>
-		<!-- END avatar_local_option -->
-	</tr>
+	<!-- BEGIN avatar_local_col -->
+		<li>
+			<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br />
+			<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}" /></label>
+		</li>
+	<!-- END avatar_local_col -->
 	<!-- END avatar_local_row -->
-	</table>
+	</ul>
 	<!-- ENDIF -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index a98bcffe3b..b3f086b6d2 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1956,6 +1956,35 @@ fieldset.permissions .padding {
 	padding: 0;
 }
 
+/* Avatars gallery
+---------------------------------------- */
+#gallery {
+	display: block;
+	margin: 0 -5px;
+	padding: 0;
+	overflow: hidden;
+}
+
+#gallery li {
+	display: block;
+	float: left;
+	border: 1px solid #ccc;
+	border-radius: 2px;
+	background: #fff;
+	padding: 5px;
+	margin: 5px;
+}
+
+#gallery li:hover {
+	background-color: #eee;
+}
+
+#gallery li label {
+	display: block;
+	text-align: center;
+	padding: 0;
+}
+
 /* Classes for additional tasks
 ---------------------------------------- */
 
-- 
cgit v1.2.1


From b107b4c0e2ff5f946e71eb962622295ded7f54ea Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 11:01:23 +0300
Subject: [ticket/11957] Responsive forums list

PHPBB3-11957
---
 phpBB/adm/style/acp_forums.html |  8 ++++----
 phpBB/adm/style/admin.css       | 43 +++++++++++++++++++++++++++++++++++++++++
 phpBB/adm/style/admin.js        |  7 +------
 3 files changed, 48 insertions(+), 10 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 7b1466cfbd..3fd2f18d67 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -440,19 +440,19 @@
 	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF -->]<!-- ENDIF --></strong></p>
 
 	<!-- IF .forums -->
-		<table cellspacing="1">
+		<table cellspacing="1" class="forums">
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<tbody>
 		<!-- BEGIN forums -->
 			<tr data-down="{forums.U_MOVE_DOWN}" data-up="{forums.U_MOVE_UP}">
-				<td style="width: 5%; text-align: center;">{forums.FOLDER_IMAGE}</td>
-				<td>
+				<td class="folder">{forums.FOLDER_IMAGE}</td>
+				<td class="forum-desc">
 					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
 					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>
 					<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
 					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}{L_COLON} <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}{L_COLON} <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
 				</td>
-				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
+				<td class="actions">
 					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
 						<span class="up">{ICON_MOVE_UP_DISABLED}</span>
 						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index b3f086b6d2..48b1712871 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -750,6 +750,19 @@ td.name {
 	color: #BC2A4D;
 }
 
+/* Forums list */
+table.forums td.folder {
+	width: 27px;
+	text-align: center;
+}
+
+table.forums td.actions {
+	vertical-align: middle;
+	width: 100px;
+	text-align: right;
+	white-space: nowrap;
+}
+
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
 {
 	table.responsive, table.responsive tbody, table.responsive tr, table.responsive td {
@@ -846,6 +859,36 @@ td.name {
 	table.responsive#memberlist td:first-child input[type="checkbox"] {
 		float: right;
 	}
+
+	/* Forums list */
+	table.responsive.forums td.folder {
+		float: left;
+		width: 27px;
+		background: transparent;
+	}
+	.rtl table.responsive.forums td.folder {
+		float: right;
+	}
+
+	table.responsive.forums td.forum-desc {
+		margin-left: 35px;
+		min-height: 27px;
+		background: transparent;
+	}
+
+	.rtl table.responsive.forums td.forum-desc {
+		margin-left: 0;
+		margin-right: 35px;
+	}
+
+	table.responsive.forums td.actions {
+		clear: both;
+		text-align: right !important;
+	}
+
+	.rtl table.responsive.forums td.actions {
+		text-align: left !important;
+	}
 }
 
 /* General form styles
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index 342859ce54..648d542325 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -51,12 +51,7 @@ function parse_document(container)
 		// Find columns
 		$this.find('colgroup:first').children().each(function(i) {
 			var column = $(this);
-			if (column.hasClass('col1')) {
-				$this.find('td:nth-child(' + (i + 1) + ')').addClass('col1');
-			}
-			if (column.hasClass('col2')) {
-				$this.find('td:nth-child(' + (i + 1) + ')').addClass('col2');
-			}
+			$this.find('td:nth-child(' + (i + 1) + ')').addClass(column.prop('className'));
 		});
 
 		// Find each header
-- 
cgit v1.2.1


From 7b3f63e8a37375b3ab087f775fdfbc54cd902380 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 11:02:16 +0300
Subject: [ticket/11957] More responsive forms adjustments

PHPBB3-11957
---
 phpBB/adm/style/admin.css | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 48b1712871..1d3c78c1da 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -934,7 +934,6 @@ input, textarea {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
 	font-size: 0.90em;
 	font-weight: normal;
-	cursor: text;
 	vertical-align: middle;
 	padding: 2px;
 	color: #111111;
@@ -1101,6 +1100,10 @@ select#full_folder_action {
 	fieldset {
 		padding: 5px;
 	}
+
+	fieldset.quick, p.quick {
+		text-align: center;
+	}
 }
 
 /* Definition list layout for forms
@@ -1305,6 +1308,13 @@ fieldset.submit-buttons legend {
 	display: none;
 }
 
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	p.submit-buttons {
+		margin-top: 0;
+	}
+}
+
 /* Input field styles
 ---------------------------------------- */
 
-- 
cgit v1.2.1


From 49e30b12432966711e31a884feb8460dd3555d92 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 11:56:03 +0300
Subject: [ticket/11957] Responsive styles list

PHPBB3-11957
---
 phpBB/adm/style/acp_styles.html | 12 ++++++------
 phpBB/adm/style/admin.css       | 15 +++++++++++++++
 phpBB/adm/style/admin.js        | 10 ++++++++++
 3 files changed, 31 insertions(+), 6 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 3dc4c2d616..55904253a9 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -79,7 +79,7 @@
 <!-- ENDIF -->
 
 <!-- IF .styles_list -->
-	<table cellspacing="1">
+	<table cellspacing="1" class="styles">
 	<thead>
 	<tr>
 		<th>{L_STYLE_NAME}</th>
@@ -97,9 +97,9 @@
 		<!-- ELSE -->
 			<!-- IF $ROW_CLASS == 'row2a' --><!-- DEFINE $ROW_CLASS = 'row2b' --><!-- ELSE --><!-- DEFINE $ROW_CLASS = 'row2a' --><!-- ENDIF -->
 		<!-- ENDIF -->
-		<td class="{$ROW_CLASS}" style="padding-left: {styles_list.PADDING}px;">
+		<td class="{$ROW_CLASS}" style="padding-{S_CONTENT_FLOW_BEGIN}: {styles_list.PADDING}px;">
 			<!-- IF styles_list.STYLE_ID and styles_list.COMMENT == '' and styles_list.STYLE_ACTIVE -->
-				<div class="default-style" style="display: none; float: right;">
+				<div class="default-style" style="display: none; float: {S_CONTENT_FLOW_END};">
 					<input class="radio" type="radio" name="default" value="{styles_list.STYLE_ID}"<!-- IF styles_list.DEFAULT --> checked="checked"<!-- ELSE --><!-- DEFINE $S_DEFAULT = 1 --><!-- ENDIF --> title="{L_STYLE_DEFAULT}" />
 				</div>
 			<!-- ENDIF -->
@@ -117,9 +117,9 @@
 			<!-- ENDIF -->
 		</td>
 		<!-- IF not STYLES_LIST_HIDE_COUNT -->
-			<td class="{$ROW_CLASS}" style="text-align: center;">{styles_list.USERS}</td>
+			<td class="{$ROW_CLASS} users">{styles_list.USERS}</td>
 		<!-- ENDIF -->
-		<td class="{$ROW_CLASS}" style="text-align: center;">
+		<td class="{$ROW_CLASS} actions">
 			<!-- BEGIN actions -->
 				<!-- IF styles_list.actions.S_ROW_COUNT > 0 --> | <!-- ENDIF -->
 				<!-- IF styles_list.actions.U_ACTION -->
@@ -129,7 +129,7 @@
 			<!-- END actions -->
 		</td>
 		{styles_list.EXTRA}
-		<td class="{$ROW_CLASS}" width="20" style="text-align: center;">
+		<td class="{$ROW_CLASS} mark" width="20">
 			<!-- IF styles_list.STYLE_ID -->
 				<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" />
 			<!-- ELSE -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 1d3c78c1da..e225a6752c 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -763,6 +763,11 @@ table.forums td.actions {
 	white-space: nowrap;
 }
 
+/* Styles list */
+table.styles td.users, table.styles td.actions, table.styles td.mark {
+	text-align: center;
+}
+
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
 {
 	table.responsive, table.responsive tbody, table.responsive tr, table.responsive td {
@@ -889,6 +894,16 @@ table.forums td.actions {
 	.rtl table.responsive.forums td.actions {
 		text-align: left !important;
 	}
+
+	/* Styles list */
+	table.responsive.styles tr.responsive-style-row td:first-child {
+		padding-left: 4px !important;
+		padding-right: 4px !important;
+	}
+
+	table.responsive.styles td:first-child > dfn, table.responsive.styles td.actions > dfn {
+		display: none !important;
+	}
 }
 
 /* General form styles
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index 648d542325..b466c02071 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -54,6 +54,16 @@ function parse_document(container)
 			$this.find('td:nth-child(' + (i + 1) + ')').addClass(column.prop('className'));
 		});
 
+		// Styles table
+		if ($this.hasClass('styles')) {
+			$this.find('td:first-child[style]').each(function() {
+				var style = $(this).attr('style');
+				if (style.length) {
+					$(this).parent('tr').attr('style', style.toLowerCase().replace('padding', 'margin')).addClass('responsive-style-row');
+				}
+			});
+		}
+
 		// Find each header
 		if (!$this.data('no-responsive-header'))
 		{
-- 
cgit v1.2.1


From c1ca57fcdb60ee772434e577de34107b2aa88cb1 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 12:21:38 +0300
Subject: [ticket/11957] Misc responsive changes

PHPBB3-11957
---
 phpBB/adm/style/admin.css | 19 +++++++++++++++++++
 phpBB/adm/style/admin.js  |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index e225a6752c..a4fef1f4ec 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -788,6 +788,7 @@ table.styles td.users, table.styles td.actions, table.styles td.mark {
 	table.responsive {
 		background: transparent none;
 		border-width: 0;
+		padding: 0;
 	}
 
 	table.responsive caption {
@@ -1119,6 +1120,10 @@ select#full_folder_action {
 	fieldset.quick, p.quick {
 		text-align: center;
 	}
+
+	fieldset.display-options {
+		clear: both;
+	}
 }
 
 /* Definition list layout for forms
@@ -1563,6 +1568,20 @@ li.pagination ul {
 	border-color: #B4BAC0;
 }
 
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	.pagination, .rtl .pagination {
+		float: none;
+		text-align: center;
+		margin: 5px 0;
+	}
+
+	.pagination li a, .pagination li span {
+		display: inline-block;
+		min-width: 10px;
+	}
+}
+
 /* Action Highlighting
 ---------------------------------------- */
 .successbox, .errorbox {
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index b466c02071..45cec5f716 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -115,7 +115,7 @@ function parse_document(container)
 					return;
 				}
 
-				if (text.length && text !== '-') {
+				if ((text.length && text !== '-') || cell.children().length) {
 					cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
 				}
 				else {
-- 
cgit v1.2.1


From 2a1db92955d9c1d20cfa3e49da158a10961eb081 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 12:51:10 +0300
Subject: [ticket/11957] Wrap content in double div

PHPBB3-11957
---
 phpBB/adm/style/admin.css                | 18 +++++++++++++++---
 phpBB/adm/style/install_footer.html      |  6 +++---
 phpBB/adm/style/install_header.html      |  1 +
 phpBB/adm/style/install_update_diff.html |  2 +-
 phpBB/adm/style/overall_footer.html      |  6 +++---
 phpBB/adm/style/overall_header.html      |  1 +
 6 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index a4fef1f4ec..9d281d4703 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -214,11 +214,23 @@ li {
 }
 
 #main {
-	margin: 0 0 0 210px;
+	float: right;
+	width: 100%;
+	margin: 0 0 0 -210px;
 }
 
 .rtl #main {
-	margin: 0 210px 0 0;
+	float: right;
+	margin: 0 -210px 0 0;
+}
+
+.main {
+	margin-left: 210px;
+}
+
+.rtl .main {
+	margin-left: 0;
+	margin-right: 210px;
 }
 
 #page-body.simple-page-body {
@@ -258,7 +270,7 @@ li {
 		margin-top: 5px;
 	}
 
-	#main, .rtl #main {
+	#main, .rtl #main, .main, .rtl .main {
 		float: none;
 		width: auto;
 		margin: 0;
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index 7a5fc666f8..c5356e7b9d 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -1,7 +1,7 @@
-
-					</div>
+						</div>
+					</div><!-- /#main -->
 				</div>
-		</div>
+		</div><!-- /#acp -->
 	</div>
 
 	<div id="page-footer">
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 182abe8875..d2dbf4bea7 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -76,3 +76,4 @@ function dE(n, s, type)
 					</div>
 
 					<div id="main" class="install-body">
+						<div class="main">
\ No newline at end of file
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index 3f2d1b71f4..c27304a425 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -34,7 +34,7 @@ window.onresize = resize_panel;
 <style type="text/css">
 /* <![CDATA[ */
 
-#main {
+#main, .rtl #main {
 	font-size: 1em;
 	line-height: 0.7em;
 	margin: 0;
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 98a3a598e4..3c291842dc 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -1,7 +1,7 @@
-
-					</div>
+						</div>
+					</div><!-- /#main -->
 				</div>
-		</div>
+		</div><!-- /#acp -->
 	</div>
 
 	<div id="page-footer">
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 658f1c49b0..eb16c61fd1 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -157,3 +157,4 @@ function popup(url, width, height, name)
 					</div>
 	
 					<div id="main">
+						<div class="main">
-- 
cgit v1.2.1


From b79cfa9f4afe2d131d5ad1e50e919656ff6a857d Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 16:43:43 +0300
Subject: [ticket/11957] Add z-index to menu

Add z-index to menu to prevent content block from overlapping menu

PHPBB3-11957
---
 phpBB/adm/style/admin.css | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 9d281d4703..64b7e6522e 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -435,6 +435,8 @@ li {
 	font-size: 1.00em;
 	padding: 0;
 	border-right: 1px solid #CCCFD3;
+	position: relative;
+	z-index: 2;
 }
 
 .rtl #menu {
-- 
cgit v1.2.1


From e9c0c9d5d2fa808476c52a6dce13df6da56394a6 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 21:04:44 +0300
Subject: [ticket/11957] Responsive ACP tabs

PHPBB3-11957
---
 phpBB/adm/style/admin.css           | 228 +++++++++++++++++++++++++++++++++---
 phpBB/adm/style/admin.js            |  67 +++++++++++
 phpBB/adm/style/install_header.html |   2 +-
 phpBB/adm/style/overall_header.html |   2 +-
 4 files changed, 282 insertions(+), 17 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 64b7e6522e..861fc617c5 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -310,12 +310,10 @@ li {
 ----------------------------------------*/
 #tabs {
 	line-height: normal;
-	margin: 0 0 -6px 7px;
+	margin: 0 7px;
 	min-width: 600px;
-}
-
-.rtl #tabs {
-	margin: 0 7px -6px 0;
+	position: relative;
+	z-index: 2;
 }
 
 #tabs ul {
@@ -324,14 +322,27 @@ li {
 	list-style: none;
 }
 
+#tabs ul:after {
+	content: '';
+	display: block;
+	clear: both;
+}
+
 #tabs li {
-	display: inline;
+	display: block;
+	float: left;
 	margin: 0;
 	padding: 0;
 	font-size: 0.85em;
 	font-weight: bold;
 }
 
+#tabs li:after {
+	content: '';
+	display: block;
+	clear: both;
+}
+
 #tabs a {
 	float: left;
 	background:url("../images/bg_tabs1.gif") no-repeat 0% -34px;
@@ -350,6 +361,7 @@ li {
 	display: block;
 	background: url("../images/bg_tabs2.gif") no-repeat 100% -34px;
 	padding: 7px 10px 4px 4px;
+	min-height: 14px;
 	color: #767676;
 	white-space: nowrap;
 	font-family: Arial, Helvetica, sans-serif;
@@ -369,12 +381,12 @@ li {
 	color: #BC2A4D;
 }
 
-#tabs #activetab a {
+#tabs .activetab a {
 	background-position: 0 0;
 	border-bottom: 1px solid #DCDEE2;
 }
 
-#tabs #activetab a span {
+#tabs .activetab a span {
 	background-position: 100% 0;
 	padding-bottom: 5px;
 	color: #23649F;
@@ -388,15 +400,91 @@ li {
 	background-position: 100% -69px;
 }
 
-#tabs #activetab a:hover span {
+#tabs .activetab a:hover span {
 	color: #115098;
 }
 
+.responsive-tab {
+	position: relative;
+}
+
+.responsive-tab .responsive-tab-link span {
+	display: inline-block;
+	font-size: 16px;
+	position: relative;
+	width: 16px;
+	line-height: 14px;
+	text-decoration: none;
+}
+
+.responsive-tab .responsive-tab-link span:before {
+	content: '';
+	position: absolute;
+	left: 5px;
+	top: 8px;
+	height: .125em;
+	width: 14px;
+	border-bottom: 0.125em solid #767676;
+	border-top: 0.375em double #767676;
+}
+
+.responsive-tab .responsive-tab-link:hover span:before {
+	border-color: #BC2A4D;
+}
+
+.responsive-tab.activetab .responsive-tab-link span:before {
+	border-color: #23649F;
+}
+
+.responsive-tab.activetab .responsive-tab-link:hover span:before {
+	border-color: #115098;
+}
+
+#tabs .dropdown {
+	top: 18px;
+	margin-right: -1px;
+}
+
+#tabs .dropdown-right .dropdown {
+	margin-left: -2px;
+}
+
+#tabs .dropdown li {
+	display: block !important;
+	float: none;
+	background: transparent none;
+	padding: 0;
+}
+
+#tabs .dropdown a, #tabs .dropdown a span {
+	background: transparent;
+	display: block;
+	border-width: 0;
+	float: none;
+	margin: 0;
+	padding: 0;
+	text-align: right;
+}
+
+#tabs .dropdown a span {
+	padding: 4px 8px;
+	color: inherit !important;
+}
+
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	#tabs {
+		min-width: 0;
+	}
+}
 
 /* Main Panel
 ---------------------------------------- */
 #acp {
-	margin: 4px 0;
+	clear: both;
+	position: relative;
+	top: -2px;
+	margin: 0 0 2px;
 	padding: 3px 1px;
 	min-width: 550px;
 	background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top;
@@ -436,7 +524,7 @@ li {
 	padding: 0;
 	border-right: 1px solid #CCCFD3;
 	position: relative;
-	z-index: 2;
+	z-index: 1;
 }
 
 .rtl #menu {
@@ -1300,18 +1388,18 @@ input:focus, textarea:focus {
 		padding-right: 20px;
 	}
 
-	dd select, dd input {
+	select, dd select, dd input {
 		max-width: 300px;
 	}
 
-	dd input[type="number"] {
+	input[type="number"], dd input[type="number"] {
 		max-width: 70px;
 	}
 }
 
 @media only screen and (max-width: 400px), only screen and (max-device-width: 400px)
 {
-	dd select, dd input {
+	select, dd select, dd input {
 		max-width: 240px;
 	}	
 }
@@ -1714,7 +1802,7 @@ li.pagination ul {
 	visibility: hidden;
 }*/
 
-.clearfix, #tabs, .row, #content, fieldset dl, #page-body {
+.clearfix, .row, #content, fieldset dl, #page-body {
 	height: 1%;
 	overflow: hidden;
 }
@@ -2086,6 +2174,116 @@ fieldset.permissions .padding {
 	padding: 0;
 }
 
+/* Dropdown menu
+----------------------------------------*/
+.dropdown {
+	position: absolute;
+	left: 0;
+	top: 22px;
+	z-index: 2;
+	border: 1px solid transparent;
+	border-radius: 5px;
+	padding: 9px 0 0;
+}
+
+.dropdown-up .dropdown {
+	top: auto;
+	bottom: 18px;
+	padding: 0 0 9px;
+}
+
+.dropdown-left .dropdown {
+	left: auto;
+	right: 0;
+}
+
+.dropdown .pointer, .dropdown .pointer-inner {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-top-width: 0;
+	border-bottom: 10px solid transparent;
+	border-left: 10px dashed transparent;
+	border-right: 10px dashed transparent;
+	-webkit-transform: rotate(360deg); /* better anti-aliasing in webkit */
+	display: block;
+}
+
+.dropdown-up .pointer, .dropdown-up .pointer-inner {
+	border-bottom-width: 0;
+	border-top: 10px solid transparent;
+}
+
+.dropdown .pointer {
+	right: auto;
+	left: 10px;
+	top: 0;
+	z-index: 3;
+}
+
+.dropdown-up .pointer {
+	bottom: 0;
+	top: auto;
+}
+
+.dropdown-left .dropdown .pointer {
+	left: auto;
+	right: 10px;
+}
+
+.dropdown .pointer-inner {
+	top: auto;
+	bottom: -11px;
+	left: -10px;
+}
+
+.dropdown-up .pointer-inner {
+	bottom: auto;
+	top: -11px;
+}
+
+.dropdown .pointer {
+	border-color: #B9B9B9 transparent;
+}
+
+.dropdown .pointer-inner {
+	border-color: #FFF transparent;
+}
+
+.dropdown .dropdown-contents {
+	z-index: 2;
+	overflow: hidden;
+	background: #fff;
+	border: 1px solid #b9b9b9;
+	border-radius: 5px;
+	padding: 5px;
+	position: relative;
+	box-shadow: 1px 3px 5px rgba(0, 0, 0, 0.2);
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.dropdown-up .dropdown-contents {
+	box-shadow: 1px 0 5px rgba(0, 0, 0, 0.2);
+}
+
+.dropdown li {
+	float: none;
+	margin: 0;
+	white-space: nowrap;
+	text-align: left;
+}
+
+.wrap .dropdown li, .dropdown.wrap li {
+	white-space: normal;
+}
+
+.dropdown li:before, .dropdown li:after {
+	display: none !important;
+}
+
+
 /* Classes for additional tasks
 ---------------------------------------- */
 
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index 45cec5f716..f34002c568 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -149,6 +149,73 @@ function parse_document(container)
 		}
 		
 	});
+
+	/**
+	* Responsive tabs
+	*/
+	container.find('#tabs').not('[data-skip-responsive]').each(function() {
+		var $this = $(this),
+			$body = $('body'),
+			ul = $this.children(),
+			tabs = ul.children().not('[data-skip-responsive]'),
+			links = tabs.children('a'),
+			item = ul.append('<li class="responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"><span>&nbsp;</span></a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
+			menu = item.find('.dropdown-contents'),
+			maxHeight = 0,
+			lastWidth = false,
+			responsive = false;
+
+		links.each(function() {
+			var link = $(this);
+			maxHeight = Math.max(maxHeight, Math.max(link.outerHeight(true), link.parent().outerHeight(true)));
+		})
+
+		function check() {
+			var width = $body.width(),
+				height = $this.height();
+
+			if (arguments.length == 0 && (!responsive || width <= lastWidth) && height <= maxHeight) {
+				return;
+			}
+
+			tabs.show();
+			item.hide();
+
+			lastWidth = width;
+			height = $this.height();
+			if (height <= maxHeight) {
+				responsive = false;
+				if (item.hasClass('dropdown-visible')) {
+					phpbb.toggleDropdown.call(item.find('a.responsive-tab-link').get(0));
+				}
+				return;
+			}
+
+			responsive = true;
+			item.show();
+			menu.html('');
+
+			var availableTabs = tabs.filter(':not(.activetab, .responsive-tab)'),
+				total = availableTabs.length,
+				i, tab;
+
+			for (i = total - 1; i >= 0; i --) {
+				tab = availableTabs.eq(i);
+				menu.prepend(tab.clone(true));
+				tab.hide();
+				if ($this.height() <= maxHeight) {
+					menu.find('a').click(function() { check(true); });
+					return;
+				}
+			}
+			menu.find('a').click(function() { check(true); });
+		}
+
+		phpbb.registerDropdown(item.find('a.responsive-tab-link'), item.find('.dropdown'), {visibleClass: 'activetab', verticalDirection: 'down'});
+
+		check(true);
+		$(window).resize(check);
+	});
 }
 
 /**
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index d2dbf4bea7..d5f8430349 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -55,7 +55,7 @@ function dE(n, s, type)
 		<div id="tabs">
 			<ul>
 			<!-- BEGIN t_block1 -->
-				<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
+				<li<!-- IF t_block1.S_SELECTED --> class="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
 			<!-- END t_block1 -->
 			</ul>
 		</div>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index eb16c61fd1..455446f8e3 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -119,7 +119,7 @@ function popup(url, width, height, name)
 		<div id="tabs">
 			<ul>
 			<!-- BEGIN t_block1 -->
-				<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
+				<li<!-- IF t_block1.S_SELECTED --> class="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
 			<!-- END t_block1 -->
 			</ul>
 		</div>
-- 
cgit v1.2.1


From 00734741af240ed4bcde1195e3584b48a998ee67 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 21:08:24 +0300
Subject: [ticket/11957] Do not add empty headers to responsive tables

PHPBB3-11957
---
 phpBB/adm/style/admin.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index f34002c568..08d93a2689 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -71,8 +71,9 @@ function parse_document(container)
 				var cell = $(this),
 					colspan = parseInt(cell.attr('colspan')),
 					dfn = cell.attr('data-dfn'),
-					text = dfn ? dfn : cell.text();
+					text = dfn ? dfn : cell.text().trim();
 
+				if (text == '&nbsp;') text = '';
 				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
 
 				for (i=0; i<colspan; i++) {
@@ -116,7 +117,9 @@ function parse_document(container)
 				}
 
 				if ((text.length && text !== '-') || cell.children().length) {
-					cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
+					if (headers[column] != '') {
+						cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
+					}
 				}
 				else {
 					cell.addClass('empty');
-- 
cgit v1.2.1


From 1cdb9a80572843c6eea2de6dfb16bc066c2a9edf Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 22:11:55 +0300
Subject: [ticket/11957] Hide other navigation items when one is activated

PHPBB3-11957
---
 phpBB/adm/style/admin.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index 08d93a2689..e9f0f1e512 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -25,7 +25,11 @@ function parse_document(container)
 
 		// Set onclick event
 		blocks.children('a.header').click(function() {
-			$(this).parent().toggleClass('active');
+			var parent = $(this).parent();
+			if (!parent.hasClass('active')) {
+				parent.siblings().removeClass('active');
+			}
+			parent.toggleClass('active');
 		});
 
 		// Set active menu
-- 
cgit v1.2.1


From bea94b1f5b6291bdc1c8f4d3c4e4c725e2740e88 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 22:16:54 +0300
Subject: [ticket/11957] Fix position of main block for tab-less pages

PHPBB3-11957
---
 phpBB/adm/style/admin.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 861fc617c5..bdcda9f299 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -493,6 +493,10 @@ li {
 	box-shadow: #FFF 0 0 0 1px inset;
 }
 
+#acp:first-child {
+	top: 0;
+}
+
 .panel {
 	background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top;
 	padding: 5px 0;
-- 
cgit v1.2.1


From 522d5cc3f46c3617af939c58e78101dd9887dd2c Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 22:45:55 +0300
Subject: [ticket/11957] Responsive ACP permissions

PHPBB3-11957
---
 phpBB/adm/style/acp_permission_roles.html |  2 +-
 phpBB/adm/style/acp_permissions.html      | 14 +++----
 phpBB/adm/style/admin.css                 | 70 +++++++++++++++++++++++++++++++
 phpBB/adm/style/permission_mask.html      |  2 +-
 4 files changed, 79 insertions(+), 9 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index 22272d806c..d4f7bbdf36 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -91,7 +91,7 @@
 			<!-- BEGIN auth -->
 			<div class="permissions-panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
 				<div class="tablewrap">
-					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1">
+					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1" class="not-responsive">
 					<colgroup>
 						<col class="permissions-name" />
 						<col class="permissions-yes" />
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index 88a82532a1..6dc9dca2e7 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -110,7 +110,7 @@
 
 		<!-- ELSEIF S_SELECT_USERGROUP -->
 
-		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
+		<div class="column1">
 
 		<!-- IF S_CAN_SELECT_USER -->
 
@@ -155,7 +155,7 @@
 
 		</div>
 
-		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
+		<div class="column2">
 
 		<!-- IF S_CAN_SELECT_GROUP -->
 
@@ -200,7 +200,7 @@
 
 	<!-- ELSEIF S_SELECT_USERGROUP_VIEW -->
 
-		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
+		<div class="column1">
 
 			<h1>{L_USERS}</h1>
 
@@ -241,7 +241,7 @@
 
 		</div>
 
-		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
+		<div class="column2">
 
 			<h1>{L_USERGROUPS}</h1>
 
@@ -324,7 +324,7 @@
 		</form>
 	<!-- ENDIF -->
 
-	<br /><br />
+	<br class="responsive-hide" /><br class="responsive-hide" />
 
 	<!-- include tooltip file -->
 	<script type="text/javascript" src="style/tooltip.js"></script>
@@ -340,7 +340,7 @@
 
 	<!-- INCLUDE permission_mask.html -->
 
-	<br /><br />
+	<br class="responsive-hide" /><br class="responsive-hide" />
 
 	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
 		<input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />
@@ -348,7 +348,7 @@
 		{S_FORM_TOKEN}
 	</fieldset>
 
-	<br /><br />
+	<br class="responsive-hide" /><br class="responsive-hide" />
 
 	</form>
 
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index bdcda9f299..fc565f8713 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1224,6 +1224,7 @@ select#full_folder_action {
 	}
 
 	fieldset.quick, p.quick {
+		float: none !important;
 		text-align: center;
 	}
 
@@ -1861,6 +1862,15 @@ li.pagination ul {
 /* Permission interface
 ---------------------------------------- */
 
+.column1, .column2 {
+	width: 48%;
+	float: left;
+}
+
+.ltr .column2, .rtl .column1 {
+	float: right;
+}
+
 fieldset.permissions legend {
 	text-transform: none;
 }
@@ -2149,6 +2159,66 @@ fieldset.permissions .padding {
 	padding: 0;
 }
 
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	.column1, .column2 {
+		float: none !important;
+		width: auto;
+	}
+
+	.permissions-simple {
+		clear: both;
+	}
+
+	.permissions-simple td, .permissions-simple dd {
+		width: auto !important;
+		margin-left: 0 !important;
+		margin-right: 0 !important;
+	}
+
+	.permissions-simple dd {
+		margin-top: 5px;
+	}
+
+	.permissions-panel .tablewrap {
+		margin: 0 5px;
+	}
+
+	.permissions-category {
+		min-width: 0;
+		margin: 0 !important;
+	}
+
+	.permissions-category a, .permissions-category a span.tabbg {
+		display: block;
+		float: none !important;
+		background: transparent none;
+	}
+
+	.permissions-category a {
+		background: #d9e5ee;
+		margin: 5px 0;
+		padding: 0 !important;
+		border-radius: 3px;
+		text-decoration: underline;
+	}
+
+	.permissions-category .activetab a {
+		background-color: #dd6900;
+		color: #fff;
+	}
+
+	.permissions-category a span.tabbg {
+		color: inherit !important;
+		padding-top: 6px !important;
+		padding-bottom: 6px !important;
+	}
+
+	.permissions-category .activetab span.colour {
+		border-color: #fff;
+	}
+}
+
 /* Avatars gallery
 ---------------------------------------- */
 #gallery {
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index ac65754a14..003e8369ca 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -76,7 +76,7 @@
 	<!-- BEGIN category -->
 		<div class="permissions-panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
 			<div class="tablewrap">
-				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1">
+				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1" class="not-responsive">
 				<colgroup>
 					<col class="permissions-name" />
 					<col class="permissions-yes" />
-- 
cgit v1.2.1


From 65ab004f966045272f348bf5dd9df49190516096 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 27 Oct 2013 01:27:31 +0300
Subject: [ticket/11957] Responsive ACP groups table

PHPBB3-11957
---
 phpBB/adm/style/acp_groups_position.html |  4 ++--
 phpBB/adm/style/admin.css                | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index cf1a7be427..7aa894945a 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -41,7 +41,7 @@
 		<tr data-down="{legend.U_MOVE_DOWN}" data-up="{legend.U_MOVE_UP}">
 			<td><strong<!-- IF legend.GROUP_COLOUR --> style="color: {legend.GROUP_COLOUR}"<!-- ENDIF -->>{legend.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{legend.GROUP_TYPE}</td>
-			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
+			<td class="actions">
 				<!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
 					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
@@ -136,7 +136,7 @@
 			</td>
 			<td style="text-align: center;"><!-- IF teampage.GROUP_TYPE -->{teampage.GROUP_TYPE}<!-- ELSE -->-<!-- ENDIF -->
 			</td></td>
-			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
+			<td class="actions">
 				<!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
 					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
 					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index fc565f8713..c411d2d0a2 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -856,21 +856,20 @@ td.name {
 	color: #BC2A4D;
 }
 
-/* Forums list */
+/* Specific tables */
 table.forums td.folder {
 	width: 27px;
 	text-align: center;
 }
 
-table.forums td.actions {
+table td.actions {
 	vertical-align: middle;
 	width: 100px;
-	text-align: right;
+	text-align: center;
 	white-space: nowrap;
 }
 
-/* Styles list */
-table.styles td.users, table.styles td.actions, table.styles td.mark {
+table.styles td.users, table td.mark {
 	text-align: center;
 }
 
@@ -972,7 +971,7 @@ table.styles td.users, table.styles td.actions, table.styles td.mark {
 		float: right;
 	}
 
-	/* Forums list */
+	/* Specific tables */
 	table.responsive.forums td.folder {
 		float: left;
 		width: 27px;
@@ -993,22 +992,21 @@ table.styles td.users, table.styles td.actions, table.styles td.mark {
 		margin-right: 35px;
 	}
 
-	table.responsive.forums td.actions {
+	table.responsive td.actions {
 		clear: both;
 		text-align: right !important;
 	}
 
-	.rtl table.responsive.forums td.actions {
+	.rtl table.responsive td.actions {
 		text-align: left !important;
 	}
 
-	/* Styles list */
 	table.responsive.styles tr.responsive-style-row td:first-child {
 		padding-left: 4px !important;
 		padding-right: 4px !important;
 	}
 
-	table.responsive.styles td:first-child > dfn, table.responsive.styles td.actions > dfn {
+	table.responsive.styles td:first-child > dfn, table.responsive td.actions > dfn {
 		display: none !important;
 	}
 }
-- 
cgit v1.2.1


From 2f19b549d8f19eaedc3e49b9c48d2561f4792145 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 28 Oct 2013 13:42:00 +0200
Subject: [ticket/11957] Append new line to install_header

PHPBB3-11957
---
 phpBB/adm/style/install_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index d5f8430349..560bf501e9 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -76,4 +76,4 @@ function dE(n, s, type)
 					</div>
 
 					<div id="main" class="install-body">
-						<div class="main">
\ No newline at end of file
+						<div class="main">
-- 
cgit v1.2.1


From 5dd199dd604b6bec14cf96c1d7d6a6b38e44057a Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 28 Oct 2013 20:18:56 +0200
Subject: [ticket/11982] Fix z-index for AJAX popup background

PHPBB3-11982
---
 phpBB/adm/style/admin.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index c411d2d0a2..0cbdc2e9f8 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1575,6 +1575,7 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 	height: 100%;
 	background-color: #000000;
 	opacity: 0.5;
+	z-index: 45;
 }
 
 @media only screen and (max-height: 500px), only screen and (max-device-width: 500px)
-- 
cgit v1.2.1


From da4e0c4219e5132ffddd67fc4621840c557c132a Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 15 Oct 2013 21:37:53 -0700
Subject: [ticket/11928] Replace AJAX loading popup with animation.

PHPBB3-11928
---
 phpBB/adm/style/admin.css           | 14 ++++++++++++++
 phpBB/adm/style/overall_footer.html |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 0cbdc2e9f8..fee2efb001 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1593,6 +1593,20 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 	}
 }
 
+#loading_indicator {
+	background: #000000 url("../images/loading.gif") center center no-repeat;
+	border-radius: 5px;
+	display: none;
+	opacity: 0.8;
+	margin-top: -50px;
+	margin-left: -50px;
+	height: 50px;
+	width: 50px;
+	position: fixed;
+	left: 50%;
+	top: 50%;
+}
+
 /* Pagination
 ---------------------------------------- */
 .pagination {
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 3c291842dc..72af9d3388 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -17,8 +17,8 @@
 
 		<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
 			<div id="darken">&nbsp;</div>
-			<div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
 		</div>
+		<div id="loading_indicator"></div>
 
 		<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
 			<a href="#" class="alert_close"></a>
-- 
cgit v1.2.1


From 57fc62b000391438adde160f97efaea7e2f0329a Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 29 Oct 2013 10:11:29 -0700
Subject: [ticket/11928] Make sure the indicator is on top of other elements.

PHPBB3-11928
---
 phpBB/adm/style/admin.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index fee2efb001..e6146e2156 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1605,6 +1605,7 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 	position: fixed;
 	left: 50%;
 	top: 50%;
+	z-index: 51;
 }
 
 /* Pagination
-- 
cgit v1.2.1


From 05dd4d55d2f5c4293c794f0f3f061cb551a5bb50 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 30 Oct 2013 15:43:07 -0700
Subject: [ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}.

PHPBB3-11987
---
 phpBB/adm/style/acp_attachments.html | 6 +++---
 phpBB/adm/style/acp_icons.html       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index c7b451e68b..0ba8581201 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -122,11 +122,11 @@
 			{
 				if (newimage == 'no_image')
 				{
-					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}images/spacer.gif";
+					document.getElementById('image_upload_icon').src = "{ROOT_PATH}images/spacer.gif";
 				}
 				else
 				{
-					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
+					document.getElementById('image_upload_icon').src = "{ROOT_PATH}{IMG_PATH}/" + newimage;
 				}
 			}
 
@@ -192,7 +192,7 @@
 			<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">
 					<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}
 			</select></dd>
-			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
+			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
 		</dl>
 		<dl>
 			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt>
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index eca02d2798..1187b7b775 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -22,7 +22,7 @@
 			{
 				var use_element = smiley[newimage];
 
-				document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage);
+				document.getElementById('add_image_src').src = '{ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage);
 				document.getElementById('add_code').value = use_element['code'];
 				document.getElementById('add_emotion').value = use_element['emotion'];
 				document.getElementById('add_width').value = use_element['width'];
-- 
cgit v1.2.1


From b225dd37d765cc37beccb139e63432d78e0bc37e Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 27 Oct 2013 01:28:57 +0300
Subject: [ticket/11977] Use CSS instead of JS to disable up/down icons

PHPBB3-11977
---
 phpBB/adm/style/acp_forums.html          | 25 ++--------
 phpBB/adm/style/acp_groups_position.html | 42 ++++-------------
 phpBB/adm/style/admin.css                |  8 ++++
 phpBB/adm/style/ajax.js                  | 79 --------------------------------
 4 files changed, 20 insertions(+), 134 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 3fd2f18d67..d4088a9b44 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -453,19 +453,10 @@
 					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}{L_COLON} <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}{L_COLON} <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
 				</td>
 				<td class="actions">
-					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
-						<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
-					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
-						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
-						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
-					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
-						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
-						<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
-					<!-- ELSE -->
-						<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-						<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
-					<!-- ENDIF -->
+					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
+					<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
+					<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 					<a href="{forums.U_EDIT}">{ICON_EDIT}</a>
 					<!-- IF not forums.S_FORUM_LINK -->
 						<a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a>
@@ -501,14 +492,6 @@
 	</fieldset>
 	</form>
 
-	<div class="hidden">
-		<a class="template-up-img" href="#">{ICON_MOVE_UP}</a>
-		<span class="template-up-img-disabled">{ICON_MOVE_UP_DISABLED}</span>
-
-		<a class="template-down-img" href="#">{ICON_MOVE_DOWN}</a>
-		<span class="template-down-img-disabled">{ICON_MOVE_DOWN_DISABLED}</span>
-	</div>
-
 <!-- ENDIF -->
 
 <!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 7aa894945a..e9858b4018 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -42,19 +42,10 @@
 			<td><strong<!-- IF legend.GROUP_COLOUR --> style="color: {legend.GROUP_COLOUR}"<!-- ENDIF -->>{legend.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{legend.GROUP_TYPE}</td>
 			<td class="actions">
-				<!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
-					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
-				<!-- ELSEIF not legend.S_FIRST_ROW && not legend.S_LAST_ROW -->
-					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
-					<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
-				<!-- ELSEIF legend.S_LAST_ROW && not legend.S_FIRST_ROW -->
-					<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
-					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
-				<!-- ELSE -->
-					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
-				<!-- ENDIF -->
+				<span class="up-disabled" style="display: none;">{ICON_MOVE_UP_DISABLED}</span>
+				<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+				<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
+				<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<a href="{legend.U_DELETE}">{ICON_DELETE}</a>
 			</td>
 		</tr>
@@ -137,19 +128,10 @@
 			<td style="text-align: center;"><!-- IF teampage.GROUP_TYPE -->{teampage.GROUP_TYPE}<!-- ELSE -->-<!-- ENDIF -->
 			</td></td>
 			<td class="actions">
-				<!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
-					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
-				<!-- ELSEIF not teampage.S_FIRST_ROW && not teampage.S_LAST_ROW -->
-					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
-					<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
-				<!-- ELSEIF teampage.S_LAST_ROW && not teampage.S_FIRST_ROW -->
-					<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
-					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
-				<!-- ELSE -->
-					<span class="up">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>
-				<!-- ENDIF -->
+				<span class="up-disabled" style="display: none;">{ICON_MOVE_UP_DISABLED}</span>
+				<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+				<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
+				<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
 				<a href="{teampage.U_DELETE}">{ICON_DELETE}</a>
 			</td>
 		</tr>
@@ -186,12 +168,4 @@
 		</fieldset>
 	</form>
 
-	<div class="hidden">
-		<a class="template-up-img" href="#">{ICON_MOVE_UP}</a>
-		<span class="template-up-img-disabled">{ICON_MOVE_UP_DISABLED}</span>
-
-		<a class="template-down-img" href="#">{ICON_MOVE_DOWN}</a>
-		<span class="template-down-img-disabled">{ICON_MOVE_DOWN_DISABLED}</span>
-	</div>
-
 <!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 0cbdc2e9f8..006cee9080 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -869,6 +869,14 @@ table td.actions {
 	white-space: nowrap;
 }
 
+table tr:first-child td.actions .up, table tr:last-child td.actions .down {
+	display: none;
+}
+
+table tr:first-child td.actions .up-disabled, table tr:last-child td.actions .down-disabled {
+	display: inline !important;
+}
+
 table.styles td.users, table td.mark {
 	text-align: center;
 }
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index efb0639f1b..78fcbd88fd 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -2,13 +2,6 @@
 
 "use strict";
 
-var imgTemplates = {
-	up: $('.template-up-img'),
-	upDisabled: $('.template-up-img-disabled'),
-	down: $('.template-down-img'),
-	downDisabled: $('.template-down-img-disabled')
-};
-
 /**
  * The following callbacks are for reording items. row_down
  * is triggered when an item is moved down, and row_up is triggered when
@@ -20,43 +13,7 @@ phpbb.addAjaxCallback('row_down', function() {
 		tr = el.parents('tr'),
 		trSwap = tr.next();
 
-	/*
-	* If the element was the first one, we have to:
-	* - Add the up-link to the row we moved
-	* - Remove the up-link on the next row
-	*/
-	if (tr.is(':first-child')) {
-		var upImg = imgTemplates.up.clone().attr('href', tr.attr('data-up'));
-		tr.find('.up').html(upImg);
-
-		phpbb.ajaxify({
-			selector: tr.find('.up').children('a'),
-			callback: 'row_up',
-			overlay: false
-		});
-
-		trSwap.find('.up').html(imgTemplates.upDisabled.clone());
-	}
-
 	tr.insertAfter(trSwap);
-
-	/*
-	* As well as:
-	* - Remove the down-link on the moved row, if it is now the last row
-	* - Add the down-link to the next row, if it was the last row
-	*/
-	if (tr.is(':last-child')) {
-		tr.find('.down').html(imgTemplates.downDisabled.clone());
-
-		var downImg = imgTemplates.down.clone().attr('href', trSwap.attr('data-down'));
-		trSwap.find('.down').html(downImg);
-
-		phpbb.ajaxify({
-			selector: trSwap.find('.down').children('a'),
-			callback: 'row_down',
-			overlay: false
-		});
-	}
 });
 
 phpbb.addAjaxCallback('row_up', function() {
@@ -64,43 +21,7 @@ phpbb.addAjaxCallback('row_up', function() {
 		tr = el.parents('tr'),
 		trSwap = tr.prev();
 
-	/*
-	* If the element was the last one, we have to:
-	* - Add the down-link to the row we moved
-	* - Remove the down-link on the next row
-	*/
-	if (tr.is(':last-child')) {
-		var downImg = imgTemplates.down.clone().attr('href', tr.attr('data-down'));
-		tr.find('.down').html(downImg);
-
-		phpbb.ajaxify({
-			selector: tr.find('.down').children('a'),
-			callback: 'row_down',
-			overlay: false
-		});
-
-		trSwap.find('.down').html(imgTemplates.downDisabled.clone());
-	}
-
 	tr.insertBefore(trSwap);
-
-	/*
-	* As well as:
-	* - Remove the up-link on the moved row, if it is now the first row
-	* - Add the up-link to the previous row, if it was the first row
-	*/
-	if (tr.is(':first-child')) {
-		tr.find('.up').html(imgTemplates.upDisabled.clone());
-
-		var upImg = imgTemplates.up.clone().attr('href', trSwap.attr('data-up'));
-		trSwap.find('.up').html(upImg);
-
-		phpbb.ajaxify({
-			selector: trSwap.find('.up').children('a'),
-			callback: 'row_up',
-			overlay: false
-		});
-	}
 });
 
 /**
-- 
cgit v1.2.1


From a6117c51b909007456674f69cd344bf6c7f50b3d Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 3 Nov 2013 15:36:20 +0200
Subject: [ticket/11977] Remove data and change code in acp_modules

PHPBB3-11977
---
 phpBB/adm/style/acp_forums.html          |  2 +-
 phpBB/adm/style/acp_groups_position.html |  4 ++--
 phpBB/adm/style/acp_modules.html         | 19 +++++--------------
 3 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index d4088a9b44..04c6ecde3a 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -444,7 +444,7 @@
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<tbody>
 		<!-- BEGIN forums -->
-			<tr data-down="{forums.U_MOVE_DOWN}" data-up="{forums.U_MOVE_UP}">
+			<tr>
 				<td class="folder">{forums.FOLDER_IMAGE}</td>
 				<td class="forum-desc">
 					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index e9858b4018..a32dd1e3a7 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -38,7 +38,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN legend -->
-		<tr data-down="{legend.U_MOVE_DOWN}" data-up="{legend.U_MOVE_UP}">
+		<tr>
 			<td><strong<!-- IF legend.GROUP_COLOUR --> style="color: {legend.GROUP_COLOUR}"<!-- ENDIF -->>{legend.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{legend.GROUP_TYPE}</td>
 			<td class="actions">
@@ -117,7 +117,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN teampage -->
-		<tr data-down="{teampage.U_MOVE_DOWN}" data-up="{teampage.U_MOVE_UP}">
+		<tr>
 			<td>
 				<!-- IF teampage.U_CATEGORY -->
 					<a href="{teampage.U_CATEGORY}">{teampage.GROUP_NAME}</a>
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index 1e49198725..f8be80bc57 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -149,20 +149,11 @@
 				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
 				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
 				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
-				<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;">
-					<!-- IF modules.S_FIRST_ROW && not modules.S_LAST_ROW -->
-						{ICON_MOVE_UP_DISABLED}
-						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF not modules.S_FIRST_ROW && not modules.S_LAST_ROW-->
-						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
-						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
-					<!-- ELSEIF modules.S_LAST_ROW && not modules.S_FIRST_ROW -->
-						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ELSE -->
-						{ICON_MOVE_UP_DISABLED}
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ENDIF -->
+				<td class="actions">
+					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
+					<span class="up"><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a></span>
+					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
+					<span class="down"><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a></span>
 					<a href="{modules.U_EDIT}">{ICON_EDIT}</a> 
 					<a href="{modules.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
 				</td>
-- 
cgit v1.2.1


From 8d5fcc8d4ca85c2752771ba7c808ed4e19c3c773 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 1 Nov 2013 15:33:31 +0100
Subject: [ticket/11994] Make extension manager UI less misleading

Enable and Install were split into two different expressions.
Purge was renamed to uninstall to make clearer what is going to happen.

PHPBB3-11994
---
 phpBB/adm/style/acp_ext_disable.html | 14 +++++++-------
 phpBB/adm/style/acp_ext_enable.html  | 16 ++++++++--------
 phpBB/adm/style/acp_ext_list.html    | 10 ++++------
 phpBB/adm/style/acp_ext_purge.html   | 16 ++++++++--------
 4 files changed, 27 insertions(+), 29 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
index 7dc3f6ec97..4fa0893be7 100644
--- a/phpBB/adm/style/acp_ext_disable.html
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -5,29 +5,29 @@
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_DISABLE_EXPLAIN}</p>
+	<p>{L_EXTENSION_DISABLE_EXPLAIN}</p>
 
 	<!-- IF PRE -->
 	<div class="errorbox">
-		<p>{L_DISABLE_CONFIRM}</p>
+		<p>{L_CONFIRM_MESSAGE}</p>
 	</div>
 
 	<form id="acp_extensions" method="post" action="{U_DISABLE}">
 	<fieldset class="submit-buttons">
-		<legend>{L_DISABLE}</legend>
-		<input class="button1" type="submit" name="disable" value="{L_DISABLE}" />
+		<legend>{L_EXTENSION_DISABLE}</legend>
+		<input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}" />
 		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
 		<div class="errorbox">
-			<p>{L_DISABLE_IN_PROGRESS}</p>
+			<p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p>
 		</div>
 	<!-- ELSE -->
 		<div class="successbox">
-			<p>{L_DISABLE_SUCCESS}</p>
+			<p>{L_EXTENSION_DISABLE_SUCCESS}</p>
 			<br />
-			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 		</div>
 	<!-- ENDIF -->
 
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 35585207eb..2a8c638b1d 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -5,35 +5,35 @@
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_ENABLE_EXPLAIN}</p>
+	<p><!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE_EXPLAIN}<!-- ELSE -->{L_EXTENSION_INSTALL_EXPLAIN}<!-- ENDIF --></p>
 
 	<!-- IF MIGRATOR_ERROR -->
 	<div class="errorbox">
 		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
 		<p>{MIGRATOR_ERROR}</p>
-		<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 	</div>
 	<!-- ELSEIF PRE -->
 	<div class="errorbox">
-		<p>{L_ENABLE_CONFIRM}</p>
+		<p>{L_CONFIRM_MESSAGE}</p>
 	</div>
 
 	<form id="acp_extensions" method="post" action="{U_ENABLE}">
 	<fieldset class="submit-buttons">
-		<legend>{L_ENABLE}</legend>
-		<input class="button1" type="submit" name="enable" value="{L_ENABLE}" />
+		<legend><!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE}<!-- ELSE -->{L_EXTENSION_INSTALL}<!-- ENDIF --></legend>
+		<input class="button1" type="submit" name="enable" value="<!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE}<!-- ELSE -->{L_EXTENSION_INSTALL}<!-- ENDIF -->" />
 		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
 		<div class="errorbox">
-			<p>{L_ENABLE_IN_PROGRESS}</p>
+			<p><!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE_IN_PROGRESS}<!-- ELSE -->{L_EXTENSION_INSTALL_IN_PROGRESS}<!-- ENDIF --></p>
 		</div>
 	<!-- ELSE -->
 		<div class="successbox">
-			<p>{L_ENABLE_SUCCESS}</p>
+			<p><!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE_SUCCESS}<!-- ELSE -->{L_EXTENSION_INSTALL_SUCCESS}<!-- ENDIF --></p>
 			<br />
-			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 		</div>
 	<!-- ENDIF -->
 
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 390b3e79f0..8408ebe748 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -18,9 +18,7 @@
 	<tbody>
 		<!-- IF .enabled -->
 		<tr>
-			<td class="row3" colspan="3">
-				<strong>{L_ENABLED} {L_EXTENSIONS}</strong>
-			</td>
+			<td class="row3" colspan="3"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
 		</tr>
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled">
@@ -28,7 +26,7 @@
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
 			<td style="text-align: center;">
 				<!-- BEGIN actions -->
-					<a href="{enabled.actions.U_ACTION}" title="{enabled.actions.L_ACTION}">{enabled.actions.L_ACTION}</a>
+					<a href="{enabled.actions.U_ACTION}"<!-- IF enabled.actions.L_ACTION_EXPLAIN --> title="{enabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{enabled.actions.L_ACTION}</a>
 					<!-- IF not enabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
 				<!-- END actions -->
 			</td>
@@ -38,7 +36,7 @@
 
 		<!-- IF .disabled -->
 		<tr>
-			<td class="row3" colspan="3"><strong>{L_DISABLED} {L_EXTENSIONS}</strong></td>
+			<td class="row3" colspan="3"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
 		</tr>
 		<!-- BEGIN disabled -->
 		<tr class="ext_disabled">
@@ -48,7 +46,7 @@
 			</td>
 			<td style="text-align: center;">
 				<!-- BEGIN actions -->
-					<a href="{disabled.actions.U_ACTION}" title="{disabled.actions.L_ACTION}">{disabled.actions.L_ACTION}</a>
+					<a href="{disabled.actions.U_ACTION}"<!-- IF disabled.actions.L_ACTION_EXPLAIN --> title="{disabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{disabled.actions.L_ACTION}</a>
 					<!-- IF not disabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
 				<!-- END actions -->
 			</td>
diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html
index 94bef82ca5..310efd0e1d 100644
--- a/phpBB/adm/style/acp_ext_purge.html
+++ b/phpBB/adm/style/acp_ext_purge.html
@@ -5,35 +5,35 @@
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_PURGE_EXPLAIN}</p>
+	<p>{L_EXTENSION_UNINSTALL_EXPLAIN}</p>
 
 	<!-- IF MIGRATOR_ERROR -->
 	<div class="errorbox">
 		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
 		<p>{MIGRATOR_ERROR}</p>
-		<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 	</div>
 	<!-- ELSEIF PRE -->
 	<div class="errorbox">
-		<p>{L_PURGE_CONFIRM}</p>
+		<p>{L_CONFIRM_MESSAGE}</p>
 	</div>
 
 	<form id="acp_extensions" method="post" action="{U_PURGE}">
 	<fieldset class="submit-buttons">
-		<legend>{L_PURGE}</legend>
-		<input class="button1" type="submit" name="purge" value="{L_PURGE}" />
+		<legend>{L_EXTENSION_UNINSTALL}</legend>
+		<input class="button1" type="submit" name="purge" value="{L_EXTENSION_UNINSTALL}" />
 		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
 		<div class="errorbox">
-			<p>{L_PURGE_IN_PROGRESS}</p>
+			<p>{L_EXTENSION_UNINSTALL_IN_PROGRESS}</p>
 		</div>
 	<!-- ELSE -->
 		<div class="successbox">
-			<p>{L_PURGE_SUCCESS}</p>
+			<p>{L_EXTENSION_UNINSTALL_SUCCESS}</p>
 			<br />
-			<p><a href="{U_RETURN}">{L_RETURN}</a></p>
+			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 		</div>
 	<!-- ENDIF -->
 
-- 
cgit v1.2.1


From 7e1a02b3a192771043009078630e8e2b9b8026a1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 2 Nov 2013 23:23:48 +0100
Subject: [ticket/11994] Make install/enable just one UI thing

PHPBB3-11994
---
 phpBB/adm/style/acp_ext_enable.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 2a8c638b1d..670904a2ce 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -5,7 +5,7 @@
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p><!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE_EXPLAIN}<!-- ELSE -->{L_EXTENSION_INSTALL_EXPLAIN}<!-- ENDIF --></p>
+	<p>{L_EXTENSION_ENABLE_EXPLAIN}</p>
 
 	<!-- IF MIGRATOR_ERROR -->
 	<div class="errorbox">
@@ -20,18 +20,18 @@
 
 	<form id="acp_extensions" method="post" action="{U_ENABLE}">
 	<fieldset class="submit-buttons">
-		<legend><!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE}<!-- ELSE -->{L_EXTENSION_INSTALL}<!-- ENDIF --></legend>
-		<input class="button1" type="submit" name="enable" value="<!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE}<!-- ELSE -->{L_EXTENSION_INSTALL}<!-- ENDIF -->" />
+		<legend>{L_EXTENSION_ENABLE}</legend>
+		<input class="button1" type="submit" name="enable" value="{L_EXTENSION_ENABLE}" />
 		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
 		<div class="errorbox">
-			<p><!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE_IN_PROGRESS}<!-- ELSE -->{L_EXTENSION_INSTALL_IN_PROGRESS}<!-- ENDIF --></p>
+			<p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p>
 		</div>
 	<!-- ELSE -->
 		<div class="successbox">
-			<p><!-- IF IS_ENABLING -->{L_EXTENSION_ENABLE_SUCCESS}<!-- ELSE -->{L_EXTENSION_INSTALL_SUCCESS}<!-- ENDIF --></p>
+			<p>{L_EXTENSION_ENABLE_SUCCESS}</p>
 			<br />
 			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 		</div>
-- 
cgit v1.2.1


From f8e92efc3f213f966a4faa1966ff8e64270328f4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 2 Nov 2013 23:40:56 +0100
Subject: [ticket/11994] Rename "uninstall" to "delete data"

PHPBB3-11994
---
 phpBB/adm/style/acp_ext_delete_data.html | 40 ++++++++++++++++++++++++++++++++
 phpBB/adm/style/acp_ext_purge.html       | 40 --------------------------------
 2 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 phpBB/adm/style/acp_ext_delete_data.html
 delete mode 100644 phpBB/adm/style/acp_ext_purge.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_delete_data.html b/phpBB/adm/style/acp_ext_delete_data.html
new file mode 100644
index 0000000000..bbac22055f
--- /dev/null
+++ b/phpBB/adm/style/acp_ext_delete_data.html
@@ -0,0 +1,40 @@
+<!-- INCLUDE overall_header.html -->
+
+	<a name="maincontent"></a>
+
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
+
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+	<p>{L_EXTENSION_DELETE_DATA_EXPLAIN}</p>
+
+	<!-- IF MIGRATOR_ERROR -->
+	<div class="errorbox">
+		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
+		<p>{MIGRATOR_ERROR}</p>
+		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
+	</div>
+	<!-- ELSEIF PRE -->
+	<div class="errorbox">
+		<p>{L_CONFIRM_MESSAGE}</p>
+	</div>
+
+	<form id="acp_extensions" method="post" action="{U_PURGE}">
+	<fieldset class="submit-buttons">
+		<legend>{L_EXTENSION_DELETE_DATA}</legend>
+		<input class="button1" type="submit" name="purge" value="{L_EXTENSION_DELETE_DATA}" />
+		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+	</fieldset>
+	</form>
+	<!-- ELSEIF S_NEXT_STEP -->
+		<div class="errorbox">
+			<p>{L_EXTENSION_DELETE_DATA_IN_PROGRESS}</p>
+		</div>
+	<!-- ELSE -->
+		<div class="successbox">
+			<p>{L_EXTENSION_DELETE_DATA_SUCCESS}</p>
+			<br />
+			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
+		</div>
+	<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html
deleted file mode 100644
index 310efd0e1d..0000000000
--- a/phpBB/adm/style/acp_ext_purge.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a name="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_EXTENSION_UNINSTALL_EXPLAIN}</p>
-
-	<!-- IF MIGRATOR_ERROR -->
-	<div class="errorbox">
-		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
-		<p>{MIGRATOR_ERROR}</p>
-		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-	</div>
-	<!-- ELSEIF PRE -->
-	<div class="errorbox">
-		<p>{L_CONFIRM_MESSAGE}</p>
-	</div>
-
-	<form id="acp_extensions" method="post" action="{U_PURGE}">
-	<fieldset class="submit-buttons">
-		<legend>{L_EXTENSION_UNINSTALL}</legend>
-		<input class="button1" type="submit" name="purge" value="{L_EXTENSION_UNINSTALL}" />
-		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-	</fieldset>
-	</form>
-	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="errorbox">
-			<p>{L_EXTENSION_UNINSTALL_IN_PROGRESS}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="successbox">
-			<p>{L_EXTENSION_UNINSTALL_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 7a8a4408952659d59a3c92108eae6ef0f10a5bb3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 8 Nov 2013 14:08:55 +0100
Subject: [ticket/12002] Change functional test to use link hash

PHPBB3-12002
---
 phpBB/adm/style/acp_ext_delete_data.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_delete_data.html b/phpBB/adm/style/acp_ext_delete_data.html
index bbac22055f..5b38d9b8d0 100644
--- a/phpBB/adm/style/acp_ext_delete_data.html
+++ b/phpBB/adm/style/acp_ext_delete_data.html
@@ -21,7 +21,7 @@
 	<form id="acp_extensions" method="post" action="{U_PURGE}">
 	<fieldset class="submit-buttons">
 		<legend>{L_EXTENSION_DELETE_DATA}</legend>
-		<input class="button1" type="submit" name="purge" value="{L_EXTENSION_DELETE_DATA}" />
+		<input class="button1" type="submit" name="delete_data" value="{L_EXTENSION_DELETE_DATA}" />
 		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
 	</form>
-- 
cgit v1.2.1


From 57ec9ee49e95fa45f8c5c441b4ed05095c3918a8 Mon Sep 17 00:00:00 2001
From: Lukasz <luki_9@wp.pl>
Date: Thu, 7 Nov 2013 19:52:27 +0100
Subject: [ticket/12005] Remove PM popup setting from user preferences
 PHPBB3-12005

---
 phpBB/adm/style/acp_users_prefs.html | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
index f1b9e28a66..1092b25b04 100644
--- a/phpBB/adm/style/acp_users_prefs.html
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -39,11 +39,6 @@
 		<dd><label><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
-	<dl> 
-		<dt><label for="popuppm">{L_POPUP_ON_PM}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
 	<dl> 
 		<dt><label for="lang">{L_BOARD_LANGUAGE}{L_COLON}</label></dt>
 		<dd><select id="lang" name="lang">{S_LANG_OPTIONS}</select></dd>
-- 
cgit v1.2.1


From c386bf7911edfc4613c6a70dae37db76bfe645cb Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 18 Oct 2013 20:47:22 -0700
Subject: [ticket/11472] Make prosilver's editor.js an asset used by all
 styles.

PHPBB3-11472
---
 phpBB/adm/style/acp_users_signature.html |   2 +-
 phpBB/adm/style/editor.js                | 336 -------------------------------
 2 files changed, 1 insertion(+), 337 deletions(-)
 delete mode 100644 phpBB/adm/style/editor.js

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index 2b4964803e..5bd6b0921a 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -32,7 +32,7 @@
 
 // ]]>
 </script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
+<!-- INCLUDEJS {ROOT_PATH}assets/javascript/editor.js -->
 
 <form id="user_signature" method="post" action="{U_ACTION}">
 
diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
deleted file mode 100644
index 9938ff5d0b..0000000000
--- a/phpBB/adm/style/editor.js
+++ /dev/null
@@ -1,336 +0,0 @@
-/**
-* bbCode control by subBlue design [ www.subBlue.com ]
-* Includes unixsafe colour palette selector by SHS`
-*/
-
-// Startup variables
-var imageTag = false;
-var theSelection = false;
-
-// Check for Browser & Platform for PC & IE specific bits
-// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
-var clientPC = navigator.userAgent.toLowerCase(); // Get client info
-var clientVer = parseInt(navigator.appVersion, 10); // Get browser version
-
-var is_ie = ((clientPC.indexOf('msie') !== -1) && (clientPC.indexOf('opera') === -1));
-var is_win = ((clientPC.indexOf('win') !== -1) || (clientPC.indexOf('16bit') !== -1));
-var baseHeight;
-
-/**
-* Shows the help messages in the helpline window
-*/
-function helpline(help) {
-	document.forms[form_name].helpbox.value = help_line[help];
-}
-
-/**
-* Fix a bug involving the TextRange object. From
-* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/ 
-function initInsertions() {
-	var doc;
-
-	if (document.forms[form_name]) {
-		doc = document;
-	} else {
-		doc = opener.document;
-	}
-
-	var textarea = doc.forms[form_name].elements[text_name];
-
-	if (is_ie && typeof(baseHeight) !== 'number') {
-		textarea.focus();
-		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
-
-		if (!document.forms[form_name]) {
-			document.body.focus();
-		}
-	}
-}
-
-/**
-* bbstyle
-*/
-function bbstyle(bbnumber) {
-	if (bbnumber !== -1) {
-		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	} else {
-		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();
-	}
-}
-
-/**
-* Apply bbcodes
-*/
-function bbfontstyle(bbopen, bbclose) {
-	theSelection = false;
-
-	var textarea = document.forms[form_name].elements[text_name];
-
-	textarea.focus();
-
-	if ((clientVer >= 4) && is_ie && is_win) {
-		// Get text selection
-		theSelection = document.selection.createRange().text;
-
-		if (theSelection) {
-			// Add tags around selection
-			document.selection.createRange().text = bbopen + theSelection + bbclose;
-			document.forms[form_name].elements[text_name].focus();
-			theSelection = '';
-			return;
-		}
-	} else if (document.forms[form_name].elements[text_name].selectionEnd
-			&& (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) {
-		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);
-		document.forms[form_name].elements[text_name].focus();
-		theSelection = '';
-		return;
-	}
-
-	//The new position for the cursor after adding the bbcode
-	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;
-
-	// Open tag
-	insert_text(bbopen + bbclose);
-
-	// Center the cursor when we don't have a selection
-	// Gecko and proper browsers
-	if (!isNaN(textarea.selectionStart)) {
-		textarea.selectionStart = new_pos;
-		textarea.selectionEnd = new_pos;
-	}
-	// IE
-	else if (document.selection) {
-		var range = textarea.createTextRange(); 
-		range.move("character", new_pos); 
-		range.select();
-		storeCaret(textarea);
-	}
-
-	textarea.focus();
-	return;
-}
-
-/**
-* Insert text at position
-*/
-function insert_text(text, spaces, popup) {
-	var textarea;
-
-	if (!popup) {
-		textarea = document.forms[form_name].elements[text_name];
-	} else {
-		textarea = opener.document.forms[form_name].elements[text_name];
-	}
-
-	if (spaces) {
-		text = ' ' + text + ' ';
-	}
-
-	if (!isNaN(textarea.selectionStart)) {
-		var sel_start = textarea.selectionStart;
-		var sel_end = textarea.selectionEnd;
-
-		mozWrap(textarea, text, '');
-		textarea.selectionStart = sel_start + text.length;
-		textarea.selectionEnd = sel_end + text.length;
-	} else if (textarea.createTextRange && textarea.caretPos) {
-		if (baseHeight !== textarea.caretPos.boundingHeight) {
-			textarea.focus();
-			storeCaret(textarea);
-		}
-
-		var caret_pos = textarea.caretPos;
-		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) === ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-	} else {
-		textarea.value = textarea.value + text;
-	}
-
-	if (!popup) {
-		textarea.focus();
-	}
-}
-
-/**
-* Add inline attachment at position
-*/
-function attach_inline(index, filename) {
-	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
-	document.forms[form_name].elements[text_name].focus();
-}
-
-/**
-* Add quote text to message
-*/
-function addquote(post_id, username)
-{
-	var message_name = 'message_' + post_id;
-	var theSelection = '';
-	var divarea = false;
-
-	if (document.all) {
-		divarea = document.all[message_name];
-	} else {
-		divarea = document.getElementById(message_name);
-	}
-
-	// Get text selection - not only the post content :(
-	if (window.getSelection) {
-		theSelection = window.getSelection().toString();
-	} else if (document.getSelection) {
-		theSelection = document.getSelection();
-	} else if (document.selection) {
-		theSelection = document.selection.createRange().text;
-	}
-
-	if (theSelection === '' || typeof theSelection === 'undefined' || theSelection === null) {
-		if (divarea.innerHTML) {
-			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
-			theSelection = theSelection.replace(/<br\/>/ig, '\n');
-			theSelection = theSelection.replace(/&lt\;/ig, '<');
-			theSelection = theSelection.replace(/&gt\;/ig, '>');
-			theSelection = theSelection.replace(/&amp\;/ig, '&');
-			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
-		} else if (document.all) {
-			theSelection = divarea.innerText;
-		} else if (divarea.textContent) {
-			theSelection = divarea.textContent;
-		} else if (divarea.firstChild.nodeValue) {
-			theSelection = divarea.firstChild.nodeValue;
-		}
-	}
-
-	if (theSelection) {
-		insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
-	}
-
-	return;
-}
-
-/**
-* From http://www.massless.org/mozedit/
-*/
-function mozWrap(txtarea, open, close) {
-	var selLength = (typeof(txtarea.textLength) === 'undefined') ? txtarea.value.length : txtarea.textLength;
-	var selStart = txtarea.selectionStart;
-	var selEnd = txtarea.selectionEnd;
-	var scrollTop = txtarea.scrollTop;
-
-	if (selEnd === 1 || selEnd === 2) {
-		selEnd = selLength;
-	}
-
-	var s1 = (txtarea.value).substring(0,selStart);
-	var s2 = (txtarea.value).substring(selStart, selEnd);
-	var s3 = (txtarea.value).substring(selEnd, selLength);
-
-	txtarea.value = s1 + open + s2 + close + s3;
-	txtarea.selectionStart = selStart + open.length;
-	txtarea.selectionEnd = selEnd + open.length;
-	txtarea.focus();
-	txtarea.scrollTop = scrollTop;
-
-	return;
-}
-
-/**
-* Insert at Caret position. Code from
-* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
-*/
-function storeCaret(textEl) {
-	if (textEl.createTextRange) {
-		textEl.caretPos = document.selection.createRange().duplicate();
-	}
-}
-
-/**
-* Color pallette
-*/
-function colorPalette(dir, width, height) {
-	var r = 0, g = 0, b = 0;
-	var numberList = new Array(6);
-	var color = '';
-
-	numberList[0] = '00';
-	numberList[1] = '40';
-	numberList[2] = '80';
-	numberList[3] = 'BF';
-	numberList[4] = 'FF';
-
-	document.writeln('<table class="type2">');
-
-	for (r = 0; r < 5; r++) {
-		if (dir === 'h') {
-			document.writeln('<tr>');
-		}
-
-		for (g = 0; g < 5; g++) {
-			if (dir === 'v') {
-				document.writeln('<tr>');
-			}
-
-			for (b = 0; b < 5; b++) {
-				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">');
-				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
-				document.writeln('</td>');
-			}
-
-			if (dir === 'v') {
-				document.writeln('</tr>');
-			}
-		}
-
-		if (dir === 'h') {
-			document.writeln('</tr>');
-		}
-	}
-	document.writeln('</table>');
-}
-
-/**
-* Caret Position object
-*/
-function caretPosition() {
-	var start = null;
-	var end = null;
-}
-
-/**
-* Get the caret position in an textarea
-*/
-function getCaretPosition(txtarea) {
-	var caretPos = new caretPosition();
-
-	// simple Gecko/Opera way
-	if (txtarea.selectionStart || txtarea.selectionStart === 0) {
-		caretPos.start = txtarea.selectionStart;
-		caretPos.end = txtarea.selectionEnd;
-	}
-	// dirty and slow IE way
-	else if (document.selection) {
-		// get current selection
-		var range = document.selection.createRange();
-
-		// a new selection of the whole textarea
-		var range_all = document.body.createTextRange();
-		range_all.moveToElementText(txtarea);
-
-		// calculate selection start point by moving beginning of range_all to beginning of range
-		var sel_start;
-		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++) {
-			range_all.moveStart('character', 1);
-		}
-
-		txtarea.sel_start = sel_start;
-
-		// we ignore the end value for IE, this is already dirty enough and we don't need it
-		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;
-	}
-
-	return caretPos;
-}
-- 
cgit v1.2.1


From b99e87664d044c8953c058efa065d8abe7acc7c6 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 18 Oct 2013 22:33:12 -0700
Subject: [ticket/11472] Update the ACP user signature page.

PHPBB3-11472
---
 phpBB/adm/style/acp_users_signature.html | 64 +++++++++++++++-----------------
 phpBB/adm/style/admin.css                |  9 +++++
 2 files changed, 39 insertions(+), 34 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index 5bd6b0921a..6f6f134836 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -3,6 +3,8 @@
 
 	var form_name = 'user_signature';
 	var text_name = 'signature';
+	var load_draft = false;
+	var upload = false;
 
 	// Define the bbCode tags
 	var bbcode = new Array();
@@ -20,11 +22,11 @@
 		o: '{LA_BBCODE_O_HELP}',
 		p: '{LA_BBCODE_P_HELP}',
 		w: '{LA_BBCODE_W_HELP}',
+		a: '{LA_BBCODE_A_HELP}',
 		s: '{LA_BBCODE_S_HELP}',
 		f: '{LA_BBCODE_F_HELP}',
 		y: '{LA_BBCODE_Y_HELP}',
-		d: '{LA_BBCODE_D_HELP}',
-		tip: '{L_STYLES_TIP}'
+		d: '{LA_BBCODE_D_HELP}'
 		<!-- BEGIN custom_tags -->
 			,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
 		<!-- END custom_tags -->
@@ -32,7 +34,7 @@
 
 // ]]>
 </script>
-<!-- INCLUDEJS {ROOT_PATH}assets/javascript/editor.js -->
+<!-- INCLUDEJS ./../assets/javascript/editor.js -->
 
 <form id="user_signature" method="post" action="{U_ACTION}">
 
@@ -48,52 +50,46 @@
 		<p>{L_SIGNATURE_EXPLAIN}</p>
 
 		<div id="format-buttons">
-			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('y')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
+			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
+			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
+			<!-- IF S_BBCODE_QUOTE -->
+				<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
+			<!-- ENDIF -->
+			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
+			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
+			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
+			<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
 			<!-- IF S_BBCODE_IMG -->
-				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
+				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
 			<!-- ENDIF -->
 			<!-- IF S_LINKS_ALLOWED -->
-				<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseout="helpline('tip')" />
+				<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
 			<!-- ENDIF -->
 			<!-- IF S_BBCODE_FLASH -->
-				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
+				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
 			<!-- ENDIF -->
-
-			{L_FONT_SIZE}{L_COLON} <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}" onmouseover="helpline('f')" onmouseout="helpline('tip')">
+			<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
 				<option value="50">{L_FONT_TINY}</option>
 				<option value="85">{L_FONT_SMALL}</option>
 				<option value="100" selected="selected">{L_FONT_NORMAL}</option>
-				<option value="150">{L_FONT_LARGE}</option>
-				<option value="200">{L_FONT_HUGE}</option>
+				<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
+					<option value="150">{L_FONT_LARGE}</option>
+					<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
+						<option value="200">{L_FONT_HUGE}</option>
+					<!-- ENDIF -->
+				<!-- ENDIF -->
 			</select>
-		<!-- IF .custom_tags -->
-			<br /><br />
 			<!-- BEGIN custom_tags -->
-				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
+				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
 			<!-- END custom_tags -->
-		<!-- ENDIF -->
-
 		</div>
 
-		<p><input type="text" class="text full" style="border: 0; background: none;" name="helpbox" value="{L_STYLES_TIP}" /></p>
-
 		<dl>
-			<dt style="width: 90px;">
-				<script type="text/javascript">
-				// <![CDATA[
-					colorPalette('v', 12, 10);
-				// ]]>
-				</script>
+			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15">
 			</dt>
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px; margin-top: 5px;">
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
 			<!-- IF S_BBCODE_ALLOWED -->
 				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
 			<!-- ENDIF -->
@@ -104,7 +100,7 @@
 				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
 			<!-- ENDIF -->
 			</dd>
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
 		</dl>
 	</fieldset>
 
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index eae4f42641..512c714fcc 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -737,6 +737,15 @@ td {
 	border-spacing: 1px;
 }
 
+dt#color_palette_placeholder table {
+	margin-right: 5px;
+	width: 80px;
+}
+
+#color_palette_placeholder td {
+	padding: 0;
+}
+
 table.type2 {
 	border: none;
 	background: none;
-- 
cgit v1.2.1


From 1ea07e2270a0e18bc6008f4ac28df03b5fd52432 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 20 Oct 2013 16:35:28 -0700
Subject: [ticket/11472] Use {T_ASSETS_PATH}.

PHPBB3-11472
---
 phpBB/adm/style/acp_users_signature.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index 6f6f134836..cfcab155bd 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -34,7 +34,7 @@
 
 // ]]>
 </script>
-<!-- INCLUDEJS ./../assets/javascript/editor.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
 <form id="user_signature" method="post" action="{U_ACTION}">
 
-- 
cgit v1.2.1


From c5680ca8227915ff7fc5f56bb4c4e9fd42b08e20 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 13 Nov 2013 01:24:37 -0800
Subject: [ticket/10810] Update all palettes.

PHPBB3-10810
---
 phpBB/adm/style/acp_groups.html          | 7 ++++++-
 phpBB/adm/style/acp_users_signature.html | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index a77010b636..925d24f3a3 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -92,7 +92,12 @@
 	</dl>
 	<dl>
 		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
-		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /><!-- IF GROUP_COLOUR -->&nbsp;<span style="background-color: #{GROUP_COLOUR}">&nbsp; &nbsp;</span><!-- ENDIF -->&nbsp;&nbsp;<span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
+		<dd>
+			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />
+			<!-- IF GROUP_COLOUR -->&nbsp;<span style="background-color: #{GROUP_COLOUR}">&nbsp; &nbsp;</span><!-- ENDIF -->&nbsp;&nbsp;<span>
+			[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]</span>
+			<div id="color_palette_placeholder" style="display: none;" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div>
+		</dd>
 	</dl>
 	<dl>
 		<dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt>
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index cfcab155bd..0a04c411d2 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -86,7 +86,7 @@
 		</div>
 
 		<dl>
-			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15">
+			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
 			</dt>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
-- 
cgit v1.2.1


From 97915b467ed2a0f15805b43155eb24ac8b326c35 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 13 Nov 2013 01:27:24 -0800
Subject: [ticket/10810] Remove obsolete swatch code.

PHPBB3-10810
---
 phpBB/adm/style/colour_swatch.html | 82 --------------------------------------
 1 file changed, 82 deletions(-)
 delete mode 100644 phpBB/adm/style/colour_swatch.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
deleted file mode 100644
index e692a8bd91..0000000000
--- a/phpBB/adm/style/colour_swatch.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
-<head>
-<meta charset="utf-8">
-<title>{L_COLOUR_SWATCH}</title>
-
-<style type="text/css">
-/* <![CDATA[ */
-	body {
-		background-color: #404040;
-		color: #fff;
-	}
-
-	table {
-		border-collapse: separate;
-		border-spacing: 0;
-		border: 0;
-	}
-
-	td {
-		border: solid 1px #333;
-		padding: 1px;
-	}
-
-	.over { 
-		border-color: white; 
-	}
-
-	.out {
-		border-color: #333333; 
-	}
-
-	img {
-		border: 0;
-	}
-/* ]]> */
-</style>
-</head>
-
-<body>
-
-<script type="text/javascript">
-// <![CDATA[
-	var r = 0, g = 0, b = 0;
-
-	var numberList = new Array(6);
-	numberList[0] = '00';
-	numberList[1] = '33';
-	numberList[2] = '66';
-	numberList[3] = '99';
-	numberList[4] = 'CC';
-	numberList[5] = 'FF';
-
-	document.writeln('<table>');
-
-	for (r = 0; r < 6; r++)
-	{
-		document.writeln('<tr>');
-
-		for (g = 0; g < 6; g++)
-		{
-			for (b = 0; b < 6; b++)
-			{
-				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td style="background-color: #' + color + ';" onmouseover="this.className=\'over\'" onmouseout="this.className=\'out\'">');
-				document.write('<a href="#" onclick="cell(\'' + color + '\'); return false;"><img src="{T_IMAGES_PATH}spacer.gif" width="13" height="10" alt="#' + color + '" title="#' + color + '" \/><\/a>');
-				document.writeln('<\/td>');
-			}
-		}
-		document.writeln('<\/tr>');
-	}
-	document.writeln('<\/table>');
-
-	function cell(color)
-	{
-		opener.document.forms["{OPENER}"].{NAME}.value = color;
-	}
-// ]]>
-</script>
-
-</body>
-</html>
-- 
cgit v1.2.1


From a5c4e4f3cebdd75aba415b9106d554e61d55154e Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 29 Oct 2013 01:15:44 +0200
Subject: [ticket/11984] Prevent AJAX background animation flicker in ACP

PHPBB3-11984
---
 phpBB/adm/style/admin.css | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 512c714fcc..e97412da68 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1587,6 +1587,8 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 
 #darkenwrapper {
 	display: none;
+	position: relative;
+	z-index: 44;
 }
 
 #darken {
-- 
cgit v1.2.1


From 366a224a248a9cac50a1d0df50ae91c89954aabc Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 30 Oct 2013 01:17:11 +0200
Subject: [ticket/11984] Fix stray </ul> and active tab hover in ACP

PHPBB3-11984
---
 phpBB/adm/style/admin.css           | 18 ++++++++----------
 phpBB/adm/style/overall_header.html |  1 -
 2 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index e97412da68..c7f91d9a8a 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -381,6 +381,14 @@ li {
 	color: #BC2A4D;
 }
 
+#tabs a:hover {
+	background-position: 0 -69px;
+}
+
+#tabs a:hover span {
+	background-position: 100% -69px;
+}
+
 #tabs .activetab a {
 	background-position: 0 0;
 	border-bottom: 1px solid #DCDEE2;
@@ -392,14 +400,6 @@ li {
 	color: #23649F;
 }
 
-#tabs a:hover {
-	background-position: 0 -69px;
-}
-
-#tabs a:hover span {
-	background-position: 100% -69px;
-}
-
 #tabs .activetab a:hover span {
 	color: #115098;
 }
@@ -1587,8 +1587,6 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 
 #darkenwrapper {
 	display: none;
-	position: relative;
-	z-index: 44;
 }
 
 #darken {
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 455446f8e3..fcef3bb8ac 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -153,7 +153,6 @@ function popup(url, width, height, name)
 								</ul>
 							</div>
 						<!-- ENDIF -->
-						</ul>
 					</div>
 	
 					<div id="main">
-- 
cgit v1.2.1


From 796e22d67557f15fe2902130eead74809b481177 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 30 Oct 2013 19:17:00 +0200
Subject: [ticket/11984] Hide <dfn> for invalid extensions

PHPBB3-11984
---
 phpBB/adm/style/admin.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index e9f0f1e512..dd46124f97 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -133,6 +133,9 @@ function parse_document(container)
 				column += colspan;
 			});
 		});
+
+		// Remove <dfn> in disabled extensions list
+		$this.find('tr.ext_disabled > .empty:nth-child(2) + .empty').siblings(':first-child').children('dfn').remove();
 	});
 
 	/**
-- 
cgit v1.2.1


From be3bab49460274e9cce5b92b9e66435d1b622a8e Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 20 Nov 2013 00:17:28 +0200
Subject: [ticket/11979] Fix errors in dropdown

PHPBB3-11979
---
 phpBB/adm/style/admin.css | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 512c714fcc..7472788a0a 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2363,11 +2363,14 @@ fieldset.permissions .padding {
 .dropdown .dropdown-contents {
 	z-index: 2;
 	overflow: hidden;
+	overflow-y: auto;
 	background: #fff;
 	border: 1px solid #b9b9b9;
 	border-radius: 5px;
 	padding: 5px;
 	position: relative;
+	min-width: 40px;
+	max-height: 200px;
 	box-shadow: 1px 3px 5px rgba(0, 0, 0, 0.2);
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
-- 
cgit v1.2.1


From 95e380ec189d7525694b779399005b9bcc96a98b Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Mon, 25 Nov 2013 11:56:09 -0800
Subject: [ticket/12036] Re-add missing move up button to module management
 page.

PHPBB3-12036
---
 phpBB/adm/style/acp_modules.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index 8870c815af..5024a950b9 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -151,7 +151,7 @@
 				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
 				<td class="actions">
 					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="up"><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a></span>
+					<span class="up"><a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a></span>
 					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
 					<span class="down"><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a></span>
 					<a href="{modules.U_EDIT}">{ICON_EDIT}</a> 
-- 
cgit v1.2.1


From 680f8eae5031348c2b08b7f914b08333467faa98 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 26 Nov 2013 10:18:53 -0800
Subject: [ticket/12040] Prevent AJAX background animation flicker in ACP

PHPBB3-12040
---
 phpBB/adm/style/admin.css | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index c7f91d9a8a..d971c38efb 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1587,6 +1587,8 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 
 #darkenwrapper {
 	display: none;
+	position: relative;
+	z-index: 44;
 }
 
 #darken {
-- 
cgit v1.2.1


From 371cfa4bfc53b20a42e7849984ca2febe9888885 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 28 Nov 2013 13:17:07 +0100
Subject: [ticket/12045] Correctly close <dd> with </dd>

PHPBB3-12045
---
 phpBB/adm/style/acp_prune_users.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index 1257f3fb3d..3c4ac454d3 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -39,7 +39,7 @@
 </dl>
 <dl>
 	<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}{L_COLON}</label></dt>
-	<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="number" id="posts_on_queue" name="posts_on_queue" /></select>
+	<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="number" id="posts_on_queue" name="posts_on_queue" /></dd>
 </dl>
 <!-- IF S_GROUP_LIST -->
 <dl>
-- 
cgit v1.2.1


From d9c754a6502cb78662671d681944fbf00a0aa2b3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 28 Nov 2013 13:17:38 +0100
Subject: [ticket/12045] Correctly close <span> before closing parent tag

PHPBB3-12045
---
 phpBB/adm/style/acp_prune_users.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index 3c4ac454d3..2bbb03a834 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -43,7 +43,7 @@
 </dl>
 <!-- IF S_GROUP_LIST -->
 <dl>
-	<dt><label for="group_id">{L_GROUP}{L_COLON}</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</dt>
+	<dt><label for="group_id">{L_GROUP}{L_COLON}</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</span></dt>
 	<dd><select name="group_id">{S_GROUP_LIST}</select></dd>
 </dl>
 <!-- ENDIF -->
-- 
cgit v1.2.1


From 03509f2f97d15658e39f8c0a6195d7b56778687e Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 4 Dec 2013 14:51:54 -0800
Subject: [ticket/12055] Alternate table row background colors using nth-child
 rule.

PHPBB3-12055
---
 phpBB/adm/style/acp_attachments.html    |  8 ++++----
 phpBB/adm/style/acp_bbcodes.html        |  4 ++--
 phpBB/adm/style/acp_bots.html           |  4 ++--
 phpBB/adm/style/acp_groups.html         | 10 +++++-----
 phpBB/adm/style/acp_icons.html          |  8 ++++----
 phpBB/adm/style/acp_inactive.html       |  5 ++---
 phpBB/adm/style/acp_language.html       |  6 +++---
 phpBB/adm/style/acp_logs.html           |  4 ++--
 phpBB/adm/style/acp_main.html           | 10 ++++------
 phpBB/adm/style/acp_profile.html        |  5 ++---
 phpBB/adm/style/acp_prune_forums.html   |  4 ++--
 phpBB/adm/style/acp_ranks.html          |  4 ++--
 phpBB/adm/style/acp_users.html          |  8 ++++----
 phpBB/adm/style/acp_users_feedback.html |  5 ++---
 phpBB/adm/style/acp_users_warnings.html |  4 ++--
 phpBB/adm/style/acp_words.html          |  4 ++--
 phpBB/adm/style/admin.css               | 10 ++++++++--
 phpBB/adm/style/captcha_qa_acp.html     | 10 ++++------
 18 files changed, 56 insertions(+), 57 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 9ce9fb5f13..9db0fc6521 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -331,7 +331,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
@@ -344,7 +344,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN orphan -->
-		<!-- IF orphan.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<tr>
 			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
 			<td>{orphan.FILETIME}</td>
 			<td>{orphan.FILESIZE}</td>
@@ -389,7 +389,7 @@
 	<!-- ENDIF -->
 	</div>
 
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
@@ -400,7 +400,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN attachments -->
-		<!-- IF attachments.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<tr>
 			<td>
 				<!-- IF attachments.S_IN_MESSAGE -->{L_EXTENSION_GROUP}{L_COLON} <strong><!-- IF attachments.EXT_GROUP_NAME -->{attachments.EXT_GROUP_NAME}<!-- ELSE -->{L_NO_EXT_GROUP}<!-- ENDIF --></strong><br />{attachments.L_DOWNLOAD_COUNT}<br />{L_IN} {L_PRIVATE_MESSAGE}
 				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br />{L_TOPIC}{L_COLON} <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index c22ed395e7..eccb469468 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -90,7 +90,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_ACP_BBCODES}</legend>
 
-	<table class="table1" id="down">
+	<table class="table1 zebra-table" id="down">
 	<thead>
 	<tr>
 		<th>{L_BBCODE_TAG}</th>
@@ -99,7 +99,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN bbcodes -->
-		<!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<tr>
 			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td>
 			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a></td>
 		</tr>
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
index eeda13303d..b0e61015b6 100644
--- a/phpBB/adm/style/acp_bots.html
+++ b/phpBB/adm/style/acp_bots.html
@@ -62,7 +62,7 @@
 
 	<form id="acp_bots" method="post" action="{U_ACTION}">
 
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_BOT_NAME}</th>
@@ -73,7 +73,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN bots -->
-		<!-- IF bots.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<tr>
 			<td style="width: 50%;">{bots.BOT_NAME}</td>
 			<td style="width: 15%; white-space: nowrap;" align="center">&nbsp;{bots.LAST_VISIT}&nbsp;</td>
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}" data-ajax="activate_deactivate">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 925d24f3a3..72f4f2b239 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -155,7 +155,7 @@
 		<a href="{U_DEFAULT_ALL}">&raquo; {L_MAKE_DEFAULT_FOR_ALL}</a>
 	</fieldset>
 
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_USERNAME}</th>
@@ -170,7 +170,7 @@
 		<td class="row3" colspan="5"><strong>{L_GROUP_LEAD}</strong></td>
 	</tr>
 	<!-- BEGIN leader -->
-		<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<tr>
 			<td><!-- IF leader.USERNAME_COLOUR --><a href="{leader.U_USER_EDIT}" style="color: #{leader.USERNAME_COLOUR};" class="username-coloured">{leader.USERNAME}</a><!-- ELSE --><a href="{leader.U_USER_EDIT}">{leader.USERNAME}</a><!-- ENDIF --></td>
 			<td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
 			<td style="text-align: center;">{leader.JOINED}</td>
@@ -179,7 +179,7 @@
 		</tr>
 	<!-- BEGINELSE -->
 		<tr>
-			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MODS}</td>
+			<td colspan="5" style="text-align: center;">{L_GROUPS_NO_MODS}</td>
 		</tr>
 	<!-- END leader -->
 	<tr>
@@ -191,7 +191,7 @@
 			<td class="row3" colspan="5"><strong>{L_GROUP_PENDING}</strong></td>
 		</tr>
 		<!-- ELSE -->
-			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<tr>
 			<td><!-- IF member.USERNAME_COLOUR --><a href="{member.U_USER_EDIT}" style="color: #{member.USERNAME_COLOUR};" class="username-coloured">{member.USERNAME}</a><!-- ELSE --><a href="{member.U_USER_EDIT}">{member.USERNAME}</a><!-- ENDIF --></td>
 			<td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
 			<td style="text-align: center;">{member.JOINED}</td>
@@ -201,7 +201,7 @@
 		<!-- ENDIF -->
 	<!-- BEGINELSE -->
 		<tr>
-			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td>
+			<td colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td>
 		</tr>
 	<!-- END member -->
 	</tbody>
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index bfe4878ba5..e96a9b86fa 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -74,7 +74,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<table class="table1" id="smilies">
+	<table class="table1 zebra-table" id="smilies">
 	<thead>
 	<tr>
 		<th colspan="{COLSPAN}">{L_CONFIG}</th>
@@ -100,7 +100,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN items -->
-		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<tr>
 	
 		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
 		<td style="vertical-align: top;">[{items.IMG}]</td>
@@ -218,7 +218,7 @@
 
 	<legend>{L_TITLE}</legend>
 
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_TITLE}</th>
@@ -236,7 +236,7 @@
 				<td class="row3" colspan="{COLSPAN}" style="text-align: center;">{L_NOT_DISPLAYED}</td>
 			</tr>
 		<!-- ENDIF -->
-		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<tr>
 			<td style="width: 85%; text-align: center;"><img src="{items.IMG_SRC}" width="{items.WIDTH}" height="{items.HEIGHT}" alt="{items.ALT_TEXT}" title="{items.ALT_TEXT}" /></td>
 			<!-- IF S_SMILIES -->
 				<td style="text-align: center;">{items.CODE}</td>
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index 1c42c93f76..1cdc1abe6b 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -16,7 +16,7 @@
 </div>
 <!-- ENDIF -->
 
-<table class="table1">
+<table class="table1 zebra-table">
 <thead>
 <tr>
 	<th>{L_USERNAME}</th>
@@ -29,8 +29,7 @@
 </thead>
 <tbody>
 <!-- BEGIN inactive -->
-	<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
+	<tr>
 		<td style="vertical-align: top;">
 			{inactive.USERNAME_FULL}
 			<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index d4fd572376..f5267e8f7f 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -211,7 +211,7 @@
 
 	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>
 
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_LANGUAGE_PACK_NAME}</th>
@@ -226,7 +226,7 @@
 		<td class="row3" colspan="5"><strong>{L_INSTALLED_LANGUAGE_PACKS}</strong></td>
 	</tr>
 	<!-- BEGIN lang -->
-		<!-- IF lang.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+	<tr>
 		<td><a href="{lang.U_DETAILS}">{lang.ENGLISH_NAME}</a> {lang.TAG}</td>
 		<td>{lang.LOCAL_NAME}</td>
 		<td style="text-align: center;"><strong>{lang.ISO}</strong></td>
@@ -240,7 +240,7 @@
 	</tr>
 	<!-- ENDIF -->
 	<!-- BEGIN notinst -->
-		<!-- IF notinst.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+	<tr>
 		<td>{notinst.NAME}</td>
 		<td>{notinst.LOCAL_NAME}</td>
 		<td style="text-align: center;"><strong>{notinst.ISO}</strong></td>
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index f22eb67a72..592b5bbc16 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -22,7 +22,7 @@
 <div><br style="clear: both;" /></div>
 
 <!-- IF .log -->
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_USERNAME}</th>
@@ -36,7 +36,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN log -->
-		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<tr>
 			<td>
 				{log.USERNAME}
 				<!-- IF log.REPORTEE_USERNAME -->
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index bb39ffe050..4fb62ebd21 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -216,7 +216,7 @@
 
 		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
 
-		<table class="table1">
+		<table class="table1 zebra-table">
 		<thead>
 		<tr>
 			<th>{L_USERNAME}</th>
@@ -227,8 +227,7 @@
 		</thead>
 		<tbody>
 		<!-- BEGIN log -->
-			<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
+			<tr>
 				<td>{log.USERNAME}</td>
 				<td style="text-align: center;">{log.IP}</td>
 				<td style="text-align: center;">{log.DATE}</td>
@@ -249,7 +248,7 @@
 
 		<div style="text-align: right;"><a href="{U_INACTIVE_USERS}">&raquo; {L_VIEW_INACTIVE_USERS}</a></div>
 
-		<table class="table1">
+		<table class="table1 zebra-table">
 		<thead>
 		<tr>
 			<th>{L_USERNAME}</th>
@@ -261,8 +260,7 @@
 		</thead>
 		<tbody>
 		<!-- BEGIN inactive -->
-			<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
+			<tr>
 				<td style="vertical-align: top;">
 					{inactive.USERNAME_FULL}
 					<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 3546873f6c..a5685668ba 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -185,7 +185,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_FIELD_IDENT}</th>
@@ -195,8 +195,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN fields -->
-		<!-- IF fields.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
+	<tr>
 		<td>{fields.FIELD_IDENT}</td>
 		<td>{fields.FIELD_TYPE}</td>
 		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}" data-ajax="activate_deactivate">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html
index 1be9689cc7..4d748f1cce 100644
--- a/phpBB/adm/style/acp_prune_forums.html
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -8,7 +8,7 @@
 
 	<p>{L_PRUNE_SUCCESS}</p>
 
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_FORUM}</th>
@@ -18,7 +18,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN pruned -->
-		<!-- IF pruned.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+	<tr>
 		<td style="text-align: center;">{pruned.FORUM_NAME}</td>
 		<td style="text-align: center;">{pruned.NUM_TOPICS}</td>
 		<td style="text-align: center;">{pruned.NUM_POSTS}</td>
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index a1409b15ef..be68dda695 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -65,7 +65,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_ACP_MANAGE_RANKS}</legend>
 
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_RANK_IMAGE}</th>
@@ -76,7 +76,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN ranks -->
-		<!-- IF ranks.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+	<tr>
 		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
 		<td style="text-align: center;">{ranks.RANK_TITLE}</td>
 		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->&nbsp; - &nbsp;<!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td>
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index b213587def..b84e32013f 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -125,7 +125,7 @@
 
 	<form id="user_groups" method="post" action="{U_ACTION}">
 
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<tbody>
 	<!-- BEGIN group -->
 		<!-- IF group.S_NEW_GROUP_TYPE -->
@@ -133,7 +133,7 @@
 			<td class="row3" colspan="4"><strong>{group.GROUP_TYPE}</strong></td>
 		</tr>
 		<!-- ELSE -->
-			<!-- IF group.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<tr>
 				<td><a href="{group.U_EDIT_GROUP}">{group.GROUP_NAME}</a></td>
 				<td><!-- IF group.S_IS_MEMBER --><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --><!-- ELSEIF not group.S_IS_MEMBER and group.U_APPROVE --><a href="{group.U_APPROVE}">{L_GROUP_APPROVE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
 				<td><!-- IF group.S_IS_MEMBER and not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
@@ -164,7 +164,7 @@
 	</div>
 
 	<!-- IF .attach -->
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
@@ -176,7 +176,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN attach -->
-		<!-- IF attach.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+	<tr>
 		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}{L_COLON} </strong><!-- ELSE --><strong>{L_POST}{L_COLON} </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>
 		<td style="text-align: center">{attach.POST_TIME}</td>
 		<td style="text-align: center">{attach.SIZE}</td>
diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html
index 95892f2822..f251724cd2 100644
--- a/phpBB/adm/style/acp_users_feedback.html
+++ b/phpBB/adm/style/acp_users_feedback.html
@@ -7,7 +7,7 @@
 	</div>
 
 	<!-- IF .log -->
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_REPORT_BY}</th>
@@ -19,8 +19,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN log -->
-		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
+		<tr>
 			<td>{log.USERNAME}</td>
 			<td style="text-align: center;">{log.IP}</td>
 			<td style="text-align: center;">{log.DATE}</td>
diff --git a/phpBB/adm/style/acp_users_warnings.html b/phpBB/adm/style/acp_users_warnings.html
index 9d082eda6d..6e7f521415 100644
--- a/phpBB/adm/style/acp_users_warnings.html
+++ b/phpBB/adm/style/acp_users_warnings.html
@@ -1,7 +1,7 @@
 	<form id="list" method="post" action="{U_ACTION}">
 
 	<!-- IF .warn -->
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_REPORT_BY}</th>
@@ -12,7 +12,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN warn -->
-		<!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<tr>
 			<td>{warn.USERNAME}</td>
 			<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td>
 			<td>{warn.ACTION}</td>
diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html
index 7e91bc4367..6038fc6161 100644
--- a/phpBB/adm/style/acp_words.html
+++ b/phpBB/adm/style/acp_words.html
@@ -47,7 +47,7 @@
 		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}" />
 	</p>
 
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th>{L_WORD}</th>
@@ -57,7 +57,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN words -->
-		<!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+	<tr>
 		<td style="text-align: center;">{words.WORD}</td>
 		<td style="text-align: center;">{words.REPLACEMENT}</td>
 		<td>&nbsp;<a href="{words.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{words.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>&nbsp;</td>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index d971c38efb..64f62b063e 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -840,8 +840,14 @@ td.name {
 	text-align: right;
 }
 
-.row1 { background-color: #F9F9F9; }
-.row2 { background-color: #DCEBFE; }
+.row1, table.zebra-table tbody tr:nth-child(odd) {
+	background-color: #F9F9F9;
+}
+
+.row2, table.zebra-table tbody tr:nth-child(even) {
+	background-color: #DCEBFE;
+}
+
 .row3 { background-color: #DBDFE2; }
 .row4 { background-color: #E4E8EB; }
 .col1 { background-color: #DCEBFE; }
diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html
index 4ff7c328fc..6235f9a104 100644
--- a/phpBB/adm/style/captcha_qa_acp.html
+++ b/phpBB/adm/style/captcha_qa_acp.html
@@ -14,7 +14,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_QUESTIONS}</legend>
 
-	<table class="table1">
+	<table class="table1 zebra-table">
 	<thead>
 	<tr>
 		<th colspan="3">{L_QUESTIONS}</th>
@@ -27,14 +27,12 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN questions -->
-
-		<!-- IF questions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
+	<tr>
 		<td style="text-align: left;">{questions.QUESTION_TEXT}</td>
 		<td style="text-align: center;">{questions.QUESTION_LANG}</td>
 		<td style="text-align: center;"><a href="{questions.U_EDIT}">{ICON_EDIT}</a>&nbsp;<a href="{questions.U_DELETE}">{ICON_DELETE}</a></td>
-		</tr>
-		<!-- END questions -->
+	</tr>
+	<!-- END questions -->
 	</tbody>
 	</table>
 	<fieldset class="quick">
-- 
cgit v1.2.1


From 097fba9fdf1ede11ea5df78ec341244c13acafbb Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 4 Dec 2013 15:51:14 -0800
Subject: [ticket/12059] Allow INCLUDECSS to work with ACP templates

PHPBB3-12059
---
 phpBB/adm/style/overall_header.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index fcef3bb8ac..04f818f95a 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -103,7 +103,11 @@ function popup(url, width, height, name)
 
 // ]]>
 </script>
+
 <!-- EVENT acp_overall_header_head_append -->
+
+{$STYLESHEETS}
+
 </head>
 
 <body class="{S_CONTENT_DIRECTION} nojs">
-- 
cgit v1.2.1


From b3a96f0a70b80cf3f132197a49b4e79d22132cbb Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 4 Dec 2013 16:32:27 -0800
Subject: [ticket/12060] Add template event acp_bbcodes_edit_form_append

PHPBB3-12060
---
 phpBB/adm/style/acp_bbcodes.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index c22ed395e7..258bae360a 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -47,6 +47,8 @@
 	</dl>
 	</fieldset>
 
+	<!-- EVENT acp_bbcodes_edit_form_append -->
+
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-- 
cgit v1.2.1


From 60a51eddd474b704f2b9bd3277f20578c69a32a1 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 4 Dec 2013 16:32:47 -0800
Subject: [ticket/12060] Add template event acp_bbcodes_actions_prepend/append

PHPBB3-12060
---
 phpBB/adm/style/acp_bbcodes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index 258bae360a..2057890bdf 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -103,7 +103,7 @@
 	<!-- BEGIN bbcodes -->
 		<!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td>
-			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a></td>
+			<td style="text-align: right; width: 40px;"><!-- EVENT acp_bbcodes_actions_prepend --> <a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a> <!-- EVENT acp_bbcodes_actions_append --></td>
 		</tr>
 	<!-- BEGINELSE -->
 		<tr class="row3">
-- 
cgit v1.2.1


From 35da9ab9cfa183a8ffc364b48ecb85c8575a03f0 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 4 Dec 2013 16:35:11 -0800
Subject: [ticket/12060] Add template events
 posting_editor_buttons_before/after

PHPBB3-12060
---
 phpBB/adm/style/acp_users_signature.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index 0a04c411d2..694e20c624 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -49,6 +49,7 @@
 		<legend>{L_SIGNATURE}</legend>
 		<p>{L_SIGNATURE_EXPLAIN}</p>
 
+		<!-- EVENT posting_editor_buttons_before -->
 		<div id="format-buttons">
 			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
 			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
@@ -84,6 +85,7 @@
 				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
 			<!-- END custom_tags -->
 		</div>
+		<!-- EVENT posting_editor_buttons_after -->
 
 		<dl>
 			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
-- 
cgit v1.2.1


From fba2c2c680adc87c5c3430438d96e390d4e8bfd1 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 4 Dec 2013 19:36:52 -0800
Subject: [ticket/12060] Use actions class for BBCodes list in ACP

PHPBB3-12060
---
 phpBB/adm/style/acp_bbcodes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index 2057890bdf..8da2afb011 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -103,7 +103,7 @@
 	<!-- BEGIN bbcodes -->
 		<!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td>
-			<td style="text-align: right; width: 40px;"><!-- EVENT acp_bbcodes_actions_prepend --> <a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a> <!-- EVENT acp_bbcodes_actions_append --></td>
+			<td class="actions"><!-- EVENT acp_bbcodes_actions_prepend --> <a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a> <!-- EVENT acp_bbcodes_actions_append --></td>
 		</tr>
 	<!-- BEGINELSE -->
 		<tr class="row3">
-- 
cgit v1.2.1


From 55309424688724797f9ff7a6b4f816d73ab092a4 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 5 Dec 2013 09:55:52 -0800
Subject: [ticket/12062] Fix to allow extensions to use INCLUDEJS in the ACP

PHPBB3-12062
---
 phpBB/adm/style/overall_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 72af9d3388..8810414fc2 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -36,9 +36,9 @@
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->
-{$SCRIPTS}
 
 <!-- EVENT acp_overall_footer_after -->
+{$SCRIPTS}
 
 </body>
 </html>
-- 
cgit v1.2.1


From 88aa7b88a4258c2c376c529c9ef82e6cf6b4f3db Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 5 Dec 2013 16:25:51 -0800
Subject: [ticket/12063] Remove obsolete valign attributes from tr tags

PHPBB3-12063
---
 phpBB/adm/style/acp_bbcodes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index c22ed395e7..2a1ce2d9b4 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -71,7 +71,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN token -->
-		<tr valign="top">
+		<tr>
 			<td class="row1">{token.TOKEN}</td>
 			<td class="row2">{token.EXPLAIN}</td>
 		</tr>
-- 
cgit v1.2.1


From 63276dacdaf885afa93bd49ae08acf895806df8c Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 5 Dec 2013 16:29:49 -0800
Subject: [ticket/12064] Delete obsolete viewsource.html file from adm/style/

PHPBB3-12064
---
 phpBB/adm/style/viewsource.html | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 phpBB/adm/style/viewsource.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/viewsource.html b/phpBB/adm/style/viewsource.html
deleted file mode 100644
index 03e9ff50e5..0000000000
--- a/phpBB/adm/style/viewsource.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-<div id="acp" style="padding: 0;">
-<div class="panel" style="padding: 10px;">
-<div style="overflow: auto;">
-	<h1>{FILENAME}</h1>
-
-	<table class="type2">
-	<tbody>
-	<!-- BEGIN source -->
-		<tr valign="top">
-			<td class="sourcenum">{source.LINENUM}&nbsp;&nbsp;</td>
-			<td class="source">{source.LINE}</td>
-		</tr>
-	<!-- END source -->
-	</tbody>
-	</table>
-
-</div>
-</div>
-</div>
-<!-- INCLUDE simple_footer.html -->
-- 
cgit v1.2.1


From 7b86a5bc6008653b7ecd0ae091089bc524ab36f4 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 5 Dec 2013 22:31:27 -0800
Subject: [ticket/12038] Check that the move action succeeded before moving the
 rows.

PHPBB3-12038
---
 phpBB/adm/style/ajax.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 78fcbd88fd..959580d6c2 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -8,7 +8,11 @@
  * an item is moved up. It moves the row up or down, and deactivates /
  * activates any up / down icons that require it (the ones at the top or bottom).
  */
-phpbb.addAjaxCallback('row_down', function() {
+phpbb.addAjaxCallback('row_down', function(res) {
+	if (typeof res.success === 'undefined' || !res.success) {
+		return;
+	}
+
 	var el = $(this),
 		tr = el.parents('tr'),
 		trSwap = tr.next();
@@ -16,7 +20,11 @@ phpbb.addAjaxCallback('row_down', function() {
 	tr.insertAfter(trSwap);
 });
 
-phpbb.addAjaxCallback('row_up', function() {
+phpbb.addAjaxCallback('row_up', function(res) {
+	if (typeof res.success === 'undefined' || !res.success) {
+		return;
+	}
+
 	var el = $(this),
 		tr = el.parents('tr'),
 		trSwap = tr.prev();
-- 
cgit v1.2.1


From 8d9cc63c19325f4782e7de8f72abd38b7af2657d Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 5 Dec 2013 22:33:03 -0800
Subject: [ticket/12038] AJAXify move up/down buttons in the smilies/topic
 icons page.

PHPBB3-12038
---
 phpBB/adm/style/acp_icons.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index bfe4878ba5..b2676c54ef 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -242,10 +242,12 @@
 				<td style="text-align: center;">{items.CODE}</td>
 				<td style="text-align: center;">{items.EMOTION}</td>
 			<!-- ENDIF -->
-			<td style="text-align: right; white-space: nowrap;">
-				<!-- IF items.S_FIRST_ROW and not U_PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
-				<!-- IF items.S_LAST_ROW and not U_NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
-				&nbsp;<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
+			<td class="actions" style="text-align: right;">
+				<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
+				<span class="up"><a href="{items.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
+				<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
+				<span class="down"><a href="{items.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
+				<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
 			</td>
 		</tr>
 	<!-- BEGINELSE -->
-- 
cgit v1.2.1


From d399d255b69ad02e7b8d5f043637ffe948bae7e2 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 5 Dec 2013 22:35:06 -0800
Subject: [ticket/12038] AJAXify move up/down buttons in the module management
 pages.

PHPBB3-12038
---
 phpBB/adm/style/acp_modules.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index 5024a950b9..c7688a610c 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -151,9 +151,9 @@
 				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
 				<td class="actions">
 					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="up"><a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a></span>
+					<span class="up"><a href="{modules.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
 					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
-					<span class="down"><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a></span>
+					<span class="down"><a href="{modules.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
 					<a href="{modules.U_EDIT}">{ICON_EDIT}</a> 
 					<a href="{modules.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
 				</td>
-- 
cgit v1.2.1


From 97558e5fd489f1cb4d4b7bae025842ff467d97d9 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 5 Dec 2013 22:35:47 -0800
Subject: [ticket/12038] AJAXify move up/down buttons in the permission roles
 page.

PHPBB3-12038
---
 phpBB/adm/style/acp_permission_roles.html | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index b8fdaeb837..b3137f134c 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -157,20 +157,11 @@
 			<!-- IF roles.ROLE_DESCRIPTION --><br /><span>{roles.ROLE_DESCRIPTION}</span><!-- ENDIF -->
 		</td>
 		<td style="width: 30%; text-align: center; vertical-align: top; white-space: nowrap;"><!-- IF roles.U_DISPLAY_ITEMS --><a href="{roles.U_DISPLAY_ITEMS}">{L_VIEW_ASSIGNED_ITEMS}</a><!-- ELSE -->{L_VIEW_ASSIGNED_ITEMS}<!-- ENDIF --></td>
-		<td style="width: 80px; text-align: right; vertical-align: top; white-space: nowrap;">
-			<!-- IF roles.S_FIRST_ROW && not roles.S_LAST_ROW -->
-				{ICON_MOVE_UP_DISABLED}
-				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-			<!-- ELSEIF not roles.S_FIRST_ROW && not roles.S_LAST_ROW-->
-				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
-				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
-			<!-- ELSEIF roles.S_LAST_ROW && not roles.S_FIRST_ROW -->
-				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
-				{ICON_MOVE_DOWN_DISABLED}
-			<!-- ELSE -->
-				{ICON_MOVE_UP_DISABLED}
-				{ICON_MOVE_DOWN_DISABLED}
-			<!-- ENDIF -->	
+		<td class="actions">
+			<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
+			<span class="up"><a href="{roles.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
+			<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
+			<span class="down"><a href="{roles.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
 			<a href="{roles.U_EDIT}" title="{L_EDIT_ROLE}">{ICON_EDIT}</a> 
 			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}" data-ajax="row_delete">{ICON_DELETE}</a>
 		</td>
-- 
cgit v1.2.1


From 58a07647595a617c7c0c73b4dbde3b5858b29227 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 5 Dec 2013 22:36:21 -0800
Subject: [ticket/12038] AJAXify move up/down buttons in custom profile fields
 page.

PHPBB3-12038
---
 phpBB/adm/style/acp_profile.html | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 3546873f6c..25120fe71c 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -201,17 +201,11 @@
 		<td>{fields.FIELD_TYPE}</td>
 		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}" data-ajax="activate_deactivate">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>
 
-		<td style="width: 80px; text-align: right; white-space: nowrap;">
-			<!-- IF fields.S_FIRST_ROW && not fields.S_LAST_ROW -->
-				{ICON_MOVE_UP_DISABLED}
-				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-			<!-- ELSEIF not fields.S_FIRST_ROW && not fields.S_LAST_ROW-->
-				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-			<!-- ELSEIF fields.S_LAST_ROW && not fields.S_FIRST_ROW -->
-				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-				{ICON_MOVE_DOWN_DISABLED}
-			<!-- ENDIF -->
+		<td class="actions" style="width: 80px;">
+			<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
+			<span class="up"><a href="{fields.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
+			<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
+			<span class="down"><a href="{fields.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
 			<!-- IF not fields.S_NEED_EDIT -->
 				<a href="{fields.U_EDIT}">{ICON_EDIT}</a>
 			<!-- ELSE -->
-- 
cgit v1.2.1


From 9e8ee56404c40cfb0ffbc435a83aa726dc41a8c0 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 5 Dec 2013 22:36:55 -0800
Subject: [ticket/12038] AJAXify move up/down buttons in report/denial reasons
 page.

PHPBB3-12038
---
 phpBB/adm/style/acp_reasons.html | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html
index ca3aebb338..d629a9553f 100644
--- a/phpBB/adm/style/acp_reasons.html
+++ b/phpBB/adm/style/acp_reasons.html
@@ -86,17 +86,11 @@
 					<br /><span>{reasons.REASON_DESCRIPTION}</span>
 				</td>
 				<td style="width: 100px;">{reasons.REASON_COUNT}</td>
-				<td style="width: 80px; text-align: right; white-space: nowrap;">
-					<!-- IF reasons.S_FIRST_ROW && not reasons.S_LAST_ROW -->
-						{ICON_MOVE_UP_DISABLED}
-						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF not reasons.S_FIRST_ROW && not reasons.S_LAST_ROW-->
-						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
-						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
-					<!-- ELSEIF reasons.S_LAST_ROW && not reasons.S_FIRST_ROW -->
-						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ENDIF -->
+				<td class="actions" style="width: 80px;">
+					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
+					<span class="up"><a href="{reasons.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
+					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
+					<span class="down"><a href="{reasons.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
 					<a href="{reasons.U_EDIT}">{ICON_EDIT}</a> 
 					<!-- IF reasons.U_DELETE -->
 						<a href="{reasons.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
-- 
cgit v1.2.1


From 7bc457175300be7ebaefad20da8d1222539a808f Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 12 Dec 2013 10:20:28 -0800
Subject: [ticket/12063] Use CSS to replace valign=top

PHPBB3-12063
---
 phpBB/adm/style/acp_bbcodes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index 2a1ce2d9b4..90a39a3eee 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -71,7 +71,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN token -->
-		<tr>
+		<tr style="vertical-align: top;">
 			<td class="row1">{token.TOKEN}</td>
 			<td class="row2">{token.EXPLAIN}</td>
 		</tr>
-- 
cgit v1.2.1


From 8864c601a2ef1232d8d2315499e189a1c92ec37c Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 13 Dec 2013 13:34:58 -0800
Subject: [ticket/12060] Rename event from append to after in acp_bbcodes.html

PHPBB3-12060
---
 phpBB/adm/style/acp_bbcodes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index 8da2afb011..4b48b94519 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -47,7 +47,7 @@
 	</dl>
 	</fieldset>
 
-	<!-- EVENT acp_bbcodes_edit_form_append -->
+	<!-- EVENT acp_bbcodes_edit_fieldsets_after -->
 
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
-- 
cgit v1.2.1


From 31eb759aa4b2978a337ae75fe713f0842ea46c24 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 13 Dec 2013 13:36:59 -0800
Subject: [ticket/12060] Use separate template event for acp user signature
 posting buttons

PHPBB3-12060
---
 phpBB/adm/style/acp_users_signature.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index 694e20c624..fff75c993d 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -49,7 +49,7 @@
 		<legend>{L_SIGNATURE}</legend>
 		<p>{L_SIGNATURE_EXPLAIN}</p>
 
-		<!-- EVENT posting_editor_buttons_before -->
+		<!-- EVENT acp_users_signature_editor_buttons_before -->
 		<div id="format-buttons">
 			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
 			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
@@ -85,7 +85,7 @@
 				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
 			<!-- END custom_tags -->
 		</div>
-		<!-- EVENT posting_editor_buttons_after -->
+		<!-- EVENT acp_users_signature_editor_buttons_after -->
 
 		<dl>
 			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
-- 
cgit v1.2.1


From 9db8665a540cb5d066572bedf5ffe0280c0cdb65 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 19 Dec 2013 17:15:15 -0800
Subject: [ticket/12077] Add missing space after template block name.

PHPBB3-12077
---
 phpBB/adm/style/acp_language.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index d4fd572376..23c37b1ba0 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -147,7 +147,7 @@
 	</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>
+		<!-- 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>
-- 
cgit v1.2.1


From bef7bc7900e0c4c364245ee3039ee2aece62a223 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 27 Dec 2013 13:15:43 +0100
Subject: [ticket/11911] Warn admins when there is no search index for the
 selected engine

PHPBB3-11911
---
 phpBB/adm/style/acp_main.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index bb39ffe050..f5b030d954 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -26,6 +26,12 @@
 		</div>
 	<!-- ENDIF -->
 
+	<!-- IF S_SEARCH_INDEX_MISSING -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{L_NO_SEARCH_INDEX}</p>
+		</div>
+	<!-- ENDIF -->
 
 	<!-- IF S_REMOVE_INSTALL -->
 		<div class="errorbox">
-- 
cgit v1.2.1


From 95d4e6aa97606f427f56644c03e1253aa3235382 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 27 Dec 2013 15:25:03 +0100
Subject: [ticket/11996] Add explanation how to correctly remove and update an
 extension

See http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=44001 for more
information about the decision.

PHPBB3-11996
---
 phpBB/adm/style/acp_ext_list.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 8408ebe748..dad1838ed3 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -6,6 +6,8 @@
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
+	<p>{L_EXTENSION_ACTIONS_EXPLAIN}</p>
+
 	<table class="table1">
 		<col class="row1" ><col class="row2" ><col class="row2" >
 	<thead>
-- 
cgit v1.2.1


From b155056cb9f72295eaae877a2335094e4cf747d8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 13 Jan 2014 10:31:54 +0100
Subject: [ticket/11996] Use a table for better styling

PHPBB3-11996
---
 phpBB/adm/style/acp_ext_list.html | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index dad1838ed3..09cf6a31f5 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -6,8 +6,6 @@
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
-	<p>{L_EXTENSION_ACTIONS_EXPLAIN}</p>
-
 	<table class="table1">
 		<col class="row1" ><col class="row2" ><col class="row2" >
 	<thead>
@@ -57,5 +55,22 @@
 		<!-- ENDIF -->
 	</tbody>
 	</table>
+	<br />
+
+	<table class="table1">
+	<tr>
+		<th>{L_EXTENSION_UPDATE_HEADLINE}</th>
+	</tr>
+	<tr>
+		<td class="row3">{L_EXTENSION_UPDATE_EXPLAIN}</td>
+	</tr>
+	<tr>
+		<th>{L_EXTENSION_REMOVE_HEADLINE}</th>
+	</tr>
+	<tr>
+		<td class="row3">{L_EXTENSION_REMOVE_EXPLAIN}</td>
+	</tr>
+	</tbody>
+	</table>
 
 <!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 57088e3b2619da9fc0f819461cb4159d50913b70 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 8 Nov 2013 19:11:38 -0800
Subject: [ticket/12011] Align ACP tabs to the right and separate ACP content
 from menu.

PHPBB3-12011
---
 phpBB/adm/style/admin.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 928479a31b..f10e32a1bb 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -220,7 +220,7 @@ li {
 }
 
 .rtl #main {
-	float: right;
+	float: left;
 	margin: 0 -210px 0 0;
 }
 
@@ -352,7 +352,7 @@ li {
 	position: relative;
 }
 
-.rtl #tabs a {
+.rtl #tabs li {
 	float: right;
 }
 
-- 
cgit v1.2.1


From 8620f1e619d9acfc03c3c1f1a0e0d48a0c09de4a Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 24 Jan 2014 03:03:54 -0800
Subject: [ticket/12125] Specify nth-child selectors separately - IE8 does not
 like them

PHPBB3-12125
---
 phpBB/adm/style/admin.css | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index f10e32a1bb..aa8622ff61 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -840,11 +840,19 @@ td.name {
 	text-align: right;
 }
 
-.row1, table.zebra-table tbody tr:nth-child(odd) {
+.row1 {
 	background-color: #F9F9F9;
 }
 
-.row2, table.zebra-table tbody tr:nth-child(even) {
+table.zebra-table tbody tr:nth-child(odd) {
+	background-color: #F9F9F9;
+}
+
+.row2 {
+	background-color: #DCEBFE;
+}
+
+table.zebra-table tbody tr:nth-child(even) {
 	background-color: #DCEBFE;
 }
 
-- 
cgit v1.2.1


From f22e51c8a16d75449da03cb2d9f3e11573ce6f1d Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 2 Feb 2014 12:53:34 -0800
Subject: [ticket/12153] Remove vars already assigned in
 generate_template_pagination().

PHPBB3-12153
---
 phpBB/adm/style/overall_header.html | 2 +-
 phpBB/adm/style/simple_header.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 04f818f95a..1fc1261489 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -11,7 +11,7 @@
 <script type="text/javascript">
 // <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
-var on_page = '{ON_PAGE}';
+var on_page = '{CURRENT_PAGE}';
 var per_page = '{PER_PAGE}';
 var base_url = '{BASE_URL|e('js')}';
 
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 9c4c8a2960..0ca751cd7e 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -10,7 +10,7 @@
 <script type="text/javascript">
 // <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
-var on_page = '{ON_PAGE}';
+var on_page = '{CURRENT_PAGE}';
 var per_page = '{PER_PAGE}';
 var base_url = '{BASE_URL|e('js')}';
 
-- 
cgit v1.2.1


From 1251b68668c656bc077fff3dd22661447e2905e3 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 2 Feb 2014 13:19:57 -0800
Subject: [ticket/12153] Remove redundant calls to pagination.on_page().

PHPBB3-12153
---
 phpBB/adm/style/acp_attachments.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 9db0fc6521..5fb9a12cda 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -384,7 +384,7 @@
 		<!-- IF .pagination -->
 			&bull; <!-- INCLUDE pagination.html -->
 		<!-- ELSE -->
-			&bull; {S_ON_PAGE}
+			&bull; {PAGE_NUMBER}
 		<!-- ENDIF -->
 	<!-- ENDIF -->
 	</div>
-- 
cgit v1.2.1


From 38608bfa62ff9bed744759969345339bd6c60fbf Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 2 Feb 2014 17:59:52 +0100
Subject: [ticket/12115] Remove occupation field from html files

PHPBB3-12115
---
 phpBB/adm/style/acp_users_profile.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index cad1dca9d8..119b3c4be4 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -30,10 +30,6 @@
 		<dt><label for="location">{L_LOCATION}{L_COLON}</label></dt>
 		<dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="occupation">{L_OCCUPATION}{L_COLON}</label></dt>
-		<dd><textarea id="occupation" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></dd>
-	</dl>
 	<dl>
 		<dt><label for="interests">{L_INTERESTS}{L_COLON}</label></dt>
 		<dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>
-- 
cgit v1.2.1


From bbada27ee9e797c7f6ce997152bc1efb8c8f125d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 2 Feb 2014 21:45:59 +0100
Subject: [ticket/12115] Also port user interests to profile fields

PHPBB3-12115
---
 phpBB/adm/style/acp_users_profile.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 119b3c4be4..2c9965687a 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -30,10 +30,6 @@
 		<dt><label for="location">{L_LOCATION}{L_COLON}</label></dt>
 		<dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="interests">{L_INTERESTS}{L_COLON}</label></dt>
-		<dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>
-	</dl>
 	<dl>
 		<dt><label for="birthday">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
 		<dd>{L_DAY}{L_COLON} <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}{L_COLON} <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}{L_COLON} <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
-- 
cgit v1.2.1


From 6bee91c42915dd613e9714016006b25fa51cb24a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Feb 2014 15:00:49 +0100
Subject: [ticket/12169] Convert user_from to profile field location

Missing changes on memberlist view due to missing functionality

PHPBB3-12169
---
 phpBB/adm/style/acp_users_profile.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 2c9965687a..f4a3c06e67 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -26,10 +26,6 @@
 		<dt><label for="website">{L_WEBSITE}{L_COLON}</label></dt>
 		<dd><input type="url" id="website" name="website" value="{WEBSITE}" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="location">{L_LOCATION}{L_COLON}</label></dt>
-		<dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>
-	</dl>
 	<dl>
 		<dt><label for="birthday">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
 		<dd>{L_DAY}{L_COLON} <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}{L_COLON} <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}{L_COLON} <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
-- 
cgit v1.2.1


From 995019a992ba5b0dca4cee6082af697552770c18 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 10 Feb 2014 16:28:21 +0100
Subject: [ticket/12169] Add new option to display profile fields on memberlist

PHPBB3-12169
---
 phpBB/adm/style/acp_profile.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 44c9cb6d49..04e6d9f12b 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -63,6 +63,10 @@
 			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}{L_COLON}</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
+		<dl>
+			<dt><label for="field_show_on_ml">{L_DISPLAY_ON_MEMBERLIST}{L_COLON}</label><br /><span>{L_DISPLAY_ON_MEMBERLIST_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_show_on_ml" name="field_show_on_ml" value="1"<!-- IF S_SHOW_ON_MEMBERLIST --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
 		<dl>
 			<dt><label for="field_required">{L_REQUIRED_FIELD}{L_COLON}</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_required" name="field_required" value="1"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>
-- 
cgit v1.2.1


From bfbf0fefbfb6d2d08c06ee2fe7826e0143948db1 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 16 Feb 2014 13:27:01 -0800
Subject: [ticket/12080] Reduce the palette options in all locations when
 responsive.

PHPBB3-12080
---
 phpBB/adm/style/admin.css | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index aa8622ff61..ea5dc6aec6 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1045,6 +1045,14 @@ table.styles td.users, table td.mark {
 	table.responsive.styles td:first-child > dfn, table.responsive td.actions > dfn {
 		display: none !important;
 	}
+
+	.horizontal-palette td:nth-child(2n), .vertical-palette tr:nth-child(2n) {
+		display: none;
+	}
+
+	.colour-palette a {
+		display: inline-block !important;
+	}
 }
 
 /* General form styles
-- 
cgit v1.2.1


From b8c836836bf74eacf4c7812013301e11b0688c62 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 16 Feb 2014 13:27:48 -0800
Subject: [ticket/12080] Stop responsive ACP sig textarea from dropping to
 second line.

PHPBB3-12080
---
 phpBB/adm/style/acp_users_signature.html | 2 +-
 phpBB/adm/style/admin.css                | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index fff75c993d..5b5c3ecf7f 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -87,7 +87,7 @@
 		</div>
 		<!-- EVENT acp_users_signature_editor_buttons_after -->
 
-		<dl>
+		<dl class="responsive-columns">
 			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
 			</dt>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index ea5dc6aec6..51845e2845 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1361,6 +1361,10 @@ fieldset dt {
 	border-left: 1px solid #CCCCCC;
 }
 
+fieldset #color_palette_placeholder {
+	padding-top: 0;
+}
+
 fieldset dd {
 	margin: 0 0 0 45%;
 	padding: 0 0 0 5px;
@@ -1427,6 +1431,10 @@ input:focus, textarea:focus {
 		width: auto;
 	}
 
+	fieldset .responsive-columns dt {
+		float: left;
+	}
+
 	.ltr fieldset dd {
 		padding-left: 20px;
 	}
-- 
cgit v1.2.1


From b942615c3b6fa9ff4820035c60edafbe7e9877f7 Mon Sep 17 00:00:00 2001
From: Zoddo <zoddo.ino@gmail.com>
Date: Thu, 6 Feb 2014 19:19:09 +0100
Subject: [ticket/12003] ACP broken when error thrown

Fix display of ACP when error is outputted before <html> tag.

PHPBB3-12003
---
 phpBB/adm/style/admin.css | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index aa8622ff61..642d4e420e 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1860,7 +1860,6 @@ li.pagination ul {
 }*/
 
 .clearfix, .row, #content, fieldset dl, #page-body {
-	height: 1%;
 	overflow: hidden;
 }
 
-- 
cgit v1.2.1


From f43dedb3fdbc72d92ac2efc5d83a625e33fdf961 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 19 Feb 2014 13:16:58 -0800
Subject: [ticket/12153] Replace old template variables with {PAGE_NUMBER}.

PHPBB3-12153
---
 phpBB/adm/style/acp_attachments.html | 2 +-
 phpBB/adm/style/pagination.html      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 5fb9a12cda..82fb229fae 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -430,7 +430,7 @@
 		<!-- IF .pagination -->
 			&bull; <!-- INCLUDE pagination.html -->
 		<!-- ELSE -->
-			&bull; {S_ON_PAGE}
+			&bull; {PAGE_NUMBER}
 		<!-- ENDIF -->
 	</div>
 	<!-- ENDIF -->
diff --git a/phpBB/adm/style/pagination.html b/phpBB/adm/style/pagination.html
index d62d0b6a81..7158f83fbc 100644
--- a/phpBB/adm/style/pagination.html
+++ b/phpBB/adm/style/pagination.html
@@ -1,5 +1,5 @@
 
- 	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; 
+ 	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; 
 	<ul>
 	<!-- BEGIN pagination -->
 		<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
-- 
cgit v1.2.1


From 6c8589775b8df2b6fbeffbe594d9279ae90e85ba Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 19 Feb 2014 16:11:40 -0600
Subject: [ticket/9871] Update version check file to use json format

PHPBB3-9871
---
 phpBB/adm/style/acp_main.html   |  1 +
 phpBB/adm/style/acp_update.html | 68 +++++++++++++++++++----------------------
 2 files changed, 32 insertions(+), 37 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 6e28c7a0cc..9a9b3ff2b9 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -17,6 +17,7 @@
 	<!-- IF S_VERSIONCHECK_FAIL -->
 		<div class="errorbox notice">
 			<p>{L_VERSIONCHECK_FAIL}</p>
+			<p>{VERSIONCHECK_FAIL_REASON}</p>
 			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
 		</div>
 	<!-- ELSEIF not S_VERSION_UP_TO_DATE -->
diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html
index 00d37515b3..0cc995959b 100644
--- a/phpBB/adm/style/acp_update.html
+++ b/phpBB/adm/style/acp_update.html
@@ -1,52 +1,46 @@
 <!-- INCLUDE overall_header.html -->
 
 <a id="maincontent"></a>
-	
-<!-- IF S_VERSION_CHECK -->
 
-	<h1>{L_VERSION_CHECK}</h1>
+<h1>{L_VERSION_CHECK}</h1>
 
-	<p>{L_VERSION_CHECK_EXPLAIN}</p>
+<p>{L_VERSION_CHECK_EXPLAIN}</p>
 
-	<!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO -->
-		<div class="successbox">
-			<p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
-		</div>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF NEXT_FEATURE_VERSION -->
-		<div class="errorbox">
-			<p>{UPGRADE_INSTRUCTIONS}</p>
-		</div>
-	<!-- ENDIF -->
+<!-- IF S_UP_TO_DATE -->
+	<div class="successbox">
+		<p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+	</div>
+<!-- ELSE -->
+	<div class="errorbox">
+		<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+	</div>
+<!-- ENDIF -->
 
-	<fieldset>
-		<legend></legend>
+<fieldset>
+	<legend></legend>
 	<dl>
 		<dt><label>{L_CURRENT_VERSION}</label></dt>
-		<dd><strong><!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->{AUTO_VERSION}<!-- ELSE -->{CURRENT_VERSION}<!-- ENDIF --></strong></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_LATEST_VERSION}</label></dt>
-		<dd><strong>{LATEST_VERSION}</strong></dd>
+		<dd><strong>{CURRENT_VERSION}</strong></dd>
 	</dl>
-	</fieldset>
+</fieldset>
 
-	<!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->
-		{L_UPDATE_INSTRUCTIONS_INCOMPLETE}
-		<br /><br />
-		{UPDATE_INSTRUCTIONS}
-		<br /><br />
-	<!-- ENDIF -->
-	<!-- IF not S_UP_TO_DATE -->
-		{UPDATE_INSTRUCTIONS}
-		<br /><br />
-	<!-- ENDIF -->
+<!-- BEGIN updates_available -->
+	<fieldset>
+		<legend></legend>
+		<dl>
+			<dt><label>{L_LATEST_VERSION}</label></dt>
+			<dd><strong>{updates_available.current}</strong></dd>
+		</dl>
+		<dl>
+			<dt><label>{L_RELEASE_ANNOUNCEMENT}</label></dt>
+			<dd><strong><a href="{updates_available.announcement}">{updates_available.announcement}</a></strong></dd>
+		</dl>
+	</fieldset>
+<!-- END updates_available -->
 
+<!-- IF not S_UP_TO_DATE -->
+	{UPDATE_INSTRUCTIONS}
+	<br /><br />
 <!-- ENDIF -->
 
 <!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 55b38e8003e092260936123ac69197112afa983e Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 19 Feb 2014 22:08:36 -0800
Subject: [ticket/12200] Add missing profile field template files to adm/style/
 directory

PHPBB3-12200
---
 phpBB/adm/style/profilefields/bool.html     | 7 +++++++
 phpBB/adm/style/profilefields/date.html     | 5 +++++
 phpBB/adm/style/profilefields/dropdown.html | 5 +++++
 phpBB/adm/style/profilefields/int.html      | 3 +++
 phpBB/adm/style/profilefields/string.html   | 3 +++
 phpBB/adm/style/profilefields/text.html     | 3 +++
 6 files changed, 26 insertions(+)
 create mode 100644 phpBB/adm/style/profilefields/bool.html
 create mode 100644 phpBB/adm/style/profilefields/date.html
 create mode 100644 phpBB/adm/style/profilefields/dropdown.html
 create mode 100644 phpBB/adm/style/profilefields/int.html
 create mode 100644 phpBB/adm/style/profilefields/string.html
 create mode 100644 phpBB/adm/style/profilefields/text.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/profilefields/bool.html b/phpBB/adm/style/profilefields/bool.html
new file mode 100644
index 0000000000..f1d7ba75f4
--- /dev/null
+++ b/phpBB/adm/style/profilefields/bool.html
@@ -0,0 +1,7 @@
+<!-- BEGIN bool -->
+<!-- IF bool.FIELD_LENGTH eq 1 -->
+	<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}</label> <!-- END options -->
+<!-- ELSE -->
+	<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> />
+<!-- ENDIF -->
+<!-- END bool -->
diff --git a/phpBB/adm/style/profilefields/date.html b/phpBB/adm/style/profilefields/date.html
new file mode 100644
index 0000000000..5d5bc04ed6
--- /dev/null
+++ b/phpBB/adm/style/profilefields/date.html
@@ -0,0 +1,5 @@
+<!-- BEGIN date -->
+<label for="{date.FIELD_IDENT}_day">{L_DAY}{L_COLON} <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select></label>
+<label for="{date.FIELD_IDENT}_month">{L_MONTH}{L_COLON} <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select></label>
+<label for="{date.FIELD_IDENT}_year">{L_YEAR}{L_COLON} <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select></label>
+<!-- END date -->
diff --git a/phpBB/adm/style/profilefields/dropdown.html b/phpBB/adm/style/profilefields/dropdown.html
new file mode 100644
index 0000000000..243b7039da
--- /dev/null
+++ b/phpBB/adm/style/profilefields/dropdown.html
@@ -0,0 +1,5 @@
+<!-- BEGIN dropdown -->
+<select name="{dropdown.FIELD_IDENT}" id="{dropdown.FIELD_IDENT}">
+	<!-- BEGIN options --><option value="{dropdown.options.OPTION_ID}"{dropdown.options.SELECTED}>{dropdown.options.VALUE}</option><!-- END options -->
+</select>
+<!-- END dropdown -->
diff --git a/phpBB/adm/style/profilefields/int.html b/phpBB/adm/style/profilefields/int.html
new file mode 100644
index 0000000000..d047c254d8
--- /dev/null
+++ b/phpBB/adm/style/profilefields/int.html
@@ -0,0 +1,3 @@
+<!-- BEGIN int -->
+<input type="number" min="{int.FIELD_MINLEN}" max="{int.FIELD_MAXLEN}" class="autowidth" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
+<!-- END int -->
diff --git a/phpBB/adm/style/profilefields/string.html b/phpBB/adm/style/profilefields/string.html
new file mode 100644
index 0000000000..a8855f50d8
--- /dev/null
+++ b/phpBB/adm/style/profilefields/string.html
@@ -0,0 +1,3 @@
+<!-- BEGIN string -->
+<input type="text" class="autowidth" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
+<!-- END string -->
diff --git a/phpBB/adm/style/profilefields/text.html b/phpBB/adm/style/profilefields/text.html
new file mode 100644
index 0000000000..6334b61926
--- /dev/null
+++ b/phpBB/adm/style/profilefields/text.html
@@ -0,0 +1,3 @@
+<!-- BEGIN text -->
+<textarea name="{text.FIELD_IDENT}" id="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}">{text.FIELD_VALUE}</textarea>
+<!-- END text -->
-- 
cgit v1.2.1


From a823205403f2dbbd907c03e59fd232552351d566 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Feb 2014 11:05:48 +0100
Subject: [ticket/12233] Allow profile fields to be contact fields

Contact fields are displayed with in the contact section of the user profile
and are displayed differently in the mini profile next to posts and private
messages

PHPBB3-12233
---
 phpBB/adm/style/acp_profile.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 04e6d9f12b..64bc3df09b 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -79,6 +79,12 @@
 			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
+		<dl>
+			<dt><label for="field_is_contact">{L_FIELD_IS_CONTACT}{L_COLON}</label><br /><span>{L_FIELD_IS_CONTACT_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_is_contact" name="field_is_contact" value="1"<!-- IF S_FIELD_CONTACT --> checked="checked"<!-- ENDIF --> /></dd>
+			<dd><input class="text medium" type="text" name="field_contact_desc" id="field_contact_desc" value="{FIELD_CONTACT_DESC}" /> <label for="field_contact_desc">{L_FIELD_CONTACT_DESC}</label></dd>
+			<dd><input class="text medium" type="text" name="field_contact_url" id="field_contact_url" value="{FIELD_CONTACT_URL}" /> <label for="field_contact_url">{L_FIELD_CONTACT_URL}</label></dd>
+		</dl>
 		</fieldset>
 
 		<!-- IF S_EDIT_MODE -->
-- 
cgit v1.2.1


From 76409388afcd6389b5a29bc54b49faaf6bc4b4a5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Feb 2014 15:11:17 +0100
Subject: [ticket/12234] Replace ICQ with custom profile field

PHPBB3-12234
---
 phpBB/adm/style/acp_users_profile.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index f4a3c06e67..39cc5da24d 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -2,10 +2,6 @@
 
 	<fieldset>
 		<legend>{L_USER_PROFILE}</legend>
-	<dl>
-		<dt><label for="icq">{L_UCP_ICQ}{L_COLON}</label></dt>
-		<dd><input type="text" id="icq" name="icq" value="{ICQ}" /></dd>
-	</dl>
 	<dl>
 		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
-- 
cgit v1.2.1


From f997d98a2a7b681d08fa6c43ef8431fa335c9ca4 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sun, 2 Mar 2014 18:43:31 +0100
Subject: [ticket/12126] Changed .phpbb_alert "max-width: 640px" to "width:
 620px"

PHPBB3-12126
---
 phpBB/adm/style/admin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 3c7e378b2b..e60e802eb9 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1572,7 +1572,7 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 	top: 150px;
 	left: 0;
 	right: 0;
-	max-width: 600px;
+	width: 620px;
 	margin: 0 auto;
 	z-index: 50;
 	padding: 25px;
-- 
cgit v1.2.1


From 50e4cac5dec183a81ba914c65c2f780485befd21 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sun, 2 Mar 2014 22:41:38 +0100
Subject: [ticket/12126] left:0 and right: 0; admin.css --> width: auto

PHPBB3-12126
---
 phpBB/adm/style/admin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index e60e802eb9..7ef74e4db0 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1642,7 +1642,7 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
 {
 	.phpbb_alert {
-		max-width: none;
+		width: auto;
 		margin: 0 25px;
 	}
 }
-- 
cgit v1.2.1


From 3e52d780ba462e2f1a9d3324fc79f7b442df4b15 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 3 Mar 2014 12:16:22 +0100
Subject: [ticket/12243] Remove outdated adm/style/custom_profile_fields.html

PHPBB3-12243
---
 phpBB/adm/style/custom_profile_fields.html | 32 ------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 phpBB/adm/style/custom_profile_fields.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html
deleted file mode 100644
index 982356bfa7..0000000000
--- a/phpBB/adm/style/custom_profile_fields.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-<!-- BEGIN dropdown -->
-	<select name="{dropdown.FIELD_IDENT}" id="{dropdown.FIELD_IDENT}">
-		<!-- BEGIN options --><option value="{dropdown.options.OPTION_ID}"{dropdown.options.SELECTED}>{dropdown.options.VALUE}</option><!-- END options -->
-	</select>
-<!-- END dropdown -->
-
-<!-- BEGIN text -->
-	<textarea name="{text.FIELD_IDENT}" id="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}">{text.FIELD_VALUE}</textarea>
-<!-- END text -->
-
-<!-- BEGIN string -->
-	<input type="text" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
-<!-- END string -->
-
-<!-- BEGIN bool -->
-	<!-- IF bool.FIELD_LENGTH eq 1 -->
-		<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}</label> <!-- END options -->
-	<!-- ELSE -->
-		<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}" value="1"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> />
-	<!-- ENDIF -->
-<!-- END bool -->
-
-<!-- BEGIN int -->
-	<input type="text" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
-<!-- END int -->
-
-<!-- BEGIN date -->
-	<span>{L_DAY}{L_COLON}</span> <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select>
-	<span>{L_MONTH}{L_COLON}</span> <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select>
-	<span>{L_YEAR}{L_COLON}</span> <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select>
-<!-- END date -->
-- 
cgit v1.2.1


From a2f2629e2a5038aca372cc3e55c408a99b6ca6fc Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 11 Feb 2014 23:02:54 +0100
Subject: [ticket/12187] Add URL type for profile fields

PHPBB3-12187
---
 phpBB/adm/style/profilefields/url.html | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 phpBB/adm/style/profilefields/url.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/profilefields/url.html b/phpBB/adm/style/profilefields/url.html
new file mode 100644
index 0000000000..8dd3a90de1
--- /dev/null
+++ b/phpBB/adm/style/profilefields/url.html
@@ -0,0 +1,3 @@
+<!-- BEGIN url -->
+<input type="url" class="inputbox autowidth" name="{url.FIELD_IDENT}" id="{url.FIELD_IDENT}" size="{url.FIELD_LENGTH}" maxlength="{url.FIELD_MAXLEN}" value="{url.FIELD_VALUE}" />
+<!-- END url -->
-- 
cgit v1.2.1


From 5b1fbfb2f2c901b89bb1163503b0468e11bbc307 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 3 Mar 2014 20:01:19 +0100
Subject: [ticket/12187] Remove user_website functionality

PHPBB3-12187
---
 phpBB/adm/style/acp_prune_users.html   | 4 ----
 phpBB/adm/style/acp_users_profile.html | 4 ----
 2 files changed, 8 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index 2bbb03a834..30ddd1c29e 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -18,10 +18,6 @@
 	<dt><label for="email">{L_EMAIL}{L_COLON}</label></dt>
 	<dd><input type="text" id="email" name="email" /></dd>
 </dl>
-<dl>
-	<dt><label for="email">{L_WEBSITE}{L_COLON}</label></dt>
-	<dd><input type="text" id="website" name="website" /></dd>
-</dl>
 <dl>
 	<dt><label for="joined">{L_JOINED}{L_COLON}</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
 	<dd>
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 39cc5da24d..18af7c8d7f 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -18,10 +18,6 @@
 		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
 		<dd><input type="email" id="jabber" name="jabber" value="{JABBER}" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="website">{L_WEBSITE}{L_COLON}</label></dt>
-		<dd><input type="url" id="website" name="website" value="{WEBSITE}" /></dd>
-	</dl>
 	<dl>
 		<dt><label for="birthday">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
 		<dd>{L_DAY}{L_COLON} <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}{L_COLON} <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}{L_COLON} <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
-- 
cgit v1.2.1


From c82f59b5abd2838a31bae58ba12c41805b684af0 Mon Sep 17 00:00:00 2001
From: hjpotter92 <hjpotter92@iitkgp.ac.in>
Date: Tue, 4 Mar 2014 03:41:45 +0530
Subject: [ticket/12245] Fix id attributes in acp_prune_users.html

The following labels had invalid id references:
1. joined (renamed to link to joined_after)
2. group_id (create teh id attribute on select box)

PHPBB3-12245
---
 phpBB/adm/style/acp_prune_users.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index 2bbb03a834..5bd325d275 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -23,7 +23,7 @@
 	<dd><input type="text" id="website" name="website" /></dd>
 </dl>
 <dl>
-	<dt><label for="joined">{L_JOINED}{L_COLON}</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
+	<dt><label for="joined_after">{L_JOINED}{L_COLON}</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
 	<dd>
 		<strong>{L_AFTER}</strong> <input type="text" id="joined_after" name="joined_after" />
 		<br /> <br /> <strong>{L_BEFORE}</strong> <input type="text" id="joined_before" name="joined_before" />
@@ -44,7 +44,7 @@
 <!-- IF S_GROUP_LIST -->
 <dl>
 	<dt><label for="group_id">{L_GROUP}{L_COLON}</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</span></dt>
-	<dd><select name="group_id">{S_GROUP_LIST}</select></dd>
+	<dd><select id="group_id" name="group_id">{S_GROUP_LIST}</select></dd>
 </dl>
 <!-- ENDIF -->
 </fieldset>
-- 
cgit v1.2.1


From 83a7e632b9b21fed88a3dbea679580d0740664f7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 4 Mar 2014 10:19:08 +0100
Subject: [ticket/12235] Convert WLM to custom profile field

PHPBB3-12235
---
 phpBB/adm/style/acp_users_profile.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 18af7c8d7f..84d5df8c14 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -6,10 +6,6 @@
 		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
-		<dd><input type="email" id="msn" name="msn" value="{MSN}" /></dd>
-	</dl>
 	<dl>
 		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
-- 
cgit v1.2.1


From 03492e62116f05da97fc4ee30d11793f4cdbbdc8 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 4 Mar 2014 15:49:33 -0800
Subject: [ticket/12248] Make extension details homepage a clickable link

http://tracker.phpbb.com/browse/PHPBB3-12248

PHPBB3-12248
---
 phpBB/adm/style/acp_ext_details.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 18786d80f9..3e7a7af6e4 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -31,7 +31,7 @@
 		<!-- IF META_HOMEPAGE -->
 		<dl>
 			<dt><label for="meta_homepage">{L_HOMEPAGE}{L_COLON}</label></dt>
-			<dd><p id="meta_homepage">{META_HOMEPAGE}</p></dd>
+			<dd><p id="meta_homepage"><strong><a href="{META_HOMEPAGE}">{META_HOMEPAGE}</a></strong></p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF META_TIME -->
-- 
cgit v1.2.1


From 71354ef185e003319cdc9031928054fdb2f0b970 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Wed, 5 Mar 2014 11:51:38 +0100
Subject: [develop] Fix incorrect merge conflict resolution from PR #2085

PHPBB3-12235
---
 phpBB/adm/style/acp_prune_users.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index 8a93448fae..b8c271355b 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -19,7 +19,7 @@
 	<dd><input type="text" id="email" name="email" /></dd>
 </dl>
 <dl>
-	<dt><label for="joined">{L_JOINED}{L_COLON}</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
+	<dt><label for="joined_after">{L_JOINED}{L_COLON}</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
 	<dd>
 		<strong>{L_AFTER}</strong> <input type="text" id="joined_after" name="joined_after" />
 		<br /> <br /> <strong>{L_BEFORE}</strong> <input type="text" id="joined_before" name="joined_before" />
-- 
cgit v1.2.1


From 2e5106aae1bfe83ad8b2336a6d519da5aabc59d2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 4 Mar 2014 11:22:55 +0100
Subject: [ticket/12237] Convert yahoo messanger to custom profile field

PHPBB3-12237
---
 phpBB/adm/style/acp_users_profile.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 84d5df8c14..c21d8833ac 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -6,10 +6,6 @@
 		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>
 		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
-		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
-	</dl>
 	<dl>
 		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
 		<dd><input type="email" id="jabber" name="jabber" value="{JABBER}" /></dd>
-- 
cgit v1.2.1


From f2059f52f3f8f430888366b70aa07c534abb35a1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 5 Mar 2014 22:13:22 +0100
Subject: [ticket/12236] Move AOL Instant Messanger field to custom profile
 field

PHPBB3-12236
---
 phpBB/adm/style/acp_users_profile.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index c21d8833ac..d32348ff1c 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -2,10 +2,6 @@
 
 	<fieldset>
 		<legend>{L_USER_PROFILE}</legend>
-	<dl>
-		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>
-		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
-	</dl>
 	<dl>
 		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
 		<dd><input type="email" id="jabber" name="jabber" value="{JABBER}" /></dd>
-- 
cgit v1.2.1


From d0b07503ad86d8c2fac5c7396348988e1587a684 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 5 Mar 2014 14:45:45 -0800
Subject: [ticket/12248] Remove p tag in favor of strong tag

PHPBB3-12248
---
 phpBB/adm/style/acp_ext_details.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 3e7a7af6e4..f14243dad0 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -31,7 +31,7 @@
 		<!-- IF META_HOMEPAGE -->
 		<dl>
 			<dt><label for="meta_homepage">{L_HOMEPAGE}{L_COLON}</label></dt>
-			<dd><p id="meta_homepage"><strong><a href="{META_HOMEPAGE}">{META_HOMEPAGE}</a></strong></p></dd>
+			<dd><strong id="meta_homepage"><a href="{META_HOMEPAGE}">{META_HOMEPAGE}</a></strong></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF META_TIME -->
-- 
cgit v1.2.1


From 4e770c2b429cab9aad69a390d1cd4d2c67b7062a Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 5 Mar 2014 14:53:31 -0800
Subject: [ticket/12248] Fix meta_author tags (IDs must be unique)

PHPBB3-12248
---
 phpBB/adm/style/acp_ext_details.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index f14243dad0..c43a229515 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -69,25 +69,25 @@
 		<!-- BEGIN meta_authors -->
 		<fieldset>
 			<dl>
-				<dt><label for="meta_author_name">{L_AUTHOR_NAME}{L_COLON}</label></dt>
-				<dd><strong id="meta_author_name">{meta_authors.AUTHOR_NAME}</strong></dd>
+				<dt><label for="meta_author_name_{meta_authors.S_ROW_COUNT}">{L_AUTHOR_NAME}{L_COLON}</label></dt>
+				<dd><strong id="meta_author_name_{meta_authors.S_ROW_COUNT}">{meta_authors.AUTHOR_NAME}</strong></dd>
 			</dl>
 			<!-- IF meta_authors.AUTHOR_EMAIL -->
 			<dl>
-				<dt><label for="meta_author_email">{L_AUTHOR_EMAIL}{L_COLON}</label></dt>
-				<dd><strong id="meta_author_email"><a href="mailto:{meta_authors.AUTHOR_EMAIL}">{meta_authors.AUTHOR_EMAIL}</a></strong></dd>
+				<dt><label for="meta_author_email_{meta_authors.S_ROW_COUNT}">{L_AUTHOR_EMAIL}{L_COLON}</label></dt>
+				<dd><strong id="meta_author_email_{meta_authors.S_ROW_COUNT}"><a href="mailto:{meta_authors.AUTHOR_EMAIL}">{meta_authors.AUTHOR_EMAIL}</a></strong></dd>
 			</dl>
 			<!-- ENDIF -->
 			<!-- IF meta_authors.AUTHOR_HOMEPAGE -->
 			<dl>
-				<dt><label for="meta_author_url">{L_AUTHOR_HOMEPAGE}{L_COLON}</label></dt>
-				<dd><strong id="meta_author_url"><a href="{meta_authors.AUTHOR_HOMEPAGE}">{meta_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
+				<dt><label for="meta_author_url_{meta_authors.S_ROW_COUNT}">{L_AUTHOR_HOMEPAGE}{L_COLON}</label></dt>
+				<dd><strong id="meta_author_url_{meta_authors.S_ROW_COUNT}"><a href="{meta_authors.AUTHOR_HOMEPAGE}">{meta_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
 			</dl>
 			<!-- ENDIF -->
 			<!-- IF meta_authors.AUTHOR_ROLE -->
 			<dl>
-				<dt><label for="author_role">{L_AUTHOR_ROLE}{L_COLON}</label></dt>
-				<dd><strong id="meta_author_role">{meta_authors.AUTHOR_ROLE}</strong></dd>
+				<dt><label for="meta_author_role_{meta_authors.S_ROW_COUNT}">{L_AUTHOR_ROLE}{L_COLON}</label></dt>
+				<dd><strong id="meta_author_role_{meta_authors.S_ROW_COUNT}">{meta_authors.AUTHOR_ROLE}</strong></dd>
 			</dl>
 			<!-- ENDIF -->
 		</fieldset>
-- 
cgit v1.2.1


From 2e49efc12d84b5a0111d61e7066bea77bcb4e5c1 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 5 Mar 2014 14:54:04 -0800
Subject: [ticket/12248] Use id instead of name attribute in a tags

PHPBB3-12248
---
 phpBB/adm/style/acp_ext_delete_data.html | 2 +-
 phpBB/adm/style/acp_ext_details.html     | 2 +-
 phpBB/adm/style/acp_ext_disable.html     | 2 +-
 phpBB/adm/style/acp_ext_enable.html      | 2 +-
 phpBB/adm/style/acp_ext_list.html        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_delete_data.html b/phpBB/adm/style/acp_ext_delete_data.html
index 5b38d9b8d0..0f3adb7cfe 100644
--- a/phpBB/adm/style/acp_ext_delete_data.html
+++ b/phpBB/adm/style/acp_ext_delete_data.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-	<a name="maincontent"></a>
+	<a id="maincontent"></a>
 
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index c43a229515..b6552bbbd4 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
index 4fa0893be7..d650544ff7 100644
--- a/phpBB/adm/style/acp_ext_disable.html
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-	<a name="maincontent"></a>
+	<a id="maincontent"></a>
 
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 670904a2ce..42523f1f58 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-	<a name="maincontent"></a>
+	<a id="maincontent"></a>
 
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 09cf6a31f5..2fcc6eab31 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
-- 
cgit v1.2.1


From 898976f8a113b61acef03506143be36ad69e6507 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 5 Mar 2014 15:05:40 -0800
Subject: [ticket/12248] Remove unused label for attributes and related id tags

PHPBB3-12248
---
 phpBB/adm/style/acp_ext_details.html | 52 ++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index b6552bbbd4..af28acdc54 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -10,39 +10,39 @@
 		<legend>{L_EXT_DETAILS}</legend>
 		<!-- IF META_DISPLAY_NAME -->
 		<dl>
-			<dt><label for="meta_display_name">{L_DISPLAY_NAME}{L_COLON}</label></dt>
-			<dd><strong id="meta_display_name">{META_DISPLAY_NAME}</strong></dd>
+			<dt><label>{L_DISPLAY_NAME}{L_COLON}</label></dt>
+			<dd><strong>{META_DISPLAY_NAME}</strong></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="meta_name">{L_CLEAN_NAME}{L_COLON}</label></dt>
-			<dd><strong id="meta_name">{META_NAME}</strong></dd>
+			<dt><label>{L_CLEAN_NAME}{L_COLON}</label></dt>
+			<dd><strong>{META_NAME}</strong></dd>
 		</dl>
 		<!-- IF META_DESCRIPTION -->
 		<dl>
-			<dt><label for="meta_description">{L_DESCRIPTION}{L_COLON}</label></dt>
-			<dd><p id="meta_description">{META_DESCRIPTION}</p></dd>
+			<dt><label>{L_DESCRIPTION}{L_COLON}</label></dt>
+			<dd><p>{META_DESCRIPTION}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="meta_version">{L_VERSION}{L_COLON}</label></dt>
-			<dd><p id="meta_version">{META_VERSION}</p></dd>
+			<dt><label>{L_VERSION}{L_COLON}</label></dt>
+			<dd><p>{META_VERSION}</p></dd>
 		</dl>
 		<!-- IF META_HOMEPAGE -->
 		<dl>
-			<dt><label for="meta_homepage">{L_HOMEPAGE}{L_COLON}</label></dt>
-			<dd><strong id="meta_homepage"><a href="{META_HOMEPAGE}">{META_HOMEPAGE}</a></strong></dd>
+			<dt><label>{L_HOMEPAGE}{L_COLON}</label></dt>
+			<dd><strong><a href="{META_HOMEPAGE}">{META_HOMEPAGE}</a></strong></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF META_TIME -->
 		<dl>
-			<dt><label for="meta_time">{L_TIME}{L_COLON}</label></dt>
-			<dd><p id="meta_time">{META_TIME}</p></dd>
+			<dt><label>{L_TIME}{L_COLON}</label></dt>
+			<dd><p>{META_TIME}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="meta_license">{L_LICENCE}{L_COLON}</label></dt>
-			<dd><p id="meta_license">{META_LICENCE}</p></dd>
+			<dt><label>{L_LICENCE}{L_COLON}</label></dt>
+			<dd><p>{META_LICENCE}</p></dd>
 		</dl>
 	</fieldset>
 
@@ -51,14 +51,14 @@
 		<legend>{L_REQUIREMENTS}</legend>
 		<!-- IF META_REQUIRE_PHPBB -->
 		<dl<!-- IF META_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
-			<dt><label for="require_phpbb">{L_PHPBB_VERSION}{L_COLON}</label></dt>
-			<dd><p id="require_phpbb">{META_REQUIRE_PHPBB}</p></dd>
+			<dt><label>{L_PHPBB_VERSION}{L_COLON}</label></dt>
+			<dd><p>{META_REQUIRE_PHPBB}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF META_REQUIRE_PHP -->
 		<dl<!-- IF META_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
-			<dt><label for="require_php">{L_PHP_VERSION}{L_COLON}</label></dt>
-			<dd><p id="require_php">{META_REQUIRE_PHP}</p></dd>
+			<dt><label>{L_PHP_VERSION}{L_COLON}</label></dt>
+			<dd><p>{META_REQUIRE_PHP}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 	</fieldset>
@@ -69,25 +69,25 @@
 		<!-- BEGIN meta_authors -->
 		<fieldset>
 			<dl>
-				<dt><label for="meta_author_name_{meta_authors.S_ROW_COUNT}">{L_AUTHOR_NAME}{L_COLON}</label></dt>
-				<dd><strong id="meta_author_name_{meta_authors.S_ROW_COUNT}">{meta_authors.AUTHOR_NAME}</strong></dd>
+				<dt><label>{L_AUTHOR_NAME}{L_COLON}</label></dt>
+				<dd><strong>{meta_authors.AUTHOR_NAME}</strong></dd>
 			</dl>
 			<!-- IF meta_authors.AUTHOR_EMAIL -->
 			<dl>
-				<dt><label for="meta_author_email_{meta_authors.S_ROW_COUNT}">{L_AUTHOR_EMAIL}{L_COLON}</label></dt>
-				<dd><strong id="meta_author_email_{meta_authors.S_ROW_COUNT}"><a href="mailto:{meta_authors.AUTHOR_EMAIL}">{meta_authors.AUTHOR_EMAIL}</a></strong></dd>
+				<dt><label>{L_AUTHOR_EMAIL}{L_COLON}</label></dt>
+				<dd><strong><a href="mailto:{meta_authors.AUTHOR_EMAIL}">{meta_authors.AUTHOR_EMAIL}</a></strong></dd>
 			</dl>
 			<!-- ENDIF -->
 			<!-- IF meta_authors.AUTHOR_HOMEPAGE -->
 			<dl>
-				<dt><label for="meta_author_url_{meta_authors.S_ROW_COUNT}">{L_AUTHOR_HOMEPAGE}{L_COLON}</label></dt>
-				<dd><strong id="meta_author_url_{meta_authors.S_ROW_COUNT}"><a href="{meta_authors.AUTHOR_HOMEPAGE}">{meta_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
+				<dt><label>{L_AUTHOR_HOMEPAGE}{L_COLON}</label></dt>
+				<dd><strong><a href="{meta_authors.AUTHOR_HOMEPAGE}">{meta_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
 			</dl>
 			<!-- ENDIF -->
 			<!-- IF meta_authors.AUTHOR_ROLE -->
 			<dl>
-				<dt><label for="meta_author_role_{meta_authors.S_ROW_COUNT}">{L_AUTHOR_ROLE}{L_COLON}</label></dt>
-				<dd><strong id="meta_author_role_{meta_authors.S_ROW_COUNT}">{meta_authors.AUTHOR_ROLE}</strong></dd>
+				<dt><label>{L_AUTHOR_ROLE}{L_COLON}</label></dt>
+				<dd><strong>{meta_authors.AUTHOR_ROLE}</strong></dd>
 			</dl>
 			<!-- ENDIF -->
 		</fieldset>
-- 
cgit v1.2.1


From aae22d699eb85e088ca422e987f36f95b6e1fc4b Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 6 Mar 2014 12:02:27 -0800
Subject: [ticket/12248] Restore id attributes to extension details (used by
 tests)

PHPBB3-12248
---
 phpBB/adm/style/acp_ext_details.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index af28acdc54..986aa24b1b 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -11,38 +11,38 @@
 		<!-- IF META_DISPLAY_NAME -->
 		<dl>
 			<dt><label>{L_DISPLAY_NAME}{L_COLON}</label></dt>
-			<dd><strong>{META_DISPLAY_NAME}</strong></dd>
+			<dd><strong id="meta_display_name">{META_DISPLAY_NAME}</strong></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
 			<dt><label>{L_CLEAN_NAME}{L_COLON}</label></dt>
-			<dd><strong>{META_NAME}</strong></dd>
+			<dd><strong id="meta_name">{META_NAME}</strong></dd>
 		</dl>
 		<!-- IF META_DESCRIPTION -->
 		<dl>
 			<dt><label>{L_DESCRIPTION}{L_COLON}</label></dt>
-			<dd><p>{META_DESCRIPTION}</p></dd>
+			<dd><p id="meta_description">{META_DESCRIPTION}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
 			<dt><label>{L_VERSION}{L_COLON}</label></dt>
-			<dd><p>{META_VERSION}</p></dd>
+			<dd><p id="meta_version">{META_VERSION}</p></dd>
 		</dl>
 		<!-- IF META_HOMEPAGE -->
 		<dl>
 			<dt><label>{L_HOMEPAGE}{L_COLON}</label></dt>
-			<dd><strong><a href="{META_HOMEPAGE}">{META_HOMEPAGE}</a></strong></dd>
+			<dd><strong id="meta_homepage"><a href="{META_HOMEPAGE}">{META_HOMEPAGE}</a></strong></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF META_TIME -->
 		<dl>
 			<dt><label>{L_TIME}{L_COLON}</label></dt>
-			<dd><p>{META_TIME}</p></dd>
+			<dd><p id="meta_time">{META_TIME}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
 			<dt><label>{L_LICENCE}{L_COLON}</label></dt>
-			<dd><p>{META_LICENCE}</p></dd>
+			<dd><p id="meta_license">{META_LICENCE}</p></dd>
 		</dl>
 	</fieldset>
 
@@ -52,13 +52,13 @@
 		<!-- IF META_REQUIRE_PHPBB -->
 		<dl<!-- IF META_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
 			<dt><label>{L_PHPBB_VERSION}{L_COLON}</label></dt>
-			<dd><p>{META_REQUIRE_PHPBB}</p></dd>
+			<dd><p id="require_phpbb">{META_REQUIRE_PHPBB}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF META_REQUIRE_PHP -->
 		<dl<!-- IF META_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
 			<dt><label>{L_PHP_VERSION}{L_COLON}</label></dt>
-			<dd><p>{META_REQUIRE_PHP}</p></dd>
+			<dd><p id="require_php">{META_REQUIRE_PHP}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 	</fieldset>
-- 
cgit v1.2.1


From 2de3943cec28a1574f5a5058057ff2ec6047657f Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 13 Mar 2014 15:08:21 -0700
Subject: [ticket/12073] Increase size of samp and code tags in ACP

PHPBB3-12073
---
 phpBB/adm/style/admin.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 7ef74e4db0..d80f538a01 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -43,6 +43,10 @@ body {
 	margin: 10px 15px;
 }
 
+code, samp {
+	font-size: 1.2em;
+}
+
 img {
 	border: 0;
 }
-- 
cgit v1.2.1


From 2c0efd5d1bd01d5153fb355492028614030fca40 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 13 Mar 2014 15:24:27 -0700
Subject: [ticket/12029] Remove ellipsis and wrap long sidebar items in ACP

PHPBB3-12029
---
 phpBB/adm/style/admin.css | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 7ef74e4db0..3115f00fd3 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -571,12 +571,6 @@ li {
 	padding: 3px 8px 3px 3px;
 }
 
-#menu li span, #menu .header {
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
 #menu li a:hover, #menu li a:hover span {
 	text-decoration: none;
 	background-color: #FFFFFF;
-- 
cgit v1.2.1


From a29ad78da61e8eb805acb3bb1b06cca7e889e9ce Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 16 Mar 2014 07:56:26 -0700
Subject: [ticket/12274] Add core.js to the install footer

Required so phpbb var is defined, as it is used in admin.js.

PHPBB3-12274
---
 phpBB/adm/style/install_footer.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index c5356e7b9d..822ab76313 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -11,6 +11,7 @@
 
 <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 -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
 
-- 
cgit v1.2.1


From e46e3111e2a3e10c9c571f846f07afb780ec8dd5 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 17 Mar 2014 12:10:18 -0700
Subject: [ticket/12284] Improve readability of extension manager details

Use span tags like the rest of the ACP does, instead of P tags.
There is no semantic need to use P tags here. These are not
paragraphs.

PHPBB3-12284
---
 phpBB/adm/style/acp_ext_details.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 986aa24b1b..5141acd9fc 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -21,12 +21,12 @@
 		<!-- IF META_DESCRIPTION -->
 		<dl>
 			<dt><label>{L_DESCRIPTION}{L_COLON}</label></dt>
-			<dd><p id="meta_description">{META_DESCRIPTION}</p></dd>
+			<dd><span id="meta_description">{META_DESCRIPTION}</span></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
 			<dt><label>{L_VERSION}{L_COLON}</label></dt>
-			<dd><p id="meta_version">{META_VERSION}</p></dd>
+			<dd><span id="meta_version">{META_VERSION}</span></dd>
 		</dl>
 		<!-- IF META_HOMEPAGE -->
 		<dl>
@@ -37,12 +37,12 @@
 		<!-- IF META_TIME -->
 		<dl>
 			<dt><label>{L_TIME}{L_COLON}</label></dt>
-			<dd><p id="meta_time">{META_TIME}</p></dd>
+			<dd><span id="meta_time">{META_TIME}</span></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
 			<dt><label>{L_LICENCE}{L_COLON}</label></dt>
-			<dd><p id="meta_license">{META_LICENCE}</p></dd>
+			<dd><span id="meta_license">{META_LICENCE}</span></dd>
 		</dl>
 	</fieldset>
 
@@ -52,13 +52,13 @@
 		<!-- IF META_REQUIRE_PHPBB -->
 		<dl<!-- IF META_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
 			<dt><label>{L_PHPBB_VERSION}{L_COLON}</label></dt>
-			<dd><p id="require_phpbb">{META_REQUIRE_PHPBB}</p></dd>
+			<dd><span id="require_phpbb">{META_REQUIRE_PHPBB}</span></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF META_REQUIRE_PHP -->
 		<dl<!-- IF META_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
 			<dt><label>{L_PHP_VERSION}{L_COLON}</label></dt>
-			<dd><p id="require_php">{META_REQUIRE_PHP}</p></dd>
+			<dd><span id="require_php">{META_REQUIRE_PHP}</span></dd>
 		</dl>
 		<!-- ENDIF -->
 	</fieldset>
-- 
cgit v1.2.1


From 51ff202820fcfee7a35d9df71c3a3d7452dd0cb7 Mon Sep 17 00:00:00 2001
From: geetakshi <geetakshi.19@gmail.com>
Date: Wed, 19 Mar 2014 19:59:19 +0530
Subject: [ticket/11357] Correcting invalid markup

PHPBB3-11357
---
 phpBB/adm/style/install_header.html      | 2 +-
 phpBB/adm/style/install_update_diff.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 560bf501e9..99b98ef068 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -41,7 +41,7 @@ function dE(n, s, type)
 		<h1>{L_INSTALL_PANEL}</h1>
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 		<!-- IF S_LANG_SELECT -->
-		<form method="post" action="">
+		<form method="post" action="#">
 			<fieldset class="nobg">
 				<label for="language">{L_SELECT_LANG}{L_COLON}</label>
 				{S_LANG_SELECT}
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index c27304a425..150ef37e0e 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -223,7 +223,7 @@ table.hrdiff caption span {
 <!-- ENDIF -->
 <!-- IF not S_DIFF_NEW_FILE -->
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
-		<form method="post" action="">
+		<form method="post" action="#">
 		<fieldset class="quick">
 			<label for="diff_mode">{L_SELECT_DIFF_MODE}{L_COLON}</label>
 			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
-- 
cgit v1.2.1


From e4f6d9bc907e4aa00ca8c3582f708b4aa0d0d449 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 20 Mar 2014 18:11:45 -0700
Subject: [ticket/12292] Improve style details page

http://tracker.phpbb.com/browse/PHPBB3-12292
Gave style details page a proper heading and back button.
Also removed a few obsolete code leftovers in the style
and CSS.

PHPBB3-12292
---
 phpBB/adm/style/acp_styles.html | 16 ++++++----------
 phpBB/adm/style/admin.css       |  4 ++--
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index b5c691b36b..e0149c2a0f 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -2,6 +2,10 @@
 
 <a id="maincontent"></a>
 
+<!-- IF S_STYLE_DETAILS -->
+	<a href="{U_ACTION}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+<!-- ENDIF -->
+
 <!-- IF S_CONFIRM_ACTION -->
 <form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
 
@@ -72,8 +76,8 @@
 
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		<a href="{U_ACTION}" class="button2">{L_BACK}</a>
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 		{S_FORM_TOKEN}
 	</fieldset>
 <!-- ENDIF -->
@@ -154,14 +158,6 @@
 	</fieldset>
 <!-- ENDIF -->
 
-<!-- IF .extra_links -->
-	<fieldset class="quick">
-		<!-- BEGIN extra_links -->
-			<a class="button2" href="{extra_links.U_ACTION}">{extra_links.L_ACTION}</a>
-		<!-- END extra_links -->
-	</fieldset>
-<!-- ENDIF -->
-
 </form>
 
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index d6377453d1..e29adc988c 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1513,7 +1513,7 @@ input.autowidth { width: auto !important;}
 
 /* Form button styles
 ---------------------------------------- */
-a.button1, input.button1, input.button3,
+a.button1, input.button1,
 a.button2, input.button2 {
 	width: auto !important;
 	padding: 1px 3px 0 3px;
@@ -1556,7 +1556,7 @@ input.disabled {
 }
 
 /* Focus states */
-input.button1:focus, input.button2:focus, input.button3:focus {
+input.button1:focus, input.button2:focus, {
 	outline-style: none;
 }
 
-- 
cgit v1.2.1


From b6b32c2340dc160e92c38f722e303153a1ca6328 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 22 Mar 2014 19:49:03 -0700
Subject: [ticket/12292] Fix syntax error in admin.css

PHPBB3-12292
---
 phpBB/adm/style/admin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index e29adc988c..22bbf404ea 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1556,7 +1556,7 @@ input.disabled {
 }
 
 /* Focus states */
-input.button1:focus, input.button2:focus, {
+input.button1:focus, input.button2:focus {
 	outline-style: none;
 }
 
-- 
cgit v1.2.1


From ba9bc9c7dc24e8c21f0c22c9e872214094d94425 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 27 Mar 2014 23:27:30 -0700
Subject: [ticket/12311] Use valid composer schema - license - for extensions

http://tracker.phpbb.com/browse/PHPBB3-12311

PHPBB3-12311
---
 phpBB/adm/style/acp_ext_details.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 5141acd9fc..6aff4b29cc 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -41,8 +41,8 @@
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label>{L_LICENCE}{L_COLON}</label></dt>
-			<dd><span id="meta_license">{META_LICENCE}</span></dd>
+			<dt><label>{L_LICENSE}{L_COLON}</label></dt>
+			<dd><span id="meta_license">{META_LICENSE}</span></dd>
 		</dl>
 	</fieldset>
 
-- 
cgit v1.2.1


From fb25917fa951e1687fcd66a29137aa1acc966e0c Mon Sep 17 00:00:00 2001
From: Prosk8er <prosk8er@gotskillslounge.com>
Date: Sat, 29 Mar 2014 09:57:11 -0400
Subject: [ticket/12301] Template Event overall_header_body_before

add template event overall_header_body_before

PHPBB3-12301
---
 phpBB/adm/style/overall_header.html | 2 ++
 phpBB/adm/style/simple_header.html  | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 1fc1261489..7e7f0cecee 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -112,6 +112,8 @@ function popup(url, width, height, name)
 
 <body class="{S_CONTENT_DIRECTION} nojs">
 
+<!-- EVENT acp_overall_header_body_before -->
+
 <div id="wrap">
 	<div id="page-header">
 		<h1>{L_ADMIN_PANEL}</h1>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 0ca751cd7e..770b7da8a6 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -106,4 +106,6 @@ function find_username(url)
 
 <body class="{S_CONTENT_DIRECTION}">
 
+<!-- EVENT acp_simple_header_body_before -->
+
 <div id="page-body" class="simple-page-body">
-- 
cgit v1.2.1


From 3c7ff1c417bd57ab71057fa3d880d58f1ee65f2a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 30 Jan 2014 22:21:06 +0100
Subject: [ticket/12150] Add options to acp

PHPBB3-12150
---
 phpBB/adm/style/acp_forums.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index e8b20007dc..4a534d0592 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -278,6 +278,19 @@
 			<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
+		<dl>
+			<dt><label for="enable_shadow_topic_prune">{L_FORUM_PRUNE_SHADOW_TOPICS}{L_COLON}</label><br /><span>{L_FORUM_PRUNE_SHADOW_TOPICS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_shadow_topic_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_shadow_topic_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_shadow_topic_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_shadow_topic_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_shadow_topic_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
+			<dd><input type="number" id="prune_shadow_topic_freq" name="prune_shadow_topic_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_shadow_topic_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
+			<dd><input type="number" id="prune_shadow_topic_days" name="prune_shadow_topic_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+		</dl>
 		</fieldset>
 	</div>
 
-- 
cgit v1.2.1


From d97c58aeeaf24b6d76e21642e1764b471f212d87 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 2 Feb 2014 12:52:57 +0100
Subject: [ticket/12150] Add missing prune settings variables in acp_forums

PHPBB3-12150
---
 phpBB/adm/style/acp_forums.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 4a534d0592..2e826e7c13 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -280,8 +280,8 @@
 		</dl>
 		<dl>
 			<dt><label for="enable_shadow_topic_prune">{L_FORUM_PRUNE_SHADOW_TOPICS}{L_COLON}</label><br /><span>{L_FORUM_PRUNE_SHADOW_TOPICS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_shadow_topic_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_shadow_topic_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_shadow_topic_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_shadow_topic_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dd><label><input type="radio" class="radio" name="enable_shadow_topic_prune" value="1"<!-- IF S_PRUNE_SHADOW_TOPIC_ENABLE --> id="enable_shadow_topic_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_shadow_topic_prune" value="0"<!-- IF not S_PRUNE_SHADOW_TOPIC_ENABLE --> id="enable_shadow_topic_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_shadow_topic_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
-- 
cgit v1.2.1


From d83d819827634931e9317469090e933edfc99f2b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 14 Mar 2014 23:35:07 +0100
Subject: [ticket/12150] Use shorter column names for prune settings

All columns were renamed from having prune_shadow_topics as namebase to just
prune_shadow.
A missing column was also added to the migration file's remove_schema() method.

PHPBB3-12150
---
 phpBB/adm/style/acp_forums.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 2e826e7c13..0bb5e10f57 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -279,17 +279,17 @@
 				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="enable_shadow_topic_prune">{L_FORUM_PRUNE_SHADOW_TOPICS}{L_COLON}</label><br /><span>{L_FORUM_PRUNE_SHADOW_TOPICS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_shadow_topic_prune" value="1"<!-- IF S_PRUNE_SHADOW_TOPIC_ENABLE --> id="enable_shadow_topic_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_shadow_topic_prune" value="0"<!-- IF not S_PRUNE_SHADOW_TOPIC_ENABLE --> id="enable_shadow_topic_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="enable_shadow_prune">{L_FORUM_PRUNE_SHADOW}{L_COLON}</label><br /><span>{L_FORUM_PRUNE_SHADOW_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_shadow_prune" value="1"<!-- IF S_PRUNE_SHADOW_ENABLE --> id="enable_shadow_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_shadow_prune" value="0"<!-- IF not S_PRUNE_SHADOW_ENABLE --> id="enable_shadow_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_shadow_topic_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_topic_freq" name="prune_shadow_topic_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
+			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_shadow_topic_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_topic_days" name="prune_shadow_topic_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
+			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		</fieldset>
 	</div>
-- 
cgit v1.2.1


From b6128dee3f2628ef8cf197d0928febc2e3c8cd6b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 2 Apr 2014 00:23:26 +0200
Subject: [ticket/8700] Use L_COLON instead of adding ":" manually

PHPBB3-8700
---
 phpBB/adm/style/acp_styles.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index e0149c2a0f..86e666c4ed 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -24,7 +24,7 @@
 	</div>
 
 </fieldset>
-		
+
 </form>
 <!-- ELSE -->
 
@@ -44,7 +44,7 @@
 		<dd><input type="text" id="name" name="style_name" value="{STYLE_NAME}" /></dd>
 	</dl>
 	<dl>
-		<dt><label>{L_STYLE_PATH}</label></dt>
+		<dt><label>{L_STYLE_PATH}{L_COLON}</label></dt>
 		<dd><strong>{STYLE_PATH}</strong></dd>
 	</dl>
 	<dl>
@@ -117,7 +117,7 @@
 				<span class="error"><br />{styles_list.COMMENT}</span>
 			<!-- ENDIF -->
 			<!-- IF not styles_list.STYLE_ID and styles_list.COMMENT == '' -->
-				<span class="style-path"><br />{L_STYLE_PATH} {styles_list.STYLE_PATH_FULL}</span>
+				<span class="style-path"><br />{L_STYLE_PATH}{L_COLON} {styles_list.STYLE_PATH_FULL}</span>
 			<!-- ENDIF -->
 		</td>
 		<!-- IF not STYLES_LIST_HIDE_COUNT -->
-- 
cgit v1.2.1


From 4e2e8f862166ee855daa5bfa42aca746a0c4bf1f Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Mon, 7 Apr 2014 08:39:03 +0200
Subject: [ticket/12369] Added ACP vars

PHPBB3-12369
---
 phpBB/adm/style/overall_header.html | 2 +-
 phpBB/adm/style/simple_header.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 7e7f0cecee..f5d0fda88a 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -110,7 +110,7 @@ function popup(url, width, height, name)
 
 </head>
 
-<body class="{S_CONTENT_DIRECTION} nojs">
+<body class="{S_CONTENT_DIRECTION} {BODY_CLASS} nojs">
 
 <!-- EVENT acp_overall_header_body_before -->
 
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 770b7da8a6..fd5145f0d5 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -104,7 +104,7 @@ function find_username(url)
 <!-- EVENT acp_simple_header_head_append -->
 </head>
 
-<body class="{S_CONTENT_DIRECTION}">
+<body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">
 
 <!-- EVENT acp_simple_header_body_before -->
 
-- 
cgit v1.2.1


From ad98a070c37a66f773851851888f7e98dc447d92 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 7 Apr 2014 20:43:32 +0200
Subject: [ticket/12372] Unify definition of function dE() across all files

PHPBB3-12372
---
 phpBB/adm/style/install_header.html | 22 ++++++++++++----------
 phpBB/adm/style/overall_header.html | 22 ++++++++++++----------
 phpBB/adm/style/simple_header.html  | 22 ++++++++++++----------
 3 files changed, 36 insertions(+), 30 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 99b98ef068..4980fd36fb 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -13,21 +13,23 @@
 
 /**
 * Set display of page element
-* s[-1,0,1] = hide,toggle display,show
+*
+* @param string	id	The ID of the element to change
+* @param int	action	Set to 0 if element display should be toggled, -1 for
+*			hiding the element, and 1 for showing it.
+* @param string	type	Display type that should be used, e.g. inline, block or
+*			other CSS "display" types
 */
-function dE(n, s, type)
-{
-	if (!type)
-	{
+function dE(id, action, type) {
+	if (!type) {
 		type = 'block';
 	}
 
-	var e = document.getElementById(n);
-	if (!s)
-	{
-		s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
+	var display = jQuery('#' + id).css('display');
+	if (!action) {
+		action = (display === '' || display === type) ? -1 : 1;
 	}
-	e.style.display = (s == 1) ? type : 'none';
+	jQuery('#' + id).css('display', ((action === 1) ? type : 'none'));
 }
 
 // ]]>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 7e7f0cecee..668c0f4e92 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -37,21 +37,23 @@ function jumpto()
 
 /**
 * Set display of page element
-* s[-1,0,1] = hide,toggle display,show
+*
+* @param string	id	The ID of the element to change
+* @param int	action	Set to 0 if element display should be toggled, -1 for
+*			hiding the element, and 1 for showing it.
+* @param string	type	Display type that should be used, e.g. inline, block or
+*			other CSS "display" types
 */
-function dE(n, s, type)
-{
-	if (!type)
-	{
+function dE(id, action, type) {
+	if (!type) {
 		type = 'block';
 	}
 
-	var e = document.getElementById(n);
-	if (!s)
-	{
-		s = (e.style.display == '') ? -1 : 1;
+	var display = jQuery('#' + id).css('display');
+	if (!action) {
+		action = (display === '' || display === type) ? -1 : 1;
 	}
-	e.style.display = (s == 1) ? type : 'none';
+	jQuery('#' + id).css('display', ((action === 1) ? type : 'none'));
 }
 
 /**
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 770b7da8a6..01757f1032 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -50,21 +50,23 @@ function jumpto()
 
 /**
 * Set display of page element
-* s[-1,0,1] = hide,toggle display,show
+*
+* @param string	id	The ID of the element to change
+* @param int	action	Set to 0 if element display should be toggled, -1 for
+*			hiding the element, and 1 for showing it.
+* @param string	type	Display type that should be used, e.g. inline, block or
+*			other CSS "display" types
 */
-function dE(n, s, type)
-{
-	if (!type)
-	{
+function dE(id, action, type) {
+	if (!type) {
 		type = 'block';
 	}
 
-	var e = document.getElementById(n);
-	if (!s)
-	{
-		s = (e.style.display == '') ? -1 : 1;
+	var display = jQuery('#' + id).css('display');
+	if (!action) {
+		action = (display === '' || display === type) ? -1 : 1;
 	}
-	e.style.display = (s == 1) ? type : 'none';
+	jQuery('#' + id).css('display', ((action === 1) ? type : 'none'));
 }
 
 /**
-- 
cgit v1.2.1


From 966a2b4892762f3a1f032089d0b01c97a1d1c2e1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 7 Apr 2014 21:27:48 +0200
Subject: [ticket/12372] Move dE() function core.js

PHPBB3-12372
---
 phpBB/adm/style/install_header.html | 28 ----------------------------
 phpBB/adm/style/overall_header.html | 21 ---------------------
 phpBB/adm/style/simple_footer.html  |  2 ++
 phpBB/adm/style/simple_header.html  | 21 ---------------------
 4 files changed, 2 insertions(+), 70 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 4980fd36fb..a8f7009e4b 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -7,34 +7,6 @@
 <title>{PAGE_TITLE}</title>
 
 <link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-<script type="text/javascript">
-// <![CDATA[
-
-/**
-* Set display of page element
-*
-* @param string	id	The ID of the element to change
-* @param int	action	Set to 0 if element display should be toggled, -1 for
-*			hiding the element, and 1 for showing it.
-* @param string	type	Display type that should be used, e.g. inline, block or
-*			other CSS "display" types
-*/
-function dE(id, action, type) {
-	if (!type) {
-		type = 'block';
-	}
-
-	var display = jQuery('#' + id).css('display');
-	if (!action) {
-		action = (display === '' || display === type) ? -1 : 1;
-	}
-	jQuery('#' + id).css('display', ((action === 1) ? type : 'none'));
-}
-
-// ]]>
-</script>
-
 </head>
 
 <body class="{S_CONTENT_DIRECTION} nojs">
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 668c0f4e92..774df48917 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -35,27 +35,6 @@ function jumpto()
 	}
 }
 
-/**
-* Set display of page element
-*
-* @param string	id	The ID of the element to change
-* @param int	action	Set to 0 if element display should be toggled, -1 for
-*			hiding the element, and 1 for showing it.
-* @param string	type	Display type that should be used, e.g. inline, block or
-*			other CSS "display" types
-*/
-function dE(id, action, type) {
-	if (!type) {
-		type = 'block';
-	}
-
-	var display = jQuery('#' + id).css('display');
-	if (!action) {
-		action = (display === '' || display === type) ? -1 : 1;
-	}
-	jQuery('#' + id).css('display', ((action === 1) ? type : 'none'));
-}
-
 /**
 * Mark/unmark checkboxes
 * id = ID of parent container, name = name prefix, state = state [true/false]
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index a559b25b72..c549a2df4e 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -18,6 +18,8 @@
 
 <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 -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+
 <!-- EVENT acp_simple_footer_after -->
 
 </body>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 01757f1032..8950c4c394 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -48,27 +48,6 @@ function jumpto()
 	}
 }
 
-/**
-* Set display of page element
-*
-* @param string	id	The ID of the element to change
-* @param int	action	Set to 0 if element display should be toggled, -1 for
-*			hiding the element, and 1 for showing it.
-* @param string	type	Display type that should be used, e.g. inline, block or
-*			other CSS "display" types
-*/
-function dE(id, action, type) {
-	if (!type) {
-		type = 'block';
-	}
-
-	var display = jQuery('#' + id).css('display');
-	if (!action) {
-		action = (display === '' || display === type) ? -1 : 1;
-	}
-	jQuery('#' + id).css('display', ((action === 1) ? type : 'none'));
-}
-
 /**
 * Mark/unmark checkboxes
 * id = ID of parent container, name = name prefix, state = state [true/false]
-- 
cgit v1.2.1


From 91a1c3af901f51d79751b733e48e8bcddc81d263 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 7 Apr 2014 21:42:30 +0200
Subject: [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()

PHPBB3-12372
---
 phpBB/adm/style/acp_forums.html          | 44 ++++++++++++++++----------------
 phpBB/adm/style/acp_modules.html         |  4 +--
 phpBB/adm/style/acp_ranks.html           |  4 +--
 phpBB/adm/style/acp_send_statistics.html | 12 ++++-----
 phpBB/adm/style/acp_users_overview.html  |  4 +--
 phpBB/adm/style/acp_users_prefs.html     |  2 +-
 phpBB/adm/style/install_update.html      |  2 +-
 phpBB/adm/style/permissions.js           | 12 ++++-----
 8 files changed, 42 insertions(+), 42 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 0bb5e10f57..822d1c5f35 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -14,45 +14,45 @@
 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
 				if (value == {FORUM_POST})
 				{
-					dE('type_actions', -1);
+					phpbb.toggleDisplay('type_actions', -1);
 				}
 				else
 				{
-					dE('type_actions', 1);
+					phpbb.toggleDisplay('type_actions', 1);
 				}
 			<!-- ENDIF -->
 
 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
 				if (value == {FORUM_LINK})
 				{
-					dE('cat_to_link_actions', 1);
+					phpbb.toggleDisplay('cat_to_link_actions', 1);
 				}
 				else
 				{
-					dE('cat_to_link_actions', -1);
+					phpbb.toggleDisplay('cat_to_link_actions', -1);
 				}
 			<!-- ENDIF -->
 
 			if (value == {FORUM_POST})
 			{
-				dE('forum_post_options', 1);
-				dE('forum_link_options', -1);
-				dE('forum_rules_options', 1);
-				dE('forum_cat_options', -1);
+				phpbb.toggleDisplay('forum_post_options', 1);
+				phpbb.toggleDisplay('forum_link_options', -1);
+				phpbb.toggleDisplay('forum_rules_options', 1);
+				phpbb.toggleDisplay('forum_cat_options', -1);
 			}
 			else if (value == {FORUM_LINK})
 			{
-				dE('forum_post_options', -1);
-				dE('forum_link_options', 1);
-				dE('forum_rules_options', -1);
-				dE('forum_cat_options', -1);
+				phpbb.toggleDisplay('forum_post_options', -1);
+				phpbb.toggleDisplay('forum_link_options', 1);
+				phpbb.toggleDisplay('forum_rules_options', -1);
+				phpbb.toggleDisplay('forum_cat_options', -1);
 			}
 			else if (value == {FORUM_CAT})
 			{
-				dE('forum_post_options', -1);
-				dE('forum_link_options', -1);
-				dE('forum_rules_options', 1);
-				dE('forum_cat_options', 1);
+				phpbb.toggleDisplay('forum_post_options', -1);
+				phpbb.toggleDisplay('forum_link_options', -1);
+				phpbb.toggleDisplay('forum_rules_options', 1);
+				phpbb.toggleDisplay('forum_cat_options', 1);
 			}
 		}
 
@@ -64,30 +64,30 @@
 		{
 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
 				<!-- IF S_FORUM_POST -->
-					dE('type_actions', -1);
+					phpbb.toggleDisplay('type_actions', -1);
 				<!-- ENDIF -->
 			<!-- ENDIF -->
 
 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
 				<!-- IF S_FORUM_CAT -->
-					dE('cat_to_link_actions', -1);
+					phpbb.toggleDisplay('cat_to_link_actions', -1);
 				<!-- ENDIF -->
 			<!-- ENDIF -->
 
 			<!-- IF not S_FORUM_POST -->
-				dE('forum_post_options', -1);
+				phpbb.toggleDisplay('forum_post_options', -1);
 			<!-- ENDIF -->
 
 			<!-- IF not S_FORUM_CAT -->
-				dE('forum_cat_options', -1);
+				phpbb.toggleDisplay('forum_cat_options', -1);
 			<!-- ENDIF -->
 
 			<!-- IF not S_FORUM_LINK -->
-				dE('forum_link_options', -1);
+				phpbb.toggleDisplay('forum_link_options', -1);
 			<!-- ENDIF -->
 
 			<!-- IF S_FORUM_LINK -->
-			dE('forum_rules_options', -1);
+			phpbb.toggleDisplay('forum_rules_options', -1);
 			<!-- ENDIF -->
 		}
 
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index c7688a610c..3c97706e6a 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -10,11 +10,11 @@
 		{
 			if (value == 'category')
 			{
-				dE('modoptions', -1);
+				phpbb.toggleDisplay('modoptions', -1);
 			}
 			else
 			{
-				dE('modoptions', 1);
+				phpbb.toggleDisplay('modoptions', 1);
 			}
 		}
 
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index be68dda695..dd2d07a837 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -35,8 +35,8 @@
 	</dl>
 	<dl>
 		<dt><label for="special_rank">{L_RANK_SPECIAL}{L_COLON}</label></dt>
-		<dd><label><input onclick="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input onclick="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input onclick="phpbb.toggleDisplay('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input onclick="phpbb.toggleDisplay('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
 	<dl>
diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html
index 2d6c4837fd..819d433c5e 100644
--- a/phpBB/adm/style/acp_send_statistics.html
+++ b/phpBB/adm/style/acp_send_statistics.html
@@ -17,8 +17,8 @@ function iframe_updated()
 		return;
 	}
 
-	dE('questionnaire-form', -1);
-	dE('questionnaire-thanks', 1);
+	phpbb.toggleDisplay('questionnaire-form', -1);
+	phpbb.toggleDisplay('questionnaire-thanks', 1);
 }
 //]]>
 </script>
@@ -31,10 +31,10 @@ function iframe_updated()
 
 	<p>{L_EXPLAIN_SHOW_STATISTICS}</p>
 
-	<p id="show-button"><input type="button" class="button2" onclick="dE('configlist', 1); dE('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>
+	<p id="show-button"><input type="button" class="button2" onclick="phpbb.toggleDisplay('configlist', 1); phpbb.toggleDisplay('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>
 
 	<div id="configlist">
-		<input type="button" class="button2" onclick="dE('show-button', 1); dE('configlist', -1);" value="{L_HIDE_STATISTICS}" />
+		<input type="button" class="button2" onclick="phpbb.toggleDisplay('show-button', 1); phpbb.toggleDisplay('configlist', -1);" value="{L_HIDE_STATISTICS}" />
 		<p class="submit-buttons">
 			<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
 		</p>
@@ -63,8 +63,8 @@ function iframe_updated()
 
 <script type="text/javascript">
 //<![CDATA[
-	dE('configlist', -1);
-	dE('questionnaire-thanks', -1);
+	phpbb.toggleDisplay('configlist', -1);
+	phpbb.toggleDisplay('questionnaire-thanks', -1);
 //]]>
 </script>
 
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 013be80465..506101c3f7 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -86,11 +86,11 @@
 		{
 			if (option != 'banuser' && option != 'banemail' && option != 'banip')
 			{
-				dE('reasons', -1);
+				phpbb.toggleDisplay('reasons', -1);
 				return;
 			}
 
-			dE('reasons', 1);
+			phpbb.toggleDisplay('reasons', 1);
 
 			element = document.getElementById('user_quick_tools').ban_reason;
 
diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
index 1092b25b04..d1e389ca04 100644
--- a/phpBB/adm/style/acp_users_prefs.html
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -50,7 +50,7 @@
 	<!-- INCLUDE timezone_option.html -->
 	<dl> 
 		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
-		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
+		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
 		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
 	</dl>
 	</fieldset>
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index d746226753..f0df138641 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -224,7 +224,7 @@
 
 		<!-- IF .not_modified -->
 			<h2>{L_FILES_NOT_MODIFIED}</h2>
-			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
 			<p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
 
 			<fieldset id="not_modified" style="display: none;">
diff --git a/phpBB/adm/style/permissions.js b/phpBB/adm/style/permissions.js
index 1c85fbd9ef..9178adab50 100644
--- a/phpBB/adm/style/permissions.js
+++ b/phpBB/adm/style/permissions.js
@@ -177,7 +177,7 @@ function swap_options(pmask, fmask, cat, adv, view) {
 	var adv_block = document.getElementById('advanced' + pmask + fmask);
 
 	if (adv_block.style.display === 'block' && adv === true) {
-		dE('advanced' + pmask + fmask, -1);
+		phpbb.toggleDisplay('advanced' + pmask + fmask, -1);
 		reset_opacity(1);
 		display_checkboxes(false);
 		return;
@@ -207,11 +207,11 @@ function swap_options(pmask, fmask, cat, adv, view) {
 		return;
 	}
 
-	dE('options' + active_option, -1);
+	phpbb.toggleDisplay('options' + active_option, -1);
 
 	//hiding and showing the checkbox
 	if (document.getElementById('checkbox' + active_pmask + active_fmask)) {
-		dE('checkbox' + pmask + fmask, -1);
+		phpbb.toggleDisplay('checkbox' + pmask + fmask, -1);
 
 		if ((pmask + fmask) !== (active_pmask + active_fmask)) {
 			document.getElementById('checkbox' + active_pmask + active_fmask).style.display = 'inline';
@@ -219,13 +219,13 @@ function swap_options(pmask, fmask, cat, adv, view) {
 	}
 
 	if (!view) {
-		dE('advanced' + active_pmask + active_fmask, -1);
+		phpbb.toggleDisplay('advanced' + active_pmask + active_fmask, -1);
 	}
 
 	if (!view) {
-		dE('advanced' + pmask + fmask, 1);
+		phpbb.toggleDisplay('advanced' + pmask + fmask, 1);
 	}
-	dE('options' + id, 1);
+	phpbb.toggleDisplay('options' + id, 1);
 
 	active_pmask = pmask;
 	active_fmask = fmask;
-- 
cgit v1.2.1


From b2eef2f5f9acb84c3762326c74cd4e9a597e6e57 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 11 Apr 2014 11:27:13 +0200
Subject: [ticket/12372] Use admin.js $(document).ready for hiding
 questionnaire details

PHPBB3-12372
---
 phpBB/adm/style/acp_send_statistics.html | 7 -------
 phpBB/adm/style/admin.js                 | 4 ++++
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html
index 819d433c5e..480e438e1f 100644
--- a/phpBB/adm/style/acp_send_statistics.html
+++ b/phpBB/adm/style/acp_send_statistics.html
@@ -61,11 +61,4 @@ function iframe_updated()
 	<p><strong>{L_THANKS_SEND_STATISTICS}</strong><br /><br /><a href="{U_ACP_MAIN}">&laquo; {L_GO_ACP_MAIN}</a></p>
 </div>
 
-<script type="text/javascript">
-//<![CDATA[
-	phpbb.toggleDisplay('configlist', -1);
-	phpbb.toggleDisplay('questionnaire-thanks', -1);
-//]]>
-</script>
-
 <!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index dd46124f97..7bda86e1e3 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -242,5 +242,9 @@ function parse_document(container)
 		});
 
 		parse_document($('body'));
+
+		// Hide configlist and success message in send statistics page
+		phpbb.toggleDisplay('configlist', -1);
+		phpbb.toggleDisplay('questionnaire-thanks', -1);
 	});
 })(jQuery);
-- 
cgit v1.2.1


From bf79367a65be6d5a31d17f63047ad4ec3475258a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 10 Apr 2014 16:25:11 +0530
Subject: [ticket/12351] Add loading indicator to links that are missing it.

When you click on the link, the turning circle is missing, so you don't
know whether it is actually doing something or not, until the response is
served.

PHPBB3-12351
---
 phpBB/adm/style/acp_forums.html          | 4 ++--
 phpBB/adm/style/acp_groups_position.html | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 0bb5e10f57..537fffbf65 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -467,9 +467,9 @@
 				</td>
 				<td class="actions">
 					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+					<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
 					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
-					<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+					<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
 					<a href="{forums.U_EDIT}">{ICON_EDIT}</a>
 					<!-- IF not forums.S_FORUM_LINK -->
 						<a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a>
diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index b1df6b6162..c01f7aeb03 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -43,9 +43,9 @@
 			<td style="text-align: center;">{legend.GROUP_TYPE}</td>
 			<td class="actions">
 				<span class="up-disabled" style="display: none;">{ICON_MOVE_UP_DISABLED}</span>
-				<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+				<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
 				<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
-				<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+				<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
 				<a href="{legend.U_DELETE}">{ICON_DELETE}</a>
 			</td>
 		</tr>
@@ -129,9 +129,9 @@
 			</td></td>
 			<td class="actions">
 				<span class="up-disabled" style="display: none;">{ICON_MOVE_UP_DISABLED}</span>
-				<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+				<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
 				<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
-				<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+				<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
 				<a href="{teampage.U_DELETE}">{ICON_DELETE}</a>
 			</td>
 		</tr>
-- 
cgit v1.2.1


From efe667130d9c133e07653dff4729731f1fc6c747 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 15 Feb 2014 23:45:51 -0800
Subject: [ticket/12201] Separate pagination from table.

PHPBB3-12201
---
 phpBB/adm/style/acp_attachments.html | 2 +-
 phpBB/adm/style/acp_logs.html        | 2 +-
 phpBB/adm/style/admin.css            | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 82fb229fae..f012298e29 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -378,7 +378,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<div class="pagination">
+	<div class="pagination top-pagination">
 	<!-- IF .pagination or TOTAL_FILES -->
 		{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} &bull; {L_TOTAL_SIZE}{L_COLON} {TOTAL_SIZE}
 		<!-- IF .pagination -->
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index 592b5bbc16..9343b9b509 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -13,7 +13,7 @@
 </fieldset>
 
 <!-- IF .pagination -->
-<div class="pagination" style="float: right; margin: 15px 0 2px 0">
+<div class="pagination top-pagination">
 	<!-- INCLUDE pagination.html -->
 </div>
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 22bbf404ea..cdb02e1d53 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1670,6 +1670,10 @@ input.button1:focus, input.button2:focus {
 	float: right;
 }
 
+.top-pagination {
+	margin: 15px 0 2px 0;
+}
+
 .rtl .pagination {
 	text-align: left;
 	float: left;
-- 
cgit v1.2.1


From 609c4efff6060d7f54679ee5b975fe59066baaed Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 15 Feb 2014 23:48:13 -0800
Subject: [ticket/12201] Center the file size and mark columns.

PHPBB3-12201
---
 phpBB/adm/style/acp_attachments.html | 8 ++++----
 phpBB/adm/style/admin.css            | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index f012298e29..1887a8e14e 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -394,8 +394,8 @@
 	<tr>
 		<th>{L_FILENAME}</th>
 		<th>{L_POSTED}</th>
-		<th>{L_FILESIZE}</th>
-		<th>{L_DELETE}</th>
+		<th class="centered-text">{L_FILESIZE}</th>
+		<th class="centered-text">{L_MARK}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -406,8 +406,8 @@
 				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br />{L_TOPIC}{L_COLON} <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF -->
 			</td>
 			<td>{attachments.FILETIME}<br />{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}</td>
-			<td>{attachments.FILESIZE}</td>
-			<td><input type="checkbox" class="radio" name="delete[{attachments.ATTACH_ID}]" /></td>
+			<td class="centered-text">{attachments.FILESIZE}</td>
+			<td class="centered-text"><input type="checkbox" class="radio" name="delete[{attachments.ATTACH_ID}]" /></td>
 		</tr>
 	<!-- END attachments -->
 	<tr class="row4">
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index cdb02e1d53..e93a09ff21 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -102,6 +102,10 @@ hr {
 	height: 1px;
 }
 
+.centered-text {
+	text-align: center;
+}
+
 .small {
 	font-size: 0.85em;
 }
-- 
cgit v1.2.1


From f78d4196eaa1040fc2e5f3c1734a74623bfa6a89 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 15 Feb 2014 23:49:35 -0800
Subject: [ticket/12201] Rearrange pagination, sorting, and submit elements.

PHPBB3-12201
---
 phpBB/adm/style/acp_attachments.html | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 1887a8e14e..e026b81ad0 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -410,21 +410,10 @@
 			<td class="centered-text"><input type="checkbox" class="radio" name="delete[{attachments.ATTACH_ID}]" /></td>
 		</tr>
 	<!-- END attachments -->
-	<tr class="row4">
-		<td colspan="3">&nbsp;</td>
-		<td class="small"><a href="#" onclick="marklist('attachments', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('attachments', 'delete', false); return false;">{L_UNMARK_ALL}</a></td>
-	</tr>
 	</tbody>
 	</table>
 
 	<!-- IF TOTAL_FILES -->
-	<fieldset class="display-options">
-		{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
-		<input class="button2" type="submit" value="{L_GO}" name="sort" />
-	</fieldset>
-
-	<hr />
-
 	<div class="pagination">
 		{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} &bull; {L_TOTAL_SIZE}{L_COLON} {TOTAL_SIZE}
 		<!-- IF .pagination -->
@@ -433,12 +422,24 @@
 			&bull; {PAGE_NUMBER}
 		<!-- ENDIF -->
 	</div>
+
+	<fieldset class="display-options">
+		{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
+		<input class="button2" type="submit" value="{L_GO}" name="sort" />
+	</fieldset>
+
+	<hr />
 	<!-- ENDIF -->
 
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
+<!-- IF .attachments -->
+	<fieldset class="quick">
+		<input class="button2" type="submit" name="submit" value="{L_DELETE_MARKED}" /><br />
+		<p class="small">
+			<a href="#" onclick="marklist('attachments', 'delete', true); return false;">{L_MARK_ALL}</a> &bull;
+			<a href="#" onclick="marklist('attachments', 'delete', false); return false;">{L_UNMARK_ALL}</a>		
+		</p>
+	</fieldset>
+<!-- ENDIF -->
 	{S_FORM_TOKEN}
 	</fieldset>
 	</form>
-- 
cgit v1.2.1


From 01464e2451893b73489cb83d45c9655a0c791395 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 16 Feb 2014 00:19:09 -0800
Subject: [ticket/12201] Only the top pagination should be floated to the
 right.

PHPBB3-12201
---
 phpBB/adm/style/admin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index e93a09ff21..edfcf3ab41 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1671,10 +1671,10 @@ input.button1:focus, input.button2:focus {
 	width: auto;
 	text-align: right;
 	margin-top: 5px;
-	float: right;
 }
 
 .top-pagination {
+	float: right;
 	margin: 15px 0 2px 0;
 }
 
-- 
cgit v1.2.1


From 38775fc06371fd0aebea2794f480dde6d7e643e7 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 16 Feb 2014 00:32:09 -0800
Subject: [ticket/12201] Display error and sorting options when there are no
 attachments

PHPBB3-12201
---
 phpBB/adm/style/acp_attachments.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index e026b81ad0..5d35666fdd 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -389,6 +389,7 @@
 	<!-- ENDIF -->
 	</div>
 
+<!-- IF .attachments -->
 	<table class="table1 zebra-table">
 	<thead>
 	<tr>
@@ -412,6 +413,11 @@
 	<!-- END attachments -->
 	</tbody>
 	</table>
+<!-- ELSE -->
+	<div class="errorbox">
+		<p>{L_NO_ATTACHMENTS}</p>
+	</div>
+<!-- ENDIF -->
 
 	<!-- IF TOTAL_FILES -->
 	<div class="pagination">
@@ -422,6 +428,7 @@
 			&bull; {PAGE_NUMBER}
 		<!-- ENDIF -->
 	</div>
+	<!-- ENDIF -->
 
 	<fieldset class="display-options">
 		{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
@@ -429,7 +436,6 @@
 	</fieldset>
 
 	<hr />
-	<!-- ENDIF -->
 
 <!-- IF .attachments -->
 	<fieldset class="quick">
-- 
cgit v1.2.1


From ccadda530deeca6239b5d0cdbced412e1c820f58 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 15 Apr 2014 15:00:34 -0700
Subject: [ticket/12201] Increase sort font size just slightly.

PHPBB3-12201
---
 phpBB/adm/style/admin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index edfcf3ab41..69c8e19e8b 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1242,7 +1242,7 @@ fieldset.display-options {
 	border: none;
 	background-color: transparent;
 	text-align: center;
-	font-size: 0.75em;
+	font-size: 0.85em;
 }
 
 fieldset.display-options select, fieldset.display-options input, fieldset.display-options label {
-- 
cgit v1.2.1


From e174e29b41e57765295edc59a288cddc017269b4 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 15 Apr 2014 15:10:15 -0700
Subject: [ticket/12201] Update select element to follow same design as
 prosilver.

PHPBB3-12201
---
 phpBB/adm/style/admin.css | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 69c8e19e8b..4e34aff919 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1130,11 +1130,14 @@ input.langvalue, textarea.langvalue {
 }
 
 optgroup, select {
+	background-color: #FAFAFA;
+	border: 1px solid #666666;
 	font-family: Verdana, Helvetica, Arial, sans-serif;
 	font-size: 0.85em;
 	font-weight: normal;
 	font-style: normal;
 	cursor: pointer;
+	padding: 1px;
 	vertical-align: middle;
 	width: auto;
 	color: #000;
-- 
cgit v1.2.1


From a9fbc34cf43ef1b70ba5930ca08d355cad4c982b Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 15 Apr 2014 15:14:47 -0700
Subject: [ticket/12201] Decreased pagination font size.

PHPBB3-12201
---
 phpBB/adm/style/admin.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 4e34aff919..6f2d65afc0 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1670,6 +1670,7 @@ input.button1:focus, input.button2:focus {
 /* Pagination
 ---------------------------------------- */
 .pagination {
+	font-size: .85em;
 	height: 1%; /* IE tweak (holly hack) */
 	width: auto;
 	text-align: right;
-- 
cgit v1.2.1


From 60d2a3389a40635fe3066c4122d00e4b10149bde Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 14 Apr 2014 01:07:13 +0800
Subject: [ticket/12403] Add template events to acp_users_prefs.html

Since it is possible for extensions to add new user preferences to UCP,
it should be also possible to control it via ACP too
just like for build-in user preferences.
Thus, some prepend/append template events are added.

PHPBB3-12403
---
 phpBB/adm/style/acp_users_prefs.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
index 1092b25b04..0a59a9d64b 100644
--- a/phpBB/adm/style/acp_users_prefs.html
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -5,9 +5,10 @@
 </script>
 
 	<form id="user_prefs" method="post" action="{U_ACTION}">
-
+	<!-- EVENT acp_users_prefs_prepend -->
 	<fieldset>
 		<legend>{L_UCP_PREFS_PERSONAL}</legend>
+	<!-- EVENT acp_users_prefs_personal_prepend -->
 	<dl> 
 		<dt><label for="viewemail">{L_SHOW_EMAIL}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
@@ -53,10 +54,12 @@
 		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
 		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
 	</dl>
+	<!-- EVENT acp_users_prefs_personal_append -->
 	</fieldset>
 
 	<fieldset>
 		<legend>{L_UCP_PREFS_POST}</legend>
+	<!-- EVENT acp_users_prefs_post_prepend -->
 	<dl> 
 		<dt><label for="bbcode">{L_DEFAULT_BBCODE}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
@@ -77,10 +80,12 @@
 		<dd><label><input type="radio" class="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
+	<!-- EVENT acp_users_prefs_post_append -->
 	</fieldset>
 
 	<fieldset>
 		<legend>{L_UCP_PREFS_VIEW}</legend>
+	<!-- EVENT acp_users_prefs_view_prepend -->
 	<dl> 
 		<dt><label for="view_images">{L_VIEW_IMAGES}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
@@ -135,8 +140,9 @@
 		<dt><label>{L_VIEW_POSTS_DIR}{L_COLON}</label></dt>
 		<dd>{S_POST_SORT_DIR}</dd>
 	</dl>
+	<!-- EVENT acp_users_prefs_view_append -->
 	</fieldset>
-
+	<!-- EVENT acp_users_prefs_append -->
 	<fieldset class="quick">
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 		{S_FORM_TOKEN}
-- 
cgit v1.2.1


From 770ab13cb082b8f7102b9205e1aa5e1bad0a6cc5 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 25 Apr 2014 11:26:49 -0700
Subject: [ticket/12332] Fix displaying attachments with long file names

PHPBB3-12332
---
 phpBB/adm/style/acp_logs.html | 10 +++++-----
 phpBB/adm/style/admin.css     |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index 9343b9b509..b3b5fe3394 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -22,15 +22,15 @@
 <div><br style="clear: both;" /></div>
 
 <!-- IF .log -->
-	<table class="table1 zebra-table">
+	<table class="table1 zebra-table fixed-width-table">
 	<thead>
 	<tr>
-		<th>{L_USERNAME}</th>
-		<th>{L_IP}</th>
-		<th>{L_TIME}</th>
+		<th style="width: 15%;">{L_USERNAME}</th>
+		<th style="width: 15%;">{L_IP}</th>
+		<th style="width: 20%;">{L_TIME}</th>
 		<th>{L_ACTION}</th>
 		<!-- IF S_CLEARLOGS -->
-			<th>{L_MARK}</th>
+			<th style="width: 10%;">{L_MARK}</th>
 		<!-- ENDIF -->
 	</tr>
 	</thead>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 6f2d65afc0..7f15c162a5 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -911,6 +911,11 @@ table.styles td.users, table td.mark {
 	text-align: center;
 }
 
+table.fixed-width-table {
+	table-layout: fixed;
+	width: 100%;
+}
+
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
 {
 	table.responsive, table.responsive tbody, table.responsive tr, table.responsive td {
-- 
cgit v1.2.1


From 3bebbc05ee2e762e8ec598e898e7930a55621fb7 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 26 Apr 2014 09:14:15 -0700
Subject: [ticket/12332] Remove width sizing, as it is already set

PHPBB3-12332
---
 phpBB/adm/style/admin.css | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 7f15c162a5..18a2084b36 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -913,7 +913,6 @@ table.styles td.users, table td.mark {
 
 table.fixed-width-table {
 	table-layout: fixed;
-	width: 100%;
 }
 
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
-- 
cgit v1.2.1


From f5262eb92885e76eb6ebd09265882426f4b11b31 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 26 Apr 2014 09:15:22 -0700
Subject: [ticket/12332] Accomplish all word creaking in template and CSS

PHPBB3-12332
---
 phpBB/adm/style/acp_attachments.html | 22 +++++++++++-----------
 phpBB/adm/style/acp_users.html       | 10 +++++-----
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 5d35666fdd..fd071588e6 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -331,15 +331,15 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<table class="table1 zebra-table">
+	<table class="table1 zebra-table fixed-width-table">
 	<thead>
 	<tr>
-		<th>{L_FILENAME}</th>
-		<th>{L_FILEDATE}</th>
-		<th>{L_FILESIZE}</th>
-		<th>{L_ATTACH_POST_ID}</th>
-		<th>{L_ATTACH_TO_POST}</th>
-		<th>{L_DELETE}</th>
+		<th style="width: 25%;">{L_FILENAME}</th>
+		<th style="width: 15%;">{L_FILEDATE}</th>
+		<th style="width: 15%;">{L_FILESIZE}</th>
+		<th style="width: 150px;">{L_ATTACH_POST_ID}</th>
+		<th style="width: 15%;">{L_ATTACH_TO_POST}</th>
+		<th style="width: 15%;">{L_DELETE}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -390,13 +390,13 @@
 	</div>
 
 <!-- IF .attachments -->
-	<table class="table1 zebra-table">
+	<table class="table1 zebra-table fixed-width-table">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
-		<th>{L_POSTED}</th>
-		<th class="centered-text">{L_FILESIZE}</th>
-		<th class="centered-text">{L_MARK}</th>
+		<th style="width: 15%;">{L_POSTED}</th>
+		<th style="width: 15%;" class="centered-text">{L_FILESIZE}</th>
+		<th style="width: 10%;" class="centered-text">{L_MARK}</th>
 	</tr>
 	</thead>
 	<tbody>
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index b84e32013f..d1be177cfa 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -164,14 +164,14 @@
 	</div>
 
 	<!-- IF .attach -->
-	<table class="table1 zebra-table">
+	<table class="table1 zebra-table fixed-width-table">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
-		<th>{L_POST_TIME}</th>
-		<th>{L_FILESIZE}</th>
-		<th>{L_DOWNLOADS}</th>
-		<th>{L_MARK}</th>
+		<th style="width: 15%;">{L_POST_TIME}</th>
+		<th style="width: 15%;">{L_FILESIZE}</th>
+		<th style="width: 15%;">{L_DOWNLOADS}</th>
+		<th style="width: 10%;">{L_MARK}</th>
 	</tr>
 	</thead>
 	<tbody>
-- 
cgit v1.2.1


From 2b9b6412b86aa0f0f38d07256bf54413498986bf Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 26 Apr 2014 09:16:03 -0700
Subject: [ticket/12332] Add break-word to fixed width table CSS

This ensures long words break and remain within the table cell

PHPBB3-12332
---
 phpBB/adm/style/admin.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 18a2084b36..60a5cd9472 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -913,6 +913,7 @@ table.styles td.users, table td.mark {
 
 table.fixed-width-table {
 	table-layout: fixed;
+	word-break: break-word;
 }
 
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
-- 
cgit v1.2.1


From 76843f4a3a7d30502bbc50a74f112d45c8a9e0a7 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 26 Apr 2014 09:25:59 -0700
Subject: [ticket/12332] Adjust column widths for responsive changes

PHPBB3-12332
---
 phpBB/adm/style/acp_attachments.html | 6 +++---
 phpBB/adm/style/acp_users.html       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index fd071588e6..61a81ff7d7 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -334,10 +334,10 @@
 	<table class="table1 zebra-table fixed-width-table">
 	<thead>
 	<tr>
-		<th style="width: 25%;">{L_FILENAME}</th>
+		<th>{L_FILENAME}</th>
 		<th style="width: 15%;">{L_FILEDATE}</th>
 		<th style="width: 15%;">{L_FILESIZE}</th>
-		<th style="width: 150px;">{L_ATTACH_POST_ID}</th>
+		<th style="width: 15%">{L_ATTACH_POST_ID}</th>
 		<th style="width: 15%;">{L_ATTACH_TO_POST}</th>
 		<th style="width: 15%;">{L_DELETE}</th>
 	</tr>
@@ -348,7 +348,7 @@
 			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
 			<td>{orphan.FILETIME}</td>
 			<td>{orphan.FILESIZE}</td>
-			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
+			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" maxlength="10" value="{orphan.POST_ID}" style="width: 75%;" /></td>
 			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
 			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
 		</tr>
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index d1be177cfa..0522d17c37 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -168,9 +168,9 @@
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
-		<th style="width: 15%;">{L_POST_TIME}</th>
+		<th style="width: 20%;">{L_POST_TIME}</th>
 		<th style="width: 15%;">{L_FILESIZE}</th>
-		<th style="width: 15%;">{L_DOWNLOADS}</th>
+		<th style="width: 20%;">{L_DOWNLOADS}</th>
 		<th style="width: 10%;">{L_MARK}</th>
 	</tr>
 	</thead>
-- 
cgit v1.2.1


From 7d5672f6c514eac03b4b72517933b15497a3d333 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 26 Apr 2014 09:50:45 -0700
Subject: [ticket/12332] Adjust size of mark column where too wide

PHPBB3-12332
---
 phpBB/adm/style/acp_logs.html  | 2 +-
 phpBB/adm/style/acp_users.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index b3b5fe3394..ec2065f906 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -30,7 +30,7 @@
 		<th style="width: 20%;">{L_TIME}</th>
 		<th>{L_ACTION}</th>
 		<!-- IF S_CLEARLOGS -->
-			<th style="width: 10%;">{L_MARK}</th>
+			<th style="width: 50px;">{L_MARK}</th>
 		<!-- ENDIF -->
 	</tr>
 	</thead>
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index 0522d17c37..25064c6f3a 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -169,9 +169,9 @@
 	<tr>
 		<th>{L_FILENAME}</th>
 		<th style="width: 20%;">{L_POST_TIME}</th>
-		<th style="width: 15%;">{L_FILESIZE}</th>
+		<th style="width: 20%;">{L_FILESIZE}</th>
 		<th style="width: 20%;">{L_DOWNLOADS}</th>
-		<th style="width: 10%;">{L_MARK}</th>
+		<th style="width: 50px;">{L_MARK}</th>
 	</tr>
 	</thead>
 	<tbody>
-- 
cgit v1.2.1


From 0e0eca2d2e82cba0fc04562a6d3f227c0fdec031 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 1 May 2014 20:04:27 -0700
Subject: [ticket/12332] Add missing semicolon to inline styling

PHPBB3-12332
---
 phpBB/adm/style/acp_attachments.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 61a81ff7d7..0e3b5ff3b2 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -337,7 +337,7 @@
 		<th>{L_FILENAME}</th>
 		<th style="width: 15%;">{L_FILEDATE}</th>
 		<th style="width: 15%;">{L_FILESIZE}</th>
-		<th style="width: 15%">{L_ATTACH_POST_ID}</th>
+		<th style="width: 15%;">{L_ATTACH_POST_ID}</th>
 		<th style="width: 15%;">{L_ATTACH_TO_POST}</th>
 		<th style="width: 15%;">{L_DELETE}</th>
 	</tr>
-- 
cgit v1.2.1


From d2c5386394840f53b9bb45567b43310e2622fbb7 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 7 May 2014 11:59:49 -0700
Subject: [ticket/12513] Add asset include support to simple header/footer in
 ACP

PHPBB3-12513
---
 phpBB/adm/style/simple_footer.html | 1 +
 phpBB/adm/style/simple_header.html | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index c549a2df4e..d3f2f17bc7 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -21,6 +21,7 @@
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 
 <!-- EVENT acp_simple_footer_after -->
+{$SCRIPTS}
 
 </body>
 </html>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index ae25f28d32..bf8f41cd7a 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -83,6 +83,7 @@ function find_username(url)
 // ]]>
 </script>
 <!-- EVENT acp_simple_header_head_append -->
+{$STYLESHEETS}
 </head>
 
 <body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">
-- 
cgit v1.2.1


From d95164e64155ea3bdbca69532af5dd49c093b351 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 6 May 2014 17:52:12 -0700
Subject: [ticket/9388] Display only the settings for the auth method that's
 selected.

PHPBB3-9388
---
 phpBB/adm/style/acp_board.html           |  1 +
 phpBB/adm/style/auth_provider_ldap.html  | 67 +++++++++++++++++---------------
 phpBB/adm/style/auth_provider_oauth.html | 30 +++++++-------
 3 files changed, 52 insertions(+), 46 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
index 1a09c4eee6..4cc0c9a9c3 100644
--- a/phpBB/adm/style/acp_board.html
+++ b/phpBB/adm/style/acp_board.html
@@ -33,6 +33,7 @@
 <!-- END options -->
 
 <!-- IF S_AUTH -->
+		</fieldset>
 	<!-- BEGIN auth_tpl -->
 		<!-- INCLUDE {auth_tpl.TEMPLATE_FILE} -->
 	<!-- END auth_tpl -->
diff --git a/phpBB/adm/style/auth_provider_ldap.html b/phpBB/adm/style/auth_provider_ldap.html
index 81afa44373..9e0567dfed 100644
--- a/phpBB/adm/style/auth_provider_ldap.html
+++ b/phpBB/adm/style/auth_provider_ldap.html
@@ -1,32 +1,35 @@
-<dl>
-	<dt><label for="ldap_server">{L_LDAP_SERVER}{L_COLON}</label><br /><span>{L_LDAP_SERVER_EXPLAIN}</span></dt>
-	<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="{AUTH_LDAP_SERVER}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_port">{L_LDAP_PORT}{L_COLON}</label><br /><span>{L_LDAP_PORT_EXPLAIN}</span></dt>
-	<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="{AUTH_LDAP_PORT}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_dn">{L_LDAP_DN}{L_COLON}</label><br /><span>{L_LDAP_DN_EXPLAIN}</span></dt>
-	<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="{AUTH_LDAP_BASE_DN}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_uid">{L_LDAP_UID}{L_COLON}</label><br /><span>{L_LDAP_UID_EXPLAIN}</span></dt>
-	<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="{AUTH_LDAP_UID}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_user_filter">{L_LDAP_USER_FILTER}{L_COLON}</label><br /><span>{L_LDAP_USER_FILTER_EXPLAIN}</span></dt>
-	<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="{AUTH_LDAP_USER_FILTER}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_email">{L_LDAP_EMAIL}{L_COLON}</label><br /><span>{L_LDAP_EMAIL_EXPLAIN}</span></dt>
-	<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="{AUTH_LDAP_EMAIL}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_user">{L_LDAP_USER}{L_COLON}</label><br /><span>{L_LDAP_USER_EXPLAIN}</span></dt>
-	<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="{AUTH_LDAP_USER}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_password">{L_LDAP_PASSWORD}{L_COLON}</label><br /><span>{L_LDAP_PASSWORD_EXPLAIN}</span></dt>
-	<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="{AUTH_LDAP_PASSWORD}" autocomplete="off" /></dd>
-</dl>
+<fieldset id="auth_ldap_settings">
+	<legend>{L_LDAP}</legend>
+	<dl>
+		<dt><label for="ldap_server">{L_LDAP_SERVER}{L_COLON}</label><br /><span>{L_LDAP_SERVER_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="{AUTH_LDAP_SERVER}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_port">{L_LDAP_PORT}{L_COLON}</label><br /><span>{L_LDAP_PORT_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="{AUTH_LDAP_PORT}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_dn">{L_LDAP_DN}{L_COLON}</label><br /><span>{L_LDAP_DN_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="{AUTH_LDAP_BASE_DN}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_uid">{L_LDAP_UID}{L_COLON}</label><br /><span>{L_LDAP_UID_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="{AUTH_LDAP_UID}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_user_filter">{L_LDAP_USER_FILTER}{L_COLON}</label><br /><span>{L_LDAP_USER_FILTER_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="{AUTH_LDAP_USER_FILTER}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_email">{L_LDAP_EMAIL}{L_COLON}</label><br /><span>{L_LDAP_EMAIL_EXPLAIN}</span></dt>
+		<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="{AUTH_LDAP_EMAIL}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_user">{L_LDAP_USER}{L_COLON}</label><br /><span>{L_LDAP_USER_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="{AUTH_LDAP_USER}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_password">{L_LDAP_PASSWORD}{L_COLON}</label><br /><span>{L_LDAP_PASSWORD_EXPLAIN}</span></dt>
+		<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="{AUTH_LDAP_PASSWORD}" autocomplete="off" /></dd>
+	</dl>
+</fieldset>
diff --git a/phpBB/adm/style/auth_provider_oauth.html b/phpBB/adm/style/auth_provider_oauth.html
index 25e40ff596..3e994ec721 100644
--- a/phpBB/adm/style/auth_provider_oauth.html
+++ b/phpBB/adm/style/auth_provider_oauth.html
@@ -1,17 +1,19 @@
-<h2>{L_AUTH_PROVIDER_OAUTH_TITLE}</h2>
+<fieldset id="auth_oauth_settings">
+	<legend>{L_AUTH_PROVIDER_OAUTH_TITLE}</legend>
 
-<p>{L_AUTH_PROVIDER_OAUTH_EXPLAIN}</p>
+	<p>{L_AUTH_PROVIDER_OAUTH_EXPLAIN}</p>
 
-<!-- BEGIN oauth_services -->
-<fieldset>
-	<legend>{oauth_services.ACTUAL_NAME}</legend>
-	<dl>
-		<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label></dt>
-		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label></dt>
-		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}" /></dd>
-	</dl>
+	<!-- BEGIN oauth_services -->
+	<fieldset>
+		<legend>{oauth_services.ACTUAL_NAME}</legend>
+		<dl>
+			<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label></dt>
+			<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label></dt>
+			<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}" /></dd>
+		</dl>
+	</fieldset>
+	<!-- END oauth_services -->
 </fieldset>
-<!-- END oauth_services -->
-- 
cgit v1.2.1


From e378037516903ed612c88e8ad0138ec956077b58 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 6 May 2014 17:57:33 -0700
Subject: [ticket/9388] Display only the settings for the selected search
 backend.

PHPBB3-9388
---
 phpBB/adm/style/acp_search.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index 496a8b2675..dd63eac7d5 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -46,13 +46,13 @@
 		<legend>{L_SEARCH_TYPE}</legend>
 	<dl>
 		<dt><label for="search_type">{L_SEARCH_TYPE}{L_COLON}</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
-		<dd><select id="search_type" name="config[search_type]">{S_SEARCH_TYPES}</select></dd>
+		<dd><select id="search_type" name="config[search_type]" data-toggable-settings="true">{S_SEARCH_TYPES}</select></dd>
 	</dl>
 	</fieldset>
 
 	<!-- BEGIN backend -->
 
-		<fieldset>
+		<fieldset id="search_{backend.IDENTIFIER}_settings">
 			<legend>{backend.NAME}</legend>
 		{backend.SETTINGS}
 		</fieldset>
-- 
cgit v1.2.1


From 1836b0130362dafba294f0fbd87a9c1d2fb181b9 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 6 May 2014 18:19:05 -0700
Subject: [ticket/9388] Use the new toggle function for the avatar type
 <select>.

PHPBB3-9388
---
 phpBB/adm/style/acp_groups.html       |  6 ++----
 phpBB/adm/style/acp_users_avatar.html |  6 ++----
 phpBB/adm/style/avatars.js            | 15 ---------------
 3 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 phpBB/adm/style/avatars.js

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 72f4f2b239..0641398185 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -114,10 +114,10 @@
 	</dl>
 	<dl>
 		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
-		<dd><select name="avatar_driver" id="avatar_driver">
+		<dd><select name="avatar_driver" id="avatar_driver" data-toggable-settings="true">
 			<option value="">{L_NO_AVATAR_CATEGORY}</option>
 			<!-- BEGIN avatar_drivers -->
-			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 			<!-- END avatar_drivers -->
 		</select></dd>
 	</dl>
@@ -139,8 +139,6 @@
 	</fieldset>
 	</form>
 
-	<!-- INCLUDEJS avatars.js -->
-
 <!-- ELSEIF S_LIST -->
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 0a72bb0b62..ba0b896e6c 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -13,10 +13,10 @@
 		<legend>{L_AVATAR_SELECT}</legend>
 		<dl>
 			<dt><label>{L_AVATAR_TYPE}</label></dt>
-			<dd><select name="avatar_driver" id="avatar_driver">
+			<dd><select name="avatar_driver" id="avatar_driver" data-toggable-settings="true">
 				<option value="">{L_NO_AVATAR_CATEGORY}</option>
 				<!-- BEGIN avatar_drivers -->
-				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
 			</select></dd>
 		</dl>
@@ -35,5 +35,3 @@
 	{S_FORM_TOKEN}
 	</fieldset>
 	</form>
-
-	<!-- INCLUDEJS avatars.js -->
diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
deleted file mode 100644
index 26ea24c0db..0000000000
--- a/phpBB/adm/style/avatars.js
+++ /dev/null
@@ -1,15 +0,0 @@
-(function($) {  // Avoid conflicts with other libraries
-
-"use strict";
-
-function avatarHide() {
-    $('#avatar_options > div').hide();
-
-    var selected = $('#avatar_driver').val();
-    $('#avatar_option_' + selected).show();
-}
-
-avatarHide();
-$('#avatar_driver').bind('change', avatarHide);
-
-})(jQuery); // Avoid conflicts with other libraries
-- 
cgit v1.2.1


From f95a7b0222a8c223644db08edf0b5364b6847a2f Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 8 May 2014 08:32:54 -0700
Subject: [ticket/9388] Reopen <fieldset> after auth templates.

PHPBB3-9388
---
 phpBB/adm/style/acp_board.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
index 4cc0c9a9c3..64592a5de2 100644
--- a/phpBB/adm/style/acp_board.html
+++ b/phpBB/adm/style/acp_board.html
@@ -33,10 +33,12 @@
 <!-- END options -->
 
 <!-- IF S_AUTH -->
-		</fieldset>
+	</fieldset>
 	<!-- BEGIN auth_tpl -->
 		<!-- INCLUDE {auth_tpl.TEMPLATE_FILE} -->
 	<!-- END auth_tpl -->
+	<fieldset>
+		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
 <!-- ENDIF -->
 
 	<p class="submit-buttons">
-- 
cgit v1.2.1


From 2ca01bdcbee86cdbf9971c356c2224e9ea8358f4 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 8 May 2014 13:39:31 -0700
Subject: [ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.

PHPBB3-9388
---
 phpBB/adm/style/auth_provider_oauth.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/auth_provider_oauth.html b/phpBB/adm/style/auth_provider_oauth.html
index 3e994ec721..4c8ff4d36c 100644
--- a/phpBB/adm/style/auth_provider_oauth.html
+++ b/phpBB/adm/style/auth_provider_oauth.html
@@ -1,6 +1,5 @@
-<fieldset id="auth_oauth_settings">
-	<legend>{L_AUTH_PROVIDER_OAUTH_TITLE}</legend>
 
+<div id="auth_oauth_settings">
 	<p>{L_AUTH_PROVIDER_OAUTH_EXPLAIN}</p>
 
 	<!-- BEGIN oauth_services -->
@@ -16,4 +15,4 @@
 		</dl>
 	</fieldset>
 	<!-- END oauth_services -->
-</fieldset>
+</div>
-- 
cgit v1.2.1


From e233f0af3615070a003a49bf055ae9fa582cc899 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 9 May 2014 13:49:41 -0700
Subject: [ticket/9388] Use "togglable" instead of "toggable"

PHPBB3-9388
---
 phpBB/adm/style/acp_groups.html       | 2 +-
 phpBB/adm/style/acp_search.html       | 2 +-
 phpBB/adm/style/acp_users_avatar.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 0641398185..cf189f979f 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -114,7 +114,7 @@
 	</dl>
 	<dl>
 		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
-		<dd><select name="avatar_driver" id="avatar_driver" data-toggable-settings="true">
+		<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
 			<option value="">{L_NO_AVATAR_CATEGORY}</option>
 			<!-- BEGIN avatar_drivers -->
 			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index dd63eac7d5..1cde52acf3 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -46,7 +46,7 @@
 		<legend>{L_SEARCH_TYPE}</legend>
 	<dl>
 		<dt><label for="search_type">{L_SEARCH_TYPE}{L_COLON}</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
-		<dd><select id="search_type" name="config[search_type]" data-toggable-settings="true">{S_SEARCH_TYPES}</select></dd>
+		<dd><select id="search_type" name="config[search_type]" data-togglable-settings="true">{S_SEARCH_TYPES}</select></dd>
 	</dl>
 	</fieldset>
 
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index ba0b896e6c..0d06d088e8 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -13,7 +13,7 @@
 		<legend>{L_AVATAR_SELECT}</legend>
 		<dl>
 			<dt><label>{L_AVATAR_TYPE}</label></dt>
-			<dd><select name="avatar_driver" id="avatar_driver" data-toggable-settings="true">
+			<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
 				<option value="">{L_NO_AVATAR_CATEGORY}</option>
 				<!-- BEGIN avatar_drivers -->
 				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
-- 
cgit v1.2.1


From c334d8431d2945267a0ec7d0e883f4c85368b6f3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 11 May 2014 12:45:05 +0200
Subject: [ticket/12527] Remove editor from template

PHPBB3-12527
---
 phpBB/adm/style/acp_language.html | 133 +-------------------------------------
 1 file changed, 2 insertions(+), 131 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index d32f6b7eac..faf8159b49 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>
 
@@ -98,113 +76,6 @@
 		<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>
-	<!-- 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>
-	<!-- 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 +102,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 -->
-- 
cgit v1.2.1


From 63e195d7f0c286b0dcbc4ae30826ee88d811c372 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 11 May 2014 13:10:51 +0200
Subject: [ticket/12527] Restore missing files and variables check

PHPBB3-12527
---
 phpBB/adm/style/acp_language.html | 60 +++++++++++++++------------------------
 1 file changed, 23 insertions(+), 37 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index faf8159b49..4439f519e0 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -36,46 +36,32 @@
 	</fieldset>
 	</form>
 
-	<br /><br />
-
-	<!-- IF S_MISSING_FILES -->
-		<div class="errorbox">
-			<h3>{L_MISSING_FILES}</h3>
-			<p>{MISSING_FILES}</p>
-		</div>
-		<br /><br />
+	<!-- IF .missing_files -->
+		<h3 class="error">{L_MISSING_FILES}</h3>
+
+		<fieldset>
+			<legend>{L_MISSING_LANG_FILES}</legend>
+			<!-- BEGIN missing_files -->
+			&raquo; {missing_files.FILE_NAME}<br />
+			<!-- END missing_files -->
+		</fieldset>
 	<!-- 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 />
+	<!-- 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 -->
-
 <!-- ELSE -->
 
 	<h1>{L_ACP_LANGUAGE_PACKS}</h1>
-- 
cgit v1.2.1


From 1d4c20b3d2222502ed495212668f6fca8d67e52d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 12 May 2014 10:49:52 +0200
Subject: [ticket/12534] Do not abuse errorbox for en/disable confirmation of
 extensions

PHPBB3-12534
---
 phpBB/adm/style/acp_ext_disable.html | 6 +++---
 phpBB/adm/style/acp_ext_enable.html  | 6 +++---
 phpBB/adm/style/admin.css            | 4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
index d650544ff7..3b09177a76 100644
--- a/phpBB/adm/style/acp_ext_disable.html
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -8,13 +8,13 @@
 	<p>{L_EXTENSION_DISABLE_EXPLAIN}</p>
 
 	<!-- IF PRE -->
-	<div class="errorbox">
+	<fieldset>
+		<h2>{L_CONFIRM}</h2>
 		<p>{L_CONFIRM_MESSAGE}</p>
-	</div>
+	</fieldset>
 
 	<form id="acp_extensions" method="post" action="{U_DISABLE}">
 	<fieldset class="submit-buttons">
-		<legend>{L_EXTENSION_DISABLE}</legend>
 		<input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}" />
 		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 42523f1f58..6bbd8c245b 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -14,13 +14,13 @@
 		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 	</div>
 	<!-- ELSEIF PRE -->
-	<div class="errorbox">
+	<fieldset>
+		<h2>{L_CONFIRM}</h2>
 		<p>{L_CONFIRM_MESSAGE}</p>
-	</div>
+	</fieldset>
 
 	<form id="acp_extensions" method="post" action="{U_ENABLE}">
 	<fieldset class="submit-buttons">
-		<legend>{L_EXTENSION_ENABLE}</legend>
 		<input class="button1" type="submit" name="enable" value="{L_EXTENSION_ENABLE}" />
 		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 60a5cd9472..a61890bc75 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1076,6 +1076,10 @@ fieldset {
 	border-radius: 3px;
 }
 
+fieldset h2 {
+	margin-top: 0;
+}
+
 .rtl fieldset {
 	border-top: 1px solid #D7D7D7;
 	border-right: 1px solid #D7D7D7;
-- 
cgit v1.2.1


From 0c6ef9aabfb45f6fbf106da9a194c561f2bd2ecc Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 12 May 2014 11:35:59 +0200
Subject: [ticket/12534] Do not use errorbox for multi steps

PHPBB3-12534
---
 phpBB/adm/style/acp_ext_disable.html | 2 +-
 phpBB/adm/style/acp_ext_enable.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
index 3b09177a76..d2b5c46fe8 100644
--- a/phpBB/adm/style/acp_ext_disable.html
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -20,7 +20,7 @@
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="errorbox">
+		<div class="successbox notice">
 			<p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p>
 		</div>
 	<!-- ELSE -->
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 6bbd8c245b..8a4a35359e 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -26,7 +26,7 @@
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="errorbox">
+		<div class="successbox notice">
 			<p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p>
 		</div>
 	<!-- ELSE -->
-- 
cgit v1.2.1


From cc99a6b6ab53365b172bb0bceabde4eda814521b Mon Sep 17 00:00:00 2001
From: n-aleha <nick_aleha@myway.com>
Date: Thu, 15 May 2014 01:18:26 +0300
Subject: [ticket/12547] Rename jquery.js to jquery.min.js in assets directory

phpBB uses the minified version of jQuery hence the rename.

PHPBB3-12547
---
 phpBB/adm/style/install_footer.html | 2 +-
 phpBB/adm/style/overall_footer.html | 2 +-
 phpBB/adm/style/simple_footer.html  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

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 -->
-- 
cgit v1.2.1


From 6e6891f841dfc4131a41a83a4c41f04feaa7397d Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Fri, 23 May 2014 22:59:46 +0200
Subject: [ticket/12325] Automatic update should notify about outdated files

PHPBB3-12325
---
 phpBB/adm/style/install_update.html | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index f0df138641..c61f5ce1a2 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -348,6 +348,25 @@
 
 		<!-- ENDIF -->
 
+		<!-- IF .deleted -->
+			<h2>{L_FILES_DELETED}</h2>
+			<p>{L_FILES_DELETED_EXPLAIN}</p>
+
+			<fieldset>
+				<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
+				<!-- BEGIN deleted -->
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong>
+					</dt>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
+						<!-- IF not deleted.S_BINARY -->[<a href="{deleted.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{deleted.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+					</dd>
+				</dl>
+				<!-- END deleted -->
+			</fieldset>
+
+		<!-- ENDIF -->
+
 		<br />
 
 		<fieldset class="quick">
-- 
cgit v1.2.1


From 2f52934fad69d86a524e34cb498427d4177f705e Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sat, 24 May 2014 14:12:11 +0200
Subject: [ticket/12325] Don't use L_COLON

PHPBB3-12325
---
 phpBB/adm/style/install_update.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index c61f5ce1a2..965a66a7d7 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -358,7 +358,7 @@
 				<dl>
 					<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong>
 					</dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN} 60%;">
 						<!-- IF not deleted.S_BINARY -->[<a href="{deleted.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{deleted.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
 					</dd>
 				</dl>
-- 
cgit v1.2.1


From 672ffbe8f6c0ba4999303c42234ede3c75498013 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sat, 24 May 2014 14:25:04 +0200
Subject: [ticket/12325] Fix: add a missing colon

PHPBB3-12325
---
 phpBB/adm/style/install_update.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index 965a66a7d7..fc056bbf1f 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -358,7 +358,7 @@
 				<dl>
 					<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong>
 					</dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN} 60%;">
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">
 						<!-- IF not deleted.S_BINARY -->[<a href="{deleted.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{deleted.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
 					</dd>
 				</dl>
-- 
cgit v1.2.1


From 2ff3efc4a1d7c5cdf26eed28876b8e3f28b47cf5 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 26 May 2014 23:38:30 +0200
Subject: [ticket/12325] Update coding style in template

PHPBB3-12325
---
 phpBB/adm/style/install_update.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index fc056bbf1f..2faa2bb6fa 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -356,8 +356,7 @@
 				<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
 				<!-- BEGIN deleted -->
 				<dl>
-					<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong>
-					</dt>
+					<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong></dt>
 					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">
 						<!-- IF not deleted.S_BINARY -->[<a href="{deleted.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{deleted.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
 					</dd>
-- 
cgit v1.2.1


From 6230ae66a3d864f4ef4cd0e79e8bf41f44b9f69e Mon Sep 17 00:00:00 2001
From: Tabitha Backoff <tmbackoff@yahoo.com>
Date: Tue, 27 May 2014 10:31:03 -0400
Subject: [ticket/12596] Add template event acp_group_options_before/after

Add template events to the group settings page to allow extensions to
add
additional options for groups.

PHPBB3-12596
---
 phpBB/adm/style/acp_groups.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

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>
-- 
cgit v1.2.1


From 27f787e5e4e118b77a3e16879d6c684bdaafc303 Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Tue, 27 May 2014 21:25:33 +0200
Subject: [ticket/12594] Update footer credit lines

PHPBB3-12594
---
 phpBB/adm/style/install_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index c3d148966d..75ad3c39f4 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -5,7 +5,7 @@
 	</div>
 
 	<div id="page-footer">
-		Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+		Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited
 	</div>
 </div>
 
-- 
cgit v1.2.1


From 55e1f02151adbe9d66a2d87c00c4f1959739aa36 Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Wed, 28 May 2014 01:05:46 +0200
Subject: [ticket/12594] Replace phpBB Group with phpBB Limited

PHPBB3-12594
---
 phpBB/adm/style/admin.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index a61890bc75..f23c720add 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1,7 +1,10 @@
 /*  phpBB 3.1 Admin Style Sheet
 	------------------------------------------------------------------------
 	Original author:	subBlue ( http://www.subblue.com/ )
-	Copyright 2007 phpBB Group ( http://www.phpbb.com/ )
+	Copyright (c) phpBB Limited <https://www.phpbb.com>
+
+	For full copyright and license information, please see
+	the docs/CREDITS.txt file.
 	------------------------------------------------------------------------
 */
 
-- 
cgit v1.2.1


From e0b2ceef833dee55a1701216d4f0823375e8fa74 Mon Sep 17 00:00:00 2001
From: Nicofuma <github@nicofuma.fr>
Date: Mon, 14 Apr 2014 06:56:04 +0200
Subject: [ticket/11366] Extension's version's check

Add a feature to check automatically the version of the installed
extensions. The informations are cached for 24 hours (like for the
global update check on the main page of the acp).

The informations about the versions are display both on the global list
and on the detailled page.

To do this the developper has to to let the composer.json of the latest
version available and add some informations into it :

    "extra": {
		"version-check": {
			"host": "<the host>",
			"directory": "<the directory containing the file>",
			"filename": "<the composer.json of the latest version>"
		}
    }

He can also add two extra informations which will be displayed if a new
version is available :

	"extra": {
		"download": "<download link>",
		"annoucement": "<announcement link>",
    }

Currently a notice is displayed when the "extra.version-check"
informations are
missing.

Ticket: https://tracker.phpbb.com/browse/PHPBB3-11366

Signed-off-by: Nicofuma <github@nicofuma.fr>

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_details.html | 35 +++++++++++++++++++++++++++++++++++
 phpBB/adm/style/acp_ext_list.html    | 24 +++++++++++++++++++-----
 2 files changed, 54 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 6aff4b29cc..435c36ccc6 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -6,6 +6,19 @@
 
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
+	<!-- IF S_VERSIONCHECK_FAIL -->
+	<div class="errorbox notice">
+		<p>{L_VERSIONCHECK_FAIL}</p>
+		<p>{VERSIONCHECK_FAIL_REASON}</p>
+		<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+	</div>
+	<!-- ENDIF -->
+	<!-- IF S_VERSIONCHECK -->	
+	<div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->">
+		<p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+	</div>
+	<!-- ENDIF -->
+
 	<fieldset>
 		<legend>{L_EXT_DETAILS}</legend>
 		<!-- IF META_DISPLAY_NAME -->
@@ -46,6 +59,28 @@
 		</dl>
 	</fieldset>
 
+	<!-- IF S_VERSIONCHECK && not S_UP_TO_DATE -->
+	<fieldset>
+		<legend>{L_LATEST_VERSION}</legend>
+		<dl>
+			<dt><label>{L_VERSION}{L_COLON}</label></dt>
+			<dd><span id="latest_version">{LATEST_VERSION}</span></dd>
+		</dl>
+		<!-- IF LATEST_DOWNLOAD -->
+		<dl>
+			<dt><label>{L_DOWNLOAD_LATEST}</label></dt>
+			<dd><strong id="latest_download"><a href="{LATEST_DOWNLOAD}">{L_DOWNLOAD} {META_NAME} {LATEST_VERSION}</a></strong></dd>
+		</dl>
+		<!-- ENDIF -->
+		<!-- IF LATEST_ANNOUNCEMENT -->
+		<dl>
+			<dt><label>{L_ANNOUNCEMENT_TOPIC}</label></dt>
+			<dd><strong id="latest_announcement"><a href="{LATEST_ANNOUNCEMENT}">{L_RELEASE_ANNOUNCEMENT}</a></strong></dd>
+		</dl>
+		<!-- ENDIF -->
+	</fieldset>
+	<!-- ENDIF -->
+
 	<!-- IF META_REQUIRE_PHPBB || META_REQUIRE_PHP -->
 	<fieldset>
 		<legend>{L_REQUIREMENTS}</legend>
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 2fcc6eab31..d612a959e8 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -7,22 +7,30 @@
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
 	<table class="table1">
-		<col class="row1" ><col class="row2" ><col class="row2" >
+		<col class="row1" ><col class="row1" ><col class="row1" ><col class="row2" ><col class="row2" >
 	<thead>
 		<tr>
 			<th>{L_EXTENSION_NAME}</th>
-			<th>{L_EXTENSION_OPTIONS}</th>
-			<th>{L_EXTENSION_ACTIONS}</th>
+			<th width="10%">{L_CURRENT_VERSION}</th>
+			<th width="10%">{L_LATEST_VERSION}</th>
+			<th width="10%">{L_EXTENSION_OPTIONS}</th>
+			<th width="10%">{L_EXTENSION_ACTIONS}</th>
 		</tr>
 	</thead>
 	<tbody>
 		<!-- IF .enabled -->
 		<tr>
-			<td class="row3" colspan="3"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
+			<td class="row3" colspan="5"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
 		</tr>
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled">
 			<td><strong>{enabled.META_DISPLAY_NAME}</strong></td>
+			<td style="text-align: center;">{enabled.META_VERSION}</td>
+			<td style="text-align: center;">
+				<!-- IF enabled.S_VERSIONCHECK -->
+				<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.LATEST_VERSION}</strong> [&nbsp;<a href="{enabled.U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+				<!-- ENDIF -->
+			</td>
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
 			<td style="text-align: center;">
 				<!-- BEGIN actions -->
@@ -36,11 +44,17 @@
 
 		<!-- IF .disabled -->
 		<tr>
-			<td class="row3" colspan="3"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
+			<td class="row3" colspan="5"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
 		</tr>
 		<!-- BEGIN disabled -->
 		<tr class="ext_disabled">
 			<td><strong>{disabled.META_DISPLAY_NAME}</strong></td>
+			<td style="text-align: center;">{disabled.META_VERSION}</td>
+			<td style="text-align: center;">
+				<!-- IF disabled.S_VERSIONCHECK -->
+				<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.LATEST_VERSION}</strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+				<!-- ENDIF -->
+			</td>
 			<td style="text-align: center;">
 				<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF -->
 			</td>
-- 
cgit v1.2.1


From 44752c0dbfe11afb58de8956a79fbe5ec0f3e127 Mon Sep 17 00:00:00 2001
From: Nicofuma <github@nicofuma.fr>
Date: Mon, 14 Apr 2014 19:09:06 +0200
Subject: [ticket/11366] Moving to \phpbb\version_helper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ bug fix (missing exception)
+ Using \phpbb\version_helper
So, now, the version file have a new format :

	{
		"stable": {
			"<branch>": {
				"current": "<version>",
				[ "announcement": "<announcement link>", ]
				[ "download": "<download link>", ]
			},
			"<branch>": {
				...
			}
		},
		"unstable": {
		}
	}

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_details.html | 36 ++++++++++++++++++++----------------
 phpBB/adm/style/acp_ext_list.html    | 11 ++++-------
 2 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 435c36ccc6..95b23395dd 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -62,22 +62,26 @@
 	<!-- IF S_VERSIONCHECK && not S_UP_TO_DATE -->
 	<fieldset>
 		<legend>{L_LATEST_VERSION}</legend>
-		<dl>
-			<dt><label>{L_VERSION}{L_COLON}</label></dt>
-			<dd><span id="latest_version">{LATEST_VERSION}</span></dd>
-		</dl>
-		<!-- IF LATEST_DOWNLOAD -->
-		<dl>
-			<dt><label>{L_DOWNLOAD_LATEST}</label></dt>
-			<dd><strong id="latest_download"><a href="{LATEST_DOWNLOAD}">{L_DOWNLOAD} {META_NAME} {LATEST_VERSION}</a></strong></dd>
-		</dl>
-		<!-- ENDIF -->
-		<!-- IF LATEST_ANNOUNCEMENT -->
-		<dl>
-			<dt><label>{L_ANNOUNCEMENT_TOPIC}</label></dt>
-			<dd><strong id="latest_announcement"><a href="{LATEST_ANNOUNCEMENT}">{L_RELEASE_ANNOUNCEMENT}</a></strong></dd>
-		</dl>
-		<!-- ENDIF -->
+		<!-- BEGIN updates_available -->
+		<fieldset>
+			<dl>
+				<dt><label>{L_VERSION}{L_COLON}</label></dt>
+				<dd><strong>{updates_available.current}</strong></dd>
+			</dl>
+			<!-- IF updates_available.download-->
+			<dl>
+				<dt><label>{L_DOWNLOAD_LATEST}</label></dt>
+				<dd><strong><a href="{updates_available.download}">{L_DOWNLOAD} {META_NAME} {LATEST_VERSION}</a></strong></dd>
+			</dl>
+			<!-- ENDIF -->
+			<!-- IF updates_available.announcement -->
+			<dl>
+				<dt><label>{L_ANNOUNCEMENT_TOPIC}</label></dt>
+				<dd><strong><a href="{updates_available.announcement}">{L_RELEASE_ANNOUNCEMENT}</a></strong></dd>
+			</dl>
+			<!-- ENDIF -->
+		</fieldset>
+		<!-- END updates_available -->
 	</fieldset>
 	<!-- ENDIF -->
 
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index d612a959e8..2e949e5c3b 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -7,12 +7,11 @@
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
 	<table class="table1">
-		<col class="row1" ><col class="row1" ><col class="row1" ><col class="row2" ><col class="row2" >
+		<col class="row1" ><col class="row1" ><col class="row2" ><col class="row2" >
 	<thead>
 		<tr>
 			<th>{L_EXTENSION_NAME}</th>
 			<th width="10%">{L_CURRENT_VERSION}</th>
-			<th width="10%">{L_LATEST_VERSION}</th>
 			<th width="10%">{L_EXTENSION_OPTIONS}</th>
 			<th width="10%">{L_EXTENSION_ACTIONS}</th>
 		</tr>
@@ -25,10 +24,9 @@
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled">
 			<td><strong>{enabled.META_DISPLAY_NAME}</strong></td>
-			<td style="text-align: center;">{enabled.META_VERSION}</td>
 			<td style="text-align: center;">
 				<!-- IF enabled.S_VERSIONCHECK -->
-				<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.LATEST_VERSION}</strong> [&nbsp;<a href="{enabled.U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+				<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.META_VERSION}</strong> [&nbsp;<a href="{enabled.U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
 				<!-- ENDIF -->
 			</td>
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
@@ -44,15 +42,14 @@
 
 		<!-- IF .disabled -->
 		<tr>
-			<td class="row3" colspan="5"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
+			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
 		</tr>
 		<!-- BEGIN disabled -->
 		<tr class="ext_disabled">
 			<td><strong>{disabled.META_DISPLAY_NAME}</strong></td>
-			<td style="text-align: center;">{disabled.META_VERSION}</td>
 			<td style="text-align: center;">
 				<!-- IF disabled.S_VERSIONCHECK -->
-				<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.LATEST_VERSION}</strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+				<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.META_VERSION}</strong> [&nbsp;<a href="{disabled.U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
 				<!-- ENDIF -->
 			</td>
 			<td style="text-align: center;">
-- 
cgit v1.2.1


From 9cd25cc828da47fc2d8b5fa044519d406cad4d11 Mon Sep 17 00:00:00 2001
From: Nicofuma <github@nicofuma.fr>
Date: Fri, 2 May 2014 23:05:18 +0200
Subject: [ticket/11366] Set the size of the 'current version' column to 20%

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 2e949e5c3b..a47b1bd576 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -11,7 +11,7 @@
 	<thead>
 		<tr>
 			<th>{L_EXTENSION_NAME}</th>
-			<th width="10%">{L_CURRENT_VERSION}</th>
+			<th width="20%">{L_CURRENT_VERSION}</th>
 			<th width="10%">{L_EXTENSION_OPTIONS}</th>
 			<th width="10%">{L_EXTENSION_ACTIONS}</th>
 		</tr>
-- 
cgit v1.2.1


From 5e29ea77d813fb6f10583fa440ed4e55e78bd28d Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sun, 11 May 2014 13:04:00 +0200
Subject: [ticket/11366] Coding style

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_details.html | 6 +++++-
 phpBB/adm/style/acp_ext_list.html    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 95b23395dd..65a9d3c774 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -6,12 +6,16 @@
 
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
-	<!-- IF S_VERSIONCHECK_FAIL -->
+	<!-- IF S_VERSIONCHECK_STATUS == 0 -->
 	<div class="errorbox notice">
 		<p>{L_VERSIONCHECK_FAIL}</p>
 		<p>{VERSIONCHECK_FAIL_REASON}</p>
 		<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
 	</div>
+	<!-- ELSE IF S_VERSIONCHECK_STATUS == 1 -->
+	<div class="errorbox notice">
+		<p>{VERSIONCHECK_FAIL_REASON}</p>
+	</div>
 	<!-- ENDIF -->
 	<!-- IF S_VERSIONCHECK -->	
 	<div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->">
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index a47b1bd576..0aed0243d9 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -13,7 +13,7 @@
 			<th>{L_EXTENSION_NAME}</th>
 			<th width="20%">{L_CURRENT_VERSION}</th>
 			<th width="10%">{L_EXTENSION_OPTIONS}</th>
-			<th width="10%">{L_EXTENSION_ACTIONS}</th>
+			<th width="25%">{L_EXTENSION_ACTIONS}</th>
 		</tr>
 	</thead>
 	<tbody>
-- 
cgit v1.2.1


From bee6c6baeafdf894fd8e30de33e4d94185af5745 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sun, 11 May 2014 18:41:22 +0200
Subject: [ticket/11366] Fix detailed view

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_details.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 65a9d3c774..830c2e3cb4 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -6,7 +6,11 @@
 
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
-	<!-- IF S_VERSIONCHECK_STATUS == 0 -->
+	<!-- IF S_VERSIONCHECK -->
+	<div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->">
+		<p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+	</div>
+	<!-- ELSE IF S_VERSIONCHECK_STATUS == 0 -->
 	<div class="errorbox notice">
 		<p>{L_VERSIONCHECK_FAIL}</p>
 		<p>{VERSIONCHECK_FAIL_REASON}</p>
@@ -17,11 +21,6 @@
 		<p>{VERSIONCHECK_FAIL_REASON}</p>
 	</div>
 	<!-- ENDIF -->
-	<!-- IF S_VERSIONCHECK -->	
-	<div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->">
-		<p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
-	</div>
-	<!-- ENDIF -->
 
 	<fieldset>
 		<legend>{L_EXT_DETAILS}</legend>
-- 
cgit v1.2.1


From 521fe2b8e29fdb61ab0c02ec40f20b652d66623a Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 12:30:27 +0200
Subject: [ticket/11366] Force the use of the cache on the list page

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_list.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 0aed0243d9..e0d432ccd3 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -26,7 +26,9 @@
 			<td><strong>{enabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;">
 				<!-- IF enabled.S_VERSIONCHECK -->
-				<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.META_VERSION}</strong> [&nbsp;<a href="{enabled.U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+				<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.META_VERSION}</strong>
+				<!-- ELSE -->
+				{enabled.META_VERSION}
 				<!-- ENDIF -->
 			</td>
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
@@ -49,7 +51,9 @@
 			<td><strong>{disabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;">
 				<!-- IF disabled.S_VERSIONCHECK -->
-				<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.META_VERSION}</strong> [&nbsp;<a href="{disabled.U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+				<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.META_VERSION}</strong>
+				<!-- ELSE -->
+				{disabled.META_VERSION}
 				<!-- ENDIF -->
 			</td>
 			<td style="text-align: center;">
-- 
cgit v1.2.1


From 13ecddf85bce88cb0b99684040578ffa766db782 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 12:40:16 +0200
Subject: [ticket/11366] Add recheck-all link

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index e0d432ccd3..d77c7690f7 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -11,7 +11,7 @@
 	<thead>
 		<tr>
 			<th>{L_EXTENSION_NAME}</th>
-			<th width="20%">{L_CURRENT_VERSION}</th>
+			<th width="20%">{L_CURRENT_VERSION} [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a>&nbsp;]</th>
 			<th width="10%">{L_EXTENSION_OPTIONS}</th>
 			<th width="25%">{L_EXTENSION_ACTIONS}</th>
 		</tr>
-- 
cgit v1.2.1


From 8dc10d6971ede7fbc63fb3fd92512f95d9ec5dfb Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 17:23:50 +0200
Subject: [ticket/11366] Add $config['extension_force_unstable']

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_list.html | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index d77c7690f7..372d9e8599 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -6,6 +6,27 @@
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
+	<form id="version_check_settings" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_EXTENSIONS_VERSION_CHECK_SETTINGS}</legend>
+		<dl>
+			<dt><label for="force_unstable">{L_FORCE_UNSTABLE}{L_COLON}</label></dt>
+			<dd>
+				<label><input type="radio" name="force_unstable" class="radio" value="1"<!-- IF FORCE_UNSTABLE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" name="force_unstable" class="radio" value="0"<!-- IF not FORCE_UNSTABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			</dd>
+		</dl>
+
+		<p class="submit-buttons">
+			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+			<input class="button2" type="reset" name="reset" value="{L_RESET}" />
+			<input type="hidden" name="action" value="set_config_version_check_force_unstable" />
+			{S_FORM_TOKEN}
+		</p>
+	</fieldset>
+	</form>
+
 	<table class="table1">
 		<col class="row1" ><col class="row1" ><col class="row2" ><col class="row2" >
 	<thead>
-- 
cgit v1.2.1


From b4dec33581642e201d2f245e29e19c187a94a628 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 18:28:18 +0200
Subject: [ticket/11366] Move "recheck all" link

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_list.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 372d9e8599..0b4a7d9fd2 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -32,7 +32,7 @@
 	<thead>
 		<tr>
 			<th>{L_EXTENSION_NAME}</th>
-			<th width="20%">{L_CURRENT_VERSION} [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a>&nbsp;]</th>
+			<th width="20%">{L_CURRENT_VERSION}</th>
 			<th width="10%">{L_EXTENSION_OPTIONS}</th>
 			<th width="25%">{L_EXTENSION_ACTIONS}</th>
 		</tr>
@@ -91,7 +91,11 @@
 		<!-- ENDIF -->
 	</tbody>
 	</table>
-	<br />
+
+	<fieldset class="quick">
+		<p class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a></p>
+		{S_FORM_TOKEN}
+	</fieldset>
 
 	<table class="table1">
 	<tr>
-- 
cgit v1.2.1


From 9b756b9b98aca4a3817d4c7857ade8582e0cbe25 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 18:47:49 +0200
Subject: [ticket/11366] Versions, options and actions heading should be
 centered

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_list.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 0b4a7d9fd2..3a725ee069 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -32,9 +32,9 @@
 	<thead>
 		<tr>
 			<th>{L_EXTENSION_NAME}</th>
-			<th width="20%">{L_CURRENT_VERSION}</th>
-			<th width="10%">{L_EXTENSION_OPTIONS}</th>
-			<th width="25%">{L_EXTENSION_ACTIONS}</th>
+			<th style="text-align: center;" width="20%">{L_CURRENT_VERSION}</th>
+			<th style="text-align: center;" width="10%">{L_EXTENSION_OPTIONS}</th>
+			<th style="text-align: center;" width="25%">{L_EXTENSION_ACTIONS}</th>
 		</tr>
 	</thead>
 	<tbody>
-- 
cgit v1.2.1


From edc3b3fb752d758a2fd4baca485b514beafca39a Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 18:55:52 +0200
Subject: [ticket/11366] Hide the version check settings by default

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 3a725ee069..3809eeda09 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -6,7 +6,7 @@
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
-	<form id="version_check_settings" method="post" action="{U_ACTION}">
+	<form id="version_check_settings" method="post" action="{U_ACTION}" style="display:none">
 
 	<fieldset>
 		<legend>{L_EXTENSIONS_VERSION_CHECK_SETTINGS}</legend>
@@ -93,7 +93,7 @@
 	</table>
 
 	<fieldset class="quick">
-		<p class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a></p>
+		<p class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a onclick="phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></p>
 		{S_FORM_TOKEN}
 	</fieldset>
 
-- 
cgit v1.2.1


From 9cbec4deb272552bc7e890af161d4b7307075eb3 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 19:13:53 +0200
Subject: [ticket/11366] Move the links to the top of the page

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_list.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 3809eeda09..95c194cc1d 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -27,6 +27,11 @@
 	</fieldset>
 	</form>
 
+	<fieldset class="quick">
+		<p class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></p>
+		{S_FORM_TOKEN}
+	</fieldset>
+
 	<table class="table1">
 		<col class="row1" ><col class="row1" ><col class="row2" ><col class="row2" >
 	<thead>
@@ -92,11 +97,6 @@
 	</tbody>
 	</table>
 
-	<fieldset class="quick">
-		<p class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a onclick="phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></p>
-		{S_FORM_TOKEN}
-	</fieldset>
-
 	<table class="table1">
 	<tr>
 		<th>{L_EXTENSION_UPDATE_HEADLINE}</th>
-- 
cgit v1.2.1


From ccddd44105ddf5de9905b27b9848ad769be227d6 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 19:15:32 +0200
Subject: [ticket/11366] Remove the extra {S_FORM_TOKEN}

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_list.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 95c194cc1d..bcd98335af 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -29,7 +29,6 @@
 
 	<fieldset class="quick">
 		<p class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></p>
-		{S_FORM_TOKEN}
 	</fieldset>
 
 	<table class="table1">
-- 
cgit v1.2.1


From f3aaab93d66ac36359a225a335c8036dda0a12ce Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 19:44:28 +0200
Subject: [ticket/11366] Exchange links and settings' form

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_list.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index bcd98335af..f0d1f789db 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -6,6 +6,10 @@
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
+	<fieldset class="quick">
+		<span class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
+	</fieldset>
+
 	<form id="version_check_settings" method="post" action="{U_ACTION}" style="display:none">
 
 	<fieldset>
@@ -27,10 +31,6 @@
 	</fieldset>
 	</form>
 
-	<fieldset class="quick">
-		<p class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></p>
-	</fieldset>
-
 	<table class="table1">
 		<col class="row1" ><col class="row1" ><col class="row2" ><col class="row2" >
 	<thead>
-- 
cgit v1.2.1


From 73cdfae42bce9de97c662fba84fb6592aa810326 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 20:02:24 +0200
Subject: [ticket/11366] Fix HTML

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index f0d1f789db..d3a7913f7d 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -17,7 +17,7 @@
 		<dl>
 			<dt><label for="force_unstable">{L_FORCE_UNSTABLE}{L_COLON}</label></dt>
 			<dd>
-				<label><input type="radio" name="force_unstable" class="radio" value="1"<!-- IF FORCE_UNSTABLE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" id="force_unstable" name="force_unstable" class="radio" value="1"<!-- IF FORCE_UNSTABLE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" name="force_unstable" class="radio" value="0"<!-- IF not FORCE_UNSTABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
@@ -44,7 +44,7 @@
 	<tbody>
 		<!-- IF .enabled -->
 		<tr>
-			<td class="row3" colspan="5"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
+			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
 		</tr>
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled">
-- 
cgit v1.2.1


From fde5a9d472976b2b19eb4e9852b86ab7c2347949 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 20:09:00 +0200
Subject: [ticket/11366] Fix headings css in list page

PHPBB3-11366
---
 phpBB/adm/style/acp_ext_list.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index d3a7913f7d..f96da7e26a 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -36,9 +36,9 @@
 	<thead>
 		<tr>
 			<th>{L_EXTENSION_NAME}</th>
-			<th style="text-align: center;" width="20%">{L_CURRENT_VERSION}</th>
-			<th style="text-align: center;" width="10%">{L_EXTENSION_OPTIONS}</th>
-			<th style="text-align: center;" width="25%">{L_EXTENSION_ACTIONS}</th>
+			<th style="text-align: center; width: 20%;">{L_CURRENT_VERSION}</th>
+			<th style="text-align: center; width: 10%;">{L_EXTENSION_OPTIONS}</th>
+			<th style="text-align: center; width: 25%;">{L_EXTENSION_ACTIONS}</th>
 		</tr>
 	</thead>
 	<tbody>
-- 
cgit v1.2.1


From d3f65cd66e4c3cbf2a8af45a7db99b40d0153214 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 3 May 2014 15:59:06 +0200
Subject: [ticket/10073] Add ACP module to add bbcode text for contact admin
 info

PHPBB3-10073
---
 phpBB/adm/style/acp_contact.html | 136 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 phpBB/adm/style/acp_contact.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_contact.html b/phpBB/adm/style/acp_contact.html
new file mode 100644
index 0000000000..b7a70e6f47
--- /dev/null
+++ b/phpBB/adm/style/acp_contact.html
@@ -0,0 +1,136 @@
+<!-- INCLUDE overall_header.html -->
+
+<script type="text/javascript">
+	// <![CDATA[
+
+	var form_name = 'acp_contact';
+	var text_name = 'contact_admin_info';
+	var load_draft = false;
+	var upload = false;
+
+	// Define the bbCode tags
+	var bbcode = new Array();
+	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
+	var imageTag = false;
+
+	// Helpline messages
+	var help_line = {
+		b: '{LA_BBCODE_B_HELP}',
+		i: '{LA_BBCODE_I_HELP}',
+		u: '{LA_BBCODE_U_HELP}',
+		q: '{LA_BBCODE_Q_HELP}',
+		c: '{LA_BBCODE_C_HELP}',
+		l: '{LA_BBCODE_L_HELP}',
+		o: '{LA_BBCODE_O_HELP}',
+		p: '{LA_BBCODE_P_HELP}',
+		w: '{LA_BBCODE_W_HELP}',
+		a: '{LA_BBCODE_A_HELP}',
+		s: '{LA_BBCODE_S_HELP}',
+		f: '{LA_BBCODE_F_HELP}',
+		y: '{LA_BBCODE_Y_HELP}',
+		d: '{LA_BBCODE_D_HELP}'
+		<!-- BEGIN custom_tags -->
+		,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
+	<!-- END custom_tags -->
+	}
+
+	// ]]>
+</script>
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
+
+<a id="maincontent"></a>
+
+<h1>{L_ACP_CONTACT_SETTINGS}</h1>
+
+<p>{L_ACP_CONTACT_SETTINGS_EXPLAIN}</p>
+
+<form id="acp_contact" method="post" action="{U_ACTION}">
+	<fieldset>
+		<legend>{L_GENERAL_OPTIONS}</legend>
+		<dl>
+			<dt><label for="contact_admin_form_enable">{L_CONTACT_US_ENABLE}{L_COLON}</label><br /><span>{L_CONTACT_US_ENABLE_EXPLAIN}</span></dt>
+			<dd>
+				<label><input type="radio" class="radio" id="contact_admin_form_enable" name="contact_admin_form_enable" value="1"<!-- IF CONTACT_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
+				<label><input type="radio" class="radio" name="contact_admin_form_enable" value="0"<!-- IF not CONTACT_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label>
+			</dd>
+		</dl>
+	</fieldset>
+
+	<!-- IF CONTACT_US_INFO_PREVIEW -->
+	<fieldset>
+		<legend>{L_CONTACT_US_INFO_PREVIEW}</legend>
+		<p>{CONTACT_US_INFO_PREVIEW}</p>
+	</fieldset>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_CONTACT_US_INFO}</legend>
+		<p>{L_CONTACT_US_INFO_EXPLAIN}</p>
+
+		<div id="format-buttons">
+			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
+			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
+			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
+			<!-- IF S_BBCODE_QUOTE -->
+			<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
+			<!-- ENDIF -->
+			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
+			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
+			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
+			<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
+			<!-- IF S_BBCODE_IMG -->
+			<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
+			<!-- ENDIF -->
+			<!-- IF S_LINKS_ALLOWED -->
+			<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
+			<!-- ENDIF -->
+			<!-- IF S_BBCODE_FLASH -->
+			<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
+			<!-- ENDIF -->
+			<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
+				<option value="50">{L_FONT_TINY}</option>
+				<option value="85">{L_FONT_SMALL}</option>
+				<option value="100" selected="selected">{L_FONT_NORMAL}</option>
+				<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
+				<option value="150">{L_FONT_LARGE}</option>
+				<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
+				<option value="200">{L_FONT_HUGE}</option>
+				<!-- ENDIF -->
+				<!-- ENDIF -->
+			</select>
+			<!-- BEGIN custom_tags -->
+			<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
+			<!-- END custom_tags -->
+		</div>
+
+		<dl class="responsive-columns">
+			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
+			</dt>
+
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;">
+				<textarea name="contact_admin_info" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{CONTACT_US_INFO}</textarea>
+			</dd>
+
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
+				<!-- IF S_BBCODE_ALLOWED -->
+				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
+				<!-- ENDIF -->
+				<!-- IF S_SMILIES_ALLOWED -->
+				<label><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label>
+				<!-- ENDIF -->
+				<!-- IF S_LINKS_ALLOWED -->
+				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
+				<!-- ENDIF -->
+			</dd>
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
+		</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From a2ca0bc6111492b10fbab05f092f7343f88b59ec Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 20 May 2014 17:20:11 +0200
Subject: [ticket/10073] Deduplicate posting buttons code in ACP

PHPBB3-10073
---
 phpBB/adm/style/acp_contact.html         | 66 ++----------------------------
 phpBB/adm/style/acp_posting_buttons.html | 70 ++++++++++++++++++++++++++++++++
 phpBB/adm/style/acp_users_signature.html | 64 +----------------------------
 3 files changed, 74 insertions(+), 126 deletions(-)
 create mode 100644 phpBB/adm/style/acp_posting_buttons.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_contact.html b/phpBB/adm/style/acp_contact.html
index b7a70e6f47..9578b3df83 100644
--- a/phpBB/adm/style/acp_contact.html
+++ b/phpBB/adm/style/acp_contact.html
@@ -1,42 +1,16 @@
 <!-- INCLUDE overall_header.html -->
 
 <script type="text/javascript">
-	// <![CDATA[
+// <![CDATA[
 
 	var form_name = 'acp_contact';
 	var text_name = 'contact_admin_info';
 	var load_draft = false;
 	var upload = false;
-
-	// Define the bbCode tags
-	var bbcode = new Array();
-	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
 	var imageTag = false;
 
-	// Helpline messages
-	var help_line = {
-		b: '{LA_BBCODE_B_HELP}',
-		i: '{LA_BBCODE_I_HELP}',
-		u: '{LA_BBCODE_U_HELP}',
-		q: '{LA_BBCODE_Q_HELP}',
-		c: '{LA_BBCODE_C_HELP}',
-		l: '{LA_BBCODE_L_HELP}',
-		o: '{LA_BBCODE_O_HELP}',
-		p: '{LA_BBCODE_P_HELP}',
-		w: '{LA_BBCODE_W_HELP}',
-		a: '{LA_BBCODE_A_HELP}',
-		s: '{LA_BBCODE_S_HELP}',
-		f: '{LA_BBCODE_F_HELP}',
-		y: '{LA_BBCODE_Y_HELP}',
-		d: '{LA_BBCODE_D_HELP}'
-		<!-- BEGIN custom_tags -->
-		,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
-	<!-- END custom_tags -->
-	}
-
-	// ]]>
+// ]]>
 </script>
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
 <a id="maincontent"></a>
 
@@ -67,41 +41,7 @@
 		<legend>{L_CONTACT_US_INFO}</legend>
 		<p>{L_CONTACT_US_INFO_EXPLAIN}</p>
 
-		<div id="format-buttons">
-			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
-			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
-			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
-			<!-- IF S_BBCODE_QUOTE -->
-			<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
-			<!-- ENDIF -->
-			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
-			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
-			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
-			<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
-			<!-- IF S_BBCODE_IMG -->
-			<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
-			<!-- ENDIF -->
-			<!-- IF S_LINKS_ALLOWED -->
-			<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
-			<!-- ENDIF -->
-			<!-- IF S_BBCODE_FLASH -->
-			<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
-			<!-- ENDIF -->
-			<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
-				<option value="50">{L_FONT_TINY}</option>
-				<option value="85">{L_FONT_SMALL}</option>
-				<option value="100" selected="selected">{L_FONT_NORMAL}</option>
-				<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
-				<option value="150">{L_FONT_LARGE}</option>
-				<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
-				<option value="200">{L_FONT_HUGE}</option>
-				<!-- ENDIF -->
-				<!-- ENDIF -->
-			</select>
-			<!-- BEGIN custom_tags -->
-			<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
-			<!-- END custom_tags -->
-		</div>
+		<!-- INCLUDE acp_posting_buttons.html -->
 
 		<dl class="responsive-columns">
 			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
diff --git a/phpBB/adm/style/acp_posting_buttons.html b/phpBB/adm/style/acp_posting_buttons.html
new file mode 100644
index 0000000000..70b6259689
--- /dev/null
+++ b/phpBB/adm/style/acp_posting_buttons.html
@@ -0,0 +1,70 @@
+<script type="text/javascript">
+// <![CDATA[
+
+	// Define the bbCode tags
+	var bbcode = new Array();
+	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
+
+	// Helpline messages
+	var help_line = {
+		b: '{LA_BBCODE_B_HELP}',
+		i: '{LA_BBCODE_I_HELP}',
+		u: '{LA_BBCODE_U_HELP}',
+		q: '{LA_BBCODE_Q_HELP}',
+		c: '{LA_BBCODE_C_HELP}',
+		l: '{LA_BBCODE_L_HELP}',
+		o: '{LA_BBCODE_O_HELP}',
+		p: '{LA_BBCODE_P_HELP}',
+		w: '{LA_BBCODE_W_HELP}',
+		a: '{LA_BBCODE_A_HELP}',
+		s: '{LA_BBCODE_S_HELP}',
+		f: '{LA_BBCODE_F_HELP}',
+		y: '{LA_BBCODE_Y_HELP}',
+		d: '{LA_BBCODE_D_HELP}'
+		<!-- BEGIN custom_tags -->
+			,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
+		<!-- END custom_tags -->
+	}
+
+// ]]>
+</script>
+
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
+
+<!-- EVENT acp_posting_buttons_before -->
+<div id="format-buttons">
+	<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
+	<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
+	<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
+	<!-- IF S_BBCODE_QUOTE -->
+		<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
+	<!-- ENDIF -->
+	<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
+	<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
+	<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
+	<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
+	<!-- IF S_BBCODE_IMG -->
+		<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
+	<!-- ENDIF -->
+	<!-- IF S_LINKS_ALLOWED -->
+		<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
+	<!-- ENDIF -->
+	<!-- IF S_BBCODE_FLASH -->
+		<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
+	<!-- ENDIF -->
+	<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
+		<option value="50">{L_FONT_TINY}</option>
+		<option value="85">{L_FONT_SMALL}</option>
+		<option value="100" selected="selected">{L_FONT_NORMAL}</option>
+		<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
+		<option value="150">{L_FONT_LARGE}</option>
+		<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
+		<option value="200">{L_FONT_HUGE}</option>
+		<!-- ENDIF -->
+		<!-- ENDIF -->
+	</select>
+	<!-- BEGIN custom_tags -->
+	<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
+	<!-- END custom_tags -->
+</div>
+<!-- EVENT acp_posting_buttons_after -->
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index 5b5c3ecf7f..c7ec5cc0eb 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -5,36 +5,10 @@
 	var text_name = 'signature';
 	var load_draft = false;
 	var upload = false;
-
-	// Define the bbCode tags
-	var bbcode = new Array();
-	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
 	var imageTag = false;
 
-	// Helpline messages
-	var help_line = {
-		b: '{LA_BBCODE_B_HELP}',
-		i: '{LA_BBCODE_I_HELP}',
-		u: '{LA_BBCODE_U_HELP}',
-		q: '{LA_BBCODE_Q_HELP}',
-		c: '{LA_BBCODE_C_HELP}',
-		l: '{LA_BBCODE_L_HELP}',
-		o: '{LA_BBCODE_O_HELP}',
-		p: '{LA_BBCODE_P_HELP}',
-		w: '{LA_BBCODE_W_HELP}',
-		a: '{LA_BBCODE_A_HELP}',
-		s: '{LA_BBCODE_S_HELP}',
-		f: '{LA_BBCODE_F_HELP}',
-		y: '{LA_BBCODE_Y_HELP}',
-		d: '{LA_BBCODE_D_HELP}'
-		<!-- BEGIN custom_tags -->
-			,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
-		<!-- END custom_tags -->
-	}
-
 // ]]>
 </script>
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
 <form id="user_signature" method="post" action="{U_ACTION}">
 
@@ -49,43 +23,7 @@
 		<legend>{L_SIGNATURE}</legend>
 		<p>{L_SIGNATURE_EXPLAIN}</p>
 
-		<!-- EVENT acp_users_signature_editor_buttons_before -->
-		<div id="format-buttons">
-			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
-			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
-			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
-			<!-- IF S_BBCODE_QUOTE -->
-				<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
-			<!-- ENDIF -->
-			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
-			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
-			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
-			<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
-			<!-- IF S_BBCODE_IMG -->
-				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
-			<!-- ENDIF -->
-			<!-- IF S_LINKS_ALLOWED -->
-				<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
-			<!-- ENDIF -->
-			<!-- IF S_BBCODE_FLASH -->
-				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
-			<!-- ENDIF -->
-			<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
-				<option value="50">{L_FONT_TINY}</option>
-				<option value="85">{L_FONT_SMALL}</option>
-				<option value="100" selected="selected">{L_FONT_NORMAL}</option>
-				<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
-					<option value="150">{L_FONT_LARGE}</option>
-					<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
-						<option value="200">{L_FONT_HUGE}</option>
-					<!-- ENDIF -->
-				<!-- ENDIF -->
-			</select>
-			<!-- BEGIN custom_tags -->
-				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
-			<!-- END custom_tags -->
-		</div>
-		<!-- EVENT acp_users_signature_editor_buttons_after -->
+		<!-- INCLUDE acp_posting_buttons.html -->
 
 		<dl class="responsive-columns">
 			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
-- 
cgit v1.2.1


From 3e0f8d7f1ebb9cd655fd9826cac11f163c91d230 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 20 May 2014 17:38:08 +0200
Subject: [ticket/10073] Move template code into the template

PHPBB3-10073
---
 phpBB/adm/style/acp_contact.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_contact.html b/phpBB/adm/style/acp_contact.html
index 9578b3df83..532617cc16 100644
--- a/phpBB/adm/style/acp_contact.html
+++ b/phpBB/adm/style/acp_contact.html
@@ -53,13 +53,13 @@
 
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
 				<!-- IF S_BBCODE_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
+				<label><input type="checkbox" class="radio" name="disable_bbcode"<!-- IF not S_BBCODE_ALLOWED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_BBCODE}</label>
 				<!-- ENDIF -->
 				<!-- IF S_SMILIES_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label>
+				<label><input type="checkbox" class="radio" name="disable_smilies"<!-- IF not S_SMILIES_ALLOWED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_SMILIES}</label>
 				<!-- ENDIF -->
 				<!-- IF S_LINKS_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
+				<label><input type="checkbox" class="radio" name="disable_magic_url"<!-- IF not S_MAGIC_URL_ALLOWED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_MAGIC_URL}</label>
 				<!-- ENDIF -->
 			</dd>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
-- 
cgit v1.2.1


From 975afa90480f6d48f266e40870fb948a38e00f2a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 20 May 2014 20:54:57 +0200
Subject: [ticket/10073] Deduplicate template variable names

PHPBB3-10073
---
 phpBB/adm/style/acp_contact.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_contact.html b/phpBB/adm/style/acp_contact.html
index 532617cc16..828fd4b659 100644
--- a/phpBB/adm/style/acp_contact.html
+++ b/phpBB/adm/style/acp_contact.html
@@ -53,13 +53,13 @@
 
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
 				<!-- IF S_BBCODE_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_bbcode"<!-- IF not S_BBCODE_ALLOWED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_BBCODE}</label>
+				<label><input type="checkbox" class="radio" name="disable_bbcode"<!-- IF S_BBCODE_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_BBCODE}</label>
 				<!-- ENDIF -->
 				<!-- IF S_SMILIES_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_smilies"<!-- IF not S_SMILIES_ALLOWED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_SMILIES}</label>
+				<label><input type="checkbox" class="radio" name="disable_smilies"<!-- IF S_SMILIES_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_SMILIES}</label>
 				<!-- ENDIF -->
 				<!-- IF S_LINKS_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_magic_url"<!-- IF not S_MAGIC_URL_ALLOWED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_MAGIC_URL}</label>
+				<label><input type="checkbox" class="radio" name="disable_magic_url"<!-- IF S_MAGIC_URL_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_MAGIC_URL}</label>
 				<!-- ENDIF -->
 			</dd>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
-- 
cgit v1.2.1


From 6a00ff3fa666aad8a52f3f2cb5197e32a825f61e Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 31 May 2014 10:52:26 -0700
Subject: [ticket/12641] Use jQuery's trim() method. IE8 does not support the
 native one

PHPBB3-12641
---
 phpBB/adm/style/admin.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index 7bda86e1e3..a839e7e0e2 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -75,7 +75,7 @@ function parse_document(container)
 				var cell = $(this),
 					colspan = parseInt(cell.attr('colspan')),
 					dfn = cell.attr('data-dfn'),
-					text = dfn ? dfn : cell.text().trim();
+					text = dfn ? dfn : $.trim(cell.text());
 
 				if (text == '&nbsp;') text = '';
 				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
@@ -114,7 +114,7 @@ function parse_document(container)
 			cells.each(function() {
 				var cell = $(this),
 					colspan = parseInt(cell.attr('colspan')),
-					text = cell.text().trim();
+					text = $.trim(cell.text());
 
 				if (headersLength <= column) {
 					return;
-- 
cgit v1.2.1


From c47b546bf08775d215da4bd07e7a93cbc68b322f Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Sun, 1 Jun 2014 10:54:04 +0200
Subject: [ticket/12613] Renamed jump-to to page-jump to prevent confusion

Jump-to can easily be confused with forum-jump.
Also switched the lang vars to reflect changes better

PHPBB3-12613
---
 phpBB/adm/style/pagination.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/pagination.html b/phpBB/adm/style/pagination.html
index 7158f83fbc..5e755723e8 100644
--- a/phpBB/adm/style/pagination.html
+++ b/phpBB/adm/style/pagination.html
@@ -1,5 +1,5 @@
 
- 	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; 
+ 	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE_CLICK}">{PAGE_NUMBER}</a> &bull; 
 	<ul>
 	<!-- BEGIN pagination -->
 		<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>
-- 
cgit v1.2.1


From 4d24681259fdd8ca5d9c1ed754db203159c979df Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 5 Jun 2014 23:28:00 +0200
Subject: [ticket/12666] Use "None" for images in root of gallery avatar path

"None" serves no real purpose right now. After this it will be used instead
of "Main" for images in the root of the gallery avatar path.

PHPBB3-12666
---
 phpBB/adm/style/acp_avatar_options_local.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 0cdb3644d7..8adafa1d99 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -1,7 +1,6 @@
 <dl>
 	<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
 	<dd><select name="avatar_local_cat" id="category">
-		<option value="">{L_NO_AVATAR_CATEGORY}</option>
 		<!-- BEGIN avatar_local_cats -->
 		<option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
 		<!-- END avatar_local_cats -->
-- 
cgit v1.2.1


From 73c2a3f1776f9adbcae603918a411035f745a51f Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 29 May 2014 11:37:28 -0700
Subject: [ticket/12553] Align alert text to the right.

PHPBB3-12553
---
 phpBB/adm/style/admin.css           |  4 +++-
 phpBB/adm/style/overall_footer.html | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index f23c720add..d646867780 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -209,6 +209,9 @@ li {
 
 #page-footer {
 	clear: both;
+}
+
+.copyright {
 	font-size: 0.75em;
 	text-align: center;
 }
@@ -1594,7 +1597,6 @@ input.button1:focus, input.button2:focus {
 	z-index: 50;
 	padding: 25px;
 	padding: 0 25px 20px 25px;
-	text-align: left;
 }
 
 .phpbb_alert .alert_close {
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 0f4589f5d4..deb38c8691 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -5,15 +5,17 @@
 	</div>
 
 	<div id="page-footer">
-		<!-- IF S_COPYRIGHT_HTML -->
-			{CREDIT_LINE}
-			<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
-		<!-- ENDIF -->
+		<div class="copyright">
+			<!-- IF S_COPYRIGHT_HTML -->
+				{CREDIT_LINE}
+				<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+			<!-- ENDIF -->
 
-		<!-- IF DEBUG_OUTPUT -->
-			<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->
-			{DEBUG_OUTPUT}
-		<!-- ENDIF -->
+			<!-- IF DEBUG_OUTPUT -->
+				<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->
+				{DEBUG_OUTPUT}
+			<!-- ENDIF -->
+		</div>
 
 		<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
 			<div id="darken">&nbsp;</div>
-- 
cgit v1.2.1


From c0063a9e2e12c4e4e43b11408f0e1ae1bc4d7ef8 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 29 May 2014 11:48:31 -0700
Subject: [ticket/12553] Fix incorrect alignment in ACP responsive tables.

PHPBB3-12553
---
 phpBB/adm/style/admin.css | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index d646867780..0f22bc100d 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -987,6 +987,10 @@ table.fixed-width-table {
 		margin-bottom: 1px;
 	}
 
+	.rtl table.responsive td {
+		text-align: right !important;
+	}
+
 	table.responsive td.empty {
 		display: none !important;
 	}
@@ -1007,6 +1011,10 @@ table.fixed-width-table {
 		box-sizing: border-box;
 	}
 
+	.rtl table.responsive.two-columns td {
+		float: right;
+	}
+
 	table.responsive.two-columns td:nth-child(2n+1) {
 		clear: left;
 	}
-- 
cgit v1.2.1


From a487fab0ea63adc2a1ac102b138ede3042943d3a Mon Sep 17 00:00:00 2001
From: Mario Skouat <forum@skouat.org>
Date: Sun, 15 Jun 2014 15:43:41 +0200
Subject: [ticket/12714] Move "allow all forums" in its own dd-element

PHPBB3-12714
---
 phpBB/adm/style/acp_attachments.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 0e3b5ff3b2..59b10f597e 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -205,8 +205,8 @@
 		</dl>
 		<dl>
 			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}{L_COLON}</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label>
-				<label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
+			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label></dd>
+			<dd><label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
 			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
 		</dl>
 
-- 
cgit v1.2.1


From b83b72b271b7d0cfe5b6dc6a06acc299e36b2969 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Tue, 3 Jun 2014 11:14:53 +0200
Subject: [ticket/12648] Fix and modernize ACP header tabs

PHPBB3-12648
---
 phpBB/adm/style/admin.css           | 165 ++++++++++++++++--------------------
 phpBB/adm/style/admin.js            |   4 +-
 phpBB/adm/style/install_header.html |   2 +-
 phpBB/adm/style/overall_header.html |   2 +-
 4 files changed, 76 insertions(+), 97 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 0f22bc100d..7204e4e53c 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -320,176 +320,155 @@ li {
 
 
 /* Tabbed menu
-	Based on: http://www.alistapart.com/articles/slidingdoors2/
 ----------------------------------------*/
 #tabs {
+	font-family: Arial, Helvetica, sans-serif;
 	line-height: normal;
 	margin: 0 7px;
-	min-width: 600px;
 	position: relative;
 	z-index: 2;
 }
 
-#tabs ul {
-	margin:0;
-	padding: 0;
+#tabs > ul {
 	list-style: none;
-}
-
-#tabs ul:after {
-	content: '';
-	display: block;
-	clear: both;
-}
-
-#tabs li {
-	display: block;
-	float: left;
 	margin: 0;
 	padding: 0;
-	font-size: 0.85em;
-	font-weight: bold;
 }
 
-#tabs li:after {
+#tabs > ul:after {
 	content: '';
 	display: block;
 	clear: both;
 }
 
-#tabs a {
+#tabs .tab {
+	display: inline-block;
 	float: left;
-	background:url("../images/bg_tabs1.gif") no-repeat 0% -34px;
-	margin: 0 1px 0 0;
-	padding: 0 0 0 7px;
-	text-decoration: none;
-	position: relative;
+	font-size: 0.85em;
+	font-weight: bold;
+	line-height: 14px;
 }
 
-.rtl #tabs li {
+.rtl #tabs .tab {
 	float: right;
 }
 
-#tabs a span {
-	float: left;
-	display: block;
-	background: url("../images/bg_tabs2.gif") no-repeat 100% -34px;
-	padding: 7px 10px 4px 4px;
-	min-height: 14px;
+#tabs .tab > a {
+	background: #D4D6DA;
+	background: -moz-linear-gradient(top, #CACBCF 0%, #D4D6DA 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #CACBCF), color-stop(100%, #D4D6DA));
+	background: -webkit-linear-gradient(top, #CACBCF 0%, #D4D6DA 100%);
+	background: -o-linear-gradient(top, #CACBCF 0%, #D4D6DA 100%);
+	background: -ms-linear-gradient(top, #CACBCF 0%, #D4D6DA 100%);
+	background: linear-gradient(to bottom, #CACBCF 0%, #D4D6DA 100%);
+	border: 1px solid #BBB;
+	border-bottom-width: 0;
+	border-radius: 5px 5px 0 0;
 	color: #767676;
-	white-space: nowrap;
-	font-family: Arial, Helvetica, sans-serif;
-	text-transform: uppercase;
+	display: block;
 	font-weight: bold;
+	margin: 1px 1px 2px 0;
+	padding: 6px 9px 4px;
+	position: relative;
+	text-decoration: none;
+	text-transform: uppercase;
+	white-space: nowrap;
+	cursor: pointer;
 }
 
-.rtl #tabs a span {
-	float: right;
-}
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-#tabs a span, .rtl #tabs a span { float:none;}
-/* End hack */
-
-#tabs a:hover span {
+#tabs .tab > a:hover {
+	background: #F1F1EE;
+	border-color: #C0BFBB;
 	color: #BC2A4D;
 }
 
-#tabs a:hover {
-	background-position: 0 -69px;
-}
-
-#tabs a:hover span {
-	background-position: 100% -69px;
-}
-
-#tabs .activetab a {
-	background-position: 0 0;
-	border-bottom: 1px solid #DCDEE2;
-}
-
-#tabs .activetab a span {
-	background-position: 100% 0;
-	padding-bottom: 5px;
+#tabs .activetab > a,
+#tabs .activetab > a:hover {
+	background: #DCDEE2;
+	background: -moz-linear-gradient(top, #F2F2F2 0%, #DCDEE2 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F2F2F2), color-stop(100%, #DCDEE2));
+	background: -webkit-linear-gradient(top, #F2F2F2 0%, #DCDEE2 100%);
+	background: -o-linear-gradient(top, #F2F2F2 0%, #DCDEE2 100%);
+	background: -ms-linear-gradient(top, #F2F2F2 0%, #DCDEE2 100%);
+	background: linear-gradient(to bottom, #F2F2F2 0%, #DCDEE2 100%);
+	border-color: #999;
+	box-shadow: 0 1px 1px #FFF inset;
 	color: #23649F;
+	margin: 0 1px 0 0;
+	padding: 7px 10px 6px;
 }
 
-#tabs .activetab a:hover span {
+#tabs .activetab > a:hover {
 	color: #115098;
 }
 
+/* Responsive tabs
+----------------------------------------*/
 .responsive-tab {
 	position: relative;
 }
 
-.responsive-tab .responsive-tab-link span {
-	display: inline-block;
+.responsive-tab > a.responsive-tab-link {
+	display: block;
 	font-size: 16px;
 	position: relative;
 	width: 16px;
 	line-height: 14px;
 	text-decoration: none;
+	padding-left: 9px !important;
+	padding-right: 9px !important;
 }
 
-.responsive-tab .responsive-tab-link span:before {
+.responsive-tab .responsive-tab-link:before {
 	content: '';
 	position: absolute;
-	left: 5px;
-	top: 8px;
+	left: 10px;
+	top: 7px;
 	height: .125em;
 	width: 14px;
 	border-bottom: 0.125em solid #767676;
 	border-top: 0.375em double #767676;
 }
 
-.responsive-tab .responsive-tab-link:hover span:before {
+.responsive-tab .responsive-tab-link:hover:before {
 	border-color: #BC2A4D;
 }
 
-.responsive-tab.activetab .responsive-tab-link span:before {
+.responsive-tab.activetab .responsive-tab-link:before {
 	border-color: #23649F;
 }
 
-.responsive-tab.activetab .responsive-tab-link:hover span:before {
+.responsive-tab.activetab .responsive-tab-link:hover:before {
 	border-color: #115098;
 }
 
-#tabs .dropdown {
-	top: 18px;
-	margin-right: -1px;
+#tabs .dropdown, #minitabs .dropdown {
+	top: 20px;
+	margin-right: -2px;
+	font-weight: normal;
 }
 
 #tabs .dropdown-right .dropdown {
 	margin-left: -2px;
 }
 
-#tabs .dropdown li {
-	display: block !important;
-	float: none;
-	background: transparent none;
-	padding: 0;
+#tabs .dropdown-contents {
+	list-style: none;
+	margin: 0;
 }
 
-#tabs .dropdown a, #tabs .dropdown a span {
-	background: transparent;
-	display: block;
-	border-width: 0;
-	float: none;
-	margin: 0;
-	padding: 0;
-	text-align: right;
+#tabs .dropdown li {
+	border-bottom: 1px dotted #DCDCDC;
 }
 
-#tabs .dropdown a span {
-	padding: 4px 8px;
-	color: inherit !important;
+#tabs .dropdown li:last-child {
+	border-bottom: none;
 }
 
-@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
-{
-	#tabs {
-		min-width: 0;
-	}
+#tabs .dropdown a {
+	display: block;
+	padding: 4px 8px;
+	text-align: right;
 }
 
 /* Main Panel
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index a839e7e0e2..253fd46a62 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -169,7 +169,7 @@ function parse_document(container)
 			ul = $this.children(),
 			tabs = ul.children().not('[data-skip-responsive]'),
 			links = tabs.children('a'),
-			item = ul.append('<li class="responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"><span>&nbsp;</span></a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
+			item = ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
 			menu = item.find('.dropdown-contents'),
 			maxHeight = 0,
 			lastWidth = false,
@@ -211,7 +211,7 @@ function parse_document(container)
 
 			for (i = total - 1; i >= 0; i --) {
 				tab = availableTabs.eq(i);
-				menu.prepend(tab.clone(true));
+				menu.prepend(tab.clone(true).removeClass('tab'));
 				tab.hide();
 				if ($this.height() <= maxHeight) {
 					menu.find('a').click(function() { check(true); });
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index a8f7009e4b..c818a4fc6d 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -29,7 +29,7 @@
 		<div id="tabs">
 			<ul>
 			<!-- BEGIN t_block1 -->
-				<li<!-- IF t_block1.S_SELECTED --> class="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
+				<li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li>
 			<!-- END t_block1 -->
 			</ul>
 		</div>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 25a82a5faa..afd2b94924 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -106,7 +106,7 @@ function popup(url, width, height, name)
 		<div id="tabs">
 			<ul>
 			<!-- BEGIN t_block1 -->
-				<li<!-- IF t_block1.S_SELECTED --> class="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
+				<li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li>
 			<!-- END t_block1 -->
 			</ul>
 		</div>
-- 
cgit v1.2.1


From 919fee6b1b4e62bb65667693eefb78625a38f8bc Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Fri, 13 Jun 2014 16:01:00 +0200
Subject: [ticket/12648] Slightly clear ACP active tab border

PHPBB3-12648
---
 phpBB/adm/style/admin.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 7204e4e53c..024651cbd9 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -392,10 +392,11 @@ li {
 	background: -ms-linear-gradient(top, #F2F2F2 0%, #DCDEE2 100%);
 	background: linear-gradient(to bottom, #F2F2F2 0%, #DCDEE2 100%);
 	border-color: #999;
+	border-bottom: 1px solid #DCDEE2;
 	box-shadow: 0 1px 1px #FFF inset;
 	color: #23649F;
 	margin: 0 1px 0 0;
-	padding: 7px 10px 6px;
+	padding: 7px 10px 5px;
 }
 
 #tabs .activetab > a:hover {
-- 
cgit v1.2.1


From 7517cc0e05558bf71e87950f75625c9cc0bf4a65 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Sat, 14 Jun 2014 01:52:22 +0200
Subject: [ticket/12648] RTL fix & ACP border fix

PHPBB3-12648
---
 phpBB/adm/style/admin.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 024651cbd9..b8f55e66c5 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -392,11 +392,11 @@ li {
 	background: -ms-linear-gradient(top, #F2F2F2 0%, #DCDEE2 100%);
 	background: linear-gradient(to bottom, #F2F2F2 0%, #DCDEE2 100%);
 	border-color: #999;
-	border-bottom: 1px solid #DCDEE2;
+	border-bottom: 2px solid #DCDEE2;
 	box-shadow: 0 1px 1px #FFF inset;
 	color: #23649F;
 	margin: 0 1px 0 0;
-	padding: 7px 10px 5px;
+	padding: 7px 10px 4px;
 }
 
 #tabs .activetab > a:hover {
-- 
cgit v1.2.1


From e427d203b6aeaa600d71d302551c874df648ee06 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Mon, 23 Jun 2014 20:53:18 -0700
Subject: [ticket/12750] Center installation page copyright text.

PHPBB3-12750
---
 phpBB/adm/style/install_footer.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index 75ad3c39f4..a29fce6c5a 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -5,7 +5,9 @@
 	</div>
 
 	<div id="page-footer">
-		Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited
+		<div class="copyright">
+			Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited
+		</div>
 	</div>
 </div>
 
-- 
cgit v1.2.1


From 29ec455a457574b58b3f4ce30323ea22d72389db Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 25 Jun 2014 22:14:33 +0200
Subject: [ticket/12462] Do not use string "None" for different options

... it limits translations.

PHPBB3-12462
---
 phpBB/adm/style/acp_groups.html       | 2 +-
 phpBB/adm/style/acp_users_avatar.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index f9846ea7cd..6049673e0a 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -117,7 +117,7 @@
 	<dl>
 		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
 		<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
-			<option value="">{L_NO_AVATAR_CATEGORY}</option>
+			<option value="">{L_NO_AVATAR}</option>
 			<!-- BEGIN avatar_drivers -->
 			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 			<!-- END avatar_drivers -->
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 0d06d088e8..8ad4ad710b 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -14,7 +14,7 @@
 		<dl>
 			<dt><label>{L_AVATAR_TYPE}</label></dt>
 			<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
-				<option value="">{L_NO_AVATAR_CATEGORY}</option>
+				<option value="">{L_NO_AVATAR}</option>
 				<!-- BEGIN avatar_drivers -->
 				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
-- 
cgit v1.2.1


From 97725db3f4f0bd8f33044335c57d930519e8efb6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 29 Jun 2014 22:13:33 +0200
Subject: [ticket/12779] Change order of file lists on automatic update

Also allow collapsing all the groups and collapse categories without user
interaction per default

PHPBB3-12779
---
 phpBB/adm/style/install_update.html | 210 ++++++++++++++++++------------------
 1 file changed, 108 insertions(+), 102 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index 2faa2bb6fa..898233f72d 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -184,72 +184,105 @@
 
 		<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
 
-		<!-- IF .up_to_date -->
-			<h2>{L_FILES_UP_TO_DATE}</h2>
-			<p>{L_FILES_UP_TO_DATE_EXPLAIN}</p>
+		<!-- IF .deleted -->
+			<h2>{L_FILES_DELETED}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('deleted', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<p>{L_FILES_DELETED_EXPLAIN}</p>
 
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_up_to_date.gif" alt="{L_STATUS_UP_TO_DATE}" /></legend>
-			<!-- BEGIN up_to_date -->
+			<fieldset id="deleted">
+				<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
+				<!-- BEGIN deleted -->
 				<dl>
-					<dd class="full" style="text-align: {S_CONTENT_FLOW_BEGIN};"><strong>{up_to_date.FILENAME}</strong></dd>
+					<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong></dt>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">
+						<!-- IF not deleted.S_BINARY -->[<a href="{deleted.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{deleted.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+					</dd>
 				</dl>
-			<!-- END up_to_date -->
+				<!-- END deleted -->
 			</fieldset>
 
 		<!-- ENDIF -->
 
-		<!-- IF .new -->
-			<h2>{L_FILES_NEW}</h2>
-			<p>{L_FILES_NEW_EXPLAIN}</p>
+		<!-- IF .conflict -->
+			<h2>{L_FILES_CONFLICT}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('conflict', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<p>{L_FILES_CONFLICT_EXPLAIN}</p>
 
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
-			<!-- BEGIN new -->
+			<!-- BEGIN conflict -->
+			<fieldset id="conflict">
+				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
 				<dl>
-					<dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br /><!-- ENDIF -->{new.FILE_PART}</strong>
-					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-				</dt>
-				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
-					<!-- IF not new.S_BINARY -->[<a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-				</dd>
-				<!-- IF new.S_CUSTOM -->
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-				<!-- ENDIF -->
+					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong>
+						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
+					</dt>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
+						<!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
+						<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+					</dd>
+					<!-- IF conflict.S_CUSTOM -->
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+					<!-- ENDIF -->
 				</dl>
-			<!-- END new -->
+				<!-- IF conflict.S_BINARY -->
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
+					</dl>
+				<!-- ELSE -->
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
+					</dl>
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
+					</dl>
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+					</dl>
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+					</dl>
+				<!-- ENDIF -->
 			</fieldset>
+			<!-- END conflict -->
 
 		<!-- ENDIF -->
 
-		<!-- IF .not_modified -->
-			<h2>{L_FILES_NOT_MODIFIED}</h2>
-			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
-			<p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
+		<!-- IF .new_conflict -->
+			<h2>{L_FILES_NEW_CONFLICT}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('new_conflict', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<p>{L_FILES_NEW_CONFLICT_EXPLAIN}</p>
 
-			<fieldset id="not_modified" style="display: none;">
-				<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
-			<!-- BEGIN not_modified -->
+			<fieldset id="new_conflict">
+				<legend><img src="{T_IMAGE_PATH}file_new_conflict.gif" alt="{L_STATUS_NEW_CONFLICT}" /></legend>
+			<!-- BEGIN new_conflict -->
 				<dl>
-					<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong>
-						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-					</dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
-					<!-- IF not_modified.S_CUSTOM -->
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-					<!-- ENDIF -->
+					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong>
+					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+				</dt>
+				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
+					<!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+				</dd>
+				<!-- IF new_conflict.S_CUSTOM -->
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+				<!-- ENDIF -->
 				</dl>
-			<!-- END not_modified -->
+			<!-- END new_conflict -->
 			</fieldset>
 
 		<!-- ENDIF -->
 
 		<!-- IF .modified -->
 			<h2>{L_FILES_MODIFIED}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
 			<p>{L_FILES_MODIFIED_EXPLAIN}</p>
 
 			<!-- BEGIN modified -->
-			<fieldset>
+			<fieldset id="modified">
 				<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
 				<dl>
 					<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong>
@@ -277,91 +310,64 @@
 
 		<!-- ENDIF -->
 
-		<!-- IF .new_conflict -->
-			<h2>{L_FILES_NEW_CONFLICT}</h2>
-			<p>{L_FILES_NEW_CONFLICT_EXPLAIN}</p>
+		<!-- IF .new -->
+			<h2>{L_FILES_NEW}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('new_files', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<p>{L_FILES_NEW_EXPLAIN}</p>
 
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_new_conflict.gif" alt="{L_STATUS_NEW_CONFLICT}" /></legend>
-			<!-- BEGIN new_conflict -->
+			<fieldset id="new_files" style="display: none;">
+				<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
+			<!-- BEGIN new -->
 				<dl>
-					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong>
-					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+					<dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br /><!-- ENDIF -->{new.FILE_PART}</strong>
+					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
 				</dt>
 				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
-					<!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+					<!-- IF not new.S_BINARY -->[<a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
 				</dd>
-				<!-- IF new_conflict.S_CUSTOM -->
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+				<!-- IF new.S_CUSTOM -->
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
 				<!-- ENDIF -->
 				</dl>
-			<!-- END new_conflict -->
+			<!-- END new -->
 			</fieldset>
 
 		<!-- ENDIF -->
 
-		<!-- IF .conflict -->
-			<h2>{L_FILES_CONFLICT}</h2>
-			<p>{L_FILES_CONFLICT_EXPLAIN}</p>
+		<!-- IF .not_modified -->
+			<h2>{L_FILES_NOT_MODIFIED}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
 
-			<!-- BEGIN conflict -->
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
+			<fieldset id="not_modified" style="display: none;">
+				<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
+			<!-- BEGIN not_modified -->
 				<dl>
-					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong>
-						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
+					<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong>
+						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
 					</dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
-						<!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
-						<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-					</dd>
-					<!-- IF conflict.S_CUSTOM -->
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
+					<!-- IF not_modified.S_CUSTOM -->
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
 					<!-- ENDIF -->
 				</dl>
-				<!-- IF conflict.S_BINARY -->
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
-					</dl>
-				<!-- ELSE -->
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-					</dl>
-				<!-- ENDIF -->
+			<!-- END not_modified -->
 			</fieldset>
-			<!-- END conflict -->
 
 		<!-- ENDIF -->
 
-		<!-- IF .deleted -->
-			<h2>{L_FILES_DELETED}</h2>
-			<p>{L_FILES_DELETED_EXPLAIN}</p>
+		<!-- IF .up_to_date -->
+			<h2>{L_FILES_UP_TO_DATE}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('up_to_date', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<p>{L_FILES_UP_TO_DATE_EXPLAIN}</p>
 
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
-				<!-- BEGIN deleted -->
+			<fieldset id="up_to_date" style="display: none;">
+				<legend><img src="{T_IMAGE_PATH}file_up_to_date.gif" alt="{L_STATUS_UP_TO_DATE}" /></legend>
+			<!-- BEGIN up_to_date -->
 				<dl>
-					<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong></dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">
-						<!-- IF not deleted.S_BINARY -->[<a href="{deleted.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{deleted.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-					</dd>
+					<dd class="full" style="text-align: {S_CONTENT_FLOW_BEGIN};"><strong>{up_to_date.FILENAME}</strong></dd>
 				</dl>
-				<!-- END deleted -->
+			<!-- END up_to_date -->
 			</fieldset>
 
 		<!-- ENDIF -->
-- 
cgit v1.2.1


From b6816c42374d3edcdcae162481bdb160b958af1a Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sat, 5 Jul 2014 22:16:58 +0200
Subject: [ticket/12807] Changes PRUNE_FREQ to PRUNE_SHADOW_FREQ/_DAYS

PHPBB3-12807
---
 phpBB/adm/style/acp_forums.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index f8ea284acb..96cdc97ba7 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -284,11 +284,11 @@
 				<label><input type="radio" class="radio" name="enable_shadow_prune" value="0"<!-- IF not S_PRUNE_SHADOW_ENABLE --> id="enable_shadow_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
+			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_SHADOW_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
 			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
+			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
 			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		</fieldset>
-- 
cgit v1.2.1


From addcbb1585247a6890720250385427b5107dea2e Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sun, 6 Jul 2014 00:28:25 +0200
Subject: [ticket/12807] New variables for _EXPLAIN

PHPBB3-12807
---
 phpBB/adm/style/acp_forums.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 96cdc97ba7..4243fb8005 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -284,11 +284,11 @@
 				<label><input type="radio" class="radio" name="enable_shadow_prune" value="0"<!-- IF not S_PRUNE_SHADOW_ENABLE --> id="enable_shadow_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_SHADOW_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
+			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_SHADOW_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_FREQ_EXPLAIN}</span></dt>
 			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
+			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt>
 			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		</fieldset>
-- 
cgit v1.2.1


From 18054332e414ffda6eb0ed534b4f44287d890144 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 5 Jul 2014 22:08:24 +0200
Subject: [ticket/12810] Use correct template vars for shadow pruning settings

PHPBB3-12810
---
 phpBB/adm/style/acp_forums.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 4243fb8005..af79791ff8 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -285,11 +285,11 @@
 		</dl>
 		<dl>
 			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_SHADOW_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_SHADOW_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		</fieldset>
 	</div>
-- 
cgit v1.2.1


From dbb331284ef8ca422b4fb304d23e9e1fcf566c55 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Thu, 10 Jul 2014 12:07:51 +0200
Subject: [ticket/12838] Add template events to acp_ranks.html

PHPBB3-12838
---
 phpBB/adm/style/acp_ranks.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index dd2d07a837..29dc0dea6f 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -45,6 +45,8 @@
 	</dl>
 	</div>
 
+	<!-- EVENT acp_ranks_edit_after -->
+
 	<p class="submit-buttons">
 		<input type="hidden" name="action" value="save" />
 
@@ -71,6 +73,7 @@
 		<th>{L_RANK_IMAGE}</th>
 		<th>{L_RANK_TITLE}</th>
 		<th>{L_RANK_MINIMUM}</th>
+		<!-- EVENT acp_ranks_list_header_after -->
 		<th>{L_ACTION}</th>
 	</tr>
 	</thead>
@@ -80,6 +83,7 @@
 		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
 		<td style="text-align: center;">{ranks.RANK_TITLE}</td>
 		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->&nbsp; - &nbsp;<!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td>
+		<!-- EVENT acp_ranks_list_column_after -->
 		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a></td>
 	</tr>
 	<!-- END ranks -->
-- 
cgit v1.2.1


From 1f61f3a416a4ca3f072ff453255016d158f433c7 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Thu, 10 Jul 2014 12:10:06 +0200
Subject: [ticket/12838] Add _before versions

PHPBB3-12838
---
 phpBB/adm/style/acp_ranks.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index 29dc0dea6f..ea69e1254b 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -24,6 +24,9 @@
 	
 	<fieldset>
 		<legend>{L_ACP_RANKS}</legend>
+
+	<!-- EVENT acp_ranks_edit_before -->
+
 	<dl>
 		<dt><label for="title">{L_RANK_TITLE}{L_COLON}</label></dt>
 		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd>
@@ -70,6 +73,7 @@
 	<table class="table1 zebra-table">
 	<thead>
 	<tr>
+		<!-- EVENT acp_ranks_list_header_before -->
 		<th>{L_RANK_IMAGE}</th>
 		<th>{L_RANK_TITLE}</th>
 		<th>{L_RANK_MINIMUM}</th>
@@ -80,6 +84,7 @@
 	<tbody>
 	<!-- BEGIN ranks -->
 	<tr>
+		<!-- EVENT acp_ranks_list_column_before -->
 		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
 		<td style="text-align: center;">{ranks.RANK_TITLE}</td>
 		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->&nbsp; - &nbsp;<!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td>
-- 
cgit v1.2.1


From 0bece6dada5af1f8245a2200f43978e5dd7f5f63 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Thu, 10 Jul 2014 16:24:17 +0200
Subject: [ticket/12838] Simplify special rank template conditional

PHPBB3-12838
---
 phpBB/adm/style/acp_ranks.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index ea69e1254b..fa06513b98 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -41,7 +41,7 @@
 		<dd><label><input onclick="phpbb.toggleDisplay('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input onclick="phpbb.toggleDisplay('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
-	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
+	<div id="posts"<!-- IF S_SPECIAL_RANK --> style="display: none;"<!-- ENDIF -->>
 	<dl>
 		<dt><label for="min_posts">{L_RANK_MINIMUM}{L_COLON}</label></dt>
 		<dd><input name="min_posts" type="number" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
-- 
cgit v1.2.1


From 81905158a14fee6148764a2745f6d7236c1be3c4 Mon Sep 17 00:00:00 2001
From: Carlo <carlo@phpbbitalia.net>
Date: Tue, 15 Jul 2014 19:36:35 +0200
Subject: [ticket/12814] Replace email type with text type

PHPBB3-12814
---
 phpBB/adm/style/auth_provider_ldap.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/auth_provider_ldap.html b/phpBB/adm/style/auth_provider_ldap.html
index 9e0567dfed..97684db396 100644
--- a/phpBB/adm/style/auth_provider_ldap.html
+++ b/phpBB/adm/style/auth_provider_ldap.html
@@ -22,7 +22,7 @@
 	</dl>
 	<dl>
 		<dt><label for="ldap_email">{L_LDAP_EMAIL}{L_COLON}</label><br /><span>{L_LDAP_EMAIL_EXPLAIN}</span></dt>
-		<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="{AUTH_LDAP_EMAIL}" /></dd>
+		<dd><input type="text" id="ldap_email" size="40" name="config[ldap_email]" value="{AUTH_LDAP_EMAIL}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="ldap_user">{L_LDAP_USER}{L_COLON}</label><br /><span>{L_LDAP_USER_EXPLAIN}</span></dt>
-- 
cgit v1.2.1


From 20c50e55b1ec21cf39c4129bd548ec7566e52437 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 18 Jul 2014 10:12:15 -0700
Subject: [ticket/12864] Add template event to header after stylesheets

https://tracker.phpbb.com/browse/PHPBB3-12864

PHPBB3-12864
---
 phpBB/adm/style/overall_header.html | 2 ++
 phpBB/adm/style/simple_header.html  | 1 +
 2 files changed, 3 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index afd2b94924..f1f7eee282 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -89,6 +89,8 @@ function popup(url, width, height, name)
 
 {$STYLESHEETS}
 
+<!-- EVENT acp_overall_header_stylesheets_after -->
+
 </head>
 
 <body class="{S_CONTENT_DIRECTION} {BODY_CLASS} nojs">
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index bf8f41cd7a..d0b9bf62ed 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -84,6 +84,7 @@ function find_username(url)
 </script>
 <!-- EVENT acp_simple_header_head_append -->
 {$STYLESHEETS}
+<!-- EVENT acp_simple_header_stylesheets_after -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">
-- 
cgit v1.2.1


From 75aef80104351d276dda5dd3e6cf0b0dfa40d02d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 25 Jul 2014 13:25:48 +0200
Subject: [ticket/12891] Replace template loops with 1 loop to reduce
 generation time

PHPBB3-12891
---
 phpBB/adm/style/acp_ban.html | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
index 71c737de70..9e9f05120a 100644
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -13,27 +13,34 @@
 
 	var ban_length = new Array();
 		ban_length[-1] = '';
-	<!-- BEGIN ban_length -->
-		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
-	<!-- END ban_length -->
-
 	var ban_reason = new Array();
 		ban_reason[-1] = '';
-	<!-- BEGIN ban_reason -->
-		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
-	<!-- END ban_reason -->
-
 	var ban_give_reason = new Array();
 		ban_give_reason[-1] = '';
-	<!-- BEGIN ban_give_reason -->
-		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
-	<!-- END ban_give_reason -->
+
+	<!-- BEGIN bans -->
+		ban_length['{bans.BAN_ID}'] = '{bans.A_LENGTH}';
+		<!-- IF bans.A_REASON -->
+			ban_reason['{bans.BAN_ID}'] = '{bans.A_REASON}';
+		<!-- ENDIF -->
+		<!-- IF bans.A_GIVE_REASON -->
+			ban_give_reason['{bans.BAN_ID}'] = '{bans.A_GIVE_REASON}';
+		<!-- ENDIF -->
+	<!-- END bans -->
 
 	function display_details(option)
 	{
-		document.getElementById('acp_unban').unbangivereason.innerHTML = ban_give_reason[option];
-		document.getElementById('acp_unban').unbanreason.innerHTML = ban_reason[option];
-		document.getElementById('acp_unban').unbanlength.value = ban_length[option];
+		document.getElementById('unbanlength').value = ban_length[option];
+		if (option in ban_reason) {
+			document.getElementById('unbanreason').innerHTML = ban_reason[option];
+		} else {
+			document.getElementById('unbanreason').innerHTML = '';
+		}
+		if (option in ban_give_reason) {
+			document.getElementById('unbangivereason').innerHTML = ban_give_reason[option];
+		} else {
+			document.getElementById('unbangivereason').innerHTML = '';
+		}
 	}
 
 // ]]>
-- 
cgit v1.2.1


From 4f23bb711ca457efba370d7ac67394e0db59b578 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 7 Aug 2014 12:21:46 +0200
Subject: [ticket/12822] Remove "None" option from avatar select boxes

This option is just used for deleting avatars for which we already have
a checkbox.

PHPBB3-12822
---
 phpBB/adm/style/acp_groups.html       | 1 -
 phpBB/adm/style/acp_users_avatar.html | 1 -
 2 files changed, 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 6049673e0a..d24d62497d 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -117,7 +117,6 @@
 	<dl>
 		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
 		<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
-			<option value="">{L_NO_AVATAR}</option>
 			<!-- BEGIN avatar_drivers -->
 			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 			<!-- END avatar_drivers -->
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 8ad4ad710b..8466985fb3 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -14,7 +14,6 @@
 		<dl>
 			<dt><label>{L_AVATAR_TYPE}</label></dt>
 			<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
-				<option value="">{L_NO_AVATAR}</option>
 				<!-- BEGIN avatar_drivers -->
 				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
-- 
cgit v1.2.1


From 55260127bd91e53f8bb5bc78e6304468b5b0aba9 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 13 Aug 2014 15:22:34 +0200
Subject: [ticket/12961] Add link in anti-spam ACP page to titania

PHPBB3-12961
---
 phpBB/adm/style/acp_captcha.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index df4c675209..65f0a33085 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -6,6 +6,7 @@
 
 <p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
 
+<p>{L_ACP_VC_EXT_GET_MORE} <a href="https://www.phpbb.com/customise/db/extensions/?from=acp" target="_blank" style="font-weight: bold;">{L_ACP_VC_EXT_LINK}</a></p>
 
 <form id="acp_captcha" method="post" action="{U_ACTION}">
 
-- 
cgit v1.2.1


From d79fec1c3fc57730807700610a69a9cf81df8c0c Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@macr.ae>
Date: Wed, 13 Aug 2014 22:53:28 +0100
Subject: [ticket/12982] Refactoring: made JS in adm nice

PHPBB3-12982
---
 phpBB/adm/style/ajax.js | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 959580d6c2..4ad6b6afa5 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -1,6 +1,8 @@
+/* global phpbb */
+
 (function($) {  // Avoid conflicts with other libraries
 
-"use strict";
+'use strict';
 
 /**
  * The following callbacks are for reording items. row_down
@@ -13,11 +15,10 @@ phpbb.addAjaxCallback('row_down', function(res) {
 		return;
 	}
 
-	var el = $(this),
-		tr = el.parents('tr'),
-		trSwap = tr.next();
+	var $firstTr = $(this).parents('tr'),
+		$secondTr = $firstTr.next();
 
-	tr.insertAfter(trSwap);
+	$firstTr.insertAfter($secondTr);
 });
 
 phpbb.addAjaxCallback('row_up', function(res) {
@@ -25,11 +26,10 @@ phpbb.addAjaxCallback('row_up', function(res) {
 		return;
 	}
 
-	var el = $(this),
-		tr = el.parents('tr'),
-		trSwap = tr.prev();
+	var $secondTr = $(this).parents('tr'),
+		$firstTr = $secondTr.prev();
 
-	tr.insertBefore(trSwap);
+	$secondTr.insertBefore($firstTr);
 });
 
 /**
@@ -38,10 +38,10 @@ phpbb.addAjaxCallback('row_up', function(res) {
  * in the href with "deactivate", and vice versa.
  */
 phpbb.addAjaxCallback('activate_deactivate', function(res) {
-	var el = $(this),
-		newHref = el.attr('href');
+	var $this = $(this),
+		newHref = $this.attr('href');
 
-	el.text(res.text);
+	$this.text(res.text);
 
 	if (newHref.indexOf('deactivate') !== -1) {
 		newHref = newHref.replace('deactivate', 'activate');
@@ -49,7 +49,7 @@ phpbb.addAjaxCallback('activate_deactivate', function(res) {
 		newHref = newHref.replace('activate', 'deactivate');
 	}
 
-	el.attr('href', newHref);
+	$this.attr('href', newHref);
 });
 
 /**
@@ -66,11 +66,10 @@ phpbb.addAjaxCallback('row_delete', function(res) {
 
 $('[data-ajax]').each(function() {
 	var $this = $(this),
-		ajax = $this.attr('data-ajax'),
-		fn;
+		ajax = $this.attr('data-ajax');
 
 	if (ajax !== 'false') {
-		fn = (ajax !== 'true') ? ajax : null;
+		var fn = (ajax !== 'true') ? ajax : null;
 		phpbb.ajaxify({
 			selector: this,
 			refresh: $this.attr('data-refresh') !== undefined,
@@ -82,7 +81,7 @@ $('[data-ajax]').each(function() {
 /**
 * Automatically resize textarea
 */
-$(document).ready(function() {
+$(function() {
 	phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), {minHeight: 75});
 });
 
-- 
cgit v1.2.1


From d08a7f70e679eaf0355a34b7c9db147b02f1dbc2 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 13 Aug 2014 15:49:26 +0200
Subject: [ticket/12961] Change url to https://www.phpbb.com/go/anti-spam/

PHPBB3-12961
---
 phpBB/adm/style/acp_captcha.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index 65f0a33085..edbf32888c 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -6,7 +6,7 @@
 
 <p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
 
-<p>{L_ACP_VC_EXT_GET_MORE} <a href="https://www.phpbb.com/customise/db/extensions/?from=acp" target="_blank" style="font-weight: bold;">{L_ACP_VC_EXT_LINK}</a></p>
+<p>{L_ACP_VC_EXT_GET_MORE} <a href="https://www.phpbb.com/go/anti-spam/" target="_blank" style="font-weight: bold;">{L_ACP_VC_EXT_LINK}</a></p>
 
 <form id="acp_captcha" method="post" action="{U_ACTION}">
 
-- 
cgit v1.2.1


From 27bb2b72893b9bf59601ae78a02e59788e956e32 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 13 Aug 2014 16:44:16 +0200
Subject: [ticket/12961] Change url to anti-spam-ext

As per IRC suggestion

PHPBB3-12961
---
 phpBB/adm/style/acp_captcha.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index edbf32888c..e64ed58c2e 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -6,7 +6,7 @@
 
 <p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
 
-<p>{L_ACP_VC_EXT_GET_MORE} <a href="https://www.phpbb.com/go/anti-spam/" target="_blank" style="font-weight: bold;">{L_ACP_VC_EXT_LINK}</a></p>
+<p>{L_ACP_VC_EXT_GET_MORE} <a href="https://www.phpbb.com/go/anti-spam-ext" target="_blank" style="font-weight: bold;">{L_ACP_VC_EXT_LINK}</a></p>
 
 <form id="acp_captcha" method="post" action="{U_ACTION}">
 
-- 
cgit v1.2.1


From 73426d2d304537144c00ff84d6e38eba9d92e45a Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Thu, 14 Aug 2014 22:22:20 +0200
Subject: [ticket/12961] Refactor lang entry

PHPBB3-12961
---
 phpBB/adm/style/acp_captcha.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index e64ed58c2e..f4866653c3 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -6,7 +6,7 @@
 
 <p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
 
-<p>{L_ACP_VC_EXT_GET_MORE} <a href="https://www.phpbb.com/go/anti-spam-ext" target="_blank" style="font-weight: bold;">{L_ACP_VC_EXT_LINK}</a></p>
+<p>{L_ACP_VC_EXT_GET_MORE}</p>
 
 <form id="acp_captcha" method="post" action="{U_ACTION}">
 
-- 
cgit v1.2.1


From da716058fa679db65a31be3090820fe98a2a296e Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Mon, 2 Jun 2014 20:48:41 +0200
Subject: [ticket/10472] Fix ACP overflow:hidden problem for medium-sized
 screens

PHPBB3-10472
---
 phpBB/adm/style/admin.css | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index b8f55e66c5..879b976c5e 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -182,6 +182,12 @@ li {
 	margin-bottom: 10px;
 }
 
+#page-header:after {
+	content: '';
+	clear: both;
+	display: block;
+}
+
 .rtl #page-header {
 	text-align: left;
 	background: url("../images/phpbb_logo.png") top right no-repeat;
@@ -203,10 +209,15 @@ li {
 }
 
 #page-body {
-	clear: both;
 	min-width: 650px;
 }
 
+#page-body:after {
+	content: '';
+	clear: both;
+	display: block;
+}
+
 #page-footer {
 	clear: both;
 }
@@ -487,6 +498,12 @@ li {
 	box-shadow: #FFF 0 0 0 1px inset;
 }
 
+#acp:after {
+	content: '';
+	clear: both;
+	display: block;
+}
+
 #acp:first-child {
 	top: 0;
 }
@@ -1132,6 +1149,10 @@ input.langvalue, textarea.langvalue {
 	width: 90%;
 }
 
+input[type="number"], dd input[type="number"] {
+	width: 60px;
+}
+
 optgroup, select {
 	background-color: #FAFAFA;
 	border: 1px solid #666666;
@@ -1887,7 +1908,7 @@ li.pagination ul {
 	visibility: hidden;
 }*/
 
-.clearfix, .row, #content, fieldset dl, #page-body {
+.clearfix, .row, fieldset dl {
 	overflow: hidden;
 }
 
-- 
cgit v1.2.1


From 726573f10004a68174da8d6313457655c2f2c344 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Mon, 2 Jun 2014 23:28:18 +0200
Subject: [ticket/10472] More clearing and white-space fixes

PHPBB3-10472
---
 phpBB/adm/style/acp_attachments.html |  2 --
 phpBB/adm/style/acp_inactive.html    |  4 +--
 phpBB/adm/style/acp_logs.html        |  3 --
 phpBB/adm/style/acp_main.html        |  4 ---
 phpBB/adm/style/admin.css            | 70 ++++++++++++++----------------------
 5 files changed, 27 insertions(+), 56 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 59b10f597e..da8a0096ea 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -284,8 +284,6 @@
 	</fieldset>
 	</form>
 
-	<br />
-
 	<form id="change_ext" method="post" action="{U_ACTION}">
 
 	<fieldset class="tabulated">
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index 1cdc1abe6b..409ea46de5 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -2,14 +2,12 @@
 
 <a id="maincontent"></a>
 
-<h2>{L_INACTIVE_USERS}</h2>
+<h1>{L_INACTIVE_USERS}</h1>
 
 <p>{L_INACTIVE_USERS_EXPLAIN}</p>
 
 <form id="inactive" method="post" action="{U_ACTION}">
 
-<div class="clearfix"></div>
-
 <!-- IF .pagination -->
 <div class="pagination">
 	<!-- INCLUDE pagination.html -->
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index ec2065f906..4f67f46e24 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -18,9 +18,6 @@
 </div>
 <!-- ENDIF -->
 
-<div class="clearfix">&nbsp;</div>
-<div><br style="clear: both;" /></div>
-
 <!-- IF .log -->
 	<table class="table1 zebra-table fixed-width-table">
 	<thead>
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 9a9b3ff2b9..065dd7ac4f 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -243,9 +243,6 @@
 		<!-- END log -->
 		</tbody>
 		</table>
-
-		<br />
-
 	<!-- ENDIF -->
 
 	<!-- IF S_INACTIVE_USERS -->
@@ -287,7 +284,6 @@
 		<!-- END inactive -->
 		</tbody>
 		</table>
-
 	<!-- ENDIF -->
 
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 879b976c5e..93a91f4bce 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -154,6 +154,10 @@ a:active {
 	font-weight: bold;
 }
 
+a#maincontent, a#acl, a#assigned_to {
+	display: block;
+}
+
 /* List items */
 ul, ol {
 	list-style-position: inside;
@@ -174,7 +178,6 @@ li {
 }
 
 #page-header {
-	clear: both;
 	text-align: right;
 	background: url("../images/phpbb_logo.png") top left no-repeat;
 	height: 54px;
@@ -182,12 +185,6 @@ li {
 	margin-bottom: 10px;
 }
 
-#page-header:after {
-	content: '';
-	clear: both;
-	display: block;
-}
-
 .rtl #page-header {
 	text-align: left;
 	background: url("../images/phpbb_logo.png") top right no-repeat;
@@ -212,16 +209,6 @@ li {
 	min-width: 650px;
 }
 
-#page-body:after {
-	content: '';
-	clear: both;
-	display: block;
-}
-
-#page-footer {
-	clear: both;
-}
-
 .copyright {
 	font-size: 0.75em;
 	text-align: center;
@@ -346,12 +333,6 @@ li {
 	padding: 0;
 }
 
-#tabs > ul:after {
-	content: '';
-	display: block;
-	clear: both;
-}
-
 #tabs .tab {
 	display: inline-block;
 	float: left;
@@ -486,7 +467,6 @@ li {
 /* Main Panel
 ---------------------------------------- */
 #acp {
-	clear: both;
 	position: relative;
 	top: -2px;
 	margin: 0 0 2px;
@@ -498,12 +478,6 @@ li {
 	box-shadow: #FFF 0 0 0 1px inset;
 }
 
-#acp:after {
-	content: '';
-	clear: both;
-	display: block;
-}
-
 #acp:first-child {
 	top: 0;
 }
@@ -740,6 +714,7 @@ td {
 .table1 {
 	border-collapse: separate;
 	border-spacing: 1px;
+	clear: both;
 }
 
 dt#color_palette_placeholder table {
@@ -1247,8 +1222,8 @@ fieldset.quick legend {
 fieldset.tabulated {
 	background: none;
 	margin: 0;
+	margin-top: 5px;
 	padding: 0;
-	padding-top: 5px;
 	border: 0;
 }
 
@@ -1697,12 +1672,12 @@ input.button1:focus, input.button2:focus {
 	height: 1%; /* IE tweak (holly hack) */
 	width: auto;
 	text-align: right;
-	margin-top: 5px;
+	margin: 5px 0;
 }
 
 .top-pagination {
 	float: right;
-	margin: 15px 0 2px 0;
+	margin: 15px 0 5px 0;
 }
 
 .rtl .pagination {
@@ -1898,17 +1873,7 @@ li.pagination ul {
 	vertical-align: middle;
 }
 
-/* Nice method for clearing floated blocks without having to insert any extra markup
-	From http://www.positioniseverything.net/easyclearing.html
-.clearfix:after, #tabs:after, .row:after, #content:after, fieldset dl:after, #page-body:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}*/
-
-.clearfix, .row, fieldset dl {
+.row, fieldset dl {
 	overflow: hidden;
 }
 
@@ -2491,3 +2456,20 @@ fieldset.permissions .padding {
 	.responsive-show-inline { display: inline !important; }
 	.responsive-show-inline-block { display: inline-block !important; }
 }
+
+.clearfix {
+	overflow: hidden;
+}
+
+.pagination:after,
+#page-header:after,
+#page-body:after,
+#tabs:after,
+#tabs > ul:after,
+#tabs li:after,
+#acp:after,
+#content:after {
+	content: '';
+	clear: both;
+	display: block;
+}
-- 
cgit v1.2.1


From 38830f9cbb41c116aa3a0d579d450c6e5cd70dd7 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 25 Jun 2014 16:06:48 +0200
Subject: [ticket/10472] Fix weird padding on input type=number

PHPBB3-10472
---
 phpBB/adm/style/admin.css | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 93a91f4bce..7d570fa68f 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1125,8 +1125,13 @@ input.langvalue, textarea.langvalue {
 }
 
 input[type="number"], dd input[type="number"] {
+	padding-right: 0;
 	width: 60px;
 }
+.rtl input[type="number"], .rtl dd input[type="number"] {
+	padding-left: 2px;
+	padding-right: 2px;
+}
 
 optgroup, select {
 	background-color: #FAFAFA;
-- 
cgit v1.2.1


From 6488d236ec1a828648abca65e79a3bd4a921343f Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Mon, 15 Sep 2014 14:58:57 +0200
Subject: [ticket/10472] Remove dd selector and use -moz-padding-end

PHPBB3-10472
---
 phpBB/adm/style/admin.css | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 7d570fa68f..b83750875a 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -854,10 +854,10 @@ table.zebra-table tbody tr:nth-child(even) {
 }
 
 /* Deactivated row */
-.row-inactive { 
-	color: #999; 
+.row-inactive {
+	color: #999;
 }
-.row-inactive a, .row-inactive strong { 
+.row-inactive a, .row-inactive strong {
 	color: #888;
 }
 .row-inactive a:hover {
@@ -1124,13 +1124,9 @@ input.langvalue, textarea.langvalue {
 	width: 90%;
 }
 
-input[type="number"], dd input[type="number"] {
-	padding-right: 0;
+input[type="number"] {
 	width: 60px;
-}
-.rtl input[type="number"], .rtl dd input[type="number"] {
-	padding-left: 2px;
-	padding-right: 2px;
+	-moz-padding-end: 0;
 }
 
 optgroup, select {
@@ -1465,7 +1461,7 @@ input:focus, textarea:focus {
 {
 	select, dd select, dd input {
 		max-width: 240px;
-	}	
+	}
 }
 
 /* Submit button fieldset or paragraph
-- 
cgit v1.2.1


From 6323180344b079013afe8a5ecaa0986a645f8829 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 17 Sep 2014 16:00:16 +0200
Subject: [ticket/12858] Fix timezone display on acp users page

PHPBB3-12858
---
 phpBB/adm/style/timezone_option.html | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/timezone_option.html b/phpBB/adm/style/timezone_option.html
index 7a799b69c6..9b44585ff2 100644
--- a/phpBB/adm/style/timezone_option.html
+++ b/phpBB/adm/style/timezone_option.html
@@ -1,17 +1,25 @@
 <dl>
 	<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt>
-	<!-- IF S_TZ_DATE_OPTIONS -->
+	<!-- IF .tz_date -->
 	<dd id="tz_select_date" style="display: none;">
 		<select name="tz_date" id="tz_date" class="autowidth tz_select">
 			<option value="">{L_SELECT_CURRENT_TIME}</option>
-			{S_TZ_DATE_OPTIONS}
+			<!-- BEGIN tz_date -->
+			<option value="{tz_date.VALUE}"<!-- IF tz_date.SELECTED --> selected="selected"<!-- ENDIF -->>{tz_date.TITLE}</option>
+			<!-- END tz_date -->
 		</select>
 	</dd>
 	<!-- ENDIF -->
 	<dd>
 		<select name="tz" id="timezone" class="autowidth tz_select">
 			<option value="">{L_SELECT_TIMEZONE}</option>
-			{S_TZ_OPTIONS}
+			<!-- BEGIN tz_select -->
+			<optgroup label="{tz_select.LABEL}" data-tz-value="{tz_select.VALUE}">
+				<!-- BEGIN tz_options -->
+				<option title="{tz_select.tz_options.TITLE}" value="{tz_select.tz_options.VALUE}"<!-- IF tz_select.tz_options.SELECTED --> selected="selected"<!-- ENDIF -->>{tz_select.tz_options.LABEL}</option>
+				<!-- END tz_options -->
+			</optgroup>
+			<!-- END tz_select -->
 		</select>
 
 		<!-- INCLUDEJS timezone.js -->
-- 
cgit v1.2.1


From 9c310f789ffad41af46b36128f197176dc1f12e3 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 17 Sep 2014 17:52:48 +0200
Subject: [ticket/12858] Rename tz_ prefixed block variables to timezone_
 prefix

PHPBB3-12858
---
 phpBB/adm/style/timezone_option.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/timezone_option.html b/phpBB/adm/style/timezone_option.html
index 9b44585ff2..acfff30184 100644
--- a/phpBB/adm/style/timezone_option.html
+++ b/phpBB/adm/style/timezone_option.html
@@ -1,25 +1,25 @@
 <dl>
 	<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt>
-	<!-- IF .tz_date -->
+	<!-- IF .timezone_date -->
 	<dd id="tz_select_date" style="display: none;">
 		<select name="tz_date" id="tz_date" class="autowidth tz_select">
 			<option value="">{L_SELECT_CURRENT_TIME}</option>
-			<!-- BEGIN tz_date -->
-			<option value="{tz_date.VALUE}"<!-- IF tz_date.SELECTED --> selected="selected"<!-- ENDIF -->>{tz_date.TITLE}</option>
-			<!-- END tz_date -->
+			<!-- BEGIN timezone_date -->
+			<option value="{timezone_date.VALUE}"<!-- IF timezone_date.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_date.TITLE}</option>
+			<!-- END timezone_date -->
 		</select>
 	</dd>
 	<!-- ENDIF -->
 	<dd>
 		<select name="tz" id="timezone" class="autowidth tz_select">
 			<option value="">{L_SELECT_TIMEZONE}</option>
-			<!-- BEGIN tz_select -->
-			<optgroup label="{tz_select.LABEL}" data-tz-value="{tz_select.VALUE}">
-				<!-- BEGIN tz_options -->
-				<option title="{tz_select.tz_options.TITLE}" value="{tz_select.tz_options.VALUE}"<!-- IF tz_select.tz_options.SELECTED --> selected="selected"<!-- ENDIF -->>{tz_select.tz_options.LABEL}</option>
-				<!-- END tz_options -->
+			<!-- BEGIN timezone_select -->
+			<optgroup label="{timezone_select.LABEL}" data-tz-value="{timezone_select.VALUE}">
+				<!-- BEGIN timezone_options -->
+				<option title="{timezone_select.timezone_options.TITLE}" value="{timezone_select.timezone_options.VALUE}"<!-- IF timezone_select.timezone_options.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_select.timezone_options.LABEL}</option>
+				<!-- END timezone_options -->
 			</optgroup>
-			<!-- END tz_select -->
+			<!-- END timezone_select -->
 		</select>
 
 		<!-- INCLUDEJS timezone.js -->
-- 
cgit v1.2.1


From ef58752db8996016dbd32a89dd8b549ec806946f Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Sat, 20 Sep 2014 18:35:26 +0200
Subject: [ticket/13082] Replace float by text-align

PHPBB3-13082
---
 phpBB/adm/style/acp_logs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index 4f67f46e24..291fc23e25 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -8,7 +8,7 @@
 
 <form id="list" method="post" action="{U_ACTION}">
 
-<fieldset class="display-options" style="float: left">
+<fieldset class="display-options" style="text-align: left;">
 	{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
 </fieldset>
 
-- 
cgit v1.2.1


From ace3b806a9d6d9a10ebe35cdadede2472b7f9fec Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Sat, 20 Sep 2014 20:35:14 +0200
Subject: [ticket/13082] move style to css file

PHPBB3-13082
---
 phpBB/adm/style/acp_logs.html | 2 +-
 phpBB/adm/style/admin.css     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index 291fc23e25..9e8eb24ea0 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -8,7 +8,7 @@
 
 <form id="list" method="post" action="{U_ACTION}">
 
-<fieldset class="display-options" style="text-align: left;">
+<fieldset class="display-options" class="text-left">
 	{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
 </fieldset>
 
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index b83750875a..3a51515d2d 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -109,6 +109,10 @@ hr {
 	text-align: center;
 }
 
+.text-left {
+	text-align: left;
+}
+
 .small {
 	font-size: 0.85em;
 }
-- 
cgit v1.2.1


From 6851ff8fabbb6888a3a731f7fe1603c5fd0c68f6 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Sun, 21 Sep 2014 00:07:39 +0200
Subject: [ticket/13082] Join classes

PHPBB3-13082
---
 phpBB/adm/style/acp_logs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index 9e8eb24ea0..37e08bafca 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -8,7 +8,7 @@
 
 <form id="list" method="post" action="{U_ACTION}">
 
-<fieldset class="display-options" class="text-left">
+<fieldset class="display-options text-left">
 	{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
 </fieldset>
 
-- 
cgit v1.2.1


From 9f981a774149499b2a8e42421a861781bd1b5dc7 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Sun, 21 Sep 2014 10:03:48 +0200
Subject: [ticket/13082] Repair fix

PHPBB3-13082
---
 phpBB/adm/style/acp_logs.html | 2 +-
 phpBB/adm/style/admin.css     | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index 37e08bafca..76ea801de0 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -8,7 +8,7 @@
 
 <form id="list" method="post" action="{U_ACTION}">
 
-<fieldset class="display-options text-left">
+<fieldset class="display-options search-box">
 	{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
 </fieldset>
 
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 3a51515d2d..b03cb0ba24 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -109,8 +109,12 @@ hr {
 	text-align: center;
 }
 
-.text-left {
-	text-align: left;
+.search-box {
+	float: left;
+}
+
+.rtl .search-box {
+	float: right;
 }
 
 .small {
@@ -1777,6 +1781,7 @@ li.pagination ul {
 	margin: 10px 0;
 	color: #FFFFFF;
 	text-align: center;
+	clear: both;
 }
 
 .success {
-- 
cgit v1.2.1


From 98711450dd7b32435066d124d0e56c01897e578e Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sun, 9 Nov 2014 02:31:20 +0100
Subject: [ticket/13309] Add event acp_email_options_after

PHPBB3-13309
---
 phpBB/adm/style/acp_email.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html
index 950ecb40b0..63acd7fcc1 100644
--- a/phpBB/adm/style/acp_email.html
+++ b/phpBB/adm/style/acp_email.html
@@ -47,6 +47,8 @@
 	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>
 </dl>
 
+<!-- EVENT acp_email_options_after -->
+
 <p class="submit-buttons">
 	<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_EMAIL}" />&nbsp;
 	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-- 
cgit v1.2.1


From bd0107a2ab58fe7f25295df28d56869bc3146fa4 Mon Sep 17 00:00:00 2001
From: omniError <omniError@github>
Date: Mon, 17 Nov 2014 16:09:40 -0600
Subject: [ticket/13347] missing acp_forums template events

PHPBB3-13347
---
 phpBB/adm/style/acp_forums.html | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index af79791ff8..68bc0020ec 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -111,6 +111,7 @@
 
 	<fieldset>
 		<legend>{L_FORUM_SETTINGS}</legend>
+    <!-- EVENT acp_forums_main_settings_prepend -->
 	<dl>
 		<dt><label for="forum_type">{L_FORUM_TYPE}{L_COLON}</label></dt>
 		<dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd>
@@ -182,6 +183,7 @@
 		<dt><label for="forum_style">{L_FORUM_STYLE}{L_COLON}</label></dt>
 		<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>
 	</dl>
+    <!-- EVENT acp_forums_main_settings_append -->
 	</fieldset>
 
 	<div id="forum_cat_options">
@@ -198,6 +200,7 @@
 	<div id="forum_post_options">
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
+        <!-- EVENT acp_forums_normal_settings_prepend -->
 		<dl>
 			<dt><label for="forum_status">{L_FORUM_STATUS}{L_COLON}</label></dt>
 			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
@@ -246,6 +249,7 @@
 
 		<fieldset>
 			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
+        <!-- EVENT acp_forums_prune_settings_prepend -->
 		<dl>
 			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}{L_COLON}</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
@@ -291,6 +295,7 @@
 			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt>
 			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
+        <!-- EVENT acp_forums_prune_settings_append -->
 		</fieldset>
 	</div>
 
@@ -317,6 +322,7 @@
 	<div id="forum_rules_options">
 		<fieldset>
 			<legend>{L_FORUM_RULES}</legend>
+        <!-- EVENT acp_forums_rules_settings_prepend -->
 		<dl>
 			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}{L_COLON}</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
 			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
@@ -334,6 +340,7 @@
 				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
 				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
 		</dl>
+        <!-- EVENT acp_forums_rules_settings_append -->
 		</fieldset>
 	</div>
 
-- 
cgit v1.2.1


From 115bf6353866a667bf941b825c5ef90abc68ec0d Mon Sep 17 00:00:00 2001
From: omniError <omniError@github>
Date: Mon, 17 Nov 2014 16:14:57 -0600
Subject: [ticket/13347] fix CS

PHPBB3-13347
---
 phpBB/adm/style/acp_forums.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 68bc0020ec..756092a1f0 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -111,7 +111,7 @@
 
 	<fieldset>
 		<legend>{L_FORUM_SETTINGS}</legend>
-    <!-- EVENT acp_forums_main_settings_prepend -->
+	<!-- EVENT acp_forums_main_settings_prepend -->
 	<dl>
 		<dt><label for="forum_type">{L_FORUM_TYPE}{L_COLON}</label></dt>
 		<dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd>
@@ -183,7 +183,7 @@
 		<dt><label for="forum_style">{L_FORUM_STYLE}{L_COLON}</label></dt>
 		<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>
 	</dl>
-    <!-- EVENT acp_forums_main_settings_append -->
+	<!-- EVENT acp_forums_main_settings_append -->
 	</fieldset>
 
 	<div id="forum_cat_options">
@@ -200,7 +200,7 @@
 	<div id="forum_post_options">
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
-        <!-- EVENT acp_forums_normal_settings_prepend -->
+		<!-- EVENT acp_forums_normal_settings_prepend -->
 		<dl>
 			<dt><label for="forum_status">{L_FORUM_STATUS}{L_COLON}</label></dt>
 			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
@@ -249,7 +249,7 @@
 
 		<fieldset>
 			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
-        <!-- EVENT acp_forums_prune_settings_prepend -->
+		<!-- EVENT acp_forums_prune_settings_prepend -->
 		<dl>
 			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}{L_COLON}</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
@@ -295,7 +295,7 @@
 			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt>
 			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
-        <!-- EVENT acp_forums_prune_settings_append -->
+		<!-- EVENT acp_forums_prune_settings_append -->
 		</fieldset>
 	</div>
 
@@ -322,7 +322,7 @@
 	<div id="forum_rules_options">
 		<fieldset>
 			<legend>{L_FORUM_RULES}</legend>
-        <!-- EVENT acp_forums_rules_settings_prepend -->
+		<!-- EVENT acp_forums_rules_settings_prepend -->
 		<dl>
 			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}{L_COLON}</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
 			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
@@ -340,7 +340,7 @@
 				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
 				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
 		</dl>
-        <!-- EVENT acp_forums_rules_settings_append -->
+		<!-- EVENT acp_forums_rules_settings_append -->
 		</fieldset>
 	</div>
 
-- 
cgit v1.2.1


From bb4b04f89a4e453833ff5478ee1100059458a1f2 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Mon, 24 Nov 2014 20:48:15 +0100
Subject: [ticket/13319] Add missing table tags

PHPBB3-13319
---
 phpBB/adm/style/acp_icons.html | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index 9117052d87..f18dad0ef6 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -7,7 +7,7 @@
 	<script type="text/javascript" defer="defer">
 	// <![CDATA[
 	<!-- IF S_ADD_CODE -->
-	
+
 			var smiley = Array();
 			<!-- BEGIN smile -->
 				smiley['{smile.SMILEY_URL}'] = Array();
@@ -37,10 +37,10 @@
 					}
 				}
 			}
-		
+
 	<!-- ENDIF -->
 
-	
+
 	function toggle_select(icon, display, select)
 	{
 		var disp = document.getElementById('order_disp_' + select);
@@ -101,7 +101,7 @@
 	<tbody>
 	<!-- BEGIN items -->
 		<tr>
-	
+
 		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
 		<td style="vertical-align: top;">[{items.IMG}]</td>
 		<!-- IF S_SMILIES -->
@@ -121,7 +121,7 @@
 				<optgroup id="order_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING}" <!-- IF not items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_DISPLAY}</optgroup>
 				<optgroup id="order_no_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING_NO}" <!-- IF  items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_UNDISPLAY}</optgroup>
 			</select></td>
-		<!-- ENDIF -->	
+		<!-- ENDIF -->
 		<!-- IF S_ADD -->
 			<td><input type="checkbox" class="radio" name="add_img[{items.IMG}]" value="1" /></td>
 		<!-- ENDIF -->
@@ -147,6 +147,8 @@
 	</tr>
 	<!-- ENDIF -->
 	<!-- ELSE -->
+	</thead>
+	<tbody>
 	<tr class="row3">
 		<td colspan="{COLSPAN}">{L_NO_ICONS}</td>
 	</tr>
@@ -174,7 +176,7 @@
 
 	<fieldset>
 		<legend>{L_IMPORT}</legend>
-	
+
 	<!-- IF not S_PAK_OPTIONS -->
 		<p>{L_NO_PAK_OPTIONS}</p>
 
@@ -259,7 +261,7 @@
 	</table>
 	<div class="pagination">
 	<!-- IF .pagination -->
-		<!-- INCLUDE pagination.html -->	
+		<!-- INCLUDE pagination.html -->
 	<!-- ENDIF -->
 	</div>
 	<p class="quick">
-- 
cgit v1.2.1


From 6b87e062929c6a6bb115c99d1851b1d0cd3fa6ee Mon Sep 17 00:00:00 2001
From: Richard McGirr <rmcgirr83@gmail.com>
Date: Fri, 6 Mar 2015 07:26:35 -0500
Subject: [ticket/13675] Add validate to acp_profile event and add template
 events

for acp users profile

PHPBB3-13675
---
 phpBB/adm/style/acp_users_profile.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index d32348ff1c..573534fc95 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -2,6 +2,7 @@
 
 	<fieldset>
 		<legend>{L_USER_PROFILE}</legend>
+	<!-- EVENT acp_users_profile_before -->
 	<dl>
 		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
 		<dd><input type="email" id="jabber" name="jabber" value="{JABBER}" /></dd>
@@ -10,6 +11,7 @@
 		<dt><label for="birthday">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
 		<dd>{L_DAY}{L_COLON} <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}{L_COLON} <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}{L_COLON} <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
 	</dl>
+	<!-- EVENT acp_users_profile_after -->
 	</fieldset>
 
 	<!-- IF .profile_fields -->
@@ -26,7 +28,7 @@
 		<!-- END profile_fields -->
 		</fieldset>
 	<!-- ENDIF -->
-
+	<!-- EVENT acp_users_profile_custom_after -->
 	<fieldset class="quick">
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 		{S_FORM_TOKEN}
-- 
cgit v1.2.1


From 7e8274c3458bc8dfce35a34e59a1bae8ab09b39d Mon Sep 17 00:00:00 2001
From: cyberalien <cyberalien@gmail.com>
Date: Sat, 14 Mar 2015 10:00:28 +0200
Subject: [ticket/13702] Add initial-scale to viewport in page header

PHPBB3-13702
---
 phpBB/adm/style/install_header.html      | 2 +-
 phpBB/adm/style/install_update_diff.html | 2 +-
 phpBB/adm/style/overall_header.html      | 2 +-
 phpBB/adm/style/simple_header.html       | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index c818a4fc6d..6f7f129d39 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -2,7 +2,7 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta name="viewport" content="width=device-width" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index 150ef37e0e..5f80084705 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -2,7 +2,7 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta name="viewport" content="width=device-width" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index f1f7eee282..ada88edff2 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -2,7 +2,7 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta name="viewport" content="width=device-width" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index d0b9bf62ed..f62a7a900e 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -2,6 +2,7 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-- 
cgit v1.2.1


From 1ba86eaa8e25a63107fd9c0ab60fa9c2c2e488f8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 30 May 2015 11:54:54 +0200
Subject: [ticket/13799] Correctly urlencode category and show selected avatar

PHPBB3-13799
---
 phpBB/adm/style/acp_avatar_options_local.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 8adafa1d99..bee3c57ea0 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -12,7 +12,7 @@
 	<!-- BEGIN avatar_local_col -->
 		<li>
 			<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br />
-			<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}" /></label>
+			<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}"<!-- IF avatar_local_row.avatar_local_col.CHECKED -->checked="checked"<!-- ENDIF --> /></label>
 		</li>
 	<!-- END avatar_local_col -->
 	<!-- END avatar_local_row -->
-- 
cgit v1.2.1


From 0f6d16920b88ea9aef9391619a64bf9494dd266d Mon Sep 17 00:00:00 2001
From: javiexin <javiexin@gmail.com>
Date: Tue, 2 Jun 2015 13:18:33 +0200
Subject: [ticket/13911] Add events to configure options for profile fields

Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields.

PHPBB3-13911
---
 phpBB/adm/style/acp_profile.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 64bc3df09b..3ce2d9471d 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -79,6 +79,7 @@
 			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
+		<!-- EVENT acp_profile_contact_before -->
 		<dl>
 			<dt><label for="field_is_contact">{L_FIELD_IS_CONTACT}{L_COLON}</label><br /><span>{L_FIELD_IS_CONTACT_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_is_contact" name="field_is_contact" value="1"<!-- IF S_FIELD_CONTACT --> checked="checked"<!-- ENDIF --> /></dd>
-- 
cgit v1.2.1


From eebab029fd2607b815a3ef234e389a9c12e52343 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 4 Jun 2015 17:51:26 +0200
Subject: [ticket/13200] Disable autocomplete for sensitive input fields

PHPBB3-13200
---
 phpBB/adm/style/acp_jabber.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html
index 4d0b1b0d97..9246987f1f 100644
--- a/phpBB/adm/style/acp_jabber.html
+++ b/phpBB/adm/style/acp_jabber.html
@@ -39,7 +39,7 @@
 </dl>
 <dl>
 	<dt><label for="jab_password">{L_JAB_PASSWORD}{L_COLON}</label><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt>
-	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
+	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" autocomplete="off" /></dd>
 </dl>
 <!-- IF S_CAN_USE_SSL -->
 <dl>
-- 
cgit v1.2.1


From a620651ca1fbd9eb42bfbe9e5d093a2a92590548 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 6 Jun 2015 10:30:09 -0700
Subject: [ticket/13818] Add browse CDB links to ext style lang management

PHPBB3-13818
---
 phpBB/adm/style/acp_ext_list.html | 8 +++++++-
 phpBB/adm/style/acp_language.html | 4 ++++
 phpBB/adm/style/acp_styles.html   | 6 +++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index f96da7e26a..f61be27c9b 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -7,7 +7,7 @@
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
 	<fieldset class="quick">
-		<span class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
+		<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.1" target="_blank">{L_BROWSE_EXTENSIONS_DATABASE}</a> &bull; <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
 	</fieldset>
 
 	<form id="version_check_settings" method="post" action="{U_ACTION}" style="display:none">
@@ -97,6 +97,12 @@
 	</table>
 
 	<table class="table1">
+	<tr>
+		<th>{L_EXTENSION_INSTALL_HEADLINE}</th>
+	</tr>
+	<tr>
+		<td class="row3">{L_EXTENSION_INSTALL_EXPLAIN}</td>
+	</tr>
 	<tr>
 		<th>{L_EXTENSION_UPDATE_HEADLINE}</th>
 	</tr>
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index 4439f519e0..f708eb1508 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -68,6 +68,10 @@
 
 	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>
 
+	<fieldset class="quick">
+		<span class="small"><a href="https://www.phpbb.com/go/customise/language-packs/3.1" target="_blank">{L_BROWSE_LANGUAGE_PACKS_DATABASE}</a></span>
+	</fieldset>
+
 	<table class="table1 zebra-table">
 	<thead>
 	<tr>
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 86e666c4ed..92ceaebc08 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -19,7 +19,7 @@
 	{S_HIDDEN_FIELDS}
 
 	<div style="text-align: center;">
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
+		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp;
 		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
 	</div>
 
@@ -32,6 +32,10 @@
 
 <!-- IF L_EXPLAIN --><p>{L_EXPLAIN}</p><!-- ENDIF -->
 
+<fieldset class="quick">
+	<span class="small"><a href="https://www.phpbb.com/go/customise/styles/3.1" target="_blank">{L_BROWSE_STYLES_DATABASE}</a></span>
+</fieldset>
+
 <form id="acp_styles" method="post" action="{U_ACTION}">
 {S_HIDDEN_FIELDS}
 {S_FORM_TOKEN}
-- 
cgit v1.2.1


From 80fee7422cdd448db7b908316c532b8674d81e5d Mon Sep 17 00:00:00 2001
From: javiexin <javiexin@gmail.com>
Date: Tue, 30 Jun 2015 14:35:01 +0200
Subject: [ticket/13934] Add enctype clause for profile fields

Adds a template variable (the same) in all places where profile fields
may need an enctype clause in the corresponding forms.

PHPBB3-13934
---
 phpBB/adm/style/acp_profile.html       | 2 +-
 phpBB/adm/style/acp_users_profile.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 64bc3df09b..df59294985 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -17,7 +17,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<form id="add_profile_field" method="post" action="{U_ACTION}">
+	<form id="add_profile_field" method="post" action="{U_ACTION}"{S_FORM_ENCTYPE}>
 
 	<!-- IF S_STEP_ONE -->
 
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 573534fc95..9296638ff6 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -1,4 +1,4 @@
-	<form id="user_profile" method="post" action="{U_ACTION}">
+	<form id="user_profile" method="post" action="{U_ACTION}"{S_FORM_ENCTYPE}>
 
 	<fieldset>
 		<legend>{L_USER_PROFILE}</legend>
-- 
cgit v1.2.1


From 3a62903fd10cfa0481fab61bbb587cad8ba1c666 Mon Sep 17 00:00:00 2001
From: Zoddo <zoddo.ino@gmail.com>
Date: Wed, 15 Jul 2015 01:25:06 +0200
Subject: [ticket/14013] Add acp_forums_custom_settings event

PHPBB3-14013
---
 phpBB/adm/style/acp_forums.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 756092a1f0..0d8b8ad583 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -343,6 +343,8 @@
 		<!-- EVENT acp_forums_rules_settings_append -->
 		</fieldset>
 	</div>
+	
+	<!-- EVENT acp_forums_custom_settings -->
 
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
-- 
cgit v1.2.1


From d89c95295572f2657b5582dffe048b27af3e72ca Mon Sep 17 00:00:00 2001
From: cyberalien <cyberalien@gmail.com>
Date: Sat, 15 Aug 2015 13:57:48 +0300
Subject: [ticket/14103] Reset text-decoration in abbr element

PHPBB3-14103
---
 phpBB/adm/style/admin.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index b03cb0ba24..396b21e3eb 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -17,6 +17,10 @@
 	font-size: 100%;
 }
 
+abbr {
+	text-decoration: none;
+}
+
 body, div, p, th, td, li, dd {
 	font-size: x-small;
 	voice-family: "\"}\"";
-- 
cgit v1.2.1


From 0f49eaa2e20fe26ff9b0e9b0313aa090583c9f20 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 11 Sep 2015 00:19:58 -0700
Subject: [ticket/14155] Row highlighting for extension/styles management

PHPBB3-14155
---
 phpBB/adm/style/acp_ext_list.html | 4 ++--
 phpBB/adm/style/acp_styles.html   | 2 +-
 phpBB/adm/style/admin.css         | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index f61be27c9b..c179bb4f9e 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -47,7 +47,7 @@
 			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
 		</tr>
 		<!-- BEGIN enabled -->
-		<tr class="ext_enabled">
+		<tr class="ext_enabled row-highlight">
 			<td><strong>{enabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;">
 				<!-- IF enabled.S_VERSIONCHECK -->
@@ -72,7 +72,7 @@
 			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
 		</tr>
 		<!-- BEGIN disabled -->
-		<tr class="ext_disabled">
+		<tr class="ext_disabled row-highlight">
 			<td><strong>{disabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;">
 				<!-- IF disabled.S_VERSIONCHECK -->
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 92ceaebc08..572486e877 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -99,7 +99,7 @@
 	</thead>
 	<!-- BEGIN styles_list -->
 	<tbody id="styles-list-{styles_list.S_ROW_COUNT}">
-	<tr<!-- IF styles_list.STYLE_ID and not styles_list.STYLE_ACTIVE --> class="row-inactive"<!-- ENDIF -->>
+	<tr class="row-highlight<!-- IF styles_list.STYLE_ID and not styles_list.STYLE_ACTIVE --> row-inactive<!-- ENDIF -->">
 		<!-- IF styles_list.LEVEL is odd -->
 			<!-- IF $ROW_CLASS == 'row1a' --><!-- DEFINE $ROW_CLASS = 'row1b' --><!-- ELSE --><!-- DEFINE $ROW_CLASS = 'row1a' --><!-- ENDIF -->
 		<!-- ELSE -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 396b21e3eb..0c00e5339e 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -859,6 +859,8 @@ table.zebra-table tbody tr:nth-child(even) {
 .row2a { background-color: #E7EEF4; }
 .row2b { background-color: #E3EBF2; }
 
+tr.row-highlight:hover td { background-color: #DBDFE2; }
+
 .spacer {
 	background-color: #DBDFE2;
 	height: 1px;
-- 
cgit v1.2.1


From a4a99f5ea3df9465b9209f554c379e5474cb8489 Mon Sep 17 00:00:00 2001
From: Zoddo <zoddo.ino@gmail.com>
Date: Sat, 12 Sep 2015 14:52:31 +0200
Subject: [ticket/14154] Add extension composer name as tooltip

PHPBB3-14154
---
 phpBB/adm/style/acp_ext_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index f61be27c9b..fa261ed289 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -48,7 +48,7 @@
 		</tr>
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled">
-			<td><strong>{enabled.META_DISPLAY_NAME}</strong></td>
+			<td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;">
 				<!-- IF enabled.S_VERSIONCHECK -->
 				<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.META_VERSION}</strong>
@@ -73,7 +73,7 @@
 		</tr>
 		<!-- BEGIN disabled -->
 		<tr class="ext_disabled">
-			<td><strong>{disabled.META_DISPLAY_NAME}</strong></td>
+			<td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;">
 				<!-- IF disabled.S_VERSIONCHECK -->
 				<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.META_VERSION}</strong>
-- 
cgit v1.2.1


From 2f4fcee7e8ac5b4a440f43c691a68a024943e2b7 Mon Sep 17 00:00:00 2001
From: Zoddo <zoddo.ino@gmail.com>
Date: Sat, 12 Sep 2015 17:00:39 +0200
Subject: [ticket/14159] Hide version info on ACP if we don't have the
 permission

This also hide a link to an unreachable module (Check phpBB version).

We could have simply remove the link to the module, but if the user hasn't
the permission to access to the phpBB version check module, I think that
he shouldn't view any version information about phpBB.

PHPBB3-14159
---
 phpBB/adm/style/acp_main.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 065dd7ac4f..6e51e1fc70 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -141,19 +141,24 @@
 		<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
 		<td><strong>{GZIP_COMPRESSION}</strong></td>
 	</tr>
+	<!-- IF S_TOTAL_ORPHAN or S_VERSIONCHECK -->
 	<tr>
+	<!-- IF S_VERSIONCHECK -->
 		<td>{L_BOARD_VERSION}{L_COLON} </td>
 		<td>
 			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
 		</td>
+	<!-- ENDIF -->
 	<!-- IF S_TOTAL_ORPHAN -->
 		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
 		<td><strong>{TOTAL_ORPHAN}</strong></td>
-	<!-- ELSE -->
+	<!-- ENDIF -->
+	<!-- IF not S_TOTAL_ORPHAN or not S_VERSIONCHECK -->
 		<td>&nbsp;</td>
 		<td>&nbsp;</td>
 	<!-- ENDIF -->
 	</tr>
+	<!-- ENDIF -->
 	</tbody>
 	</table>
 
-- 
cgit v1.2.1


From 65997eb577ee6d9ea87f32e9bd87e6f9c775d5d0 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Wed, 23 Sep 2015 11:03:42 +0200
Subject: [ticket/14187] Add acp_styles_list_before event

PHPBB3-14187
---
 phpBB/adm/style/acp_styles.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 92ceaebc08..64123808c6 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -87,6 +87,7 @@
 <!-- ENDIF -->
 
 <!-- IF .styles_list -->
+	<!-- EVENT acp_styles_list_before -->
 	<table class="table1 styles">
 	<thead>
 	<tr>
-- 
cgit v1.2.1


From 098c8e1fe94f77243b03bc2c0b2f8f3a9c4c4ecc Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 26 Sep 2015 22:20:52 +0700
Subject: [ticket/14201] Add template events to acp_permissions.html

PHPBB3-14201
---
 phpBB/adm/style/acp_permissions.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index 6dc9dca2e7..912cf28fd2 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -30,7 +30,7 @@
 			<legend>{L_LOOK_UP_FORUM}</legend>
 			<!-- IF S_FORUM_MULTIPLE --><p>{L_LOOK_UP_FORUMS_EXPLAIN}</p><!-- ENDIF -->
 		<dl>
-			<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
+			<dt><!-- EVENT acp_permissions_select_forum_prepend --><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_permissions_select_forum_append --></dt>
 			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
 			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
 		</dl>
@@ -52,7 +52,7 @@
 				<legend>{L_LOOK_UP_FORUM}</legend>
 				<p>{L_SELECT_FORUM_SUBFORUM_EXPLAIN}</p>
 			<dl>
-				<dt><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
+				<dt><!-- EVENT acp_permissions_select_multiple_forum_prepend --><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_permissions_select_multiple_forum_append --></dt>
 				<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>
 			</dl>
 
@@ -95,7 +95,7 @@
 		<fieldset>
 			<legend>{L_LOOK_UP_GROUP}</legend>
 		<dl>
-			<dt><label for="group">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>
+			<dt><!-- EVENT acp_permissions_select_group_prepend --><label for="group">{L_LOOK_UP_GROUP}{L_COLON}</label><!-- EVENT acp_permissions_select_group_append --></dt>
 			<dd><select name="group_id[]" id="group">{S_GROUP_OPTIONS}</select></dd>
 		</dl>
 
@@ -140,7 +140,7 @@
 				<p>{L_USERNAMES_EXPLAIN}</p>
 			<dl>
 				<dd class="full"><textarea id="username" name="usernames" rows="5" cols="5" style="width: 100%; height: 60px;"></textarea></dd>
-				<dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+				<dd class="full" style="text-align: left;"><!-- EVENT acp_permissions_find_username_prepend --><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><!-- EVENT acp_permissions_find_username_append --><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
 			</dl>
 			</fieldset>
 
@@ -183,7 +183,7 @@
 			<fieldset>
 				<legend>{L_ADD_GROUPS}</legend>
 			<dl>
-				<dd class="full"><select name="group_id[]" style="width: 100%; height: 107px;" multiple="multiple">{S_ADD_GROUP_OPTIONS}</select></dd>
+				<dd class="full"><!-- EVENT acp_permissions_add_group_options_prepend --><select name="group_id[]" style="width: 100%; height: 107px;" multiple="multiple">{S_ADD_GROUP_OPTIONS}</select><!-- EVENT acp_permissions_add_group_options_append --></dd>
 			</dl>
 			</fieldset>
 
@@ -267,7 +267,9 @@
 				<legend>{L_LOOK_UP_GROUP}</legend>
 			<dl>
 				<dt><label for="group_select">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>
+				<!-- EVENT acp_permissions_select_group_before -->
 				<dd><select name="group_id[]" id="group_select">{S_ADD_GROUP_OPTIONS}</select></dd>
+				<!-- EVENT acp_permissions_select_group_after -->
 				<dd>&nbsp;</dd>
 			</dl>
 			</fieldset>
-- 
cgit v1.2.1


From 3672df0bc2bca8f23cd7cf591be24cd61e05c0c3 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 26 Sep 2015 22:36:38 +0700
Subject: [ticket/14201] Add events to acp_users.html,
 permission_forum_copy.html

PHPBB3-14201
---
 phpBB/adm/style/acp_users.html             | 2 ++
 phpBB/adm/style/permission_forum_copy.html | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index 25064c6f3a..d51b21c87d 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -146,7 +146,9 @@
 
 	<!-- IF S_GROUP_OPTIONS -->
 		<fieldset class="quick">
+			<!-- EVENT acp_users_select_group_before-->
 			{L_USER_GROUP_ADD}{L_COLON} <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+			<!-- EVENT acp_users_select_group_after-->
 			{S_FORM_TOKEN}
 		</fieldset>
 	<!-- ENDIF -->
diff --git a/phpBB/adm/style/permission_forum_copy.html b/phpBB/adm/style/permission_forum_copy.html
index 1e012a9347..b1539aff12 100644
--- a/phpBB/adm/style/permission_forum_copy.html
+++ b/phpBB/adm/style/permission_forum_copy.html
@@ -12,7 +12,7 @@
 		<legend>{L_LOOK_UP_FORUM}</legend>
 
 		<dl>
-			<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
+			<dt><!-- EVENT acp_permission_forum_copy_src_forum_prepend --><label for="src_forum">{L_COPY_PERMISSIONS_FROM}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span><!-- EVENT acp_permission_forum_copy_src_forum_append --></dt>
 			<dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>
 		</dl>
 	</fieldset>
@@ -22,7 +22,7 @@
 		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
 
 		<dl>
-			<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
+			<dt><!-- EVENT acp_permission_forum_copy_dest_forum_prepend --><label for="dest_forums">{L_COPY_PERMISSIONS_TO}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span><!-- EVENT acp_permission_forum_copy_dest_forum_append --></dt>
 			<dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
 		</dl>
 	</fieldset>
-- 
cgit v1.2.1


From 2642cfe298b5d867e7f0b1936c09dca72c8eb94a Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 26 Sep 2015 23:58:59 +0700
Subject: [ticket/14201] Add more template events to ACP

PHPBB3-14201
---
 phpBB/adm/style/acp_ban.html             | 2 +-
 phpBB/adm/style/acp_email.html           | 4 +++-
 phpBB/adm/style/acp_forums.html          | 2 +-
 phpBB/adm/style/acp_groups.html          | 4 +++-
 phpBB/adm/style/acp_groups_position.html | 4 ++++
 phpBB/adm/style/acp_logs.html            | 2 +-
 phpBB/adm/style/acp_prune_forums.html    | 2 +-
 phpBB/adm/style/acp_prune_users.html     | 2 +-
 8 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
index 9e9f05120a..5e57bdd87d 100644
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -52,7 +52,7 @@
 	<legend>{L_TITLE}</legend>
 <dl>
 	<dt><label for="ban">{L_BAN_CELL}{L_COLON}</label></dt>
-	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
+	<dd><!-- EVENT acp_ban_cell_textarea_prepend--><textarea name="ban" cols="40" rows="3" id="ban"></textarea><!-- EVENT acp_ban_cell_textarea_append--></dd>
 	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
 </dl>
 <dl>
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html
index 63acd7fcc1..6979d5957b 100644
--- a/phpBB/adm/style/acp_email.html
+++ b/phpBB/adm/style/acp_email.html
@@ -19,12 +19,14 @@
 	<legend>{L_COMPOSE}</legend>
 <dl>
 	<dt><label for="group">{L_SEND_TO_GROUP}{L_COLON}</label></dt>
+	<!-- EVENT acp_email_group_options_prepend-->
 	<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
+	<!-- EVENT acp_email_group_options_append-->
 </dl>
 <dl>
 	<dt><label for="usernames">{L_SEND_TO_USERS}{L_COLON}</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
 	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
-	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	<dd><!-- EVENT acp_email_find_username_prepend-->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_email_find_username_append--></dd>
 </dl>
 <dl>
 	<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 0d8b8ad583..c72c93d7af 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -498,7 +498,7 @@
 	<fieldset class="quick">
 		{L_SELECT_FORUM}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
 
-		<input class="button2" type="submit" value="{L_GO}" />
+		<!-- EVENT acp_forums_quick_select_button_prepend--><input class="button2" type="submit" value="{L_GO}" /><!-- EVENT acp_forums_quick_select_button_append-->
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index d24d62497d..23f6e744c0 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -236,7 +236,7 @@
 	<dl>
 		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+		<dd><!-- EVENT acp_groups_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_groups_find_username_append --></dd>
 	</dl>
 
 	<p class="quick">
@@ -265,6 +265,7 @@
 
 	<form id="acp_groups" method="post" action="{U_ACTION}">
 
+	<!-- EVENT acp_groups_manage_before -->
 	<table class="table1">
 		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
@@ -285,6 +286,7 @@
 		<!-- ENDIF -->
 	</tbody>
 	</table>
+	<!-- EVENT acp_groups_manage_after -->
 
 	<fieldset class="quick">
 		<!-- IF S_GROUP_ADD -->
diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index c01f7aeb03..6a2abe6ac2 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -65,8 +65,10 @@
 					<option<!-- IF add_legend.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_legend.GROUP_ID}">{add_legend.GROUP_NAME}</option>
 				<!-- END add_legend -->
 			</select>
+			<!-- EVENT acp_groups_position_legend_add_button_before-->
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
 			<input type="hidden" name="action" value="add" />
+			<!-- EVENT acp_groups_position_legend_add_button_after-->
 			{S_FORM_TOKEN}
 		</fieldset>
 	</form>
@@ -162,8 +164,10 @@
 					<option<!-- IF add_teampage.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_teampage.GROUP_ID}">{add_teampage.GROUP_NAME}</option>
 				<!-- END add_teampage -->
 			</select>
+			<!-- EVENT acp_groups_position_teampage_add_button_before-->
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
 			<input type="hidden" name="action" value="add" />
+			<!-- EVENT acp_groups_position_teampage_add_button_after-->
 			{S_FORM_TOKEN}
 		</fieldset>
 	</form>
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index 76ea801de0..58618e4065 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -73,7 +73,7 @@
 <!-- IF S_SHOW_FORUMS -->
 	<fieldset class="quick">
 		{L_SELECT_FORUM}{L_COLON} <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
-		<input class="button2" type="submit" value="{L_GO}" />
+		<!-- EVENT acp_logs_quick_select_forum_button_prepend--><input class="button2" type="submit" value="{L_GO}" /><!-- EVENT acp_logs_quick_select_forum_button_append-->
 	</fieldset>
 <!-- ENDIF -->
 
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html
index 4d748f1cce..1a9c99202a 100644
--- a/phpBB/adm/style/acp_prune_forums.html
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -43,7 +43,7 @@
 		<legend>{L_SELECT_FORUM}</legend>
 		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
 	<dl>
-		<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
+		<dt><!-- EVENT acp_prune_forums_prepend--><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_prune_forums_append--></dt>
 		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
 		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>
 	</dl>
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index b8c271355b..03f95f9a89 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -50,7 +50,7 @@
 <dl>
 	<dt><label for="users">{L_ACP_PRUNE_USERS}{L_COLON}</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
 	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
-	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	<dd><!-- EVENT acp_prune_users_find_username_prepend-->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_prune_users_find_username_append--></dd>
 </dl>
 </fieldset>
 
-- 
cgit v1.2.1


From 4830b3eacd13a37c2f61caf7431517d53902659e Mon Sep 17 00:00:00 2001
From: Richard McGirr <rmcgirr83@gmail.com>
Date: Thu, 8 Oct 2015 05:58:06 -0400
Subject: [ticket/14219] Add email to inactive user listing

in ACP.  May help in spotting spam accounts quickly

PHPBB3-14219
---
 phpBB/adm/style/acp_inactive.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index 409ea46de5..2aa3051f53 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -18,6 +18,7 @@
 <thead>
 <tr>
 	<th>{L_USERNAME}</th>
+	<th>{L_EMAIL}</th>
 	<th>{L_JOINED}</th>
 	<th>{L_INACTIVE_DATE}</th>
 	<th>{L_LAST_VISIT}</th>
@@ -32,6 +33,7 @@
 			{inactive.USERNAME_FULL}
 			<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
 		</td>
+		<td style="vertical-align: top;">{inactive.USER_EMAIL}</td>
 		<td style="vertical-align: top;">{inactive.JOINED}</td>
 		<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
 		<td style="vertical-align: top;">{inactive.LAST_VISIT}</td>
-- 
cgit v1.2.1


From 1260f92813776f3c5035ed82aaeca518e41abce4 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 27 Sep 2015 01:01:56 +0700
Subject: [ticket/14201] Add events.md descriptions, fix accidentally swapped
 events

PHPBB3-14201
---
 phpBB/adm/style/acp_ban.html             | 2 +-
 phpBB/adm/style/acp_email.html           | 6 +++---
 phpBB/adm/style/acp_forums.html          | 2 +-
 phpBB/adm/style/acp_groups_position.html | 8 ++++----
 phpBB/adm/style/acp_logs.html            | 2 +-
 phpBB/adm/style/acp_permissions.html     | 4 ++--
 phpBB/adm/style/acp_prune_forums.html    | 2 +-
 phpBB/adm/style/acp_prune_users.html     | 2 +-
 phpBB/adm/style/acp_users.html           | 4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
index 5e57bdd87d..f2249941a5 100644
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -52,7 +52,7 @@
 	<legend>{L_TITLE}</legend>
 <dl>
 	<dt><label for="ban">{L_BAN_CELL}{L_COLON}</label></dt>
-	<dd><!-- EVENT acp_ban_cell_textarea_prepend--><textarea name="ban" cols="40" rows="3" id="ban"></textarea><!-- EVENT acp_ban_cell_textarea_append--></dd>
+	<dd><!-- EVENT acp_ban_cell_prepend --><textarea name="ban" cols="40" rows="3" id="ban"></textarea><!-- EVENT acp_ban_cell_append --></dd>
 	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
 </dl>
 <dl>
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html
index 6979d5957b..e14c56ab47 100644
--- a/phpBB/adm/style/acp_email.html
+++ b/phpBB/adm/style/acp_email.html
@@ -19,14 +19,14 @@
 	<legend>{L_COMPOSE}</legend>
 <dl>
 	<dt><label for="group">{L_SEND_TO_GROUP}{L_COLON}</label></dt>
-	<!-- EVENT acp_email_group_options_prepend-->
+	<!-- EVENT acp_email_group_options_prepend -->
 	<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
-	<!-- EVENT acp_email_group_options_append-->
+	<!-- EVENT acp_email_group_options_append -->
 </dl>
 <dl>
 	<dt><label for="usernames">{L_SEND_TO_USERS}{L_COLON}</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
 	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
-	<dd><!-- EVENT acp_email_find_username_prepend-->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_email_find_username_append--></dd>
+	<dd><!-- EVENT acp_email_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_email_find_username_append --></dd>
 </dl>
 <dl>
 	<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index c72c93d7af..dcad90d7bc 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -498,7 +498,7 @@
 	<fieldset class="quick">
 		{L_SELECT_FORUM}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
 
-		<!-- EVENT acp_forums_quick_select_button_prepend--><input class="button2" type="submit" value="{L_GO}" /><!-- EVENT acp_forums_quick_select_button_append-->
+		<!-- EVENT acp_forums_quick_select_button_prepend --><input class="button2" type="submit" value="{L_GO}" /><!-- EVENT acp_forums_quick_select_button_append -->
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 6a2abe6ac2..20ed9521f0 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -65,10 +65,10 @@
 					<option<!-- IF add_legend.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_legend.GROUP_ID}">{add_legend.GROUP_NAME}</option>
 				<!-- END add_legend -->
 			</select>
-			<!-- EVENT acp_groups_position_legend_add_button_before-->
+			<!-- EVENT acp_groups_position_legend_add_button_before -->
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
 			<input type="hidden" name="action" value="add" />
-			<!-- EVENT acp_groups_position_legend_add_button_after-->
+			<!-- EVENT acp_groups_position_legend_add_button_after -->
 			{S_FORM_TOKEN}
 		</fieldset>
 	</form>
@@ -164,10 +164,10 @@
 					<option<!-- IF add_teampage.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_teampage.GROUP_ID}">{add_teampage.GROUP_NAME}</option>
 				<!-- END add_teampage -->
 			</select>
-			<!-- EVENT acp_groups_position_teampage_add_button_before-->
+			<!-- EVENT acp_groups_position_teampage_add_button_before -->
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
 			<input type="hidden" name="action" value="add" />
-			<!-- EVENT acp_groups_position_teampage_add_button_after-->
+			<!-- EVENT acp_groups_position_teampage_add_button_after -->
 			{S_FORM_TOKEN}
 		</fieldset>
 	</form>
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index 58618e4065..cb15a8f51d 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -73,7 +73,7 @@
 <!-- IF S_SHOW_FORUMS -->
 	<fieldset class="quick">
 		{L_SELECT_FORUM}{L_COLON} <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
-		<!-- EVENT acp_logs_quick_select_forum_button_prepend--><input class="button2" type="submit" value="{L_GO}" /><!-- EVENT acp_logs_quick_select_forum_button_append-->
+		<!-- EVENT acp_logs_quick_select_forum_button_prepend --><input class="button2" type="submit" value="{L_GO}" /><!-- EVENT acp_logs_quick_select_forum_button_append -->
 	</fieldset>
 <!-- ENDIF -->
 
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index 912cf28fd2..a4d33ed78b 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -30,7 +30,7 @@
 			<legend>{L_LOOK_UP_FORUM}</legend>
 			<!-- IF S_FORUM_MULTIPLE --><p>{L_LOOK_UP_FORUMS_EXPLAIN}</p><!-- ENDIF -->
 		<dl>
-			<dt><!-- EVENT acp_permissions_select_forum_prepend --><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_permissions_select_forum_append --></dt>
+			<dt><!-- EVENT acp_permissions_select_multiple_forum_prepend --><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_permissions_select_multiple_forum_append --></dt>
 			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
 			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
 		</dl>
@@ -52,7 +52,7 @@
 				<legend>{L_LOOK_UP_FORUM}</legend>
 				<p>{L_SELECT_FORUM_SUBFORUM_EXPLAIN}</p>
 			<dl>
-				<dt><!-- EVENT acp_permissions_select_multiple_forum_prepend --><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_permissions_select_multiple_forum_append --></dt>
+				<dt><!-- EVENT acp_permissions_select_forum_prepend --><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_permissions_select_forum_append --></dt>
 				<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>
 			</dl>
 
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html
index 1a9c99202a..b8c681ea00 100644
--- a/phpBB/adm/style/acp_prune_forums.html
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -43,7 +43,7 @@
 		<legend>{L_SELECT_FORUM}</legend>
 		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
 	<dl>
-		<dt><!-- EVENT acp_prune_forums_prepend--><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_prune_forums_append--></dt>
+		<dt><!-- EVENT acp_prune_forums_prepend --><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_prune_forums_append --></dt>
 		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
 		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>
 	</dl>
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index 03f95f9a89..6e8b2e4214 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -50,7 +50,7 @@
 <dl>
 	<dt><label for="users">{L_ACP_PRUNE_USERS}{L_COLON}</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
 	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
-	<dd><!-- EVENT acp_prune_users_find_username_prepend-->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_prune_users_find_username_append--></dd>
+	<dd><!-- EVENT acp_prune_users_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_prune_users_find_username_append --></dd>
 </dl>
 </fieldset>
 
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index d51b21c87d..18c3d84f96 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -146,9 +146,9 @@
 
 	<!-- IF S_GROUP_OPTIONS -->
 		<fieldset class="quick">
-			<!-- EVENT acp_users_select_group_before-->
+			<!-- EVENT acp_users_select_group_before -->
 			{L_USER_GROUP_ADD}{L_COLON} <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-			<!-- EVENT acp_users_select_group_after-->
+			<!-- EVENT acp_users_select_group_after -->
 			{S_FORM_TOKEN}
 		</fieldset>
 	<!-- ENDIF -->
-- 
cgit v1.2.1


From 5d8e9004837426bf72f67ed35b55344d4d47624a Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 14 Oct 2015 01:54:22 -0700
Subject: [ticket/11971] Validate "Spambot countermeasures" settings before
 saving.

PHPBB3-11971
---
 phpBB/adm/style/acp_captcha.html | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index f4866653c3..0efbbac51e 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -8,6 +8,13 @@
 
 <p>{L_ACP_VC_EXT_GET_MORE}</p>
 
+<!-- IF ERROR_MSG -->
+<div class="errorbox">
+	<h3>{L_WARNING}</h3>
+	<p>{ERROR_MSG}</p>
+</div>
+<!-- ENDIF -->
+
 <form id="acp_captcha" method="post" action="{U_ACTION}">
 
 <fieldset>
-- 
cgit v1.2.1


From aca6e64669079abc385f3094d8b6c186d9b46082 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 6 Nov 2015 10:20:05 +0100
Subject: [ticket/14272] Only use maxlength and size for allowed input elements

PHPBB3-14272
---
 phpBB/adm/style/acp_attachments.html             |  4 ++--
 phpBB/adm/style/acp_avatar_options_gravatar.html |  4 ++--
 phpBB/adm/style/acp_avatar_options_remote.html   |  4 ++--
 phpBB/adm/style/acp_captcha.html                 |  4 ++--
 phpBB/adm/style/acp_forums.html                  | 12 ++++++------
 phpBB/adm/style/acp_groups.html                  |  4 ++--
 phpBB/adm/style/acp_icons.html                   |  8 ++++----
 phpBB/adm/style/acp_inactive.html                |  2 +-
 phpBB/adm/style/acp_jabber.html                  |  4 ++--
 phpBB/adm/style/acp_ranks.html                   |  2 +-
 phpBB/adm/style/acp_search.html                  | 10 +++++-----
 11 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index da8a0096ea..d048191864 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -196,7 +196,7 @@
 		</dl>
 		<dl>
 			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt>
-			<dd><input type="number" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
+			<dd><input type="number" id="extgroup_filesize" min="0" max="999999999999999" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
 		</dl>
 		<dl>
 			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}{L_COLON}</label></dt>
@@ -346,7 +346,7 @@
 			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
 			<td>{orphan.FILETIME}</td>
 			<td>{orphan.FILESIZE}</td>
-			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" maxlength="10" value="{orphan.POST_ID}" style="width: 75%;" /></td>
+			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" min="0" max="9999999999" name="post_id[{orphan.ATTACH_ID}]" value="{orphan.POST_ID}" style="width: 75%;" /></td>
 			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
 			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
 		</tr>
diff --git a/phpBB/adm/style/acp_avatar_options_gravatar.html b/phpBB/adm/style/acp_avatar_options_gravatar.html
index 0c2e8cc984..dbe9891e19 100644
--- a/phpBB/adm/style/acp_avatar_options_gravatar.html
+++ b/phpBB/adm/style/acp_avatar_options_gravatar.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<input type="number" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
-		<input type="number" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+		<input type="number" name="avatar_gravatar_width" id="avatar_gravatar_width" min="0" max="999" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp;
+		<input type="number" name="avatar_gravatar_height" id="avatar_gravatar_height" min="0" max="999" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
index 1c0e3db599..3b514620b4 100644
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<input type="number" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
-		<input type="number" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+		<input type="number" name="avatar_remote_width" id="avatar_remote_width" min="0" max="999" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp;
+		<input type="number" name="avatar_remote_height" id="avatar_remote_height" min="0" max="999" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index f4866653c3..9c1f25fa03 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -20,11 +20,11 @@
 </dl>
 <dl>
 	<dt><label for="max_reg_attempts">{L_REG_LIMIT}{L_COLON}</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
-	<dd><input id="max_reg_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
+	<dd><input id="max_reg_attempts" type="number" min="0" max="9999" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
 </dl>
 <dl>
 	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}{L_COLON}</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>
-	<dd><input id="max_login_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
+	<dd><input id="max_login_attempts" type="number" min="0" max="9999" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
 </dl>
 <dl>
 	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 0d8b8ad583..bba66c14d2 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -242,7 +242,7 @@
 		</dl>
 		<dl>
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
-			<dd><input type="number" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" min="0" max="9999" /></dd>
+			<dd><input type="number" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" min="0" max="9999" /></dd>
 		</dl>
 		<!-- EVENT acp_forums_normal_settings_append -->
 		</fieldset>
@@ -257,15 +257,15 @@
 		</dl>
 		<dl>
 			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
@@ -289,11 +289,11 @@
 		</dl>
 		<dl>
 			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_SHADOW_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_SHADOW_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_SHADOW_FREQ}" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<!-- EVENT acp_forums_prune_settings_append -->
 		</fieldset>
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index d24d62497d..e062dbe005 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -86,11 +86,11 @@
 		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
 	<dl>
 		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}{L_COLON}</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
-		<dd><input name="group_message_limit" type="number" id="group_message_limit" maxlength="4" size="4" min="0" max="9999" value="{GROUP_MESSAGE_LIMIT}" /></dd>
+		<dd><input name="group_message_limit" type="number" id="group_message_limit" min="0" max="9999" value="{GROUP_MESSAGE_LIMIT}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}{L_COLON}</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
-		<dd><input name="group_max_recipients" type="number" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
+		<dd><input name="group_max_recipients" type="number" id="group_max_recipients" min="0" max="9999" value="{GROUP_MAX_RECIPIENTS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index f18dad0ef6..e0d2840bb5 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -108,8 +108,8 @@
 			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
 			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
 		<!-- ENDIF -->
-		<td><input class="text post" type="number" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
-		<td><input class="text post" type="number" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
+		<td><input class="text post" type="number" min="0" max="999" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
+		<td><input class="text post" type="number" min="0" max="999" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
 		<td>
 			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>
 			<!-- IF items.S_ID -->
@@ -136,8 +136,8 @@
 		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>
 		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>
 		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td>
-		<td><input class="text post" type="number" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
-		<td><input class="text post" type="number" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
+		<td><input class="text post" type="number" min="0" max="999" name="add_width" id="add_width" value="{WIDTH}" /></td>
+		<td><input class="text post" type="number" min="0" max="999" name="add_height" id="add_height" value="{HEIGHT}" /></td>
 		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>
  		<td><select id="order_add_order" name="add_order">
 				<optgroup id="order_disp_add_order" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index 2aa3051f53..2e17bea47d 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -52,7 +52,7 @@
 </table>
 
 <fieldset class="display-options">
-	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;{L_USERS_PER_PAGE}{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
+	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;{L_USERS_PER_PAGE}{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" min="0" max="999" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
 	<input class="button2" type="submit" value="{L_GO}" name="sort" />
 </fieldset>
 
diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html
index 9246987f1f..3c3b895624 100644
--- a/phpBB/adm/style/acp_jabber.html
+++ b/phpBB/adm/style/acp_jabber.html
@@ -31,7 +31,7 @@
 </dl>
 <dl>
 	<dt><label for="jab_port">{L_JAB_PORT}{L_COLON}</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
+	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" min="0" max="99999" /></dd>
 </dl>
 <dl>
 	<dt><label for="jab_username">{L_JAB_USERNAME}{L_COLON}</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
@@ -50,7 +50,7 @@
 <!-- ENDIF -->
 <dl>
 	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}{L_COLON}</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" min="0" max="99999" /></dd>
+	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" min="0" max="99999" /></dd>
 </dl>
 
 </fieldset>
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index fa06513b98..e67c9acd80 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -44,7 +44,7 @@
 	<div id="posts"<!-- IF S_SPECIAL_RANK --> style="display: none;"<!-- ENDIF -->>
 	<dl>
 		<dt><label for="min_posts">{L_RANK_MINIMUM}{L_COLON}</label></dt>
-		<dd><input name="min_posts" type="number" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
+		<dd><input name="min_posts" type="number" id="min_posts" min="0" max="9999999999" value="{MIN_POSTS}" /></dd>
 	</dl>
 	</div>
 
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index 1cde52acf3..0736d22fe7 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -18,11 +18,11 @@
 	</dl>
 	<dl>
 		<dt><label for="search_interval">{L_SEARCH_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
+		<dd><input id="search_interval" type="number" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
 		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_anonymous_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
+		<dd><input id="search_anonymous_interval" type="number" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
 		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}{L_COLON}</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
@@ -30,15 +30,15 @@
 	</dl>
 	<dl>
 		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
-		<dd><input id="min_search_author_chars" type="number" size="4" maxlength="4" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
+		<dd><input id="min_search_author_chars" size="4" maxlength="4" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-		<dd><input id="max_num_search_keywords" type="number" size="4" maxlength="4" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
+		<dd><input id="max_num_search_keywords" type="number" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}{L_COLON}</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
-		<dd><input id="search_store_results" type="number" size="4" maxlength="6" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
+		<dd><input id="search_store_results" type="number" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
 	</dl>
 	</fieldset>
 
-- 
cgit v1.2.1


From 685449bfe3d470adb6fe14867b3cfb820bcd135a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 6 Nov 2015 10:31:56 +0100
Subject: [ticket/14272] Fix invalid or missing min/max settings

PHPBB3-14272
---
 phpBB/adm/style/acp_search.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index 0736d22fe7..f7ad3c5e89 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -30,7 +30,7 @@
 	</dl>
 	<dl>
 		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
-		<dd><input id="min_search_author_chars" size="4" maxlength="4" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
+		<dd><input id="min_search_author_chars" type="number" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-- 
cgit v1.2.1


From 4a92b85cadf7f0fad62a87f7b7fb001cc1bab132 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 7 Dec 2015 19:57:34 +0100
Subject: [ticket/14346] Do not turn version red if update status is unknown

PHPBB3-14346
---
 phpBB/adm/style/acp_main.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 6e51e1fc70..4af3f1a62c 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -146,7 +146,7 @@
 	<!-- IF S_VERSIONCHECK -->
 		<td>{L_BOARD_VERSION}{L_COLON} </td>
 		<td>
-			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
 		</td>
 	<!-- ENDIF -->
 	<!-- IF S_TOTAL_ORPHAN -->
-- 
cgit v1.2.1


From 1654caf34b9abd072e078173e74fdca31d144878 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 22 Dec 2015 09:29:29 -0800
Subject: [ticket/14374] Update dynamic fallback jquery CDN script tag

PHPBB3-14374
---
 phpBB/adm/style/install_footer.html | 2 +-
 phpBB/adm/style/overall_footer.html | 2 +-
 phpBB/adm/style/simple_footer.html  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index a29fce6c5a..8e7599dc3f 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -12,7 +12,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.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</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 deb38c8691..8745286d64 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -34,7 +34,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.min.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('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</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 c08fd931a0..08ee0a739f 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.min.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('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 
 <!-- EVENT acp_simple_footer_after -->
-- 
cgit v1.2.1


From f3c2c497d8443d7cb77eaaf9c8031db1cb3434d9 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 1 Dec 2015 15:15:43 +0100
Subject: [ticket/14272] Assign min and max values for avatar driver settings

PHPBB3-14272
---
 phpBB/adm/style/acp_avatar_options_gravatar.html | 4 ++--
 phpBB/adm/style/acp_avatar_options_remote.html   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_avatar_options_gravatar.html b/phpBB/adm/style/acp_avatar_options_gravatar.html
index dbe9891e19..d5906ba87d 100644
--- a/phpBB/adm/style/acp_avatar_options_gravatar.html
+++ b/phpBB/adm/style/acp_avatar_options_gravatar.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<input type="number" name="avatar_gravatar_width" id="avatar_gravatar_width" min="0" max="999" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp;
-		<input type="number" name="avatar_gravatar_height" id="avatar_gravatar_height" min="0" max="999" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+		<input type="number" name="avatar_gravatar_width" id="avatar_gravatar_width" min="{AVATAR_MIN_WIDTH}" max="{AVATAR_MAX_WIDTH}" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp;
+		<input type="number" name="avatar_gravatar_height" id="avatar_gravatar_height" min="{AVATAR_MIN_HEIGHT}" max="{AVATAR_MAX_HEIGHT}" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
index 3b514620b4..e64d13686c 100644
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<input type="number" name="avatar_remote_width" id="avatar_remote_width" min="0" max="999" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp;
-		<input type="number" name="avatar_remote_height" id="avatar_remote_height" min="0" max="999" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+		<input type="number" name="avatar_remote_width" id="avatar_remote_width" min="{AVATAR_MIN_WIDTH}" max="{AVATAR_MAX_WIDTH}" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp;
+		<input type="number" name="avatar_remote_height" id="avatar_remote_height" min="{AVATAR_MIN_HEIGHT}" max="{AVATAR_MAX_HEIGHT}" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>
-- 
cgit v1.2.1


From 678ca5dcdc27f2df10c6042ce74d08f4196d5a02 Mon Sep 17 00:00:00 2001
From: Saeed Hubaishan <saeed@hubaishan.com>
Date: Sun, 29 Nov 2015 10:51:19 +0300
Subject: [ticket/13180] Increase dateformat field size

[ticket/13180] Increase dateformat field size

change field size to 64 in these files
add new migration file to update the database schema

PHPBB3-13180
---
 phpBB/adm/style/acp_users_prefs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
index 14715f59e4..61904adc23 100644
--- a/phpBB/adm/style/acp_users_prefs.html
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -52,7 +52,7 @@
 	<dl> 
 		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
 		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
-		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
+		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="64" /></div></dd>
 	</dl>
 	<!-- EVENT acp_users_prefs_personal_append -->
 	</fieldset>
-- 
cgit v1.2.1


From b39b3da5af89d9687ff5e985244695131d36c753 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 3 Feb 2016 22:03:31 +0100
Subject: [ticket/14272] Allow input of floats for filesize

This might be needed while switching the default input from KiB to MiB or
similar changes to settings.

PHPBB3-14272
---
 phpBB/adm/style/acp_attachments.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index d048191864..e1f7f140c9 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -196,7 +196,7 @@
 		</dl>
 		<dl>
 			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt>
-			<dd><input type="number" id="extgroup_filesize" min="0" max="999999999999999" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
+			<dd><input type="number" id="extgroup_filesize" min="0" max="999999999999999" step="any" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
 		</dl>
 		<dl>
 			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}{L_COLON}</label></dt>
-- 
cgit v1.2.1


From 244d171cb035f0229ad2a06d01062ca809a72025 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 24 Mar 2016 16:07:07 +0100
Subject: [ticket/14136] Add back X-UA-Compatible meta tag

This was previously removed without needing to. Adding it back to force
users to not emulate the page for previous versions of IE. The
imagetoolbar http-equiv tag was not restored as IE does not contain that
anymore since IE7. Also, the chome=1 has been removed from the
X-UA-Compatible content as ChromeFrame does not receive any further
updates since 2014 and is potentially broken.

PHPBB3-14136
---
 phpBB/adm/style/install_header.html      | 1 +
 phpBB/adm/style/install_update_diff.html | 1 +
 phpBB/adm/style/overall_header.html      | 1 +
 phpBB/adm/style/simple_header.html       | 1 +
 4 files changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 6f7f129d39..cfafe7917f 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -2,6 +2,7 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index 5f80084705..324dc50d05 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -2,6 +2,7 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index ada88edff2..d399c680ee 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -2,6 +2,7 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index f62a7a900e..9f47b2052b 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -2,6 +2,7 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
-- 
cgit v1.2.1


From 04f320cb011f386d11672547c17965a7bd16ef35 Mon Sep 17 00:00:00 2001
From: Richard McGirr <rmcgirr83@gmail.com>
Date: Tue, 5 Apr 2016 06:57:32 -0400
Subject: [ticket/13716] Check phpBB version against config version

Display a warning in the ACP if the version constant (files)
does not match the phpbb_config version
(often indicating that the database updates hasn't been run)

PHPBB3-13716
---
 phpBB/adm/style/acp_main.html   |  6 +++++-
 phpBB/adm/style/acp_update.html | 23 ++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 4af3f1a62c..efcb25cb68 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -14,7 +14,11 @@
 
 	<p>{L_ADMIN_INTRO}</p>
 
-	<!-- IF S_VERSIONCHECK_FAIL -->
+	<!-- IF S_UPDATE_INCOMPLETE -->
+		<div class="errorbox">
+			<p>{L_UPDATE_INCOMPLETE} <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
+		</div>
+	<!-- ELSEIF S_VERSIONCHECK_FAIL -->
 		<div class="errorbox notice">
 			<p>{L_VERSIONCHECK_FAIL}</p>
 			<p>{VERSIONCHECK_FAIL_REASON}</p>
diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html
index 0cc995959b..68cce6265f 100644
--- a/phpBB/adm/style/acp_update.html
+++ b/phpBB/adm/style/acp_update.html
@@ -6,11 +6,16 @@
 
 <p>{L_VERSION_CHECK_EXPLAIN}</p>
 
+<!-- IF S_UPDATE_INCOMPLETE -->
+	<div class="errorbox">
+		<p>{L_UPDATE_INCOMPLETE} {L_UPDATE_INCOMPLETE_MORE}</p>
+	</div>
+<!-- ENDIF -->
 <!-- IF S_UP_TO_DATE -->
 	<div class="successbox">
 		<p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
 	</div>
-<!-- ELSE -->
+<!-- ELSEIF not S_UPDATE_INCOMPLETE -->
 	<div class="errorbox">
 		<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
 	</div>
@@ -18,10 +23,21 @@
 
 <fieldset>
 	<legend></legend>
+	<!-- IF not S_UPDATE_INCOMPLETE -->
 	<dl>
 		<dt><label>{L_CURRENT_VERSION}</label></dt>
 		<dd><strong>{CURRENT_VERSION}</strong></dd>
 	</dl>
+	<!-- ELSE -->
+	<dl>
+		<dt><label>{L_FILES_VERSION}</label></dt>
+		<dd><strong>{FILES_VERSION}</strong></dd>
+	</dl>
+	<dl>
+		<dt><label>{L_DATABASE_VERSION}</label></dt>
+		<dd><strong>{CURRENT_VERSION}</strong></dd>
+	</dl>
+	<!-- ENDIF -->
 </fieldset>
 
 <!-- BEGIN updates_available -->
@@ -38,6 +54,11 @@
 	</fieldset>
 <!-- END updates_available -->
 
+<!-- IF S_UPDATE_INCOMPLETE -->
+	{INCOMPLETE_INSTRUCTIONS}
+	<br><br>
+<!-- ENDIF -->
+
 <!-- IF not S_UP_TO_DATE -->
 	{UPDATE_INSTRUCTIONS}
 	<br /><br />
-- 
cgit v1.2.1


From 0d7625c534b87b5d27977c2baa5e5ada132f7280 Mon Sep 17 00:00:00 2001
From: Richard McGirr <rmcgirr83@gmail.com>
Date: Mon, 16 May 2016 18:01:55 -0400
Subject: [ticket/13716] Remove extra br tag and correct missing closing a html
 tag

PHPBB3-13716
---
 phpBB/adm/style/acp_update.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html
index 68cce6265f..351a3ba26c 100644
--- a/phpBB/adm/style/acp_update.html
+++ b/phpBB/adm/style/acp_update.html
@@ -56,7 +56,7 @@
 
 <!-- IF S_UPDATE_INCOMPLETE -->
 	{INCOMPLETE_INSTRUCTIONS}
-	<br><br>
+	<br>
 <!-- ENDIF -->
 
 <!-- IF not S_UP_TO_DATE -->
-- 
cgit v1.2.1


From 73073ac8c3f18b48d9c178e150ce00bf4792fbe1 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Sun, 29 May 2016 17:28:33 +0200
Subject: [ticket/14643] Offer latest backup to restore by default

PHPBB3-14643
---
 phpBB/adm/style/acp_database.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html
index bf0c80bcd9..39f06319f9 100644
--- a/phpBB/adm/style/acp_database.html
+++ b/phpBB/adm/style/acp_database.html
@@ -14,7 +14,7 @@
 		<legend>{L_RESTORE_OPTIONS}</legend>
 	<dl>
 		<dt><label for="file">{L_SELECT_FILE}{L_COLON}</label></dt>
-		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
+		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_FIRST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
 	</dl>
 
 	<p class="submit-buttons">
-- 
cgit v1.2.1


From 5503c09cd5301a64da0ad9d40f6a4fa11967e931 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 14 Sep 2016 10:37:27 -0700
Subject: [ticket/14783] Add template event before custom BBCodes in ACP

PHPBB3-14783
---
 phpBB/adm/style/acp_posting_buttons.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_posting_buttons.html b/phpBB/adm/style/acp_posting_buttons.html
index 70b6259689..c3c42f8e82 100644
--- a/phpBB/adm/style/acp_posting_buttons.html
+++ b/phpBB/adm/style/acp_posting_buttons.html
@@ -63,6 +63,7 @@
 		<!-- ENDIF -->
 		<!-- ENDIF -->
 	</select>
+	<!-- EVENT acp_posting_buttons_custom_tags_before -->
 	<!-- BEGIN custom_tags -->
 	<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
 	<!-- END custom_tags -->
-- 
cgit v1.2.1


From 2f6a2581756fc9e6dd992623146ea3336db59d6e Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Wed, 2 Nov 2016 10:03:11 +0100
Subject: [ticket/14848] Add acp_ext_list_disabled/enabled_title_after

PHPBB3-14848
---
 phpBB/adm/style/acp_ext_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 8feb12a423..ccc39ea76d 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -44,7 +44,7 @@
 	<tbody>
 		<!-- IF .enabled -->
 		<tr>
-			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
+			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong><!-- EVENT acp_ext_list_enabled_title_after --></td>
 		</tr>
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled row-highlight">
@@ -69,7 +69,7 @@
 
 		<!-- IF .disabled -->
 		<tr>
-			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
+			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong><!-- EVENT acp_ext_list_disabled_title_after --></td>
 		</tr>
 		<!-- BEGIN disabled -->
 		<tr class="ext_disabled row-highlight">
-- 
cgit v1.2.1


From 6c98e3b12f8b41a471e37a44eb413ce6489a70be Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 26 Nov 2016 09:58:47 +0100
Subject: [ticket/9590] Submit permissions form in chunks when using "Apply
 all"

This will add an AJAX call that will submit the permissions form in chunks
of 5 fieldsets when clicking on "Apply all permissions".

PHPBB3-9590
---
 phpBB/adm/style/ajax.js | 78 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 4ad6b6afa5..42dcbe6de8 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -62,7 +62,77 @@ phpbb.addAjaxCallback('row_delete', function(res) {
 	}
 });
 
+/**
+ * Handler for submitting permissions form in chunks
+ * This call will submit permissions forms in chunks of 5 fieldsets.
+ */
+function submitPermissions() {
+	var $form = $('form#set-permissions'),
+		fieldsetList = $form.find('fieldset[id^=perm]'),
+		formDataSets = [],
+		$submitAllButton = $form.find('input[type=submit][name^=action]')[0];
+
+	$.each(fieldsetList, function (key, value) {
+		if (key % 5 === 0) {
+			formDataSets[Math.floor(key / 5)] = $form.find('fieldset#' + value.id + ' input').serialize();
+		} else {
+			formDataSets[Math.floor(key / 5)] += '&' + $form.find('fieldset#' + value.id + ' input').serialize();
+		}
+	});
+
+	// Set proper start values for handling refresh of page
+	var permissionSubmitSize = formDataSets.length,
+		permissionRequestCount = 0,
+		permissionSubmitFailed = false;
+
+	/**
+	 * Handler for submitted permissions form chunk
+	 *
+	 * @param {object} res Object returned by AJAX call
+	 */
+	function handlePermissionReturn(res) {
+		permissionRequestCount++;
+		var $dark = $('#darkenwrapper');
+
+		if (res.S_USER_WARNING) {
+			phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
+			permissionSubmitFailed = true;
+		} else if (!permissionSubmitFailed && res.S_USER_NOTICE) {
+			if (permissionRequestCount >= permissionSubmitSize) {
+				var $alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
+				// Do not allow closing alert
+				$dark.off('click');
+				$alert.find('.alert_close').hide();
+
+				if (typeof res.REFRESH_DATA !== 'undefined') {
+					setTimeout(function () {
+						window.location = res.REFRESH_DATA.url;
+
+						// Hide the alert even if we refresh the page, in case the user
+						// presses the back button.
+						$dark.fadeOut(phpbb.alertTime, function () {
+							if (typeof $alert !== 'undefined') {
+								$alert.hide();
+							}
+						});
+					}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds
+				}
+			}
+		}
+	}
 
+	$.each(formDataSets, function (key, formData) {
+		$.ajax({
+			url: $form.action,
+			type: 'POST',
+			data: formData + '&' + $submitAllButton.name + '=' + encodeURIComponent($submitAllButton.value) +
+				'&creation_time=' + $form.find('input[type=hidden][name=creation_time]')[0].value +
+				'&form_token=' + $form.find('input[type=hidden][name=form_token]')[0].value,
+			success: handlePermissionReturn,
+			error: handlePermissionReturn
+		});
+	});
+}
 
 $('[data-ajax]').each(function() {
 	var $this = $(this),
@@ -83,6 +153,14 @@ $('[data-ajax]').each(function() {
 */
 $(function() {
 	phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), {minHeight: 75});
+
+	var $setPermissionsForm = $('form#set-permissions');
+	if ($setPermissionsForm.length) {
+		$setPermissionsForm.on('submit', function (e) {
+			submitPermissions();
+			e.preventDefault();
+		});
+	}
 });
 
 
-- 
cgit v1.2.1


From ff76a3e433700687cb1937cfe97263a94cd539d4 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 26 Nov 2016 12:31:22 +0100
Subject: [ticket/9590] Correctly set roles and refresh page using POST

PHPBB3-9590
---
 phpBB/adm/style/ajax.js | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 42dcbe6de8..21cc22c6c6 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -74,15 +74,16 @@ function submitPermissions() {
 
 	$.each(fieldsetList, function (key, value) {
 		if (key % 5 === 0) {
-			formDataSets[Math.floor(key / 5)] = $form.find('fieldset#' + value.id + ' input').serialize();
+			formDataSets[Math.floor(key / 5)] = $form.find('fieldset#' + value.id).serialize();
 		} else {
-			formDataSets[Math.floor(key / 5)] += '&' + $form.find('fieldset#' + value.id + ' input').serialize();
+			formDataSets[Math.floor(key / 5)] += '&' + $form.find('fieldset#' + value.id).serialize();
 		}
 	});
 
 	// Set proper start values for handling refresh of page
 	var permissionSubmitSize = formDataSets.length,
 		permissionRequestCount = 0,
+		forumIds = [],
 		permissionSubmitFailed = false;
 
 	/**
@@ -98,6 +99,19 @@ function submitPermissions() {
 			phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
 			permissionSubmitFailed = true;
 		} else if (!permissionSubmitFailed && res.S_USER_NOTICE) {
+			// Fill list of selected forums
+			if (typeof res.REFRESH_DATA !== 'undefined') {
+				$.each(res.REFRESH_DATA.url.split('&'), function (key, value){
+					var forumIdMatch = value.match(/^forum_id\[\]=([0-9]+)$/);
+					if (forumIdMatch !== null) {
+						forumIds.push(forumIdMatch[1]);
+						// Remove added forum IDs from refresh URL
+						res.REFRESH_DATA.url = res.REFRESH_DATA.url.replace('&' + forumIdMatch[0], '');
+					}
+				});
+			}
+
+			// Display success message at the end of submitting the form
 			if (permissionRequestCount >= permissionSubmitSize) {
 				var $alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
 				// Do not allow closing alert
@@ -106,7 +120,15 @@ function submitPermissions() {
 
 				if (typeof res.REFRESH_DATA !== 'undefined') {
 					setTimeout(function () {
-						window.location = res.REFRESH_DATA.url;
+						// Create forum to submit using POST. This will prevent
+						// exceeding the maximum length of URLs
+						var form = '<form action="' + res.REFRESH_DATA.url + '" method="post">';
+						$.each(forumIds, function (key, value) {
+							form += '<input type="text" name="forum_id[]" value="' + value + '" />';
+						});
+						form += '</form>';
+						$form = $(form);
+						$('body').append($form);
 
 						// Hide the alert even if we refresh the page, in case the user
 						// presses the back button.
@@ -115,12 +137,16 @@ function submitPermissions() {
 								$alert.hide();
 							}
 						});
+
+						// Submit form
+						$form.submit();
 					}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds
 				}
 			}
 		}
 	}
 
+	// Create AJAX request for each form data set
 	$.each(formDataSets, function (key, formData) {
 		$.ajax({
 			url: $form.action,
-- 
cgit v1.2.1


From 30b3fbb2cf4fba62ab4deb3cbcb5875e26af8cf4 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 26 Nov 2016 13:27:24 +0100
Subject: [ticket/9590] Support ajax submit of permissions for specific forums

PHPBB3-9590
---
 phpBB/adm/style/ajax.js | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 21cc22c6c6..d95b1d47d6 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -70,15 +70,8 @@ function submitPermissions() {
 	var $form = $('form#set-permissions'),
 		fieldsetList = $form.find('fieldset[id^=perm]'),
 		formDataSets = [],
-		$submitAllButton = $form.find('input[type=submit][name^=action]')[0];
-
-	$.each(fieldsetList, function (key, value) {
-		if (key % 5 === 0) {
-			formDataSets[Math.floor(key / 5)] = $form.find('fieldset#' + value.id).serialize();
-		} else {
-			formDataSets[Math.floor(key / 5)] += '&' + $form.find('fieldset#' + value.id).serialize();
-		}
-	});
+		$submitAllButton = $form.find('input[type=submit][name^=action]')[0],
+		$submitButton = $form.find('input[type=submit][data-clicked=true]')[0];
 
 	// Set proper start values for handling refresh of page
 	var permissionSubmitSize = formDataSets.length,
@@ -86,6 +79,24 @@ function submitPermissions() {
 		forumIds = [],
 		permissionSubmitFailed = false;
 
+	if ($submitAllButton === $submitButton) {
+		$.each(fieldsetList, function (key, value) {
+			if (key % 5 === 0) {
+				formDataSets[Math.floor(key / 5)] = $form.find('fieldset#' + value.id).serialize();
+			} else {
+				formDataSets[Math.floor(key / 5)] += '&' + $form.find('fieldset#' + value.id).serialize();
+			}
+		});
+	} else {
+		formDataSets[0] = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id).serialize();
+		// Add each forum ID to forum ID list to preserve selected forums
+		$.each($form.find('input[type=hidden][name^=forum_id]'), function (key, value) {
+			if (value.name.match(/^forum_id\[([0-9]+)\]$/)) {
+				forumIds.push(value.value);
+			}
+		});
+	}
+
 	/**
 	 * Handler for submitted permissions form chunk
 	 *
@@ -186,6 +197,10 @@ $(function() {
 			submitPermissions();
 			e.preventDefault();
 		});
+		$setPermissionsForm.find('input[type=submit]').click(function() {
+			$('input[type=submit]', $(this).parents($('form#set-permissions'))).removeAttr('data-clicked');
+			$(this).attr('data-clicked', true);
+		});
 	}
 });
 
-- 
cgit v1.2.1


From b01b3b8b94ed2f77b9855c53d590bd9e3e734278 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 26 Nov 2016 23:31:52 +0100
Subject: [ticket/9590] Preserve selected forums after previous page redirect

Also improved the way the forum ID list is generated when clicking
on "Apply all permissions".

PHPBB3-9590
---
 phpBB/adm/style/ajax.js | 47 ++++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index d95b1d47d6..e9f03baac3 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -89,14 +89,15 @@ function submitPermissions() {
 		});
 	} else {
 		formDataSets[0] = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id).serialize();
-		// Add each forum ID to forum ID list to preserve selected forums
-		$.each($form.find('input[type=hidden][name^=forum_id]'), function (key, value) {
-			if (value.name.match(/^forum_id\[([0-9]+)\]$/)) {
-				forumIds.push(value.value);
-			}
-		});
 	}
 
+	// Add each forum ID to forum ID list to preserve selected forums
+	$.each($form.find('input[type=hidden][name^=forum_id]'), function (key, value) {
+		if (value.name.match(/^forum_id\[([0-9]+)\]$/)) {
+			forumIds.push(value.value);
+		}
+	});
+
 	/**
 	 * Handler for submitted permissions form chunk
 	 *
@@ -110,21 +111,29 @@ function submitPermissions() {
 			phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
 			permissionSubmitFailed = true;
 		} else if (!permissionSubmitFailed && res.S_USER_NOTICE) {
-			// Fill list of selected forums
-			if (typeof res.REFRESH_DATA !== 'undefined') {
-				$.each(res.REFRESH_DATA.url.split('&'), function (key, value){
-					var forumIdMatch = value.match(/^forum_id\[\]=([0-9]+)$/);
-					if (forumIdMatch !== null) {
-						forumIds.push(forumIdMatch[1]);
-						// Remove added forum IDs from refresh URL
-						res.REFRESH_DATA.url = res.REFRESH_DATA.url.replace('&' + forumIdMatch[0], '');
-					}
-				});
-			}
-
 			// Display success message at the end of submitting the form
 			if (permissionRequestCount >= permissionSubmitSize) {
 				var $alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
+				var $alertBoxLink = $alert.find('p.alert_text > a');
+
+				// Create form to submit instead of normal "Back to previous page" link
+				if ($alertBoxLink) {
+					// Remove forum_id[] from URL
+					$alertBoxLink.attr('href', $alertBoxLink.attr('href').replace(/(&forum_id\[\]=[0-9]+)/, ''));
+					var previousPageForm = '<form action="' + $alertBoxLink.attr('href') + '" method="post">';
+					$.each(forumIds, function (key, value) {
+						previousPageForm += '<input type="text" name="forum_id[]" value="' + value + '" />';
+					});
+					previousPageForm += '</form>';
+
+					$alertBoxLink.on('click', function (e) {
+						var $previousPageForm = $(previousPageForm);
+						$('body').append($previousPageForm);
+						e.preventDefault();
+						$previousPageForm.submit();
+					});
+				}
+
 				// Do not allow closing alert
 				$dark.off('click');
 				$alert.find('.alert_close').hide();
@@ -133,7 +142,7 @@ function submitPermissions() {
 					setTimeout(function () {
 						// Create forum to submit using POST. This will prevent
 						// exceeding the maximum length of URLs
-						var form = '<form action="' + res.REFRESH_DATA.url + '" method="post">';
+						var form = '<form action="' + res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/, '') + '" method="post">';
 						$.each(forumIds, function (key, value) {
 							form += '<input type="text" name="forum_id[]" value="' + value + '" />';
 						});
-- 
cgit v1.2.1


From 0f46d35f7548c76f352b55855225a343238809e8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 26 Nov 2016 23:56:11 +0100
Subject: [ticket/9590] Further deduplicate code for form data

PHPBB3-9590
---
 phpBB/adm/style/ajax.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index e9f03baac3..64670f9d10 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -79,18 +79,18 @@ function submitPermissions() {
 		forumIds = [],
 		permissionSubmitFailed = false;
 
-	if ($submitAllButton === $submitButton) {
-		$.each(fieldsetList, function (key, value) {
-			if (key % 5 === 0) {
-				formDataSets[Math.floor(key / 5)] = $form.find('fieldset#' + value.id).serialize();
-			} else {
-				formDataSets[Math.floor(key / 5)] += '&' + $form.find('fieldset#' + value.id).serialize();
-			}
-		});
-	} else {
-		formDataSets[0] = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id).serialize();
+	if ($submitAllButton !== $submitButton) {
+		fieldsetList = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id);
 	}
 
+	$.each(fieldsetList, function (key, value) {
+		if (key % 5 === 0) {
+			formDataSets[Math.floor(key / 5)] = $form.find('fieldset#' + value.id).serialize();
+		} else {
+			formDataSets[Math.floor(key / 5)] += '&' + $form.find('fieldset#' + value.id).serialize();
+		}
+	});
+
 	// Add each forum ID to forum ID list to preserve selected forums
 	$.each($form.find('input[type=hidden][name^=forum_id]'), function (key, value) {
 		if (value.name.match(/^forum_id\[([0-9]+)\]$/)) {
-- 
cgit v1.2.1


From 5e36dd3d0bcc046437ca8ecd0ae144fc33d799a2 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 27 Nov 2016 00:12:59 +0100
Subject: [ticket/9590] Correctly update submit size and replace all forum_id[]

PHPBB3-9590
---
 phpBB/adm/style/ajax.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 64670f9d10..7ddd2d3742 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -74,7 +74,7 @@ function submitPermissions() {
 		$submitButton = $form.find('input[type=submit][data-clicked=true]')[0];
 
 	// Set proper start values for handling refresh of page
-	var permissionSubmitSize = formDataSets.length,
+	var permissionSubmitSize = 0,
 		permissionRequestCount = 0,
 		forumIds = [],
 		permissionSubmitFailed = false;
@@ -91,6 +91,8 @@ function submitPermissions() {
 		}
 	});
 
+	permissionSubmitSize = formDataSets.length;
+
 	// Add each forum ID to forum ID list to preserve selected forums
 	$.each($form.find('input[type=hidden][name^=forum_id]'), function (key, value) {
 		if (value.name.match(/^forum_id\[([0-9]+)\]$/)) {
@@ -119,7 +121,7 @@ function submitPermissions() {
 				// Create form to submit instead of normal "Back to previous page" link
 				if ($alertBoxLink) {
 					// Remove forum_id[] from URL
-					$alertBoxLink.attr('href', $alertBoxLink.attr('href').replace(/(&forum_id\[\]=[0-9]+)/, ''));
+					$alertBoxLink.attr('href', $alertBoxLink.attr('href').replace(/(&forum_id\[\]=[0-9]+)/g, ''));
 					var previousPageForm = '<form action="' + $alertBoxLink.attr('href') + '" method="post">';
 					$.each(forumIds, function (key, value) {
 						previousPageForm += '<input type="text" name="forum_id[]" value="' + value + '" />';
@@ -142,7 +144,7 @@ function submitPermissions() {
 					setTimeout(function () {
 						// Create forum to submit using POST. This will prevent
 						// exceeding the maximum length of URLs
-						var form = '<form action="' + res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/, '') + '" method="post">';
+						var form = '<form action="' + res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/g, '') + '" method="post">';
 						$.each(forumIds, function (key, value) {
 							form += '<input type="text" name="forum_id[]" value="' + value + '" />';
 						});
-- 
cgit v1.2.1


From 76ffd288fe5378410d0d811c48e096f42d27622f Mon Sep 17 00:00:00 2001
From: javiexin <javiexin@gmail.com>
Date: Thu, 8 Dec 2016 12:16:07 +0100
Subject: [ticket/14887] ACP profile step one lang specific event

PHPBB3-14887
---
 phpBB/adm/style/acp_profile.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 07718846cc..cebd2e9632 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -127,6 +127,7 @@
 			<!-- ENDIF -->
 			</dl>
 		<!-- ENDIF -->
+		<!-- EVENT acp_profile_step_one_lang_after -->
 		</fieldset>
 
 		<fieldset class="quick">
-- 
cgit v1.2.1


From 573507e6a59767c216532b722e9fa07514c343b8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 18 Dec 2016 15:18:52 +0100
Subject: [ticket/14922] Make sure to pass hidden input on ajax form
 submissions

PHPBB3-14922
---
 phpBB/adm/style/ajax.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 7ddd2d3742..a7ecf8ff7b 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -175,7 +175,8 @@ function submitPermissions() {
 			type: 'POST',
 			data: formData + '&' + $submitAllButton.name + '=' + encodeURIComponent($submitAllButton.value) +
 				'&creation_time=' + $form.find('input[type=hidden][name=creation_time]')[0].value +
-				'&form_token=' + $form.find('input[type=hidden][name=form_token]')[0].value,
+				'&form_token=' + $form.find('input[type=hidden][name=form_token]')[0].value +
+				'&' + $form.children('input[type=hidden]').serialize(),
 			success: handlePermissionReturn,
 			error: handlePermissionReturn
 		});
-- 
cgit v1.2.1


From 87f82c404ead9559d5eedd8ee759f860f91dd2c2 Mon Sep 17 00:00:00 2001
From: javiexin <javiexin@gmail.com>
Date: Tue, 27 Dec 2016 02:07:46 +0100
Subject: [ticket/14940] Add ACP template event acp_ext_details_end

PHPBB3-14940
---
 phpBB/adm/style/acp_ext_details.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 830c2e3cb4..465a89e17a 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -136,4 +136,5 @@
 		<!-- END meta_authors -->
 	</fieldset>
 
+	<!-- EVENT acp_ext_details_end -->
 <!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 74f723e4ec0858235729f1d4e3daec53d9e88c84 Mon Sep 17 00:00:00 2001
From: javiexin <javiexin@gmail.com>
Date: Thu, 12 Jan 2017 22:26:56 +0100
Subject: [ticket/14995] Add ACP template events acp_ext_list_*_name_after

PHPBB3-14995
---
 phpBB/adm/style/acp_ext_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index ccc39ea76d..af9e00a614 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -48,7 +48,7 @@
 		</tr>
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled row-highlight">
-			<td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong></td>
+			<td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_enabled_name_after --></td>
 			<td style="text-align: center;">
 				<!-- IF enabled.S_VERSIONCHECK -->
 				<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.META_VERSION}</strong>
@@ -73,7 +73,7 @@
 		</tr>
 		<!-- BEGIN disabled -->
 		<tr class="ext_disabled row-highlight">
-			<td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong></td>
+			<td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_disabled_name_after --></td>
 			<td style="text-align: center;">
 				<!-- IF disabled.S_VERSIONCHECK -->
 				<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.META_VERSION}</strong>
-- 
cgit v1.2.1


From 366e8583c88b6a7719b39af43790ab0c55aeada7 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 13 Jan 2017 12:00:31 -0800
Subject: [ticket/15003] Do not check disabled checkboxes with marklist
 function

PHPBB3-15003
---
 phpBB/adm/style/overall_header.html | 2 +-
 phpBB/adm/style/simple_header.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index d399c680ee..bd8caf1443 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -53,7 +53,7 @@ function marklist(id, name, state)
 	
 	for (var r = 0; r < rb.length; r++)
 	{
-		if (rb[r].name.substr(0, name.length) == name)
+		if (rb[r].name.substr(0, name.length) == name && rb[r].disabled !== true)
 		{
 			rb[r].checked = state;
 		}
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 9f47b2052b..439645a211 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -66,7 +66,7 @@ function marklist(id, name, state)
 	
 	for (var r = 0; r < rb.length; r++)
 	{
-		if (rb[r].name.substr(0, name.length) == name)
+		if (rb[r].name.substr(0, name.length) == name && rb[r].disabled !== true)
 		{
 			rb[r].checked = state;
 		}
-- 
cgit v1.2.1


From a620ce0713f42daea8c5b0c4fdb70c63748af1f8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 22 Jan 2017 16:37:20 +0100
Subject: [ticket/14968] Display possible upgrade on acp index and update page

PHPBB3-14968
---
 phpBB/adm/style/acp_main.html   | 5 +++++
 phpBB/adm/style/acp_update.html | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index efcb25cb68..1bdb7b8d2a 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -30,6 +30,11 @@
 			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
 		</div>
 	<!-- ENDIF -->
+	<!-- IF S_VERSION_UPGRADEABLE -->
+		<div class="errorbox notice">
+			<p>{UPGRADE_INSTRUCTIONS}</p>
+		</div>
+	<!-- ENDIF -->
 
 	<!-- IF S_SEARCH_INDEX_MISSING -->
 		<div class="errorbox">
diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html
index 351a3ba26c..5288833d05 100644
--- a/phpBB/adm/style/acp_update.html
+++ b/phpBB/adm/style/acp_update.html
@@ -20,6 +20,11 @@
 		<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
 	</div>
 <!-- ENDIF -->
+<!-- IF S_VERSION_UPGRADEABLE -->
+	<div class="errorbox notice">
+		<p>{UPGRADE_INSTRUCTIONS}</p>
+	</div>
+<!-- ENDIF -->
 
 <fieldset>
 	<legend></legend>
-- 
cgit v1.2.1


From 59027c94f25d66b8fc3322902477aae350b24f75 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 22 Jan 2017 19:20:18 +0100
Subject: [ticket/15006] Pass inherit settings to form and use correct button

PHPBB3-15006
---
 phpBB/adm/style/ajax.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index a7ecf8ff7b..77fd28fbe6 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -173,10 +173,11 @@ function submitPermissions() {
 		$.ajax({
 			url: $form.action,
 			type: 'POST',
-			data: formData + '&' + $submitAllButton.name + '=' + encodeURIComponent($submitAllButton.value) +
+			data: formData + '&' + $submitButton.name + '=' + encodeURIComponent($submitButton.value) +
 				'&creation_time=' + $form.find('input[type=hidden][name=creation_time]')[0].value +
 				'&form_token=' + $form.find('input[type=hidden][name=form_token]')[0].value +
-				'&' + $form.children('input[type=hidden]').serialize(),
+				'&' + $form.children('input[type=hidden]').serialize() +
+				'&' + $form.find('input[type=checkbox][name^=inherit]').serialize(),
 			success: handlePermissionReturn,
 			error: handlePermissionReturn
 		});
-- 
cgit v1.2.1


From 09f6637597fff1dcdfc6117067c1f758fa23f60d Mon Sep 17 00:00:00 2001
From: javiexin <javiexin@gmail.com>
Date: Fri, 10 Feb 2017 14:36:51 +0100
Subject: [ticket/15081] Add acp_ext_details_notice template event

PHPBB3-15081
---
 phpBB/adm/style/acp_ext_details.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 830c2e3cb4..1576f5fb2a 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -21,6 +21,7 @@
 		<p>{VERSIONCHECK_FAIL_REASON}</p>
 	</div>
 	<!-- ENDIF -->
+<!-- EVENT acp_ext_details_notice -->
 
 	<fieldset>
 		<legend>{L_EXT_DETAILS}</legend>
-- 
cgit v1.2.1


From d10a5b67a1d508b2c48924678650b8d03c8f129d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= <rubencm@gmail.com>
Date: Thu, 16 Mar 2017 00:00:50 +0100
Subject: [ticket/14820] Add style version in ACP

PHPBB3-14820
---
 phpBB/adm/style/acp_styles.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index a36d15fe73..43c2f96a65 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -51,6 +51,10 @@
 		<dt><label>{L_STYLE_PATH}{L_COLON}</label></dt>
 		<dd><strong>{STYLE_PATH}</strong></dd>
 	</dl>
+	<dl>
+		<dt><label>{L_STYLE_VERSION}{L_COLON}</label></dt>
+		<dd><strong>{STYLE_VERSION}</strong></dd>
+	</dl>
 	<dl>
 		<dt><label for="name">{L_COPYRIGHT}{L_COLON}</label></dt>
 		<dd><strong>{STYLE_COPYRIGHT}</strong></dd>
-- 
cgit v1.2.1


From 32f3ddca7061c7584508dd09e4b1226b8aae1aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= <rubencm@gmail.com>
Date: Thu, 30 Mar 2017 08:33:04 +0200
Subject: [ticket/15150] Add Jabber SSL context configuration options

PHPBB3-15150
---
 phpBB/adm/style/acp_jabber.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html
index 3c3b895624..8e3412c94a 100644
--- a/phpBB/adm/style/acp_jabber.html
+++ b/phpBB/adm/style/acp_jabber.html
@@ -47,6 +47,21 @@
 	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
+<dl>
+	<dt><label for="jab_use_ssl">{L_JAB_VERIFY_PEER}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="jab_verify_peer" name="jab_verify_peer" value="1"<!-- IF JAB_VERIFY_PEER --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input type="radio" class="radio" name="jab_verify_peer" value="0"<!-- IF not JAB_VERIFY_PEER --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+</dl>
+<dl>
+	<dt><label for="jab_use_ssl">{L_JAB_VERIFY_PEER_NAME}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_NAME_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="jab_verify_peer_name" name="jab_verify_peer_name" value="1"<!-- IF JAB_VERIFY_PEER_NAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input type="radio" class="radio" name="jab_verify_peer_name" value="0"<!-- IF not JAB_VERIFY_PEER_NAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+</dl>
+<dl>
+	<dt><label for="jab_use_ssl">{L_JAB_ALLOW_SELF_SIGNED}{L_COLON}</label><br /><span>{L_JAB_ALLOW_SELF_SIGNED_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="jab_allow_self_signed" name="jab_allow_self_signed" value="1"<!-- IF JAB_ALLOW_SELF_SIGNED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input type="radio" class="radio" name="jab_allow_self_signed" value="0"<!-- IF not JAB_ALLOW_SELF_SIGNED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+</dl>
 <!-- ENDIF -->
 <dl>
 	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}{L_COLON}</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
-- 
cgit v1.2.1


From 2f277b6f670a08ce6ca3f1ae84e73752d595a3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= <rubencm@gmail.com>
Date: Thu, 30 Mar 2017 20:26:55 +0200
Subject: [ticket/15150] Fix template label tag

PHPBB3-15150
---
 phpBB/adm/style/acp_jabber.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html
index 8e3412c94a..e76c9a0323 100644
--- a/phpBB/adm/style/acp_jabber.html
+++ b/phpBB/adm/style/acp_jabber.html
@@ -48,17 +48,17 @@
 		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
 <dl>
-	<dt><label for="jab_use_ssl">{L_JAB_VERIFY_PEER}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_EXPLAIN}</span></dt>
+	<dt><label for="jab_verify_peer">{L_JAB_VERIFY_PEER}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="jab_verify_peer" name="jab_verify_peer" value="1"<!-- IF JAB_VERIFY_PEER --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input type="radio" class="radio" name="jab_verify_peer" value="0"<!-- IF not JAB_VERIFY_PEER --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
 <dl>
-	<dt><label for="jab_use_ssl">{L_JAB_VERIFY_PEER_NAME}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_NAME_EXPLAIN}</span></dt>
+	<dt><label for="jab_verify_peer_name">{L_JAB_VERIFY_PEER_NAME}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_NAME_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="jab_verify_peer_name" name="jab_verify_peer_name" value="1"<!-- IF JAB_VERIFY_PEER_NAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input type="radio" class="radio" name="jab_verify_peer_name" value="0"<!-- IF not JAB_VERIFY_PEER_NAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
 <dl>
-	<dt><label for="jab_use_ssl">{L_JAB_ALLOW_SELF_SIGNED}{L_COLON}</label><br /><span>{L_JAB_ALLOW_SELF_SIGNED_EXPLAIN}</span></dt>
+	<dt><label for="jab_allow_self_signed">{L_JAB_ALLOW_SELF_SIGNED}{L_COLON}</label><br /><span>{L_JAB_ALLOW_SELF_SIGNED_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="jab_allow_self_signed" name="jab_allow_self_signed" value="1"<!-- IF JAB_ALLOW_SELF_SIGNED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input type="radio" class="radio" name="jab_allow_self_signed" value="0"<!-- IF not JAB_ALLOW_SELF_SIGNED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
-- 
cgit v1.2.1


From ecdc05a13ec84020d169bdf03725bbc58815afc8 Mon Sep 17 00:00:00 2001
From: javiexin <javiexin@gmail.com>
Date: Mon, 5 Jun 2017 15:14:42 +0200
Subject: [ticket/15241] Add ACP template event acp_profile_contact_last

Event to place code in Profile Field configuration screen,
as additional information for Contact Profile Fields.

PHPBB-15241
---
 phpBB/adm/style/acp_profile.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index cebd2e9632..bd3935b464 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -85,6 +85,7 @@
 			<dd><input type="checkbox" class="radio" id="field_is_contact" name="field_is_contact" value="1"<!-- IF S_FIELD_CONTACT --> checked="checked"<!-- ENDIF --> /></dd>
 			<dd><input class="text medium" type="text" name="field_contact_desc" id="field_contact_desc" value="{FIELD_CONTACT_DESC}" /> <label for="field_contact_desc">{L_FIELD_CONTACT_DESC}</label></dd>
 			<dd><input class="text medium" type="text" name="field_contact_url" id="field_contact_url" value="{FIELD_CONTACT_URL}" /> <label for="field_contact_url">{L_FIELD_CONTACT_URL}</label></dd>
+			<!-- EVENT acp_profile_contact_last -->
 		</dl>
 		</fieldset>
 
-- 
cgit v1.2.1