From 2d35e6044300293916f26df4495af542b24c63a8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 9 May 2011 22:53:08 +0200
Subject: [ticket/10154] Move "copy permissions from" to below "parent" on
 forum creation

Move "copy permissions from" to below "parent forum" in forum creation form.

PHPBB3-10154
---
 phpBB/adm/style/acp_forums.html | 12 ++++++------
 1 file 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 d27cea28f7..9201736085 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -140,6 +140,12 @@
 		<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>
+	<!-- 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 -->
 	<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>
@@ -176,12 +182,6 @@
 		<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">
-- 
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 4ddd116cd436f273fea04bd9f81d0a77b58e9d0e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 3 Jun 2011 18:54:13 +0200
Subject: [ticket/8138] Add autocomplete="off" to a user and forum ACP.

PHPBB3-8138
---
 phpBB/adm/style/acp_forums.html         | 4 ++--
 phpBB/adm/style/acp_users_overview.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 9201736085..8577c08860 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -166,11 +166,11 @@
 	</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>
+		<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>
-		<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>
+		<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>
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 911dcad293..9237e45daf 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -43,19 +43,19 @@
 </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>
+	<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="" /></dd>
+	<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="" /></dd>
+	<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>
-	<dd><input type="password" id="password_confirm" name="password_confirm" value="" /></dd>
+	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>
 </dl>
 
 <p class="quick">
-- 
cgit v1.2.1


From a275d17625325e0353b67fabf5a9b0c4fb35877e Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Wed, 6 Jul 2011 20:38:02 -0400
Subject: [ticket/9859] Changing all phpBB footers to match the new credit line

PHPBB3-9859
---
 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 9b5494b8b6..26a3c6ab3d 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -8,7 +8,7 @@
 	</div>
 
 	<div id="page-footer">
-		Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
+		Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 	</div>
 </div>
 
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 03ca369562..b48b449597 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -9,7 +9,7 @@
 
 	<div id="page-footer">
 		<!-- IF S_COPYRIGHT_HTML -->
-			Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
+			Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 			<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- ENDIF -->
 
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 7276fb4b63..ac9c26a690 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -5,7 +5,7 @@
 <div id="page-footer">
 
 	<!-- IF S_COPYRIGHT_HTML -->
-		<br />Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
+		<br />Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- ENDIF -->
 
-- 
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 16c5352a12cef9572712f4600b8dd9313d2c9d2a Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Thu, 14 Jul 2011 21:00:10 +0100
Subject: [ticket/10032] Fixed typos in bbcode button name.

addlistitem was addlitsitem.

PHPBB3-10032
---
 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 69c6d8f3fb..c91d199eb3 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -56,7 +56,7 @@
 			<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="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="y" name="addlistitem" 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 -->
-- 
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 f51b2f8fecab566c625cf5811b70ba2f6272a8a5 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Mon, 25 Jul 2011 21:08:26 +0100
Subject: [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.

There is no space between the first radio button and "Yes", while there
is a space between the second radio button and "No". This commit fixes
that.

PHPBB3-10292
---
 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 2ad8b3e8aa..1f45109517 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -35,7 +35,7 @@
 	</dl>
 	<dl>
 		<dt><label for="special_rank">{L_RANK_SPECIAL}:</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>
+		<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 -->
-- 
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 9c6339fb57d44caf86af43624d3308f6413b2c7d Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Mon, 11 Jul 2011 18:00:42 +0100
Subject: [ticket/8173] Removed some redundant code in the BBCode JavaScript.

The following code can be found in the ACP, when changing a user's
signature:

t: '{ BBCODE_T_HELP }',

The code that uses it and the code that produces it were changed or
removed a while ago, but this code remained. In 2c4c1f9, the accesskey
for the list item button was changed to y from t, explaining the origin of
the redundant code - although it wasn't being used then, either.

This commit also changes the helpline code of "[*]" to y, as the access
key is y, so this makes it more consistent.

PHPBB3-8173
---
 phpBB/adm/style/acp_users_signature.html | 5 ++---
 1 file changed, 2 insertions(+), 3 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 69c6d8f3fb..d7f445c8e1 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -22,9 +22,8 @@
 		w: '{LA_BBCODE_W_HELP}',
 		s: '{LA_BBCODE_S_HELP}',
 		f: '{LA_BBCODE_F_HELP}',
-		e: '{LA_BBCODE_E_HELP}',
+		y: '{LA_BBCODE_Y_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}'
@@ -56,7 +55,7 @@
 			<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="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="y" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('y')" 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 -->
-- 
cgit v1.2.1


From 81f682a81252fa9199fe140b2b0e1a6caf575f72 Mon Sep 17 00:00:00 2001
From: callumacrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 09:28:45 +0100
Subject: [ticket/8599] Added ability to select all to add multiple smilies
 screen.

PHPBB3-8599
---
 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 eedf39b440..a34a91043c 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">
+	<table cellspacing="1" id="smilies">
 	<thead>
 	<tr>
 		<th colspan="{COLSPAN}">{L_CONFIG}</th>
@@ -94,7 +94,7 @@
 		<td>{L_ORDER}</td>
 	<!-- ENDIF -->
 	<!-- IF S_ADD -->
-		<td>{L_ADD}</td>
+		<td>{L_ADD} <a href="#" onclick="marklist('smilies', 'add_img', true); return false;">({L_MARK_ALL})</a></td>
 	<!-- ENDIF -->
 	</tr>
 	</thead>
-- 
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 5b66413f69db8839a2553ef29f5b2cd947992916 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 14 Aug 2011 20:46:01 +0200
Subject: [ticket/10315] Add top/bottom margin to the options in ACP to avoid
 overlapping

PHPBB3-10315
---
 phpBB/adm/style/admin.css | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 4c3fa51af3..666f4921ba 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -899,12 +899,15 @@ html>body dd label input { vertical-align: text-bottom;}	/* Tweak for Moz to ali
 dd input {
 	font-size: 1.00em;
 	max-width: 100%;
+	margin: 2px 0;
 }
 
 dd select {
 	font-size: 100%;
+	font-size: 1em;
 	width: auto;
 	max-width: 100%;
+	margin: 2px 0;
 }
 
 dd textarea {
@@ -912,11 +915,6 @@ dd textarea {
 	width: 90%;
 }
 
-dd select {
-	width: auto;
-	font-size: 1.00em;
-}
-
 fieldset dl {
 	margin-bottom: 10px;
 	font-size: 0.85em;
-- 
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 88b31c2ab3f2fe1e88920b3d3b022ee1355321f7 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Tue, 18 Oct 2011 01:54:17 +0800
Subject: [ticket/10419] Add mbstring PHP ini parameters checks to ACP

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

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 7d3b6945ac..c665c9d893 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -34,6 +34,36 @@
 		</div>
 	<!-- ENDIF -->
 
+	<!-- IF S_MBSTRING_LOADED -->
+		<!-- IF S_MBSTRING_FUNC_OVERLOAD_FAIL -->
+			<div class="errorbox">
+				<h3>{L_ERROR_MBSTRING_FUNC_OVERLOAD}</h3>
+				<p>{L_ERROR_MBSTRING_FUNC_OVERLOAD_EXPLAIN}</p>
+			</div>
+		<!-- ENDIF -->
+
+		<!-- IF S_MBSTRING_ENCODING_TRANSLATION_FAIL -->
+			<div class="errorbox">
+				<h3>{L_ERROR_MBSTRING_ENCODING_TRANSLATION}</h3>
+				<p>{L_ERROR_MBSTRING_ENCODING_TRANSLATION_EXPLAIN}</p>
+			</div>
+		<!-- ENDIF -->
+
+		<!-- IF S_MBSTRING_HTTP_INPUT_FAIL -->
+			<div class="errorbox">
+				<h3>{L_ERROR_MBSTRING_HTTP_INPUT}</h3>
+				<p>{L_ERROR_MBSTRING_HTTP_INPUT_EXPLAIN}</p>
+			</div>
+		<!-- ENDIF -->
+
+		<!-- IF S_MBSTRING_HTTP_OUTPUT_FAIL -->
+			<div class="errorbox">
+				<h3>{L_ERROR_MBSTRING_HTTP_OUTPUT}</h3>
+				<p>{L_ERROR_MBSTRING_HTTP_OUTPUT_EXPLAIN}</p>
+			</div>
+		<!-- ENDIF -->
+	<!-- ENDIF -->
+
 	<!-- IF S_WRITABLE_CONFIG -->
 		<div class="errorbox notice">
 			<p>{L_WRITABLE_CONFIG}</p>
-- 
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 75a44a6970136122c17756522e25814d4015035b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 10 Sep 2010 07:23:55 -0700
Subject: [ticket/9778] Replaced "Find a member" with "Enter username"

When clicking on the "Users and groups" tab in the ACP, the user is
able to either enter the username of the member he wants to manage
or click on "Find a member" below the input field. Unfortunately,
the label for the input field is also "Find a member", which leads
some users to the idea that they can search for users using that
input field. By changing the label to "Enter username" this should
be clear to the user.

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

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index e266654649..d5a29a21cc 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_FIND_USERNAME}:</label></dt>
+		<dt><label for="username">{L_ENTER_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>
-- 
cgit v1.2.1


From eb1f15bc8b7b7a284b25b2c9b9942714b6848ebc Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 12 Nov 2011 14:59:11 +0100
Subject: [ticket/8996] Also fix the BBCode bug in subsilver2 and acp

---
 phpBB/adm/style/editor.js | 68 ++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 31 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index 217aa699e2..600fa254cf 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -28,8 +28,8 @@ 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])
@@ -66,7 +66,7 @@ function bbstyle(bbnumber)
 	else
 	{
 		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();		
+		document.forms[form_name].elements[text_name].focus();
 	}
 }
 
@@ -76,7 +76,7 @@ function bbstyle(bbnumber)
 function bbfontstyle(bbopen, bbclose)
 {
 	theSelection = false;
-		
+
 	var textarea = document.forms[form_name].elements[text_name];
 
 	textarea.focus();
@@ -84,14 +84,10 @@ function bbfontstyle(bbopen, bbclose)
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
 		// Get text selection
-		theSelection = document.selection.createRange().text;
-
-		if (theSelection)
+		if (textarea.createTextRange && textarea.caretPos)
 		{
-			// Add tags around selection
-			document.selection.createRange().text = bbopen + theSelection + bbclose;
-			document.forms[form_name].elements[text_name].focus();
-			theSelection = '';
+			textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
+			textarea.focus();
 			return;
 		}
 	}
@@ -102,10 +98,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,12 +112,12 @@ function bbfontstyle(bbopen, bbclose)
 	{
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
-	}	
+	}
 	// IE
 	else if (document.selection)
 	{
-		var range = textarea.createTextRange(); 
-		range.move("character", new_pos); 
+		var range = textarea.createTextRange();
+		range.move("character", bbopen.length);
 		range.select();
 		storeCaret(textarea);
 	}
@@ -136,7 +132,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 +155,18 @@ 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;
-		
+
 	}
 	else
 	{
@@ -233,7 +229,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)
@@ -268,7 +264,7 @@ function mozWrap(txtarea, open, close)
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd == 1 || selEnd == 2) 
+	if (selEnd == 1 || selEnd == 2)
 	{
 		selEnd = selLength;
 	}
@@ -292,7 +288,17 @@ function mozWrap(txtarea, open, close)
 */
 function storeCaret(textEl)
 {
-	if (textEl.createTextRange)
+	var keyCode = false;
+	if (is_ie)
+	{
+		keyCode = (event.keyCode) ? event.keyCode : event.charCode;
+	}
+
+	// Did the user press Shift (16), Ctrl (17) or Alt (18)?
+	// If so, we do not update the caretPos, so BBCodes can still be applied correctly.
+	var is_control_key = (keyCode == 16 || keyCode == 17 || keyCode == 18);
+
+	if ((!is_ie || !is_control_key) && (textEl.createTextRange))
 	{
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
@@ -328,7 +334,7 @@ function colorPalette(dir, width, height)
 			{
 				document.writeln('<tr>');
 			}
-			
+
 			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
@@ -368,9 +374,9 @@ function caretPosition()
 function getCaretPosition(txtarea)
 {
 	var caretPos = new caretPosition();
-	
+
 	// simple Gecko/Opera way
-	if (txtarea.selectionStart || txtarea.selectionStart == 0)
+	if (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
 	{
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
@@ -384,19 +390,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 730d2d5d19741508f243d61f47c28af2564be6b1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 15 Dec 2011 22:14:59 +0100
Subject: [ticket/8996] Revert initial fix to keep old behaviour on empty
 selection

Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp"

This reverts commit eb1f15bc8b7b7a284b25b2c9b9942714b6848ebc.

PHPBB3-8996
---
 phpBB/adm/style/editor.js | 68 +++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 37 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index 600fa254cf..217aa699e2 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -28,8 +28,8 @@ 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])
@@ -66,7 +66,7 @@ function bbstyle(bbnumber)
 	else
 	{
 		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();
+		document.forms[form_name].elements[text_name].focus();		
 	}
 }
 
@@ -76,7 +76,7 @@ function bbstyle(bbnumber)
 function bbfontstyle(bbopen, bbclose)
 {
 	theSelection = false;
-
+		
 	var textarea = document.forms[form_name].elements[text_name];
 
 	textarea.focus();
@@ -84,10 +84,14 @@ function bbfontstyle(bbopen, bbclose)
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
 		// Get text selection
-		if (textarea.createTextRange && textarea.caretPos)
+		theSelection = document.selection.createRange().text;
+
+		if (theSelection)
 		{
-			textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
-			textarea.focus();
+			// Add tags around selection
+			document.selection.createRange().text = bbopen + theSelection + bbclose;
+			document.forms[form_name].elements[text_name].focus();
+			theSelection = '';
 			return;
 		}
 	}
@@ -98,10 +102,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);
@@ -112,12 +116,12 @@ function bbfontstyle(bbopen, bbclose)
 	{
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
-	}
+	}	
 	// IE
 	else if (document.selection)
 	{
-		var range = textarea.createTextRange();
-		range.move("character", bbopen.length);
+		var range = textarea.createTextRange(); 
+		range.move("character", new_pos); 
 		range.select();
 		storeCaret(textarea);
 	}
@@ -132,7 +136,7 @@ function bbfontstyle(bbopen, bbclose)
 function insert_text(text, spaces, popup)
 {
 	var textarea;
-
+	
 	if (!popup)
 	{
 		textarea = document.forms[form_name].elements[text_name];
@@ -155,18 +159,18 @@ 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;
-
+		
 	}
 	else
 	{
@@ -229,7 +233,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)
@@ -264,7 +268,7 @@ function mozWrap(txtarea, open, close)
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd == 1 || selEnd == 2)
+	if (selEnd == 1 || selEnd == 2) 
 	{
 		selEnd = selLength;
 	}
@@ -288,17 +292,7 @@ function mozWrap(txtarea, open, close)
 */
 function storeCaret(textEl)
 {
-	var keyCode = false;
-	if (is_ie)
-	{
-		keyCode = (event.keyCode) ? event.keyCode : event.charCode;
-	}
-
-	// Did the user press Shift (16), Ctrl (17) or Alt (18)?
-	// If so, we do not update the caretPos, so BBCodes can still be applied correctly.
-	var is_control_key = (keyCode == 16 || keyCode == 17 || keyCode == 18);
-
-	if ((!is_ie || !is_control_key) && (textEl.createTextRange))
+	if (textEl.createTextRange)
 	{
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
@@ -334,7 +328,7 @@ function colorPalette(dir, width, height)
 			{
 				document.writeln('<tr>');
 			}
-
+			
 			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
@@ -374,9 +368,9 @@ function caretPosition()
 function getCaretPosition(txtarea)
 {
 	var caretPos = new caretPosition();
-
+	
 	// simple Gecko/Opera way
-	if (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
+	if (txtarea.selectionStart || txtarea.selectionStart == 0)
 	{
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
@@ -390,19 +384,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 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 23363efaaacd2bec39a51c27db51a2777e7a4c21 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Mon, 2 Jan 2012 21:07:40 +0200
Subject: [ticket/10563] Show deactivated styles below active styles in acp

Separates active and deactivated styles in styles list in acp

PHPBB3-10563
---
 phpBB/adm/style/acp_styles.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 098cc723d9..6aa1c0ccc9 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -402,6 +402,12 @@
 		<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 -->
-- 
cgit v1.2.1


From 225892f506e0a109e710534fee64a11614921d88 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 3 Feb 2012 16:14:48 +0000
Subject: [ticket/9914] Add backup warning to updater.

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

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index 22d21d8314..818889c89b 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -43,6 +43,11 @@
 		<p>{WARNING_MSG}</p>
 	</div>
 	<!-- ENDIF -->
+	
+	<div class="errorbox" style="margin-top: 0;">
+		<h3>{L_NOTICE}</h3>
+		<p>{L_BACKUP_NOTICE}</p>
+	</div>
 
 	<form id="install_update" method="post" action="{U_ACTION}">
 
-- 
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 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 0ceb77fb995e7433242a87c1fe0c22840a2b23e1 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Tue, 3 Apr 2012 19:29:34 +0800
Subject: [ticket/10607] Added 'Powered by' translation string.

Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
---
 phpBB/adm/style/overall_footer.html | 2 +-
 phpBB/adm/style/simple_footer.html  | 2 +-
 2 files 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 b48b449597..361d3185fd 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -9,7 +9,7 @@
 
 	<div id="page-footer">
 		<!-- IF S_COPYRIGHT_HTML -->
-			Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+			{CREDIT_LINE}
 			<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- ENDIF -->
 
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index ac9c26a690..6395eace6c 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -5,7 +5,7 @@
 <div id="page-footer">
 
 	<!-- IF S_COPYRIGHT_HTML -->
-		<br />Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+		<br />{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- ENDIF -->
 
-- 
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 7a6d3ec61bff708fa1ebc60765c91af0a5648fc9 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sun, 15 Apr 2012 23:33:34 -0500
Subject: [ticket/10819] Improve side-by-side diff styling

Used transparent background for unchanged lines
Shortened the table headers and make the background grey
Added a border between the columns
Increased the font size on pre blocks
Added Consolas as the first pre font, for Windows users
Added wordwrapping for pre blocks

PHPBB3-10819
---
 phpBB/adm/style/install_update_diff.html | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index b65a014312..96bf2532b1 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -119,6 +119,7 @@ table.hrdiff {
 	overflow: hidden;
 	border-bottom: 1px solid #999;
 	table-layout: fixed;
+	background: transparent;
 }
 
 table.hrdiff th {
@@ -128,7 +129,8 @@ table.hrdiff th {
 	font-family: Verdana,Helvetica,sans-serif;
 	font-size: 11px;
 	border-bottom: 1px solid #999;
-	background: transparent;
+	border-right: 1px solid #999;
+	background: #D9D9D9;
 }
 
 table.hrdiff thead th {
@@ -142,29 +144,28 @@ table.hrdiff tr:first-child th {
 }
 
 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 {
+table.hrdiff tbody td {
 	border-right: 1px solid #999;
 }
 
+/* Variant of http://www.longren.org/wrapping-text-inside-pre-tags/ */
 table.hrdiff td pre {
-	overflow: auto;
-	display: block;
-	width: 100%;
-	overflow: auto;
-	display: block;
+	font-family: "Consolas", monospace;
+	font-size: 1.1em;
+	overflow-x: auto;			/* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */
+	white-space: pre-wrap;		/* css-3 */
+	white-space: -moz-pre-wrap !important;	/* Mozilla, since 1999 */
+	white-space: -pre-wrap;		/* Opera 4-6 */
+	white-space: -o-pre-wrap;	/* Opera 7 */
+	word-wrap: break-word;		/* Internet Explorer 5.5+ */
 }
 
 table.hrdiff .unmodified {
-	background: #fff;
+	background: transparent;
 }
 
 table.hrdiff .added {
-- 
cgit v1.2.1


From 09621342a54525e9dfcd3419b91d39e13ee7a326 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sun, 15 Apr 2012 23:38:12 -0500
Subject: [ticket/10819] Forgot this causes vertical scrollbars on IE

PHPBB3-10819
---
 phpBB/adm/style/install_update_diff.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index 96bf2532b1..e57d19161d 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -156,7 +156,6 @@ table.hrdiff tbody td {
 table.hrdiff td pre {
 	font-family: "Consolas", monospace;
 	font-size: 1.1em;
-	overflow-x: auto;			/* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */
 	white-space: pre-wrap;		/* css-3 */
 	white-space: -moz-pre-wrap !important;	/* Mozilla, since 1999 */
 	white-space: -pre-wrap;		/* Opera 4-6 */
-- 
cgit v1.2.1


From 00c54f8a7cad92eff14fe62530766666c2c796a7 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Tue, 17 Apr 2012 22:59:10 -0500
Subject: [ticket/10819] Remove support for older browsers

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

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index e57d19161d..4d8bcfd1fc 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -152,14 +152,10 @@ table.hrdiff tbody td {
 	border-right: 1px solid #999;
 }
 
-/* Variant of http://www.longren.org/wrapping-text-inside-pre-tags/ */
 table.hrdiff td pre {
 	font-family: "Consolas", monospace;
 	font-size: 1.1em;
 	white-space: pre-wrap;		/* css-3 */
-	white-space: -moz-pre-wrap !important;	/* Mozilla, since 1999 */
-	white-space: -pre-wrap;		/* Opera 4-6 */
-	white-space: -o-pre-wrap;	/* Opera 7 */
 	word-wrap: break-word;		/* Internet Explorer 5.5+ */
 }
 
-- 
cgit v1.2.1


From a960bd6790a60bd1023e632230848e9e786c8921 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 6 May 2012 19:37:49 +0300
Subject: [ticket/10860] Fixing js error in updater

Fixing javascript error in side-by-side diff styling in updater:
resizing inner block instead of outer block and increasing
height by inner/outer block difference.

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

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index b65a014312..15ea00141d 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -15,12 +15,12 @@
 // <![CDATA[
 function resize_panel()
 {
-	var block = document.getElementById('codepanel');
+	var block = document.getElementById('diff_content');
 	var height;
 
 	if (window.innerHeight)
 	{
-		height = window.innerHeight - 150;
+		height = window.innerHeight - 200;
 		block.style.height = height + 'px';
 	}
 	else
-- 
cgit v1.2.1


From 643970dce4710b1eebbeb86ff4ac0074c9bfe298 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Mon, 26 Mar 2012 22:59:35 +0530
Subject: [ticket/10308] disable retain/ delete posts option when deleting a
 user

When deleting a user, it asks whether the posts by user should be retained
or deleted. The selection should be disable if the user has no posts.

PHPBB3-10308
---
 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 9237e45daf..0eeb7cde8b 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -140,7 +140,7 @@
 		<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 class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
+			<dd><select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_RETAIN_POSTS}</option><option value="remove"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_DELETE_POSTS}</option></select></dd>
 		</dl>
 		<p class="quick">
 			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-- 
cgit v1.2.1


From 239e6016a308cd80135ebe9d7057c2eb102af29d Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Mon, 9 Apr 2012 02:21:45 +0530
Subject: [ticket/10308] Displays message to user if there are no posts.

While deletng the user, if the user has no posts in addition to the
options being disabled an added message is displayed.

PHPBB3-10308
---
 phpBB/adm/style/acp_users_overview.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 0eeb7cde8b..b158995563 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -141,6 +141,9 @@
 		<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 class="sep" value="">{L_SELECT_OPTION}</option><option value="retain"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_RETAIN_POSTS}</option><option value="remove"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_DELETE_POSTS}</option></select></dd>
+			<!-- IF USER_POSTS == 0 -->
+			<dd>{L_NO_POSTS}</dd>
+			<!-- ENDIF -->
 		</dl>
 		<p class="quick">
 			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-- 
cgit v1.2.1


From 8f7e85604bb36679db1baa37588fc5e39a8b853f Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Wed, 11 Apr 2012 03:00:16 +0530
Subject: [ticket/10308] fixes language entity.

Language key has been changed and has been made more specific to
avoid conflicts

PHPBB3-10308
---
 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 b158995563..73be17c4c1 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -142,7 +142,7 @@
 			<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 class="sep" value="">{L_SELECT_OPTION}</option><option value="retain"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_RETAIN_POSTS}</option><option value="remove"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_DELETE_POSTS}</option></select></dd>
 			<!-- IF USER_POSTS == 0 -->
-			<dd>{L_NO_POSTS}</dd>
+			<dd>{L_USER_NO_POSTS}</dd>
 			<!-- ENDIF -->
 		</dl>
 		<p class="quick">
-- 
cgit v1.2.1


From 59177a86c4160a4879aaf77e602f91ccea0fb107 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Fri, 20 Apr 2012 17:11:07 +0530
Subject: [ticket/10308] fix language and user's total posts

language modified to be clear and select box disappears in case no
posts by user. user's total posts are fetched using a new query.

PHPBB3-10308
---
 phpBB/adm/style/acp_users_overview.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 73be17c4c1..e6a1411bbb 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -140,9 +140,11 @@
 		<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 class="sep" value="">{L_SELECT_OPTION}</option><option value="retain"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_RETAIN_POSTS}</option><option value="remove"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_DELETE_POSTS}</option></select></dd>
-			<!-- IF USER_POSTS == 0 -->
-			<dd>{L_USER_NO_POSTS}</dd>
+			<dd>
+			<!-- IF USER_TOTAL_POSTS == 0 -->
+			{L_USER_NO_POSTS}
+			<!-- ELSE -->
+			<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></dd>
 			<!-- ENDIF -->
 		</dl>
 		<p class="quick">
-- 
cgit v1.2.1


From faf232219ef3b7a5dcc3d22639d4005040b0d8ad Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Fri, 20 Apr 2012 23:11:55 +0530
Subject: [ticket/10308] renames language key to USER_NO_POSTS_DELETE

language key renamed to make its usability more clearer.

PHPBB3-10308
---
 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 e6a1411bbb..2a27cc2a63 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -142,7 +142,7 @@
 			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
 			<dd>
 			<!-- IF USER_TOTAL_POSTS == 0 -->
-			{L_USER_NO_POSTS}
+			{L_USER_NO_POSTS_DELETE}
 			<!-- ELSE -->
 			<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></dd>
 			<!-- ENDIF -->
-- 
cgit v1.2.1


From cf303c34788b32e1c09f483e2760b77eff3e05ca Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sat, 21 Apr 2012 14:29:21 +0530
Subject: [ticket/10308] fixes user deletion if no posts

introduces a hidden input field with retain posts as the mode in case
user has no posts.

PHPBB3-10308
---
 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 2a27cc2a63..fdc1d55855 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -142,7 +142,7 @@
 			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
 			<dd>
 			<!-- IF USER_TOTAL_POSTS == 0 -->
-			{L_USER_NO_POSTS_DELETE}
+			{L_USER_NO_POSTS_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
 			<!-- ELSE -->
 			<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></dd>
 			<!-- ENDIF -->
-- 
cgit v1.2.1


From 164054f0679caaa68fb8400d3469b1149022db29 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sun, 22 Apr 2012 00:36:38 +0530
Subject: [ticket/10308] fixes sql query, limit it to 1

instead of fetching all posts by user we limit the query to 1 to check if
a user has posts or not

PHPBB3-10308
---
 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 fdc1d55855..ea2700e5e4 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -141,7 +141,7 @@
 		<dl>
 			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
 			<dd>
-			<!-- IF USER_TOTAL_POSTS == 0 -->
+			<!-- IF USER_HAS_POSTS == 0 -->
 			{L_USER_NO_POSTS_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
 			<!-- ELSE -->
 			<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></dd>
-- 
cgit v1.2.1


From cf556f92c91816f6aef9028d911b5584f08842af Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Wed, 9 May 2012 21:46:27 +0530
Subject: [ticket/10308] fixes language variable name

Language variable has be renamed for better understanding

PHPBB3-10308
---
 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 ea2700e5e4..1969428e38 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -142,7 +142,7 @@
 			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
 			<dd>
 			<!-- IF USER_HAS_POSTS == 0 -->
-			{L_USER_NO_POSTS_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
+			{L_USER_NO_POSTS_TO_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
 			<!-- ELSE -->
 			<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></dd>
 			<!-- ENDIF -->
-- 
cgit v1.2.1


From 041b7be77ecd4e52048b94b4e47ad8268716a032 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Fri, 11 May 2012 01:50:36 +0530
Subject: [ticket/10308] fixes indentation

indentation is fixed and user_posts variable is compared as a boolean
variable.

PHPBB3-10308
---
 phpBB/adm/style/acp_users_overview.html | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 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 1969428e38..e2dcdb6307 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -135,24 +135,24 @@
 	</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>
-			<!-- IF USER_HAS_POSTS == 0 -->
-			{L_USER_NO_POSTS_TO_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
-			<!-- ELSE -->
-			<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></dd>
-			<!-- ENDIF -->
-		</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>
-	</form>
+		<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>
+					<!-- 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></dd>
+					<!-- ELSE -->
+						{L_USER_NO_POSTS_TO_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
+					<!-- ENDIF -->
+				</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>
+		</form>
 	<!-- ENDIF -->
 <!-- ENDIF -->
-- 
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 625333ea2ed4b89ea479786f599948d5530c7202 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sat, 30 Jun 2012 12:21:37 -0500
Subject: [ticket/10773] ACP logo with registered trademark symbol

PHPBB3-10773
---
 phpBB/adm/style/admin.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 666f4921ba..b9996fd1d1 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -142,15 +142,15 @@ li {
 #page-header {
 	clear: both;
 	text-align: right;
-	background: url("../images/phpbb_logo.gif") top left no-repeat;
-	height: 49px;
+	background: url("../images/phpbb_logo.png") top left no-repeat;
+	height: 54px;
 	font-size: 0.85em;
 	margin-bottom: 10px;
 }
 
 .rtl #page-header {
 	text-align: left;
-	background: url("../images/phpbb_logo.gif") top right no-repeat;
+	background: url("../images/phpbb_logo.png") top right no-repeat;
 }
 
 #page-header h1 {
-- 
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 10172887fd47e86eefbabd6f5e755cd93279960d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 17 Jul 2012 18:48:10 +0200
Subject: [ticket/10965] Introduce a new profile field option to display no
 value

By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.

PHPBB3-10965
---
 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..1c9c038f8f 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -63,6 +63,10 @@
 			<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_show_novalue">{L_SHOW_NOVALUE_FIELD}:</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>
 			<dd><input type="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
-- 
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 95d02d74ac6d71578a98e8850140d9a6cad7e852 Mon Sep 17 00:00:00 2001
From: Vinny <vinny@suportephpbb.com.br>
Date: Fri, 5 Oct 2012 21:18:59 -0300
Subject: [ticket/11135] Full replacement of credit link to https

PHPBB3-11135
---
 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 26a3c6ab3d..319f7e06c7 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -8,7 +8,7 @@
 	</div>
 
 	<div id="page-footer">
-		Powered by <a href="http://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 Group
 	</div>
 </div>
 
-- 
cgit v1.2.1


From d376348acf271ab0e2bcba4e8eb5993192d0ef87 Mon Sep 17 00:00:00 2001
From: westr <russellwwest@gmail.com>
Date: Tue, 16 Oct 2012 12:44:33 +0100
Subject: [ticket/11093] acp_users_overview.html has a wrongly placed </dd>

Amended the closing dd tag to the appropriate line: line 145 instead of 141

PHPBB3-11093
---
 phpBB/adm/style/acp_users_overview.html | 3 ++-
 1 file changed, 2 insertions(+), 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 e2dcdb6307..ba350a13fb 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -142,10 +142,11 @@
 					<dt><label for="delete_type">{L_DELETE_USER}:</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></dd>
+						<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>
 					<!-- ELSE -->
 						{L_USER_NO_POSTS_TO_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
 					<!-- ENDIF -->
+					</dd>
 				</dl>
 				<p class="quick">
 					<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-- 
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