diff options
| author | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-09-06 10:17:10 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-09-14 10:10:45 +0300 |
| commit | d27bc857f3b8c434696f3324574a9cc10ca9159a (patch) | |
| tree | 4a8c601332c180168956bcd755f17819cfb7e476 /phpBB | |
| parent | 973f4bc88731039eca473a08e24684d684f13aef (diff) | |
| download | forums-d27bc857f3b8c434696f3324574a9cc10ca9159a.tar forums-d27bc857f3b8c434696f3324574a9cc10ca9159a.tar.gz forums-d27bc857f3b8c434696f3324574a9cc10ca9159a.tar.bz2 forums-d27bc857f3b8c434696f3324574a9cc10ca9159a.tar.xz forums-d27bc857f3b8c434696f3324574a9cc10ca9159a.zip | |
[ticket/11795] Remove PM popup
PHPBB3-11795
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/template/forum_fn.js | 6 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 6 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/overall_header.html | 3 |
3 files changed, 1 insertions, 14 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 8bbb847dfc..693211983f 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -425,12 +425,6 @@ function insert_single_user(formId, user) 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 bc8d9d366a..0b0c7a4172 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -36,16 +36,12 @@ <link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> <![endif]--> -<!-- IF S_USER_PM_POPUP and S_NEW_PM --> - {% set body_attributes %}{{ body_attributes }} data-popup-pm-url="{U_POPUP_PM|e('html_attr')}"{% endset %} -<!-- ENDIF --> - <!-- EVENT overall_header_head_append --> {$STYLESHEETS} </head> -<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}"{{ body_attributes }}> +<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}"> <div id="wrap"> <a id="top" accesskey="t"></a> diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 4dfde86404..7bfb85017a 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -22,9 +22,6 @@ <script type="text/javascript"> // <![CDATA[ -<!-- IF S_USER_PM_POPUP and S_NEW_PM --> - popup('{U_POPUP_PM|e('js')}', 400, 225, '_phpbbprivmsg'); -<!-- ENDIF --> function popup(url, width, height, name) { |