From 5bb0c65c2438b250c9484d25af304f0973f63b86 Mon Sep 17 00:00:00 2001 From: PayBas Date: Mon, 7 Apr 2014 08:16:39 +0200 Subject: [PATCH 1/4] [ticket/12369] Add template var {BODY_CLASS} to HTML body http://tracker.phpbb.com/browse/PHPBB3-12369 PHPBB3-12369 --- phpBB/includes/functions.php | 3 ++- phpBB/styles/prosilver/template/overall_header.html | 2 +- phpBB/styles/prosilver/template/simple_header.html | 2 +- phpBB/styles/subsilver2/template/overall_header.html | 2 +- phpBB/styles/subsilver2/template/simple_header.html | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8c29bc7171..2eb471c1a8 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4928,7 +4928,8 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'LOGGED_IN_USER_LIST' => $online_userlist, 'RECORD_USERS' => $l_online_record, 'PRIVATE_MESSAGE_COUNT' => (!empty($user->data['user_unread_privmsg'])) ? $user->data['user_unread_privmsg'] : 0, - 'HIDDEN_FIELDS_FOR_JUMPBOX' => $hidden_fields_for_jumpbox, + 'HIDDEN_FIELDS_FOR_JUMPBOX' => $hidden_fields_for_jumpbox, + 'BODY_CLASS' => '', 'UNREAD_NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', 'NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 5d09694346..d342fce441 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -48,7 +48,7 @@ {$STYLESHEETS} - + diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index 24a99154d0..f5e265ac16 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -26,7 +26,7 @@ - + diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 0882f5c97d..0d3e727ecd 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -132,7 +132,7 @@ function marklist(id, name, state) {$STYLESHEETS} - + diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html index 85528e6769..37a33415e9 100644 --- a/phpBB/styles/subsilver2/template/simple_header.html +++ b/phpBB/styles/subsilver2/template/simple_header.html @@ -11,7 +11,7 @@ - +
From 4e2e8f862166ee855daa5bfa42aca746a0c4bf1f Mon Sep 17 00:00:00 2001 From: PayBas Date: Mon, 7 Apr 2014 08:39:03 +0200 Subject: [PATCH 2/4] [ticket/12369] Added ACP vars PHPBB3-12369 --- phpBB/adm/style/overall_header.html | 2 +- phpBB/adm/style/simple_header.html | 2 +- phpBB/includes/functions_acp.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index 7e7f0cecee..f5d0fda88a 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -110,7 +110,7 @@ function popup(url, width, height, name) - + diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index 770b7da8a6..fd5145f0d5 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -104,7 +104,7 @@ function find_username(url) - + diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index cb44ed2794..37abab847a 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -63,6 +63,7 @@ function adm_page_header($page_title) $template->assign_vars(array( 'PAGE_TITLE' => $page_title, 'USERNAME' => $user->data['username'], + 'BODY_CLASS' => '', 'SID' => $SID, '_SID' => $_SID, From 964a75ba7c57c7c59bcf013afecf638d6b85316e Mon Sep 17 00:00:00 2001 From: PayBas Date: Mon, 7 Apr 2014 17:56:27 +0200 Subject: [PATCH 3/4] [ticket/12369] Removed template vars initial state PHPBB3-12369 --- phpBB/includes/functions.php | 1 - phpBB/includes/functions_acp.php | 1 - 2 files changed, 2 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 2eb471c1a8..13d05d0814 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4929,7 +4929,6 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'RECORD_USERS' => $l_online_record, 'PRIVATE_MESSAGE_COUNT' => (!empty($user->data['user_unread_privmsg'])) ? $user->data['user_unread_privmsg'] : 0, 'HIDDEN_FIELDS_FOR_JUMPBOX' => $hidden_fields_for_jumpbox, - 'BODY_CLASS' => '', 'UNREAD_NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', 'NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 37abab847a..cb44ed2794 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -63,7 +63,6 @@ function adm_page_header($page_title) $template->assign_vars(array( 'PAGE_TITLE' => $page_title, 'USERNAME' => $user->data['username'], - 'BODY_CLASS' => '', 'SID' => $SID, '_SID' => $_SID, From 4cd6317d412bd002a4c213be4ba74018d612d446 Mon Sep 17 00:00:00 2001 From: PayBas Date: Mon, 7 Apr 2014 22:46:22 +0200 Subject: [PATCH 4/4] [ticket/12369] White-space cleanup PHPBB3-12369 --- phpBB/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 13d05d0814..8c29bc7171 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4928,7 +4928,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'LOGGED_IN_USER_LIST' => $online_userlist, 'RECORD_USERS' => $l_online_record, 'PRIVATE_MESSAGE_COUNT' => (!empty($user->data['user_unread_privmsg'])) ? $user->data['user_unread_privmsg'] : 0, - 'HIDDEN_FIELDS_FOR_JUMPBOX' => $hidden_fields_for_jumpbox, + 'HIDDEN_FIELDS_FOR_JUMPBOX' => $hidden_fields_for_jumpbox, 'UNREAD_NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', 'NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '',