From 22c8df5403b74cbcad8a267f12c048eaaf053e0f Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Fri, 16 Aug 2013 19:45:38 +0300 Subject: [ticket/11795] Move PM popup JS to forum_fn.js Move PM popup JavaScript from overall_header to forum_fn.js Use TWIG to escape PM popup URL PHPBB3-11795 --- phpBB/styles/prosilver/template/forum_fn.js | 6 ++++++ phpBB/styles/prosilver/template/overall_header.html | 17 +++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) (limited to 'phpBB/styles/prosilver/template') diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 992479e45e..4b02093b3e 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -323,6 +323,12 @@ jQuery(document).ready(apply_onkeypress_event); jumpto($(this)); }); + // PM popup + $('body[data-popup-pm-url]').each(function() { + var url = this.getAttribute('data-popup-pm-url'); + window.open(url.replace(/&/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400'); + }); + // Adjust HTML code for IE8 and older versions var test = document.createElement('div'), oldBrowser = (typeof test.style.borderRadius == 'undefined'); diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 8342136da3..26394034d4 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -24,17 +24,6 @@ Modified by: --> - - @@ -47,12 +36,16 @@ + + {% set body_attributes %}{{ body_attributes }} data-popup-pm-url="{{ U_POPUP_PM|e('html_attr') }}"{% endset %} + + {$STYLESHEETS} - +

-- cgit v1.2.1