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')

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 5db30e66fd03dacb4bb961afd9672eb9d65ba148 Mon Sep 17 00:00:00 2001
From: Vinny <vinny@suportephpbb.com.br>
Date: Tue, 9 Oct 2012 00:31:59 -0300
Subject: [ticket/11139] Fix fatal error on colour swatch window

PHPBB3-11139
---
 phpBB/adm/swatch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm')

diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php
index 434b00e542..5e8984db70 100644
--- a/phpBB/adm/swatch.php
+++ b/phpBB/adm/swatch.php
@@ -22,7 +22,7 @@ $auth->acl($user->data);
 $user->setup();
 
 // Set custom template for admin area
-$template->set_custom_template($phpbb_root_path . 'adm/style', 'admin');
+$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', '');
 
 $template->set_filenames(array(
 	'body' => 'colour_swatch.html')
-- 
cgit v1.2.1


From 571d352eed670ad986bd653a2ac0bd81429c9cf5 Mon Sep 17 00:00:00 2001
From: Vinny <vinny@suportephpbb.com.br>
Date: Tue, 9 Oct 2012 14:29:26 -0300
Subject: [ticket/11139] Adding the $phpbb_admin_path variable

PHPBB3-11139
---
 phpBB/adm/swatch.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/adm')

diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php
index 5e8984db70..86498a255f 100644
--- a/phpBB/adm/swatch.php
+++ b/phpBB/adm/swatch.php
@@ -21,6 +21,8 @@ $user->session_begin(false);
 $auth->acl($user->data);
 $user->setup();
 
+$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : './';
+
 // Set custom template for admin area
 $phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', '');
 
-- 
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')

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